CPU: Fix O3 and possible InOrder segfaults in FS.

2010-09-20 02:46:42 -07:00
parent 3f9f4bf3d6
commit ab8d7eee76
5 changed files with 9 additions and 8 deletions
--- a/src/cpu/o3/commit_impl.hh
+++ b/src/cpu/o3/commit_impl.hh
@@ -1062,7 +1062,7 @@ 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);
+        cpu->trap(inst_fault, tid, head_inst->staticInst);

        // Exit state update mode to avoid accidental updating.
        thread[tid]->inSyscall = false;