From: Gabe Black <gabeblack@google.com>
Date: Mon, 1 Oct 2018 05:40:28 +0000 (-0700)
Subject: systemc: Use the stage of simulation and not port size in add_trace.
X-Git-Tag: v19.0.0.0~1550
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e5a994140a1f0fcd08ba6ddad7d11d6daa3d07a0;p=gem5.git

systemc: Use the stage of simulation and not port size in add_trace.

The assumption was that a port wouldn't have any interfaces until
after elaboration, and that if it would be traced, it would have
interfaces. Checking if the simulation has started (and hence
elaboration has finished) is a more accurate and direct way to check
the same thing.

Change-Id: I7fe9ecea469997d1a257dd3e4a0db31889aff722
Reviewed-on: https://gem5-review.googlesource.com/c/13195
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>
---

diff --git a/src/systemc/ext/channel/sc_in.hh b/src/systemc/ext/channel/sc_in.hh
index a76840161..3fea8a803 100644
--- a/src/systemc/ext/channel/sc_in.hh
+++ b/src/systemc/ext/channel/sc_in.hh
@@ -33,6 +33,7 @@
 #include <string>
 
 #include "../core/sc_event.hh"
+#include "../core/sc_main.hh"
 #include "../core/sc_port.hh"
 #include "../utils/sc_trace_file.hh"
 #include "sc_signal_in_if.hh"
@@ -155,10 +156,10 @@ template <class T>
 inline void
 sc_trace(sc_trace_file *tf, const sc_in<T> &i, const std::string &name)
 {
-    if (i.size())
-        sc_trace(tf, i->read(), name);
-    else
+    if (::sc_core::sc_get_status() < ::sc_core::SC_START_OF_SIMULATION)
         i.add_trace(tf, name);
+    else
+        sc_trace(tf, i->read(), name);
 }
 
 template <>
@@ -316,10 +317,10 @@ inline void
 sc_trace<bool>(sc_trace_file *tf, const sc_in<bool> &i,
         const std::string &name)
 {
-    if (i.size())
-        sc_trace(tf, i->read(), name);
-    else
+    if (::sc_core::sc_get_status() < ::sc_core::SC_START_OF_SIMULATION)
         i.add_trace(tf, name);
+    else
+        sc_trace(tf, i->read(), name);
 }
 
 template <>
@@ -475,10 +476,10 @@ inline void
 sc_trace<sc_dt::sc_logic>(sc_trace_file *tf, const sc_in<sc_dt::sc_logic> &i,
         const std::string &name)
 {
-    if (i.size())
-        sc_trace(tf, i->read(), name);
-    else
+    if (::sc_core::sc_get_status() < ::sc_core::SC_START_OF_SIMULATION)
         i.add_trace(tf, name);
+    else
+        sc_trace(tf, i->read(), name);
 }
 
 } // namespace sc_core
diff --git a/src/systemc/ext/channel/sc_inout.hh b/src/systemc/ext/channel/sc_inout.hh
index 7f19443d5..2973a5414 100644
--- a/src/systemc/ext/channel/sc_inout.hh
+++ b/src/systemc/ext/channel/sc_inout.hh
@@ -33,6 +33,7 @@
 #include <string>
 
 #include "../core/sc_event.hh"
+#include "../core/sc_main.hh"
 #include "../core/sc_port.hh"
 #include "../dt/bit/sc_logic.hh"
 #include "../utils/sc_trace_file.hh"
@@ -184,10 +185,10 @@ template <class T>
 inline void
 sc_trace(sc_trace_file *tf, const sc_inout<T> &i, const std::string &name)
 {
-    if (i.size())
-        sc_trace(tf, i->read(), name);
-    else
+    if (::sc_core::sc_get_status() < ::sc_core::SC_START_OF_SIMULATION)
         i.add_trace(tf, name);
+    else
+        sc_trace(tf, i->read(), name);
 }
 
 template <>
@@ -357,10 +358,10 @@ template <>
 inline void sc_trace<bool>(
         sc_trace_file *tf, const sc_inout<bool> &i, const std::string &name)
 {
-    if (i.size())
-        sc_trace(tf, i->read(), name);
-    else
+    if (::sc_core::sc_get_status() < ::sc_core::SC_START_OF_SIMULATION)
         i.add_trace(tf, name);
+    else
+        sc_trace(tf, i->read(), name);
 }
 
 template <>
@@ -549,10 +550,10 @@ inline void
 sc_trace<sc_dt::sc_logic>(sc_trace_file *tf,
         const sc_inout<sc_dt::sc_logic> &i, const std::string &name)
 {
-    if (i.size())
-        sc_trace(tf, i->read(), name);
-    else
+    if (::sc_core::sc_get_status() < ::sc_core::SC_START_OF_SIMULATION)
         i.add_trace(tf, name);
+    else
+        sc_trace(tf, i->read(), name);
 }
 
 } // namespace sc_core