summaryrefslogtreecommitdiff
path: root/src/cpu/simple
diff options
context:
space:
mode:
authorKevin Lim <ktlim@umich.edu>2006-07-06 23:20:44 -0400
committerKevin Lim <ktlim@umich.edu>2006-07-06 23:20:44 -0400
commit55e59e26c1a7acd8715262999451c451fc50b480 (patch)
treea2d314bb791c0be13dc32901a42261a35d55b987 /src/cpu/simple
parent1ccfdb442ff34f9f2b38ee7716b7baee99a397c2 (diff)
parent6872b99c29cd4263062bb8b3ef15aa5a9f2532d4 (diff)
downloadgem5-55e59e26c1a7acd8715262999451c451fc50b480.tar.xz
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge --HG-- extra : convert_revision : 942c43e2fdd68cde7aaaba5e88a667f80feab162
Diffstat (limited to 'src/cpu/simple')
-rw-r--r--src/cpu/simple/timing.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cpu/simple/timing.cc b/src/cpu/simple/timing.cc
index 036037ba9..6774d79a9 100644
--- a/src/cpu/simple/timing.cc
+++ b/src/cpu/simple/timing.cc
@@ -118,11 +118,11 @@ TimingSimpleCPU::drain(Event *drain_event)
// an access to complete.
if (status() == Idle || status() == Running || status() == SwitchedOut) {
changeState(SimObject::DrainedTiming);
- return false;
+ return true;
} else {
changeState(SimObject::Draining);
drainEvent = drain_event;
- return true;
+ return false;
}
}