diff options
| author | Lisa Hsu <hsul@eecs.umich.edu> | 2006-10-12 18:56:57 -0400 |
|---|---|---|
| committer | Lisa Hsu <hsul@eecs.umich.edu> | 2006-10-12 18:56:57 -0400 |
| commit | 339b1f85165df0e2654f755cc921eded3db8977c (patch) | |
| tree | 256d738554e3d0a2987c9d4769313310a5ce9967 /src/cpu/simple/timing.cc | |
| parent | 3d2764acf3a05a65c32e93bd18c8fe9a6e0d9ecc (diff) | |
| parent | ba795552f58525e34c26a79224ff24c11145103e (diff) | |
| download | gem5-339b1f85165df0e2654f755cc921eded3db8977c.tar.xz | |
Merge zizzer:/bk/newmem
into zed.eecs.umich.edu:/z/hsul/work/m5/newmem
src/cpu/simple/timing.cc:
hand merge
--HG--
extra : convert_revision : 083bf102249ad9bc63c447dbf85d3863f935f647
Diffstat (limited to 'src/cpu/simple/timing.cc')
| -rw-r--r-- | src/cpu/simple/timing.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cpu/simple/timing.cc b/src/cpu/simple/timing.cc index 33f673cbc..ad5c0e5d6 100644 --- a/src/cpu/simple/timing.cc +++ b/src/cpu/simple/timing.cc @@ -147,6 +147,8 @@ void TimingSimpleCPU::resume() { if (_status != SwitchedOut && _status != Idle) { + assert(system->getMemoryMode() == System::Timing); + // Delete the old event if it existed. if (fetchEvent) { if (fetchEvent->scheduled()) @@ -160,7 +162,6 @@ TimingSimpleCPU::resume() fetchEvent->schedule(curTick); } - assert(system->getMemoryMode() == System::Timing); changeState(SimObject::Running); previousTick = curTick; } |