From 321d3a6e8c9ed9511f7944c8ad8dbd16508cb5ad Mon Sep 17 00:00:00 2001
From: Gabe Black <gblack@eecs.umich.edu>
Date: Wed, 2 Jun 2010 12:58:01 -0500
Subject: ARM: Implement a new set of base classes for non macro memory
 instructions.

---
 src/arch/arm/insts/mem.cc | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

(limited to 'src/arch/arm/insts/mem.cc')

diff --git a/src/arch/arm/insts/mem.cc b/src/arch/arm/insts/mem.cc
index afbf05e44..f62786979 100644
--- a/src/arch/arm/insts/mem.cc
+++ b/src/arch/arm/insts/mem.cc
@@ -1,4 +1,17 @@
-/* Copyright (c) 2007-2008 The Florida State University
+/*
+ * Copyright (c) 2010 ARM Limited
+ * All rights reserved
+ *
+ * The license below extends only to copyright in the software and shall
+ * not be construed as granting a license to any other intellectual
+ * property including but not limited to intellectual property relating
+ * to a hardware implementation of the functionality of the software
+ * licensed hereunder.  You may use the software subject to the license
+ * terms below provided that you ensure that this notice is replicated
+ * unmodified and in its entirety in all distributions of the software,
+ * modified or unmodified, in source code or in binary form.
+ *
+ * Copyright (c) 2007-2008 The Florida State University
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -32,6 +45,28 @@
 
 namespace ArmISA
 {
+
+void
+MemoryNew::printInst(std::ostream &os, AddrMode addrMode) const
+{
+    printMnemonic(os);
+    printReg(os, dest);
+    os << ", [";
+    printReg(os, base);
+    if (addrMode != AddrMd_PostIndex) {
+        os << ", ";
+        printOffset(os);
+        os << "]";
+        if (addrMode == AddrMd_PreIndex) {
+            os << "!";
+        }
+    } else {
+        os << "] ";
+        printOffset(os);
+
+    }
+}
+
 std::string
 Memory::generateDisassembly(Addr pc, const SymbolTable *symtab) const
 {
@@ -50,4 +85,5 @@ Memory::generateDisassembly(Addr pc, const SymbolTable *symtab) const
         ss << "!";
     return ss.str();
 }
+
 }
-- 
cgit v1.2.3