From: Gabe Black <gabeblack@google.com>
Date: Fri, 10 Aug 2018 03:31:35 +0000 (-0700)
Subject: systemc: Ensure delta notifications happen at the right time after sc_pause.
X-Git-Tag: v19.0.0.0~1770
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a11636c7d19caa5832c09b539bcee01ec8818364;p=gem5.git

systemc: Ensure delta notifications happen at the right time after sc_pause.

Normally delta notifications would be created during the evaluation or
update phases, and so there isn't any problem with them cutting in
front of those stages. When the simulation is paused however, those
notifications could be waiting before the ready event starts and could
preempt it.

This change adds a check for that situation to the end of the pause
event and runs the evalution and update stages inline if necessary.

Change-Id: I4477b2ae8e7980406df00ba7320ae2a24ae2da9b
Reviewed-on: https://gem5-review.googlesource.com/12080
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>
---

diff --git a/src/systemc/core/scheduler.cc b/src/systemc/core/scheduler.cc
index 44c56467d..d2e87f25d 100644
--- a/src/systemc/core/scheduler.cc
+++ b/src/systemc/core/scheduler.cc
@@ -210,6 +210,14 @@ Scheduler::pause()
     _paused = true;
     kernel->status(::sc_core::SC_PAUSED);
     scMain->run();
+
+    // If the ready event is supposed to run now, run it inline so that it
+    // preempts any delta notifications which were scheduled while we were
+    // paused.
+    if (readyEvent.scheduled()) {
+        eq->deschedule(&readyEvent);
+        runReady();
+    }
 }
 
 void