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>

diff --git a/src/systemc/channel/sc_in_resolved.cc b/src/systemc/channel/sc_in_resolved.cc
index b57f4cd7d8192bd200aa48558d0b779e8f2dfb5b..40190c895e0b539ed6b9ed3aaf082f78df10a87b 100644 (file)
--- 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 71cece84617d59a018ffc98284077ab374771233..8355a884784d166b5a45654d4a1589e1df67abb7 100644 (file)
--- 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 a3947f68ac80a09a51c2b31a18cd9dcb1736ba60..af61f31ca81ce7a478c7a62e260569db9cca596a 100644 (file)
--- 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 90431842e16ea402d9fccae6b72eca109338b1db..119082486722b80518e8f00f20beb0f92199de28 100644 (file)
--- 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

diff --git a/src/systemc/ext/channel/sc_in_resolved.hh b/src/systemc/ext/channel/sc_in_resolved.hh
index 1c49b8caa1233909bc212588180fe69b929f143d..6aba8ee28c99f89635fd41eddc2e15d4a3717d12 100644 (file)
--- a/src/systemc/ext/channel/sc_in_resolved.hh
+++ b/src/systemc/ext/channel/sc_in_resolved.hh
@@ -51,7 +51,7 @@ class sc_in_resolved : public sc_in<sc_dt::sc_logic>
 
     virtual void end_of_elaboration();
 
-    virtual const char *kind() const;
+    virtual const char *kind() const { return "sc_in_resolved"; }
 
   private:
     // Disabled

diff --git a/src/systemc/ext/channel/sc_inout_resolved.hh b/src/systemc/ext/channel/sc_inout_resolved.hh
index 32348dba1d649ccdcd856ce20663c4b25ac76b11..7466bc34c2f701aeaa72c353059cac21ab3053f2 100644 (file)
--- a/src/systemc/ext/channel/sc_inout_resolved.hh
+++ b/src/systemc/ext/channel/sc_inout_resolved.hh
@@ -62,7 +62,7 @@ class sc_inout_resolved : public sc_inout<sc_dt::sc_logic>
             const sc_port<sc_signal_inout_if<sc_dt::sc_logic>, 1> &);
     sc_inout_resolved &operator = (const sc_inout_resolved &);
 
-    virtual const char *kind() const;
+    virtual const char *kind() const { return "sc_inout_resolved"; }
 
   private:
     // Disabled

diff --git a/src/systemc/ext/channel/sc_out_resolved.hh b/src/systemc/ext/channel/sc_out_resolved.hh
index 0a8f2986aea9ebb1b19c9114057a8a787fde8dd7..25f923431bfe75505dbb4fa36c7ce7dd8ca01083 100644 (file)
--- a/src/systemc/ext/channel/sc_out_resolved.hh
+++ b/src/systemc/ext/channel/sc_out_resolved.hh
@@ -30,6 +30,7 @@
 #ifndef __SYSTEMC_EXT_CHANNEL_SC_OUT_RESOLVED_HH__
 #define __SYSTEMC_EXT_CHANNEL_SC_OUT_RESOLVED_HH__
 
+#include "sc_inout_resolved.hh"
 #include "sc_out.hh"
 #include "sc_signal_in_if.hh"
 #include "sc_signal_inout_if.hh"
@@ -45,7 +46,7 @@ class sc_logic;
 namespace sc_core
 {
 
-class sc_out_resolved : public sc_out<sc_dt::sc_logic>
+class sc_out_resolved : public sc_inout_resolved
 {
   public:
     sc_out_resolved();
@@ -60,11 +61,11 @@ class sc_out_resolved : public sc_out<sc_dt::sc_logic>
             const sc_port<sc_signal_inout_if<sc_dt::sc_logic>, 1> &);
     sc_out_resolved &operator = (const sc_out_resolved &);
 
-    virtual const char *kind() const;
+    virtual const char *kind() const { return "sc_out_resolved"; }
 
   private:
     // Disabled
-    sc_out_resolved(const sc_out_resolved &) : sc_out<sc_dt::sc_logic>() {}
+    sc_out_resolved(const sc_out_resolved &) : sc_inout_resolved() {}
 };
 
 } // namespace sc_core

diff --git a/src/systemc/ext/channel/sc_signal_resolved.hh b/src/systemc/ext/channel/sc_signal_resolved.hh
index f04fa363fa313f5880d09cf352a3987146fc2b4b..6daacc0471e0ef66b7f30c1dbd863fa3d89debee 100644 (file)
--- a/src/systemc/ext/channel/sc_signal_resolved.hh
+++ b/src/systemc/ext/channel/sc_signal_resolved.hh
@@ -30,6 +30,8 @@
 #ifndef __SYSTEMC_EXT_CHANNEL_SC_SIGNAL_RESOLVED_HH__
 #define __SYSTEMC_EXT_CHANNEL_SC_SIGNAL_RESOLVED_HH__
 
+#include <map>
+
 #include "sc_signal.hh"
 #include "sc_signal_inout_if.hh"
 
@@ -40,6 +42,13 @@ class sc_logic;
 
 };
 
+namespace sc_gem5
+{
+
+class Process;
+
+} // namespace sc_gem5
+
 namespace sc_core
 {
 
@@ -58,7 +67,7 @@ class sc_signal_resolved : public sc_signal<sc_dt::sc_logic, SC_MANY_WRITERS>
     sc_signal_resolved &operator = (const sc_dt::sc_logic &);
     sc_signal_resolved &operator = (const sc_signal_resolved &);
 
-    virtual const char *kind() const;
+    virtual const char *kind() const { return "sc_signal_resolved"; }
 
   protected:
     virtual void update();
@@ -68,6 +77,8 @@ class sc_signal_resolved : public sc_signal<sc_dt::sc_logic, SC_MANY_WRITERS>
     sc_signal_resolved(const sc_signal_resolved &) :
             sc_interface(), sc_signal<sc_dt::sc_logic, SC_MANY_WRITERS>()
     {}
+
+    std::map<::sc_gem5::Process *, sc_dt::sc_logic> inputs;
 };
 
 } // namespace sc_core