summaryrefslogtreecommitdiff
path: root/src/cpu/o3
diff options
context:
space:
mode:
authorLisa Hsu <hsul@eecs.umich.edu>2006-10-18 17:59:11 -0400
committerLisa Hsu <hsul@eecs.umich.edu>2006-10-18 17:59:11 -0400
commitc2c48645c9b4f93cce8c1f653b6ef3e451829112 (patch)
tree4d3fcc4c0a7af958c37633407375a580171d51d2 /src/cpu/o3
parent0e2561710b44f811a5e179935d54ef240013d03e (diff)
downloadgem5-c2c48645c9b4f93cce8c1f653b6ef3e451829112.tar.xz
only do this assert after you know you're not switched out or idle.
--HG-- extra : convert_revision : 0cd0d31db44fe7e8e44bde90e1756873faca422f
Diffstat (limited to 'src/cpu/o3')
-rw-r--r--src/cpu/o3/cpu.cc7
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;