Gabe Black has submitted this change and it was merged. (
https://gem5-review.googlesource.com/c/public/gem5/+/15296 )
Change subject: systemc: Stop using the Accellera specific "none" global
event object.
......................................................................
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.gutier...@amd.com>
Maintainer: Anthony Gutierrez <anthony.gutier...@amd.com>
---
M src/systemc/ext/tlm_core/1/req_rsp/ports/event_finder.hh
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Anthony Gutierrez: Looks good to me, approved; Looks good to me, approved
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 2e411eb..cdf2d8b 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 @@
{
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);
}
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/15296
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: I5e8892bd83cc1984d63949ef3e249755dca0c702
Gerrit-Change-Number: 15296
Gerrit-PatchSet: 3
Gerrit-Owner: Gabe Black <gabebl...@google.com>
Gerrit-Reviewer: Andreas Sandberg <andreas.sandb...@arm.com>
Gerrit-Reviewer: Anthony Gutierrez <anthony.gutier...@amd.com>
Gerrit-Reviewer: Gabe Black <gabebl...@google.com>
Gerrit-Reviewer: Giacomo Travaglini <giacomo.travagl...@arm.com>
Gerrit-Reviewer: Jason Lowe-Power <ja...@lowepower.com>
Gerrit-Reviewer: Matthias Jung <jun...@eit.uni-kl.de>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev
