1 files changed, 23 insertions, 8 deletions

diff --git a/src/systemc/core/scheduler.hh b/src/systemc/core/scheduler.hh
index 2843b6829..c22bdf870 100644
--- a/src/systemc/core/scheduler.hh
+++ b/src/systemc/core/scheduler.hh
@@ -225,10 +225,7 @@ class Scheduler
         TimeSlot *&ts = timeSlots[tick];
         if (!ts) {
             ts = new TimeSlot;
-            if (initDone)
-                eq->schedule(ts, tick);
-            else
-                eventsToSchedule[ts] = tick;
+            schedule(ts, tick);
         }
         ts->events.insert(event);
     }
@@ -255,10 +252,7 @@ class Scheduler
 
         // If no more events are happening at this time slot, get rid of it.
         if (events.empty()) {
-            if (initDone)
-                eq->deschedule(ts);
-            else
-                eventsToSchedule.erase(ts);
+            deschedule(ts);
             timeSlots.erase(tsit);
         }
     }
@@ -328,6 +322,27 @@ class Scheduler
 
     EventQueue *eq;
 
+    // For gem5 style events.
+    void
+    schedule(::Event *event, Tick tick)
+    {
+        if (initDone)
+            eq->schedule(event, tick);
+        else
+            eventsToSchedule[event] = tick;
+    }
+
+    void schedule(::Event *event) { schedule(event, getCurTick()); }
+
+    void
+    deschedule(::Event *event)
+    {
+        if (initDone)
+            eq->deschedule(event);
+        else
+            eventsToSchedule.erase(event);
+    }
+
     ScEvents deltas;
     TimeSlots timeSlots;