fixes stop condition in report handler to be SC 2.4 compliant

eyck · eyck · commit 4db09b165dc4 · 2026-01-10T17:10:06.000+01:00
diff --git a/src/sysc/scc/report.cpp b/src/sysc/scc/report.cpp
@@ -295,7 +295,12 @@ void report_handler(const sc_report& rep, const sc_actions& actions) {
             flush_loggers();
         } catch(spdlog::spdlog_ex e) {
         }
-        if((sc_get_status() & (sc_core::SC_START_OF_SIMULATION | SC_RUNNING | SC_PAUSED | SC_SUSPENDED)) && !sc_stop_called) {
+#if SYSTEMC_VERSION < 20241015
+        static const int stop_expr = sc_core::SC_START_OF_SIMULATION | SC_RUNNING | SC_PAUSED;
+#else
+        static constexpr int stop_expr = sc_core::SC_START_OF_SIMULATION | SC_RUNNING | SC_PAUSED | SC_SUSPENDED;
+#endif
+        if((sc_get_status() & stop_expr) && !sc_stop_called) {
             sc_stop();
             sc_stop_called = true;
         }

Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,12 @@ void report_handler(const sc_report& rep, const sc_actions& actions) {`
`295`	`295`	`flush_loggers();`
`296`	`296`	`} catch(spdlog::spdlog_ex e) {`
`297`	`297`	`}`
`298`		`- if((sc_get_status() & (sc_core::SC_START_OF_SIMULATION \| SC_RUNNING \| SC_PAUSED \| SC_SUSPENDED)) && !sc_stop_called) {`
	`298`	`+#if SYSTEMC_VERSION < 20241015`
	`299`	`+ static const int stop_expr = sc_core::SC_START_OF_SIMULATION \| SC_RUNNING \| SC_PAUSED;`
	`300`	`+#else`
	`301`	`+ static constexpr int stop_expr = sc_core::SC_START_OF_SIMULATION \| SC_RUNNING \| SC_PAUSED \| SC_SUSPENDED;`
	`302`	`+#endif`
	`303`	`+ if((sc_get_status() & stop_expr) && !sc_stop_called) {`
`299`	`304`	`sc_stop();`
`300`	`305`	`sc_stop_called = true;`
`301`	`306`	`}`