arch-arm,cpu: Use getEMI() in more places.

Use that method to avoid reading the machInst.

Change-Id: I11434206c0b7a1aa3793aa46b5056ad60a64b01c
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/40100
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-by: Daniel Carvalho <odanrc@yahoo.com.br>
Maintainer: Giacomo Travaglini <giacomo.travaglini@arm.com>
Maintainer: Bobby R. Bruce <bbruce@ucdavis.edu>
Tested-by: kokoro <noreply+kokoro@google.com>

diff --git a/src/arch/arm/tracers/tarmac_base.cc b/src/arch/arm/tracers/tarmac_base.cc
index 7015cc2b4ce93ec56e5cd3416879f15631e87acc..e3364c4ed57ca8c259d203acdbe14e5e70a62824 100644 (file)
--- a/src/arch/arm/tracers/tarmac_base.cc
+++ b/src/arch/arm/tracers/tarmac_base.cc
@@ -64,7 +64,7 @@ TarmacBaseRecord::InstEntry::InstEntry(
     bool predicate)
         : taken(predicate) ,
           addr(pc.instAddr()) ,
-          opcode(staticInst->machInst & 0xffffffff),
+          opcode(staticInst->getEMI() & 0xffffffff),
           disassemble(staticInst->disassemble(addr)),
           isetstate(pcToISetState(pc)),
           mode(MODE_USER)

diff --git a/src/arch/arm/tracers/tarmac_parser.cc b/src/arch/arm/tracers/tarmac_parser.cc
index 33253427644cb982c84e1b906699968930d67ac4..db9c7e1d7a660512b8a0e84e46093dfd75cd8613 100644 (file)
--- a/src/arch/arm/tracers/tarmac_parser.cc
+++ b/src/arch/arm/tracers/tarmac_parser.cc
@@ -951,7 +951,7 @@ TarmacParserRecord::printMismatchHeader(const StaticInstPtr staticInst,
     outs << "\nMismatch between gem5 and TARMAC trace @ " << std::dec
          << curTick() << " ticks\n"
          << "[seq_num: " << std::dec << instRecord.seq_num
-         << ", opcode: 0x" << std::hex << (staticInst->machInst & 0xffffffff)
+         << ", opcode: 0x" << std::hex << (staticInst->getEMI() & 0xffffffff)
          << ", PC: 0x" << pc.pc()
          << ", disasm: " <<  staticInst->disassemble(pc.pc()) << "]"
          << std::endl;

diff --git a/src/cpu/minor/dyn_inst.cc b/src/cpu/minor/dyn_inst.cc
index 1b43fc80772ca39e7d94e56668836f29d81ca168..5a08da83e67b4a497d5de6ebdd3697fcb59679f5 100644 (file)
--- a/src/cpu/minor/dyn_inst.cc
+++ b/src/cpu/minor/dyn_inst.cc
@@ -214,7 +214,7 @@ MinorDynInst::minorTraceInst(const Named &named_object) const
                     regs_str << ',';
             }
 
-            ccprintf(regs_str, " extMachInst=%160x", staticInst->machInst);
+            ccprintf(regs_str, " extMachInst=%160x", staticInst->getEMI());
         }
 
         std::ostringstream flags;