From 5a1ad990a64adccaa6116288771628103e47157c Mon Sep 17 00:00:00 2001
From: Gabe Black <gabeblack@google.com>
Date: Tue, 11 Sep 2018 20:14:22 -0700
Subject: 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>
---
 src/systemc/ext/channel/sc_in_resolved.hh     |  2 +-
 src/systemc/ext/channel/sc_inout_resolved.hh  |  2 +-
 src/systemc/ext/channel/sc_out_resolved.hh    |  7 ++++---
 src/systemc/ext/channel/sc_signal_resolved.hh | 13 ++++++++++++-
 4 files changed, 18 insertions(+), 6 deletions(-)

(limited to 'src/systemc/ext/channel')

diff --git a/src/systemc/ext/channel/sc_in_resolved.hh b/src/systemc/ext/channel/sc_in_resolved.hh
index 1c49b8caa..6aba8ee28 100644
--- 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 32348dba1..7466bc34c 100644
--- 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 0a8f2986a..25f923431 100644
--- 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 f04fa363f..6daacc047 100644
--- 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
-- 
cgit v1.2.3