diff options
| author | Lisa Hsu <hsul@eecs.umich.edu> | 2007-01-19 21:34:21 -0500 |
|---|---|---|
| committer | Lisa Hsu <hsul@eecs.umich.edu> | 2007-01-19 21:34:21 -0500 |
| commit | 01c959aeaf7f4c6e15bae9d8de227b6d2cbb7ae1 (patch) | |
| tree | 158f99a529eccb9c4835a2f544cc4ce59d482ec8 /src/cpu/simple/base.cc | |
| parent | f1aeaf7ceb44ea6ef7032048a68c74ecedc7685b (diff) | |
| parent | ae0d8d16818e49a16a3c2fa0553acf60514934e6 (diff) | |
| download | gem5-01c959aeaf7f4c6e15bae9d8de227b6d2cbb7ae1.tar.xz | |
Merge zed.eecs.umich.edu:/.automount/zeep/z/saidi/work/m5.newmem
into zed.eecs.umich.edu:/z/hsul/work/sparc/x86.m5
--HG--
extra : convert_revision : 9b8567bb775ed6fcc30096f1ab4cc37058bc7376
Diffstat (limited to 'src/cpu/simple/base.cc')
| -rw-r--r-- | src/cpu/simple/base.cc | 1 |
1 files changed, 1 insertions, 0 deletions
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 |