From 71eeee982485916df7a849d1ebd67525fac3cd86 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Wed, 22 Aug 2018 14:28:37 -0700 Subject: [PATCH] systemc: Override notifyWork for timeout/event_and_list sensitivities. The notifyWork function for SensitivityEventAndList assumes it's being triggered by an event which is part of its list, but when SensitivityTimeoutAndEventAndList triggers it might be from an event or from a timeout. This change overrides notifyWork for that class and makes it delegate to notifyWork for the subclasses depending on whether there's an event pointer. Change-Id: I598af2b78d71ee9934edea10ca7ac5c88149e3f3 Reviewed-on: https://gem5-review.googlesource.com/12247 Reviewed-by: Gabe Black Maintainer: Gabe Black --- src/systemc/core/process.cc | 12 ++++++++++++ src/systemc/core/process.hh | 2 ++ 2 files changed, 14 insertions(+) diff --git a/src/systemc/core/process.cc b/src/systemc/core/process.cc index 3e629c3ec..5d5c5216f 100644 --- a/src/systemc/core/process.cc +++ b/src/systemc/core/process.cc @@ -104,6 +104,18 @@ SensitivityEventOrList::~SensitivityEventOrList() Event::getFromScEvent(e)->delSensitivity(this); } +void +SensitivityTimeoutAndEventAndList::notifyWork(Event *e) +{ + if (e) { + // An event went off which must be part of the sc_event_and_list. + SensitivityEventAndList::notifyWork(e); + } else { + // There's no inciting event, so this must be a timeout. + SensitivityTimeout::notifyWork(e); + } +} + class UnwindExceptionReset : public ::sc_core::sc_unwind_exception { diff --git a/src/systemc/core/process.hh b/src/systemc/core/process.hh index 267a7ed3d..fe75aa7de 100644 --- a/src/systemc/core/process.hh +++ b/src/systemc/core/process.hh @@ -138,6 +138,8 @@ class SensitivityTimeoutAndEventAndList : Sensitivity(p), SensitivityTimeout(p, t), SensitivityEventAndList(p, eal) {} + + void notifyWork(Event *e) override; }; class SensitivityTimeoutAndEventOrList : -- 2.30.2