ARM: Move PC mode bits around so they can be used for exectrace

3 files changed, 17 insertions, 12 deletions

diff --git a/src/arch/arm/isa_traits.hh b/src/arch/arm/isa_traits.hh
index 00c4c2932..4cffe3bec 100644
--- a/src/arch/arm/isa_traits.hh
+++ b/src/arch/arm/isa_traits.hh
@@ -121,6 +121,13 @@ namespace ArmISA
 
     // Memory accesses cannot be unaligned
     const bool HasUnalignedMemAcc = false;
+
+    // These otherwise unused bits of the PC are used to select a mode
+    // like the J and T bits of the CPSR.
+    static const Addr PcJBitShift = 33;
+    static const Addr PcTBitShift = 34;
+    static const Addr PcModeMask = (ULL(1) << PcJBitShift) |
+                                   (ULL(1) << PcTBitShift);
 };
 
 using namespace ArmISA;
diff --git a/src/arch/arm/miscregs.hh b/src/arch/arm/miscregs.hh
index ad4f91908..e3e2ca2c2 100644
--- a/src/arch/arm/miscregs.hh
+++ b/src/arch/arm/miscregs.hh
@@ -201,13 +201,6 @@ namespace ArmISA
     // integer register to allow renaming.
     static const uint32_t CondCodesMask = 0xF80F0000;
 
-    // These otherwise unused bits of the PC are used to select a mode
-    // like the J and T bits of the CPSR.
-    static const Addr PcJBitShift = 33;
-    static const Addr PcTBitShift = 34;
-    static const Addr PcModeMask = (ULL(1) << PcJBitShift) |
-                                   (ULL(1) << PcTBitShift);
-
     BitUnion32(SCTLR)
         Bitfield<30> te;  // Thumb Exception Enable
         Bitfield<29> afe; // Access flag enable
diff --git a/src/cpu/exetrace.cc b/src/cpu/exetrace.cc
index 07be700bb..28c7861ef 100644
--- a/src/cpu/exetrace.cc
+++ b/src/cpu/exetrace.cc
@@ -33,6 +33,7 @@
 
 #include <iomanip>
 
+#include "arch/isa_traits.hh"
 #include "base/loader/symtab.hh"
 #include "cpu/base.hh"
 #include "cpu/exetrace.hh"
@@ -70,18 +71,22 @@ Trace::ExeTracerRecord::traceInst(StaticInstPtr inst, bool ran)
 
     std::string sym_str;
     Addr sym_addr;
+    Addr cur_pc = PC;
+#if THE_ISA == ARM_ISA
+    cur_pc &= ~PcModeMask;
+#endif
     if (debugSymbolTable
         && IsOn(ExecSymbol)
 #if FULL_SYSTEM
         && !inUserMode(thread)
 #endif
-        && debugSymbolTable->findNearestSymbol(PC, sym_str, sym_addr)) {
-        if (PC != sym_addr)
-            sym_str += csprintf("+%d", PC - sym_addr);
+        && debugSymbolTable->findNearestSymbol(cur_pc, sym_str, sym_addr)) {
+        if (cur_pc != sym_addr)
+            sym_str += csprintf("+%d",cur_pc - sym_addr);
         outs << "@" << sym_str;
     }
     else {
-        outs << "0x" << hex << PC;
+        outs << "0x" << hex << cur_pc;
     }
 
     if (inst->isMicroop()) {
@@ -97,7 +102,7 @@ Trace::ExeTracerRecord::traceInst(StaticInstPtr inst, bool ran)
     //
 
     outs << setw(26) << left;
-    outs << inst->disassemble(PC, debugSymbolTable);
+    outs << inst->disassemble(cur_pc, debugSymbolTable);
 
     if (ran) {
         outs << " : ";