diff options
| author | Gabe Black <gabeblack@google.com> | 2019-01-02 22:14:23 -0800 |
|---|---|---|
| committer | Gabe Black <gabeblack@google.com> | 2019-01-09 01:35:37 +0000 |
| commit | 5701aab0f17aec5d2f857fa00a75b8f5db617ec1 (patch) | |
| tree | f66e06ab984bc4ddebf4dd36ff5b67a7d35eeb06 | |
| parent | e345154b19939db37fb391111d4dad190c62e81c (diff) | |
| download | gem5-5701aab0f17aec5d2f857fa00a75b8f5db617ec1.tar.xz | |
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>
| -rw-r--r-- | src/systemc/ext/tlm_core/1/req_rsp/ports/event_finder.hh | 3 |
1 files changed, 2 insertions, 1 deletions
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); } |