From 3d29513196e7d59e1b8f9da120089bac17e8771d Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Thu, 20 Sep 2018 02:57:54 -0700 Subject: systemc: Implement general and VCD trace support. This doesn't include WIF trace support, but does make allowances for adding it in the future. Change-Id: Ifb62f40a7d8a13e94463930a44ac4b1cf41e3009 Reviewed-on: https://gem5-review.googlesource.com/c/12826 Reviewed-by: Gabe Black Maintainer: Gabe Black --- src/systemc/ext/channel/sc_in.hh | 77 ++++++++++++++++++++++++++++++++++------ 1 file changed, 66 insertions(+), 11 deletions(-) (limited to 'src/systemc/ext/channel/sc_in.hh') diff --git a/src/systemc/ext/channel/sc_in.hh b/src/systemc/ext/channel/sc_in.hh index b7170aed3..a76840161 100644 --- a/src/systemc/ext/channel/sc_in.hh +++ b/src/systemc/ext/channel/sc_in.hh @@ -34,9 +34,9 @@ #include "../core/sc_event.hh" #include "../core/sc_port.hh" +#include "../utils/sc_trace_file.hh" #include "sc_signal_in_if.hh" #include "sc_signal_inout_if.hh" -#include "warn_unimpl.hh" namespace sc_core { @@ -112,7 +112,14 @@ class sc_in : public sc_port, 1> bind(p); } - virtual void end_of_elaboration() { /* Implementation defined. */ } + virtual void + end_of_elaboration() + { + for (auto params: traceParamsVec) + sc_trace(params->tf, (*this)->read(), params->name); + + traceParamsVec.clear(); + } const T &read() const { return (*this)->read(); } operator const T& () const { return (*this)->read(); } @@ -128,9 +135,17 @@ class sc_in : public sc_port, 1> virtual const char *kind() const { return "sc_in"; } + void + add_trace(sc_trace_file *tf, const std::string &name) const + { + traceParamsVec.push_back(new sc_trace_params(tf, name)); + } + private: mutable sc_event_finder_t > _valueChangedFinder; + mutable sc_trace_params_vec traceParamsVec; + // Disabled sc_in(const sc_in &); sc_in &operator = (const sc_in &); @@ -138,9 +153,12 @@ class sc_in : public sc_port, 1> template inline void -sc_trace(sc_trace_file *, const sc_in &, const std::string &) +sc_trace(sc_trace_file *tf, const sc_in &i, const std::string &name) { - sc_channel_warn_unimpl(__PRETTY_FUNCTION__); + if (i.size()) + sc_trace(tf, i->read(), name); + else + i.add_trace(tf, name); } template <> @@ -236,7 +254,14 @@ class sc_in : public sc_port, 1> bind(p); } - virtual void end_of_elaboration() { /* Implementation defined. */ } + virtual void + end_of_elaboration() + { + for (auto params: traceParamsVec) + sc_trace(params->tf, (*this)->read(), params->name); + + traceParamsVec.clear(); + } const bool &read() const { return (*this)->read(); } operator const bool& () const { return (*this)->read(); } @@ -268,11 +293,19 @@ class sc_in : public sc_port, 1> virtual const char *kind() const { return "sc_in"; } + void + add_trace(sc_trace_file *tf, const std::string &name) const + { + traceParamsVec.push_back(new sc_trace_params(tf, name)); + } + private: mutable sc_event_finder_t > _valueChangedFinder; mutable sc_event_finder_t > _posFinder; mutable sc_event_finder_t > _negFinder; + mutable sc_trace_params_vec traceParamsVec; + // Disabled sc_in(const sc_in &); sc_in &operator = (const sc_in &); @@ -280,9 +313,13 @@ class sc_in : public sc_port, 1> template <> inline void -sc_trace(sc_trace_file *, const sc_in &, const std::string &) +sc_trace(sc_trace_file *tf, const sc_in &i, + const std::string &name) { - sc_channel_warn_unimpl(__PRETTY_FUNCTION__); + if (i.size()) + sc_trace(tf, i->read(), name); + else + i.add_trace(tf, name); } template <> @@ -383,7 +420,14 @@ class sc_in : bind(p); } - virtual void end_of_elaboration() { /* Implementation defined. */ } + virtual void + end_of_elaboration() + { + for (auto params: traceParamsVec) + sc_trace(params->tf, (*this)->read(), params->name); + + traceParamsVec.clear(); + } const sc_dt::sc_logic &read() const { return (*this)->read(); } operator const sc_dt::sc_logic& () const { return (*this)->read(); } @@ -407,12 +451,20 @@ class sc_in : virtual const char *kind() const { return "sc_in"; } + void + add_trace(sc_trace_file *tf, const std::string &name) const + { + traceParamsVec.push_back(new sc_trace_params(tf, name)); + } + private: mutable sc_event_finder_t > _valueChangedFinder; mutable sc_event_finder_t > _posFinder; mutable sc_event_finder_t > _negFinder; + mutable sc_trace_params_vec traceParamsVec; + // Disabled sc_in(const sc_in &); sc_in &operator = (const sc_in &); @@ -420,10 +472,13 @@ class sc_in : template <> inline void -sc_trace( - sc_trace_file *, const sc_in &, const std::string &) +sc_trace(sc_trace_file *tf, const sc_in &i, + const std::string &name) { - sc_channel_warn_unimpl(__PRETTY_FUNCTION__); + if (i.size()) + sc_trace(tf, i->read(), name); + else + i.add_trace(tf, name); } } // namespace sc_core -- cgit v1.2.3