summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Black <gabeblack@google.com>2018-10-04 17:40:36 -0700
committerGabe Black <gabeblack@google.com>2018-10-16 00:54:46 +0000
commit157d053bee4d17115e0ab03b1499f66862a087ea (patch)
treee1e48426096ee4194bc8e1a22f33cdc4b6940063
parenta61426dcc4a7f775f0902ba272501e926aeec13f (diff)
downloadgem5-157d053bee4d17115e0ab03b1499f66862a087ea.tar.xz
systemc: Add some deprecated positional binding operators.
These are used in one of the tests, specifically the comma operator. It didn't cause compilation to fail because of the default meaning of the comma. Change-Id: I7ce7fe74f02d4ad6a4ab896a2f0d6bd1ce635c2f Reviewed-on: https://gem5-review.googlesource.com/c/13298 Reviewed-by: Gabe Black <gabeblack@google.com> Maintainer: Gabe Black <gabeblack@google.com>
-rw-r--r--src/systemc/core/sc_module.cc28
-rw-r--r--src/systemc/ext/core/sc_module.hh6
2 files changed, 34 insertions, 0 deletions
diff --git a/src/systemc/core/sc_module.cc b/src/systemc/core/sc_module.cc
index 42fff3271..175b9db63 100644
--- a/src/systemc/core/sc_module.cc
+++ b/src/systemc/core/sc_module.cc
@@ -210,6 +210,34 @@ sc_module::operator () (const sc_bind_proxy &p001,
_gem5_module->bindPorts(proxies);
}
+sc_module &
+sc_module::operator << (sc_interface &iface)
+{
+ (*this)(iface);
+ return *this;
+}
+
+sc_module &
+sc_module::operator << (sc_port_base &pb)
+{
+ (*this)(pb);
+ return *this;
+}
+
+sc_module &
+sc_module::operator , (sc_interface &iface)
+{
+ (*this)(iface);
+ return *this;
+}
+
+sc_module &
+sc_module::operator , (sc_port_base &pb)
+{
+ (*this)(pb);
+ return *this;
+}
+
const std::vector<sc_object *> &
sc_module::get_child_objects() const
{
diff --git a/src/systemc/ext/core/sc_module.hh b/src/systemc/ext/core/sc_module.hh
index d318a755e..dea728fba 100644
--- a/src/systemc/ext/core/sc_module.hh
+++ b/src/systemc/ext/core/sc_module.hh
@@ -166,6 +166,12 @@ class sc_module : public sc_object
const sc_bind_proxy &p063 = SC_BIND_PROXY_NIL,
const sc_bind_proxy &p064 = SC_BIND_PROXY_NIL);
+ // Deprecated
+ sc_module &operator << (sc_interface &);
+ sc_module &operator << (sc_port_base &);
+ sc_module &operator , (sc_interface &);
+ sc_module &operator , (sc_port_base &);
+
virtual const std::vector<sc_object *> &get_child_objects() const;
virtual const std::vector<sc_event *> &get_child_events() const;