From: Gabe Black <gabeblack@google.com>
Date: Wed, 26 Sep 2018 07:24:01 +0000 (-0700)
Subject: systemc: Implement the synchronous reset state.
X-Git-Tag: v19.0.0.0~1560
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f4ab64a588771391c2eebd9b1c8b089aa33cda67;p=gem5.git

systemc: Implement the synchronous reset state.

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

diff --git a/src/systemc/core/process.hh b/src/systemc/core/process.hh
index 4266c2d7d..9e85fc7cc 100644
--- a/src/systemc/core/process.hh
+++ b/src/systemc/core/process.hh
@@ -119,6 +119,7 @@ class Process : public ::sc_core::sc_process_b, public ListNode
     bool hasStaticSensitivities() { return !staticSensitivities.empty(); }
     bool internal() { return _internal; }
     bool timedOut() { return _timedOut; }
+    bool syncReset() { return _syncReset; }
 
     bool dontInitialize() { return _dontInitialize; }
     void dontInitialize(bool di) { _dontInitialize = di; }
diff --git a/src/systemc/core/scheduler.cc b/src/systemc/core/scheduler.cc
index d79abb251..6d571f60b 100644
--- a/src/systemc/core/scheduler.cc
+++ b/src/systemc/core/scheduler.cc
@@ -178,12 +178,14 @@ Scheduler::yield()
             }
         }
     }
-    if (_current && _current->excWrapper) {
-        // Make sure this isn't a method process.
-        assert(!_current->needsStart());
-        auto ew = _current->excWrapper;
-        _current->excWrapper = nullptr;
-        ew->throw_it();
+    if (_current && !_current->needsStart()) {
+        if (_current->excWrapper) {
+            auto ew = _current->excWrapper;
+            _current->excWrapper = nullptr;
+            ew->throw_it();
+        } else if (_current->syncReset()) {
+            _current->reset(false);
+        }
     }
 }