From e6a0be648e9fdb4b882cfb5f3224d097817338bc Mon Sep 17 00:00:00 2001
From: Min Kyu Jeong <minkyu.jeong@arm.com>
Date: Mon, 23 Aug 2010 11:18:42 -0500
Subject: ARM: Improve printing of uop disassembly.

---
 src/arch/arm/insts/macromem.cc | 27 +++++++++++++++++++++++++++
 src/arch/arm/insts/macromem.hh |  4 ++++
 2 files changed, 31 insertions(+)

(limited to 'src/arch/arm/insts')

diff --git a/src/arch/arm/insts/macromem.cc b/src/arch/arm/insts/macromem.cc
index e47f4c21c..2a2412912 100644
--- a/src/arch/arm/insts/macromem.cc
+++ b/src/arch/arm/insts/macromem.cc
@@ -215,4 +215,31 @@ MacroVFPMemOp::MacroVFPMemOp(const char *mnem, ExtMachInst machInst,
     }
 }
 
+std::string
+MicroIntOp::generateDisassembly(Addr pc, const SymbolTable *symtab) const
+{
+    std::stringstream ss;
+    printMnemonic(ss);
+    printReg(ss, ura);
+    ss << ", ";
+    printReg(ss, urb);
+    ss << ", ";
+    ccprintf(ss, "#%d", imm);
+    return ss.str();
+}
+
+std::string
+MicroMemOp::generateDisassembly(Addr pc, const SymbolTable *symtab) const
+{
+    std::stringstream ss;
+    printMnemonic(ss);
+    printReg(ss, ura);
+    ss << ", [";
+    printReg(ss, urb);
+    ss << ", ";
+    ccprintf(ss, "#%d", imm);
+    ss << "]";
+    return ss.str();
+}
+
 }
diff --git a/src/arch/arm/insts/macromem.hh b/src/arch/arm/insts/macromem.hh
index f2d4f9276..003f5a3fd 100644
--- a/src/arch/arm/insts/macromem.hh
+++ b/src/arch/arm/insts/macromem.hh
@@ -94,6 +94,8 @@ class MicroIntOp : public MicroOp
               ura(_ura), urb(_urb), imm(_imm)
     {
     }
+
+    std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const;
 };
 
 /**
@@ -111,6 +113,8 @@ class MicroMemOp : public MicroIntOp
               up(_up), memAccessFlags(TLB::MustBeOne | TLB::AlignWord)
     {
     }
+
+    std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const;
 };
 
 /**
-- 
cgit v1.2.3