From 9dfbea68a204ca93ef9d20a13dd2fe7288121c75 Mon Sep 17 00:00:00 2001
From: Ali Saidi <saidi@eecs.umich.edu>
Date: Wed, 9 May 2007 22:34:54 -0400
Subject: update for new reschedule semantics

--HG--
extra : convert_revision : 8c18b2513d638f67cc096e7f1483b47390a374ca
---
 src/sim/eventq.hh      | 17 ++++++++++++-----
 src/sim/pseudo_inst.cc | 10 ++--------
 2 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'src/sim')

diff --git a/src/sim/eventq.hh b/src/sim/eventq.hh
index a57e9077e..974313968 100644
--- a/src/sim/eventq.hh
+++ b/src/sim/eventq.hh
@@ -210,7 +210,8 @@ class Event : public Serializable, public FastAlloc
     void schedule(Tick t);
 
     /// Reschedule the event with the current priority
-    void reschedule(Tick t);
+    // always parameter means to schedule if not already scheduled
+    void reschedule(Tick t, bool always = false);
 
     /// Remove the event from the current schedule
     void deschedule();
@@ -402,16 +403,22 @@ Event::deschedule()
 }
 
 inline void
-Event::reschedule(Tick t)
+Event::reschedule(Tick t, bool always)
 {
-    assert(scheduled());
-    clearFlags(Squashed);
+    assert(scheduled() || always);
 
 #if TRACING_ON
     when_scheduled = curTick;
 #endif
     _when = t;
-    queue->reschedule(this);
+
+    if (scheduled()) {
+        clearFlags(Squashed);
+        queue->reschedule(this);
+    } else {
+        setFlags(Scheduled);
+        queue->schedule(this);
+    }
 }
 
 inline void
diff --git a/src/sim/pseudo_inst.cc b/src/sim/pseudo_inst.cc
index 56a779674..10127aa5f 100644
--- a/src/sim/pseudo_inst.cc
+++ b/src/sim/pseudo_inst.cc
@@ -87,10 +87,7 @@ namespace PseudoInst
 
         Tick resume = curTick + Clock::Int::ns * ns;
 
-        if (quiesceEvent->scheduled())
-            quiesceEvent->reschedule(resume);
-        else
-            quiesceEvent->schedule(resume);
+        quiesceEvent->reschedule(resume, true);
 
         DPRINTF(Quiesce, "%s: quiesceNs(%d) until %d\n",
                 tc->getCpuPtr()->name(), ns, resume);
@@ -110,10 +107,7 @@ namespace PseudoInst
 
         Tick resume = curTick + tc->getCpuPtr()->cycles(cycles);
 
-        if (quiesceEvent->scheduled())
-            quiesceEvent->reschedule(resume);
-        else
-            quiesceEvent->schedule(resume);
+        quiesceEvent->reschedule(resume, true);
 
         DPRINTF(Quiesce, "%s: quiesceCycles(%d) until %d\n",
                 tc->getCpuPtr()->name(), cycles, resume);
-- 
cgit v1.2.3