summaryrefslogtreecommitdiff
path: root/src/cpu
diff options
context:
space:
mode:
Diffstat (limited to 'src/cpu')
-rw-r--r--src/cpu/exetrace.cc2
-rw-r--r--src/cpu/simple/atomic.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/cpu/exetrace.cc b/src/cpu/exetrace.cc
index c568b1439..3e2b0f03e 100644
--- a/src/cpu/exetrace.cc
+++ b/src/cpu/exetrace.cc
@@ -652,7 +652,7 @@ Trace::InstRecord::dump()
predecoder.setTC(thread);
predecoder.moreBytes(m5Pc, 0, shared_data->instruction);
- assert(predecoder.extMachInstRead());
+ assert(predecoder.extMachInstReady());
StaticInstPtr legionInst =
StaticInst::decode(predecoder.getExtMachInst());
diff --git a/src/cpu/simple/atomic.cc b/src/cpu/simple/atomic.cc
index 6f69b5ac4..b0a01c3a3 100644
--- a/src/cpu/simple/atomic.cc
+++ b/src/cpu/simple/atomic.cc
@@ -557,7 +557,7 @@ AtomicSimpleCPU::tick()
}
}
- if(predecoder.needMoreBytes())
+ if(predecoder.needMoreBytes() || fault != NoFault)
advancePC(fault);
}