summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2009-04-19 02:23:29 -0700
committerGabe Black <gblack@eecs.umich.edu>2009-04-19 02:23:29 -0700
commitd10195b1a4d331f2db99161bd6ed546e6d3cd31d (patch)
tree9b7dade17de285735504bef71e5868fa856d2a55
parent05b5861419f3b7049b831f79bd67a55fa8c7f712 (diff)
downloadgem5-d10195b1a4d331f2db99161bd6ed546e6d3cd31d.tar.xz
CPU: If the simple CPU is already idle, just return from suspendContext, don't assert.
-rw-r--r--src/cpu/simple/atomic.cc3
-rw-r--r--src/cpu/simple/timing.cc3
2 files changed, 6 insertions, 0 deletions
diff --git a/src/cpu/simple/atomic.cc b/src/cpu/simple/atomic.cc
index 601111588..3ce0ba172 100644
--- a/src/cpu/simple/atomic.cc
+++ b/src/cpu/simple/atomic.cc
@@ -271,6 +271,9 @@ AtomicSimpleCPU::suspendContext(int thread_num)
assert(thread_num == 0);
assert(thread);
+ if (_status == Idle)
+ return;
+
assert(_status == Running);
// tick event may not be scheduled if this gets called from inside
diff --git a/src/cpu/simple/timing.cc b/src/cpu/simple/timing.cc
index 1af2ea0ec..64c4108a7 100644
--- a/src/cpu/simple/timing.cc
+++ b/src/cpu/simple/timing.cc
@@ -233,6 +233,9 @@ TimingSimpleCPU::suspendContext(int thread_num)
assert(thread_num == 0);
assert(thread);
+ if (_status == Idle)
+ return;
+
assert(_status == Running);
// just change status to Idle... if status != Running,