[gem5-dev] Change in gem5/gem5[master]: systemc: Add in the deprecated binding port constructors.
Gabe Black has submitted this change and it was merged. (
https://gem5-review.googlesource.com/c/public/gem5/+/10958 )
Change subject: systemc: Add in the deprecated binding port constructors.
..
systemc: Add in the deprecated binding port constructors.
These are needed by... you guessed it, the regression tests.
Change-Id: Id30e71944cc7f3faca7dcb197f37938368364fcd
Reviewed-on: https://gem5-review.googlesource.com/10958
Reviewed-by: Gabe Black
Maintainer: Gabe Black
---
M src/systemc/ext/channel/sc_fifo_in.hh
M src/systemc/ext/channel/sc_fifo_out.hh
M src/systemc/ext/channel/sc_in.hh
M src/systemc/ext/channel/sc_inout.hh
M src/systemc/ext/channel/sc_out.hh
M src/systemc/ext/core/sc_port.hh
6 files changed, 236 insertions(+), 12 deletions(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
diff --git a/src/systemc/ext/channel/sc_fifo_in.hh
b/src/systemc/ext/channel/sc_fifo_in.hh
index 7f593c1..0952d77 100644
--- a/src/systemc/ext/channel/sc_fifo_in.hh
+++ b/src/systemc/ext/channel/sc_fifo_in.hh
@@ -49,6 +49,26 @@
{}
virtual ~sc_fifo_in() {}
+// Deprecated binding constructors.
+explicit sc_fifo_in(const sc_fifo_in_if ) :
+sc_port, 0>(interface)
+{}
+sc_fifo_in(const char *name, const sc_fifo_in_if ) :
+sc_port, 0>(name, interface)
+{}
+explicit sc_fifo_in(sc_port_b > ) :
+sc_port, 0>(parent)
+{}
+sc_fifo_in(const char *name, sc_port_b > ) :
+sc_port, 0>(name, parent)
+{}
+explicit sc_fifo_in(sc_port, 0> ) :
+sc_port, 0>(parent)
+{}
+sc_fifo_in(const char *name, sc_port, 0> ) :
+sc_port, 0>(name, parent)
+{}
+
void
read(T &)
{
diff --git a/src/systemc/ext/channel/sc_fifo_out.hh
b/src/systemc/ext/channel/sc_fifo_out.hh
index 4beb15d..af2f6ef 100644
--- a/src/systemc/ext/channel/sc_fifo_out.hh
+++ b/src/systemc/ext/channel/sc_fifo_out.hh
@@ -50,6 +50,26 @@
{}
virtual ~sc_fifo_out() {}
+// Deprecated binding constructors.
+explicit sc_fifo_out(const sc_fifo_out_if ) :
+sc_port, 0>(interface)
+{}
+sc_fifo_out(const char *name, const sc_fifo_out_if ) :
+sc_port, 0>(name, interface)
+{}
+explicit sc_fifo_out(sc_port_b > ) :
+sc_port, 0>(parent)
+{}
+sc_fifo_out(const char *name, sc_port_b > ) :
+sc_port, 0>(name, parent)
+{}
+explicit sc_fifo_out(sc_port, 0> ) :
+sc_port, 0>(parent)
+{}
+sc_fifo_out(const char *name, sc_port, 0> ) :
+sc_port, 0>(name, parent)
+{}
+
void
write(const T &)
{
diff --git a/src/systemc/ext/channel/sc_in.hh
b/src/systemc/ext/channel/sc_in.hh
index a283d0d..f691afe 100644
--- a/src/systemc/ext/channel/sc_in.hh
+++ b/src/systemc/ext/channel/sc_in.hh
@@ -52,6 +52,26 @@
explicit sc_in(const char *name) : sc_port,
1>(name) {}
virtual ~sc_in() {}
+// Deprecated binding constructors.
+explicit sc_in(const sc_signal_in_if ) :
+sc_port, 1>(interface)
+{}
+sc_in(const char *name, const sc_signal_in_if ) :
+sc_port, 1>(name, interface)
+{}
+explicit sc_in(sc_port_b > ) :
+sc_port, 1>(parent)
+{}
+sc_in(const char *name, sc_port_b > ) :
+sc_port, 1>(name, parent)
+{}
+explicit sc_in(sc_port, 1> ) :
+sc_port, 1>(parent)
+{}
+sc_in(const char *name, sc_port, 1> ) :
+sc_port, 1>(name, parent)
+{}
+
virtual void
bind(const sc_signal_in_if &)
{
@@ -152,6 +172,26 @@
sc_port, 1>(name) {}
virtual ~sc_in() {}
+// Deprecated binding constructors.
+explicit sc_in(const sc_signal_in_if ) :
+sc_port, 1>(interface)
+{}
+sc_in(const char *name, const sc_signal_in_if ) :
+sc_port, 1>(name, interface)
+{}
+explicit sc_in(sc_port_b > ) :
+sc_port, 1>(parent)
+{}
+sc_in(const char *name, sc_port_b > ) :
+sc_port, 1>(name, parent)
+{}
+explicit sc_in(sc_port, 1> ) :
+sc_port, 1>(parent)
+{}
+sc_in(const char *name, sc_port, 1> ) :
+sc_port, 1>(name, parent)
+{}
+
virtual void
bind(const sc_signal_in_if &)
{
@@ -292,6 +332,29 @@
{}
virtual ~sc_in() {}
+// Deprecated binding constructors.
+explicit sc_in(const sc_signal_in_if ) :
+sc_port, 1>(interface)
+{}
+sc_in(const char *name,
+const sc_signal_in_if ) :
+sc_port, 1>(name, interface)
+{}
+explicit sc_in(sc_port_b > ) :
+sc_port, 1>(parent)
+{}
+sc_in(const char *name,
+sc_port_b > ) :
+sc_port, 1>(name, parent)
+{}
+explicit sc_in(sc_port, 1> ) :
+sc_port, 1>(parent)
+{}
+sc_in(const char *name,
+sc_port, 1> ) :
+sc_port, 1>(name, parent)
+{}
+
virtual void
bind(const sc_signal_in_if &)
[gem5-dev] Change in gem5/gem5[master]: systemc: Add in the deprecated binding port constructors.
Hello Jason Lowe-Power, Matthias Jung, Andreas Sandberg, I'd like you to reexamine a change. Please visit https://gem5-review.googlesource.com/10958 to look at the new patch set (#3). Change subject: systemc: Add in the deprecated binding port constructors. .. systemc: Add in the deprecated binding port constructors. These are needed by... you guessed it, the regression tests. Change-Id: Id30e71944cc7f3faca7dcb197f37938368364fcd --- M src/systemc/ext/channel/sc_fifo_in.hh M src/systemc/ext/channel/sc_fifo_out.hh M src/systemc/ext/channel/sc_in.hh M src/systemc/ext/channel/sc_inout.hh M src/systemc/ext/channel/sc_out.hh M src/systemc/ext/core/sc_port.hh 6 files changed, 236 insertions(+), 12 deletions(-) -- To view, visit https://gem5-review.googlesource.com/10958 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: Id30e71944cc7f3faca7dcb197f37938368364fcd Gerrit-Change-Number: 10958 Gerrit-PatchSet: 3 Gerrit-Owner: Gabe Black Gerrit-Reviewer: Andreas Sandberg Gerrit-Reviewer: Gabe Black Gerrit-Reviewer: Jason Lowe-Power Gerrit-Reviewer: Matthias Jung Gerrit-MessageType: newpatchset ___ gem5-dev mailing list gem5-dev@gem5.org http://m5sim.org/mailman/listinfo/gem5-dev
[gem5-dev] Change in gem5/gem5[master]: systemc: Add in the deprecated binding port constructors.
Gabe Black has uploaded this change for review. (
https://gem5-review.googlesource.com/10958
Change subject: systemc: Add in the deprecated binding port constructors.
..
systemc: Add in the deprecated binding port constructors.
These are needed by... you guessed it, the regression tests.
Change-Id: Id30e71944cc7f3faca7dcb197f37938368364fcd
---
M src/systemc/ext/channel/sc_fifo_in.hh
M src/systemc/ext/channel/sc_fifo_out.hh
M src/systemc/ext/channel/sc_in.hh
M src/systemc/ext/channel/sc_inout.hh
M src/systemc/ext/channel/sc_out.hh
M src/systemc/ext/core/sc_port.hh
6 files changed, 148 insertions(+), 12 deletions(-)
diff --git a/src/systemc/ext/channel/sc_fifo_in.hh
b/src/systemc/ext/channel/sc_fifo_in.hh
index e04edc9..5b05de2 100644
--- a/src/systemc/ext/channel/sc_fifo_in.hh
+++ b/src/systemc/ext/channel/sc_fifo_in.hh
@@ -49,6 +49,26 @@
{}
virtual ~sc_fifo_in() {}
+// Deprecated binding constructors.
+explicit sc_fifo_in(const sc_fifo_in_if ) :
+sc_port, 0>(interface)
+{}
+sc_fifo_in(const char *name, const sc_fifo_in_if ) :
+sc_port, 0>(name, interface)
+{}
+explicit sc_fifo_in(sc_port_b > ) :
+sc_port, 0>(parent)
+{}
+sc_fifo_in(const char *name, sc_port_b > ) :
+sc_port, 0>(name, parent)
+{}
+explicit sc_fifo_in(sc_port, 0> ) :
+sc_port, 0>(parent)
+{}
+sc_fifo_in(const char *name, sc_port, 0> ) :
+sc_port, 0>(name, parent)
+{}
+
void
read(T &)
{
diff --git a/src/systemc/ext/channel/sc_fifo_out.hh
b/src/systemc/ext/channel/sc_fifo_out.hh
index 4beb15d..af2f6ef 100644
--- a/src/systemc/ext/channel/sc_fifo_out.hh
+++ b/src/systemc/ext/channel/sc_fifo_out.hh
@@ -50,6 +50,26 @@
{}
virtual ~sc_fifo_out() {}
+// Deprecated binding constructors.
+explicit sc_fifo_out(const sc_fifo_out_if ) :
+sc_port, 0>(interface)
+{}
+sc_fifo_out(const char *name, const sc_fifo_out_if ) :
+sc_port, 0>(name, interface)
+{}
+explicit sc_fifo_out(sc_port_b > ) :
+sc_port, 0>(parent)
+{}
+sc_fifo_out(const char *name, sc_port_b > ) :
+sc_port, 0>(name, parent)
+{}
+explicit sc_fifo_out(sc_port, 0> ) :
+sc_port, 0>(parent)
+{}
+sc_fifo_out(const char *name, sc_port, 0> ) :
+sc_port, 0>(name, parent)
+{}
+
void
write(const T &)
{
diff --git a/src/systemc/ext/channel/sc_in.hh
b/src/systemc/ext/channel/sc_in.hh
index 09725e1..e8c22fd 100644
--- a/src/systemc/ext/channel/sc_in.hh
+++ b/src/systemc/ext/channel/sc_in.hh
@@ -52,6 +52,26 @@
explicit sc_in(const char *name) : sc_port,
1>(name) {}
virtual ~sc_in() {}
+// Deprecated binding constructors.
+explicit sc_in(const sc_signal_in_if ) :
+sc_port, 1>(interface)
+{}
+sc_in(const char *name, const sc_signal_in_if ) :
+sc_port, 1>(name, interface)
+{}
+explicit sc_in(sc_port_b > ) :
+sc_port, 1>(parent)
+{}
+sc_in(const char *name, sc_port_b > ) :
+sc_port, 1>(name, parent)
+{}
+explicit sc_in(sc_port, 1> ) :
+sc_port, 1>(parent)
+{}
+sc_in(const char *name, sc_port, 1> ) :
+sc_port, 1>(name, parent)
+{}
+
virtual void
bind(const sc_signal_in_if &)
{
diff --git a/src/systemc/ext/channel/sc_inout.hh
b/src/systemc/ext/channel/sc_inout.hh
index 1802b2e..9648bcf 100644
--- a/src/systemc/ext/channel/sc_inout.hh
+++ b/src/systemc/ext/channel/sc_inout.hh
@@ -60,6 +60,26 @@
{}
virtual ~sc_inout() {}
+// Deprecated binding constructors.
+explicit sc_inout(const sc_signal_inout_if ) :
+sc_port, 1>(interface)
+{}
+sc_inout(const char *name, const sc_signal_inout_if ) :
+sc_port, 1>(name, interface)
+{}
+explicit sc_inout(sc_port_b > ) :
+sc_port, 1>(parent)
+{}
+sc_inout(const char *name, sc_port_b > ) :
+sc_port, 1>(name, parent)
+{}
+explicit sc_inout(sc_port, 1> ) :
+sc_port, 1>(parent)
+{}
+sc_inout(const char *name, sc_port, 1> ) :
+sc_port, 1>(name, parent)
+{}
+
void
initialize(const T &)
{
diff --git a/src/systemc/ext/channel/sc_out.hh
b/src/systemc/ext/channel/sc_out.hh
index e55a821..53bd255 100644
--- a/src/systemc/ext/channel/sc_out.hh
+++ b/src/systemc/ext/channel/sc_out.hh
@@ -45,6 +45,22 @@
explicit sc_out(const char *name) : sc_inout(name) {}
virtual ~sc_out() {}
+// Deprecated binding constructors.
+explicit sc_out(const sc_signal_inout_if ) :
+sc_inout(interface)
+{}
+sc_out(const char *name, const sc_signal_inout_if ) :
+sc_inout(name, interface)
+{}
+explicit sc_out(sc_port_b > ) :
+sc_inout(parent)
+{}
+sc_out(const char *name, sc_port_b > ) :
+sc_inout(name, parent)
+{}
+explicit sc_out(sc_out ) :
