derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Gabe Black
2021-01-28 18:50:54 -08:00
parent e656730f35
commit b8dfb95284
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/arch/arm/tracers/tarmac_base.cc
View File

@@ -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)

2
src/arch/arm/tracers/tarmac_parser.cc
View File

@@ -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;

2
src/cpu/minor/dyn_inst.cc
View File

@@ -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;