1 files changed, 23 insertions, 29 deletions

diff --git a/src/cpu/o3/iew_impl.hh b/src/cpu/o3/iew_impl.hh
index e25c8829b..4b4f66a1f 100644
--- a/src/cpu/o3/iew_impl.hh
+++ b/src/cpu/o3/iew_impl.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2011 ARM Limited
+ * Copyright (c) 2010-2012 ARM Limited
  * All rights reserved.
  *
  * The license below extends only to copyright in the software and shall
@@ -54,6 +54,7 @@
 #include "cpu/timebuf.hh"
 #include "debug/Activity.hh"
 #include "debug/Decode.hh"
+#include "debug/Drain.hh"
 #include "debug/IEW.hh"
 #include "params/DerivO3CPU.hh"
 
@@ -73,8 +74,7 @@ DefaultIEW<Impl>::DefaultIEW(O3CPU *_cpu, DerivO3CPUParams *params)
       issueWidth(params->issueWidth),
       wbOutstanding(0),
       wbWidth(params->wbWidth),
-      numThreads(params->numThreads),
-      switchedOut(false)
+      numThreads(params->numThreads)
 {
     _status = Active;
     exeStatus = Running;
@@ -360,38 +360,33 @@ DefaultIEW<Impl>::setScoreboard(Scoreboard *sb_ptr)
 
 template <class Impl>
 bool
-DefaultIEW<Impl>::drain()
+DefaultIEW<Impl>::isDrained() const
 {
-    // IEW is ready to drain at any time.
-    cpu->signalDrained();
-    return true;
-}
+    bool drained(ldstQueue.isDrained());
 
-template <class Impl>
-void
-DefaultIEW<Impl>::resume()
-{
+    for (ThreadID tid = 0; tid < numThreads; tid++) {
+        if (!insts[tid].empty()) {
+            DPRINTF(Drain, "%i: Insts not empty.\n", tid);
+            drained = false;
+        }
+        if (!skidBuffer[tid].empty()) {
+            DPRINTF(Drain, "%i: Skid buffer not empty.\n", tid);
+            drained = false;
+        }
+    }
+
+    return drained;
 }
 
 template <class Impl>
 void
-DefaultIEW<Impl>::switchOut()
+DefaultIEW<Impl>::drainSanityCheck() const
 {
-    // Clear any state.
-    switchedOut = true;
-    assert(insts[0].empty());
-    assert(skidBuffer[0].empty());
+    assert(isDrained());
 
-    instQueue.switchOut();
-    ldstQueue.switchOut();
-    fuPool->switchOut();
-
-    for (ThreadID tid = 0; tid < numThreads; tid++) {
-        while (!insts[tid].empty())
-            insts[tid].pop();
-        while (!skidBuffer[tid].empty())
-            skidBuffer[tid].pop();
-    }
+    instQueue.drainSanityCheck();
+    ldstQueue.drainSanityCheck();
+    fuPool->drainSanityCheck();
 }
 
 template <class Impl>
@@ -402,11 +397,10 @@ DefaultIEW<Impl>::takeOverFrom()
     _status = Active;
     exeStatus = Running;
     wbStatus = Idle;
-    switchedOut = false;
 
     instQueue.takeOverFrom();
     ldstQueue.takeOverFrom();
-    fuPool->takeOver();
+    fuPool->takeOverFrom();
 
     startupStage();
     cpu->activityThisCycle();