From: Ali Saidi <saidi@eecs.umich.edu>
Date: Wed, 17 Jan 2007 00:12:33 +0000 (-0500)
Subject: In the case that we generate a fault (e.g. a tlb miss) on a microcoded instruction... 
X-Git-Tag: m5_2.0_beta3~224^2~10^2~3
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=64528df38d7484591ae27bb2a2252fc1bccd4e9a;p=gem5.git

In the case that we generate a fault (e.g. a tlb miss) on a microcoded instruction set curMacroStaticInst to null
This way we'll jump immediately to the handler

--HG--
extra : convert_revision : 36218d3a5c2342337e66e1229ea2219533efd41e
---

diff --git a/src/cpu/simple/base.cc b/src/cpu/simple/base.cc
index 4e5754bbb..ddccc5a9b 100644
--- a/src/cpu/simple/base.cc
+++ b/src/cpu/simple/base.cc
@@ -437,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