diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/cpu/o3/commit_impl.hh | 5 | ||||
| -rw-r--r-- | src/cpu/o3/fetch_impl.hh | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/cpu/o3/commit_impl.hh b/src/cpu/o3/commit_impl.hh index b3a97ad3a..d32493cbc 100644 --- a/src/cpu/o3/commit_impl.hh +++ b/src/cpu/o3/commit_impl.hh @@ -1225,7 +1225,10 @@ DefaultCommit<Impl>::commitHead(DynInstPtr &head_inst, unsigned inst_num) // needed to update the state as soon as possible. This // prevents external agents from changing any specific state // that the trap need. - cpu->trap(inst_fault, tid, head_inst->staticInst); + cpu->trap(inst_fault, tid, + head_inst->notAnInst() ? + StaticInst::nullStaticInstPtr : + head_inst->staticInst); // Exit state update mode to avoid accidental updating. thread[tid]->noSquashFromTC = false; diff --git a/src/cpu/o3/fetch_impl.hh b/src/cpu/o3/fetch_impl.hh index 6cca77a87..d8793426b 100644 --- a/src/cpu/o3/fetch_impl.hh +++ b/src/cpu/o3/fetch_impl.hh @@ -729,6 +729,7 @@ DefaultFetch<Impl>::finishTranslation(const Fault &fault, RequestPtr mem_req) // We will use a nop in ordier to carry the fault. DynInstPtr instruction = buildInst(tid, StaticInst::nopStaticInstPtr, NULL, fetchPC, fetchPC, false); + instruction->setNotAnInst(); instruction->setPredTarg(fetchPC); instruction->fault = fault; |