summaryrefslogtreecommitdiff
path: root/src/systemc/channel
diff options
context:
space:
mode:
authorGabe Black <gabeblack@google.com>2018-09-11 20:14:22 -0700
committerGabe Black <gabeblack@google.com>2018-10-09 21:47:27 +0000
commit5a1ad990a64adccaa6116288771628103e47157c (patch)
tree6991311041e148e1f25a5f9bc5bfa73267991ee9 /src/systemc/channel
parenta41c71b3121b0e31f9c69032aaf91c222b857e8c (diff)
downloadgem5-5a1ad990a64adccaa6116288771628103e47157c.tar.xz
systemc: Implement the sc_*_resolved classes.
Change-Id: Ib595da10e0f900ee4cc1847d41d29251dacb55d7 Reviewed-on: https://gem5-review.googlesource.com/c/12620 Reviewed-by: Gabe Black <gabeblack@google.com> Maintainer: Gabe Black <gabeblack@google.com>
Diffstat (limited to 'src/systemc/channel')
-rw-r--r--src/systemc/channel/sc_in_resolved.cc14
-rw-r--r--src/systemc/channel/sc_inout_resolved.cc35
-rw-r--r--src/systemc/channel/sc_out_resolved.cc29
-rw-r--r--src/systemc/channel/sc_signal_resolved.cc49
4 files changed, 80 insertions, 47 deletions
diff --git a/src/systemc/channel/sc_in_resolved.cc b/src/systemc/channel/sc_in_resolved.cc
index b57f4cd7d..40190c895 100644
--- a/src/systemc/channel/sc_in_resolved.cc
+++ b/src/systemc/channel/sc_in_resolved.cc
@@ -29,6 +29,7 @@
#include "base/logging.hh"
#include "systemc/ext/channel/sc_in_resolved.hh"
+#include "systemc/ext/channel/sc_signal_resolved.hh"
namespace sc_core
{
@@ -41,8 +42,15 @@ sc_in_resolved::sc_in_resolved(const char *name) :
sc_in_resolved::~sc_in_resolved() {}
-void sc_in_resolved::end_of_elaboration() {}
-
-const char *sc_in_resolved::kind() const { return "sc_in_resolved"; }
+void
+sc_in_resolved::end_of_elaboration()
+{
+ sc_in<sc_dt::sc_logic>::end_of_elaboration();
+ if (!dynamic_cast<sc_signal_resolved *>(get_interface())) {
+ std::string msg = csprintf("%s (%s)", name(), kind());
+ SC_REPORT_ERROR("(E117) resolved port not bound to resolved signal",
+ msg.c_str());
+ }
+}
} // namespace sc_core
diff --git a/src/systemc/channel/sc_inout_resolved.cc b/src/systemc/channel/sc_inout_resolved.cc
index 71cece846..8355a8847 100644
--- a/src/systemc/channel/sc_inout_resolved.cc
+++ b/src/systemc/channel/sc_inout_resolved.cc
@@ -29,6 +29,8 @@
#include "base/logging.hh"
#include "systemc/ext/channel/sc_inout_resolved.hh"
+#include "systemc/ext/channel/sc_signal_resolved.hh"
+#include "systemc/ext/utils/sc_report_handler.hh"
namespace sc_core
{
@@ -41,45 +43,52 @@ sc_inout_resolved::sc_inout_resolved(const char *name) :
sc_inout_resolved::~sc_inout_resolved() {}
-void sc_inout_resolved::end_of_elaboration() {}
+void
+sc_inout_resolved::end_of_elaboration()
+{
+ sc_inout<sc_dt::sc_logic>::end_of_elaboration();
+ if (!dynamic_cast<sc_signal_resolved *>(get_interface())) {
+ std::string msg = csprintf("%s (%s)", name(), kind());
+ SC_REPORT_ERROR("(E117) resolved port not bound to resolved signal",
+ msg.c_str());
+ }
+}
sc_inout_resolved &
-sc_inout_resolved::operator = (const sc_dt::sc_logic &)
+sc_inout_resolved::operator = (const sc_dt::sc_logic &l)
{
- warn("%s not implemented.\n", __PRETTY_FUNCTION__);
+ (*this)->write(l);
return *this;
}
sc_inout_resolved &
-sc_inout_resolved::operator = (const sc_signal_in_if<sc_dt::sc_logic> &)
+sc_inout_resolved::operator = (const sc_signal_in_if<sc_dt::sc_logic> &i)
{
- warn("%s not implemented.\n", __PRETTY_FUNCTION__);
+ (*this)->write(i.read());
return *this;
}
sc_inout_resolved &
sc_inout_resolved::operator = (
- const sc_port<sc_signal_in_if<sc_dt::sc_logic>, 1> &)
+ const sc_port<sc_signal_in_if<sc_dt::sc_logic>, 1> &p)
{
- warn("%s not implemented.\n", __PRETTY_FUNCTION__);
+ (*this)->write(p->read());
return *this;
}
sc_inout_resolved &
sc_inout_resolved::operator = (
- const sc_port<sc_signal_inout_if<sc_dt::sc_logic>, 1> &)
+ const sc_port<sc_signal_inout_if<sc_dt::sc_logic>, 1> &p)
{
- warn("%s not implemented.\n", __PRETTY_FUNCTION__);
+ (*this)->write(p->read());
return *this;
}
sc_inout_resolved &
-sc_inout_resolved::operator = (const sc_inout_resolved &)
+sc_inout_resolved::operator = (const sc_inout_resolved &p)
{
- warn("%s not implemented.\n", __PRETTY_FUNCTION__);
+ (*this)->write(p->read());
return *this;
}
-const char *sc_inout_resolved::kind() const { return "sc_inout_resolved"; }
-
} // namespace sc_core
diff --git a/src/systemc/channel/sc_out_resolved.cc b/src/systemc/channel/sc_out_resolved.cc
index a3947f68a..af61f31ca 100644
--- a/src/systemc/channel/sc_out_resolved.cc
+++ b/src/systemc/channel/sc_out_resolved.cc
@@ -33,50 +33,45 @@
namespace sc_core
{
-sc_out_resolved::sc_out_resolved() : sc_out<sc_dt::sc_logic>() {}
-
-sc_out_resolved::sc_out_resolved(const char *name) :
- sc_out<sc_dt::sc_logic>(name) {}
-
+sc_out_resolved::sc_out_resolved() : sc_inout_resolved() {}
+sc_out_resolved::sc_out_resolved(const char *name) : sc_inout_resolved(name) {}
sc_out_resolved::~sc_out_resolved() {}
sc_out_resolved &
-sc_out_resolved::operator = (const sc_dt::sc_logic &)
+sc_out_resolved::operator = (const sc_dt::sc_logic &l)
{
- warn("%s not implemented.\n", __PRETTY_FUNCTION__);
+ (*this)->write(l);
return *this;
}
sc_out_resolved &
-sc_out_resolved::operator = (const sc_signal_in_if<sc_dt::sc_logic> &)
+sc_out_resolved::operator = (const sc_signal_in_if<sc_dt::sc_logic> &i)
{
- warn("%s not implemented.\n", __PRETTY_FUNCTION__);
+ (*this)->write(i.read());
return *this;
}
sc_out_resolved &
sc_out_resolved::operator = (
- const sc_port<sc_signal_in_if<sc_dt::sc_logic>, 1> &)
+ const sc_port<sc_signal_in_if<sc_dt::sc_logic>, 1> &p)
{
- warn("%s not implemented.\n", __PRETTY_FUNCTION__);
+ (*this)->write(p->read());
return *this;
}
sc_out_resolved &
sc_out_resolved::operator = (
- const sc_port<sc_signal_inout_if<sc_dt::sc_logic>, 1> &)
+ const sc_port<sc_signal_inout_if<sc_dt::sc_logic>, 1> &p)
{
- warn("%s not implemented.\n", __PRETTY_FUNCTION__);
+ (*this)->write(p->read());
return *this;
}
sc_out_resolved &
-sc_out_resolved::operator = (const sc_out_resolved &)
+sc_out_resolved::operator = (const sc_out_resolved &p)
{
- warn("%s not implemented.\n", __PRETTY_FUNCTION__);
+ (*this)->write(p->read());
return *this;
}
-const char *sc_out_resolved::kind() const { return "sc_out_resolved"; }
-
} // namespace sc_core
diff --git a/src/systemc/channel/sc_signal_resolved.cc b/src/systemc/channel/sc_signal_resolved.cc
index 90431842e..119082486 100644
--- a/src/systemc/channel/sc_signal_resolved.cc
+++ b/src/systemc/channel/sc_signal_resolved.cc
@@ -28,6 +28,8 @@
*/
#include "base/logging.hh"
+#include "systemc/core/process.hh"
+#include "systemc/core/scheduler.hh"
#include "systemc/ext/channel/sc_signal_resolved.hh"
#include "systemc/ext/core/sc_module.hh" // for sc_gen_unique_name
@@ -44,39 +46,58 @@ sc_signal_resolved::sc_signal_resolved(const char *name) :
{}
sc_signal_resolved::~sc_signal_resolved() {}
+void sc_signal_resolved::register_port(sc_port_base &, const char *) {}
void
-sc_signal_resolved::register_port(sc_port_base &, const char *)
+sc_signal_resolved::write(const sc_dt::sc_logic &l)
{
- warn("%s not implemented.\n", __PRETTY_FUNCTION__);
-}
+ ::sc_gem5::Process *p = ::sc_gem5::scheduler.current();
-void
-sc_signal_resolved::write(const sc_dt::sc_logic &)
-{
- warn("%s not implemented.\n", __PRETTY_FUNCTION__);
+ auto it = inputs.find(p);
+ if (it == inputs.end()) {
+ inputs.emplace(p, l);
+ request_update();
+ } else if (it->second != l) {
+ it->second = l;
+ request_update();
+ }
}
sc_signal_resolved &
-sc_signal_resolved::operator = (const sc_dt::sc_logic &)
+sc_signal_resolved::operator = (const sc_dt::sc_logic &l)
{
- warn("%s not implemented.\n", __PRETTY_FUNCTION__);
+ write(l);
return *this;
}
sc_signal_resolved &
-sc_signal_resolved::operator = (const sc_signal_resolved &)
+sc_signal_resolved::operator = (const sc_signal_resolved &r)
{
- warn("%s not implemented.\n", __PRETTY_FUNCTION__);
+ write(r.read());
return *this;
}
-const char *sc_signal_resolved::kind() const { return "sc_signal_resolved"; }
-
void
sc_signal_resolved::update()
{
- warn("%s not implemented.\n", __PRETTY_FUNCTION__);
+ using sc_dt::Log_0;
+ using sc_dt::Log_1;
+ using sc_dt::Log_Z;
+ using sc_dt::Log_X;
+ static sc_dt::sc_logic_value_t merge_table[4][4] = {
+ { Log_0, Log_X, Log_0, Log_X },
+ { Log_X, Log_1, Log_1, Log_X },
+ { Log_0, Log_1, Log_Z, Log_X },
+ { Log_X, Log_X, Log_X, Log_X }
+ };
+
+ // Resolve the inputs, and give the result to the underlying signal class.
+ m_new_val = Log_Z;
+ for (auto &input: inputs)
+ m_new_val = merge_table[m_new_val.value()][input.second.value()];
+
+ // Ask the signal to update it's value.
+ sc_signal<sc_dt::sc_logic, SC_MANY_WRITERS>::update();
}
} // namespace sc_core