commit e035d680f0051936052ae02c70c8527e194007aa
author Gabe Black <gabeblack@google.com> Sat Oct 06 04:11:00 2018 -0700
committer Gabe Black <gabeblack@google.com> Tue Oct 16 01:03:21 2018 +0000
tree abbe628745c05ad66cff9f69675600074247cc3d
parent 226207d43a0897d07448945fab06554b8dfbc684

systemc: If a process hasn't started, still signal its reset event.

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

src/systemc/core/process.hh

diff --git a/src/systemc/core/process.hh b/src/systemc/core/process.hh
index 86ca674..d50c829 100644
--- a/src/systemc/core/process.hh
+++ b/src/systemc/core/process.hh
@@ -97,8 +97,8 @@
     void incref() { refCount++; }
     void decref() { refCount--; }
 
-    const ::sc_core::sc_event &resetEvent() { return _resetEvent; }
-    const ::sc_core::sc_event &terminatedEvent() { return _terminatedEvent; }
+    ::sc_core::sc_event &resetEvent() { return _resetEvent; }
+    ::sc_core::sc_event &terminatedEvent() { return _terminatedEvent; }
 
     void setStackSize(size_t size) { stackSize = size; }
 

src/systemc/core/scheduler.cc

diff --git a/src/systemc/core/scheduler.cc b/src/systemc/core/scheduler.cc
index d4d70b2..e0a270d 100644
--- a/src/systemc/core/scheduler.cc
+++ b/src/systemc/core/scheduler.cc
@@ -171,6 +171,10 @@
         // If the current process needs to be manually started, start it.
         if (_current && _current->needsStart()) {
             _current->needsStart(false);
+            // If a process hasn't started yet, "resetting" it just starts it
+            // and signals its reset event.
+            if (_current->inReset())
+                _current->resetEvent().notify();
             try {
                 _current->run();
             } catch (...) {