diff options
| author | Ron Dreslinski <rdreslin@umich.edu> | 2006-10-19 19:00:43 -0400 |
|---|---|---|
| committer | Ron Dreslinski <rdreslin@umich.edu> | 2006-10-19 19:00:43 -0400 |
| commit | 9cf063eb8e0b9d4af40f0e8fe609f9135be899f5 (patch) | |
| tree | 6c001f86099f6e84dc70849c52101b3b1c6b3bd1 /src/cpu | |
| parent | 39d24f7241e0645bd4cf1e71d37be9b4e913cb9b (diff) | |
| parent | bf917535f835b296d6fd88d3c63f3b692ffb1509 (diff) | |
| download | gem5-9cf063eb8e0b9d4af40f0e8fe609f9135be899f5.tar.xz | |
Merge zizzer:/bk/newmem
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/newmemcleanest
--HG--
extra : convert_revision : c6611b32537918f5bf183788227ddf69a9a9a069
Diffstat (limited to 'src/cpu')
| -rw-r--r-- | src/cpu/o3/cpu.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/cpu/o3/cpu.cc b/src/cpu/o3/cpu.cc index 4c9a8e91f..367508288 100644 --- a/src/cpu/o3/cpu.cc +++ b/src/cpu/o3/cpu.cc @@ -850,9 +850,6 @@ template <class Impl> void FullO3CPU<Impl>::resume() { -#if FULL_SYSTEM - assert(system->getMemoryMode() == System::Timing); -#endif fetch.resume(); decode.resume(); rename.resume(); @@ -864,6 +861,10 @@ FullO3CPU<Impl>::resume() if (_status == SwitchedOut || _status == Idle) return; +#if FULL_SYSTEM + assert(system->getMemoryMode() == System::Timing); +#endif + if (!tickEvent.scheduled()) tickEvent.schedule(curTick); _status = Running; |