From: Gabe Black <gabeblack@google.com>
Date: Tue, 24 Jul 2018 02:39:52 +0000 (-0700)
Subject: systemc: Ignore direct requests to mark a process as ready.
X-Git-Tag: v19.0.0.0~1823
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=802efef3c40a028b0048bc4b8985dcc9bf64322f;p=gem5.git

systemc: Ignore direct requests to mark a process as ready.

That might happen when a process is being marked as ready at the start
of simulation.

Because the process might not end up on the ready list, displacing it
from the init list, excplicitly pop it off the init list as well.

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

diff --git a/src/systemc/core/process.cc b/src/systemc/core/process.cc
index ec5c57cb9..39ee9e051 100644
--- a/src/systemc/core/process.cc
+++ b/src/systemc/core/process.cc
@@ -325,6 +325,8 @@ Process::satisfySensitivity(Sensitivity *s)
 void
 Process::ready()
 {
+    if (disabled())
+        return;
     if (suspended())
         _suspendedReady = true;
     else
diff --git a/src/systemc/core/scheduler.cc b/src/systemc/core/scheduler.cc
index 085602d7b..7d2e9ef88 100644
--- a/src/systemc/core/scheduler.cc
+++ b/src/systemc/core/scheduler.cc
@@ -59,6 +59,7 @@ Scheduler::prepareForInit()
 
     for (Process *p = initList.getNext(); p; p = initList.getNext()) {
         p->finalize();
+        p->popListNode();
         p->ready();
     }