ARM: Implement WFE/WFI/SEV semantics.

[gem5.git] / src / sim / eventq.cc

diff --git a/src/sim/eventq.cc b/src/sim/eventq.cc
index f3d0eb461be91042dd8444c54b9ff8f5f77cad45..78524fe51fc3492986db8d205b31856d5864adba 100644 (file)
--- a/src/sim/eventq.cc
+++ b/src/sim/eventq.cc
@@ -40,6 +40,7 @@
 #include "base/misc.hh"
 #include "base/trace.hh"
 #include "cpu/smt.hh"
+#include "debug/Config.hh"
 #include "sim/core.hh"
 #include "sim/eventq.hh"
 
@@ -59,6 +60,8 @@ Counter Event::instanceCounter = 0;
 
 Event::~Event()
 {
+    assert(!scheduled());
+    flags = 0;
 }
 
 const std::string
@@ -231,13 +234,22 @@ Event::unserialize(Checkpoint *cp, const string &section)
     UNSERIALIZE_SCALAR(_when);
     UNSERIALIZE_SCALAR(_priority);
 
-    // need to see if original event was in a scheduled, unsquashed
-    // state, but don't want to restore those flags in the current
-    // object itself (since they aren't immediately true)
     short _flags;
     UNSERIALIZE_SCALAR(_flags);
+
+    // Old checkpoints had no concept of the Initialized flag
+    // so restoring from old checkpoints always fail.
+    // Events are initialized on construction but original code 
+    // "flags = _flags" would just overwrite the initialization. 
+    // So, read in the checkpoint flags, but then set the Initialized 
+    // flag on top of it in order to avoid failures.
+    assert(initialized());
     flags = _flags;
+    flags.set(Initialized);
 
+    // need to see if original event was in a scheduled, unsquashed
+    // state, but don't want to restore those flags in the current
+    // object itself (since they aren't immediately true)
     bool wasScheduled = flags.isSet(Scheduled) && !flags.isSet(Squashed);
     flags.clear(Squashed | Scheduled);
 
@@ -298,7 +310,7 @@ void
 EventQueue::dump() const
 {
     cprintf("============================================================\n");
-    cprintf("EventQueue Dump  (cycle %d)\n", curTick);
+    cprintf("EventQueue Dump  (cycle %d)\n", curTick());
     cprintf("------------------------------------------------------------\n");
 
     if (empty())
@@ -406,3 +418,7 @@ Event::dump() const
         cprintf("Not Scheduled\n");
     }
 }
+
+EventQueue::EventQueue(const string &n)
+    : objName(n), head(NULL)
+{}