Merge zizzer.eecs.umich.edu:/bk/m5

into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest

--HG--
extra : convert_revision : 51b3fd809a77e146b8370636b2cc60ddf1075195

2 files changed, 9 insertions, 2 deletions

diff --git a/sim/eventq.hh b/sim/eventq.hh
index 60a61fa29..ed37fd4f4 100644
--- a/sim/eventq.hh
+++ b/sim/eventq.hh
@@ -243,10 +243,13 @@ class EventWrapper : public Event
     T *object;
 
   public:
-    EventWrapper(T *obj, EventQueue *q = &mainEventQueue,
+    EventWrapper(T *obj, bool del = false, EventQueue *q = &mainEventQueue,
                  Priority p = Default_Pri)
         : Event(q, p), object(obj)
-    {}
+    {
+        if (del)
+            setFlags(AutoDelete);
+    }
     void process() { (object->*F)(); }
 };
 
@@ -324,6 +327,8 @@ inline void
 Event::schedule(Tick t)
 {
     assert(!scheduled());
+    assert(t >= curTick);
+
     setFlags(Scheduled);
 #if TRACING_ON
     when_scheduled = curTick;
diff --git a/sim/universe.cc b/sim/universe.cc
index feede514e..d6c849ac7 100644
--- a/sim/universe.cc
+++ b/sim/universe.cc
@@ -47,6 +47,7 @@ Tick ticksPerSecond;
 double __ticksPerMS;
 double __ticksPerUS;
 double __ticksPerNS;
+double __ticksPerPS;
 
 string outputDirectory;
 ostream *outputStream;
@@ -79,6 +80,7 @@ UniverseParamContext::checkParams()
     __ticksPerMS = freq / 1.0e3;
     __ticksPerUS = freq / 1.0e6;
     __ticksPerNS = freq / 1.0e9;
+    __ticksPerPS = freq / 1.0e12;
 
     if (universe_output_dir.isValid()) {
         outputDirectory = universe_output_dir;