From ee30b44ad5d8913fb0869f75a1c78d87072e277a Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Sun, 26 Aug 2018 15:53:31 -0700 Subject: systemc: Handle sc_stop called from sc_main correctly. When in sc_main, sc_is_running will return true but we're not going to run any gem5 events since we're currently in the sc_main Fiber. In that case, we need to do the sc_stop work inline. If we're actually running and not just paused, then we do still want to schedule the work of sc_stop to happen as its own event since that will happen before returning to sc_main, and actually will likely be the mechanism by which sc_main starts executing again. Change-Id: If9ffafc4f240af0f3d9c726b36a0950b5219dc00 Reviewed-on: https://gem5-review.googlesource.com/12269 Reviewed-by: Gabe Black Maintainer: Gabe Black --- src/systemc/core/sc_main.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/systemc/core/sc_main.cc b/src/systemc/core/sc_main.cc index ea243bf61..2637cef0e 100644 --- a/src/systemc/core/sc_main.cc +++ b/src/systemc/core/sc_main.cc @@ -225,7 +225,7 @@ sc_stop() if (::sc_gem5::Kernel::status() == SC_STOPPED) return; - if (sc_is_running()) { + if ((sc_get_status() & SC_RUNNING)) { bool finish_delta = (_stop_mode == SC_STOP_FINISH_DELTA); ::sc_gem5::scheduler.scheduleStop(finish_delta); } else { -- cgit v1.2.3