diff options
author | Kevin Lim <ktlim@umich.edu> | 2006-06-29 21:38:16 -0400 |
---|---|---|
committer | Kevin Lim <ktlim@umich.edu> | 2006-06-29 21:38:16 -0400 |
commit | 0fbecab797ffe7fc68e3a9af9fd0a21df37ec635 (patch) | |
tree | 4983720f62cd4fc1ee57690678228e5aca75d531 /src/cpu/simple/base.cc | |
parent | ad6788493c09aec456a1136f126abde7000696ab (diff) | |
parent | de90be348239a0a58ebb659dfc6a2f2fe5909292 (diff) | |
download | gem5-0fbecab797ffe7fc68e3a9af9fd0a21df37ec635.tar.xz |
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge
--HG--
extra : convert_revision : 0756f7f1f63fae472e0ef1d20e9eb38e56de78c8
Diffstat (limited to 'src/cpu/simple/base.cc')
-rw-r--r-- | src/cpu/simple/base.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/cpu/simple/base.cc b/src/cpu/simple/base.cc index b4258fce6..db5dd2acf 100644 --- a/src/cpu/simple/base.cc +++ b/src/cpu/simple/base.cc @@ -446,11 +446,7 @@ void BaseSimpleCPU::advancePC(Fault fault) { if (fault != NoFault) { -#if FULL_SYSTEM fault->invoke(tc); -#else // !FULL_SYSTEM - fatal("fault (%s) detected @ PC %08p", fault->name(), thread->readPC()); -#endif // FULL_SYSTEM } else { // go to the next instruction |