From c42dfdeda8ca198bf076817431f41d24463e1cda Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Tue, 21 Aug 2018 19:10:47 -0700 Subject: [PATCH] systemc: Make sure no delta cycles are scheduled when stopping. If the readyEvent is still scheduled when sc_main completes, gem5 will return to it's main fiber and keep executing events, including that one. That means a delta cycle will run even after sc_main is complete. This change ensures that the readyEvent has been descheduled as part of stopping. Change-Id: I9479ac4ebff3335477b371b02efa6d44c70cbc8e Reviewed-on: https://gem5-review.googlesource.com/12224 Reviewed-by: Gabe Black Maintainer: Gabe Black --- src/systemc/core/scheduler.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/systemc/core/scheduler.cc b/src/systemc/core/scheduler.cc index 6762086a0..f930bb515 100644 --- a/src/systemc/core/scheduler.cc +++ b/src/systemc/core/scheduler.cc @@ -272,6 +272,10 @@ Scheduler::stop() { _stopped = true; kernel->stop(); + + if (readyEvent.scheduled()) + eq->deschedule(&readyEvent); + runOnce = false; scMain->run(); } -- 2.30.2