Merge zed.eecs.umich.edu:/.automount/zeep/z/saidi/work/m5.newmem

[gem5.git] / src / cpu / simple / base.cc

diff --git a/src/cpu/simple/base.cc b/src/cpu/simple/base.cc
index ab438aa770a712a8681583bfa8c53dfc476f549d..ddccc5a9b8670e506a778f98656866231a20f1d5 100644 (file)
--- a/src/cpu/simple/base.cc
+++ b/src/cpu/simple/base.cc
@@ -315,6 +315,7 @@ BaseSimpleCPU::checkForInterrupts()
         Fault interrupt = interrupts.getInterrupt(tc);
 
         if (interrupt != NoFault) {
+            interrupts.updateIntrInfo(tc);
             checkInterrupts = false;
             interrupt->invoke(tc);
         }
@@ -436,6 +437,7 @@ void
 BaseSimpleCPU::advancePC(Fault fault)
 {
     if (fault != NoFault) {
+        curMacroStaticInst = StaticInst::nullStaticInstPtr;
         fault->invoke(tc);
     } else {
         //If we're at the last micro op for this instruction