summaryrefslogtreecommitdiff
path: root/src/cpu
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2007-04-10 17:27:33 +0000
committerGabe Black <gblack@eecs.umich.edu>2007-04-10 17:27:33 +0000
commitfcc35a67e0cfa2e627ebba3fca0252bfb18f03c6 (patch)
treecd7bb69a26beca9bae831112a79b56cc3d4bbbfa /src/cpu
parentf71a6c8fed86c62d309908f37311456e8ec7a588 (diff)
parent74122c04cf8105d507f390c456c6e3c113b5a56e (diff)
downloadgem5-fcc35a67e0cfa2e627ebba3fca0252bfb18f03c6.tar.xz
Merge zizzer.eecs.umich.edu:/bk/newmem
into ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86 --HG-- extra : convert_revision : c5275ef3e53393496a2ebe05b2f516884bb392f9
Diffstat (limited to 'src/cpu')
-rw-r--r--src/cpu/simple/atomic.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cpu/simple/atomic.cc b/src/cpu/simple/atomic.cc
index 6f69b5ac4..b0a01c3a3 100644
--- 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);
}