Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/40100 )
Change subject: arch-arm,cpu: Use getEMI() in more places.
......................................................................
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.travagl...@arm.com>
Reviewed-by: Daniel Carvalho <oda...@yahoo.com.br>
Maintainer: Giacomo Travaglini <giacomo.travagl...@arm.com>
Maintainer: Bobby R. Bruce <bbr...@ucdavis.edu>
Tested-by: kokoro <noreply+kok...@google.com>
---
M src/arch/arm/tracers/tarmac_base.cc
M src/arch/arm/tracers/tarmac_parser.cc
M src/cpu/minor/dyn_inst.cc
3 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Giacomo Travaglini: Looks good to me, approved; Looks good to me, approved
Daniel Carvalho: Looks good to me, but someone else must approve
Bobby R. Bruce: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/arm/tracers/tarmac_base.cc
b/src/arch/arm/tracers/tarmac_base.cc
index 7015cc2..e3364c4 100644
--- a/src/arch/arm/tracers/tarmac_base.cc
+++ b/src/arch/arm/tracers/tarmac_base.cc
@@ -64,7 +64,7 @@
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 3325342..db9c7e1 100644
--- a/src/arch/arm/tracers/tarmac_parser.cc
+++ b/src/arch/arm/tracers/tarmac_parser.cc
@@ -951,7 +951,7 @@
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 1b43fc8..5a08da8 100644
--- a/src/cpu/minor/dyn_inst.cc
+++ b/src/cpu/minor/dyn_inst.cc
@@ -214,7 +214,7 @@
regs_str << ',';
}
- ccprintf(regs_str, " extMachInst=%160x", staticInst->machInst);
+ ccprintf(regs_str, " extMachInst=%160x", staticInst->getEMI());
}
std::ostringstream flags;
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/40100
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I11434206c0b7a1aa3793aa46b5056ad60a64b01c
Gerrit-Change-Number: 40100
Gerrit-PatchSet: 7
Gerrit-Owner: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: Andreas Sandberg <andreas.sandb...@arm.com>
Gerrit-Reviewer: Bobby R. Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Daniel Carvalho <oda...@yahoo.com.br>
Gerrit-Reviewer: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: Giacomo Travaglini <giacomo.travagl...@arm.com>
Gerrit-Reviewer: Jason Lowe-Power <ja...@lowepower.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
