From: Gabe Black <gabeblack@google.com>
Date: Thu, 3 Jan 2019 06:14:23 +0000 (-0800)
Subject: systemc: Stop using the Accellera specific "none" global event object.
X-Git-Tag: v19.0.0.0~1297
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5701aab0f17aec5d2f857fa00a75b8f5db617ec1;p=gem5.git

systemc: Stop using the Accellera specific "none" global event object.

That event being available is nonstandard. Define our own static event
for use in that case.

Change-Id: I5e8892bd83cc1984d63949ef3e249755dca0c702
Reviewed-on: https://gem5-review.googlesource.com/c/15296
Reviewed-by: Anthony Gutierrez <anthony.gutierrez@amd.com>
Maintainer: Anthony Gutierrez <anthony.gutierrez@amd.com>
---

diff --git a/src/systemc/ext/tlm_core/1/req_rsp/ports/event_finder.hh b/src/systemc/ext/tlm_core/1/req_rsp/ports/event_finder.hh
index 2e411ebad..cdf2d8b58 100644
--- a/src/systemc/ext/tlm_core/1/req_rsp/ports/event_finder.hh
+++ b/src/systemc/ext/tlm_core/1/req_rsp/ports/event_finder.hh
@@ -56,9 +56,10 @@ tlm_event_finder_t<IF, T>::find_event(sc_core::sc_interface *if_p) const
 {
     const IF *iface = if_p ? dynamic_cast<const IF *>(if_p) :
         dynamic_cast<const IF *>(port()->_gem5Interface(0));
+    static sc_core::sc_event none;
     if (iface == nullptr) {
         report_error(sc_core::SC_ID_FIND_EVENT_, "port is not bound");
-        return sc_core::sc_event::none;
+        return none;
     }
     return (const_cast<IF *>(iface)->*m_event_method)(nullptr);
 }