Gabe Black has submitted this change and it was merged. (
https://gem5-review.googlesource.com/c/public/gem5/+/13880 )
Change subject: systemc: Explicitly keep the sc_port bind alongside sc_in's
version.
......................................................................
systemc: Explicitly keep the sc_port bind alongside sc_in's version.
The sc_in bind function was hiding the one from sc_port by changing
the const-ness of its parameter. This change explicitly exposes the
underlying sc_port version, and keeps it alongside the new sc_in
version.
This seems mildly dangerous and undesirable because now there are two
very similar functions which would both need to be overridden in order
to get new behavior, but I don't think it's any more dangerous and
undesirable than as (perhaps unintentionally) specified in the
standard.
Change-Id: Ib42a1f8e70bc97abeeeb8d614e71c4019b3a2323
Reviewed-on: https://gem5-review.googlesource.com/c/13880
Reviewed-by: Gabe Black <[email protected]>
Maintainer: Gabe Black <[email protected]>
---
M src/systemc/ext/channel/sc_in.hh
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
diff --git a/src/systemc/ext/channel/sc_in.hh
b/src/systemc/ext/channel/sc_in.hh
index 3fea8a8..85d089d 100644
--- a/src/systemc/ext/channel/sc_in.hh
+++ b/src/systemc/ext/channel/sc_in.hh
@@ -225,6 +225,8 @@
_negFinder(*this, &sc_signal_in_if<bool>::negedge_event)
{}
+ using sc_port<sc_signal_in_if<bool>, 1>::bind;
+
virtual void
bind(const sc_signal_in_if<bool> &i)
{
@@ -390,6 +392,8 @@
_negFinder(*this, &sc_signal_in_if<sc_dt::sc_logic>::negedge_event)
{}
+ using sc_port<sc_signal_in_if<sc_dt::sc_logic>, 1>::bind;
+
virtual void
bind(const sc_signal_in_if<sc_dt::sc_logic> &i)
{
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/13880
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: Ib42a1f8e70bc97abeeeb8d614e71c4019b3a2323
Gerrit-Change-Number: 13880
Gerrit-PatchSet: 3
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Matthias Jung <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
