Merge zizzer.eecs.umich.edu:/bk/newmem

into ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86 --HG-- extra : convert_revision : c5275ef3e53393496a2ebe05b2f516884bb392f9
2007-04-10 17:27:33 +00:00
parent f71a6c8fed 74122c04cf
commit fcc35a67e0
10 changed files with 169 additions and 73 deletions
--- 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);
    }