summaryrefslogtreecommitdiff
path: root/src/cpu
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2007-01-23 15:50:03 -0500
committerAli Saidi <saidi@eecs.umich.edu>2007-01-23 15:50:03 -0500
commit4301e4cd08018eb56b4f196afcce9a8311f390b4 (patch)
tree4139c676d721c1a39d5ff4b6c6c8550a42264d5e /src/cpu
parent60eaa03d72a13863596e64343d7407af1cab51c5 (diff)
downloadgem5-4301e4cd08018eb56b4f196afcce9a8311f390b4.tar.xz
use pstate.am to mask off PC/NPC where it needs to +be
check writability of tlb cache entry before using update tagaccess in places I forgot to move the tlb privileged test up since it is higher priority src/arch/sparc/faults.cc: save only 32 bits of PC/NPC if Pstate.am is set src/arch/sparc/isa/decoder.isa: return only 32 bits of PC/NPC if Pstate.am is set increment cleanwin correctly src/arch/sparc/tlb.cc: check writability of cache entry update tagaccess in a few more places move the privileged test up since it is higher priority src/cpu/exetrace.cc: mask off upper bits of pc if pstate.am is set before comparing to legion --HG-- extra : convert_revision : 02a51c141ee3f9a2600c28eac018ea7216f3655c
Diffstat (limited to 'src/cpu')
-rw-r--r--src/cpu/exetrace.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/cpu/exetrace.cc b/src/cpu/exetrace.cc
index 87075c1ec..26e8b6b44 100644
--- a/src/cpu/exetrace.cc
+++ b/src/cpu/exetrace.cc
@@ -340,6 +340,9 @@ Trace::InstRecord::dump(ostream &outs)
while (!compared) {
if (shared_data->flags == OWN_M5) {
m5Pc = PC & TheISA::PAddrImplMask;
+ if (bits(shared_data->pstate,3,3)) {
+ m5Pc &= mask(32);
+ }
lgnPc = shared_data->pc & TheISA::PAddrImplMask;
if (lgnPc != m5Pc)
diffPC = true;