From 28b09df79bdd6c232be2b386119569291f92311c Mon Sep 17 00:00:00 2001
From: Gabe Black <gabeblack@google.com>
Date: Fri, 24 Aug 2018 17:58:10 -0700
Subject: [PATCH] systemc: Make sure methods aren't restarted by yield.

Methods may need to yield control to other Processes when throwing
them exceptions. In that case, we need to keep track of the fact that
the method doesn't need to be restarted when it resumes within yield.

Change-Id: I829c387d6ddb563b2957db47e55adadbbe6bc51a
Reviewed-on: https://gem5-review.googlesource.com/12265
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>
---
 src/systemc/core/process.cc   | 1 +
 src/systemc/core/process.hh   | 1 +
 src/systemc/core/scheduler.cc | 4 +++-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/systemc/core/process.cc b/src/systemc/core/process.cc
index 1a101f749f..94e49a8afd 100644
--- a/src/systemc/core/process.cc
+++ b/src/systemc/core/process.cc
@@ -320,6 +320,7 @@ Process::run()
             _isUnwinding = false;
         }
     } while (reset);
+    needsStart(true);
 }
 
 void
diff --git a/src/systemc/core/process.hh b/src/systemc/core/process.hh
index 17f417b6e2..0cb3e3c01c 100644
--- a/src/systemc/core/process.hh
+++ b/src/systemc/core/process.hh
@@ -271,6 +271,7 @@ class Process : public ::sc_core::sc_process_b, public ListNode
   public:
     virtual ::sc_core::sc_curr_proc_kind procKind() const = 0;
     bool needsStart() const { return _needsStart; }
+    void needsStart(bool ns) { _needsStart = ns; }
     bool dynamic() const { return _dynamic; }
     bool isUnwinding() const { return _isUnwinding; }
     void isUnwinding(bool v) { _isUnwinding = v; }
diff --git a/src/systemc/core/scheduler.cc b/src/systemc/core/scheduler.cc
index 2dc3aa74c1..7851bac67e 100644
--- a/src/systemc/core/scheduler.cc
+++ b/src/systemc/core/scheduler.cc
@@ -174,8 +174,10 @@ Scheduler::yield()
         // Fibers which aren't running should be parked at this line.
         _current->fiber()->run();
         // If the current process needs to be manually started, start it.
-        if (_current && _current->needsStart())
+        if (_current && _current->needsStart()) {
+            _current->needsStart(false);
             _current->run();
+        }
     }
     if (_current && _current->excWrapper) {
         // Make sure this isn't a method process.