diff options
| -rw-r--r-- | src/systemc/core/sc_sensitive.cc | 50 | ||||
| -rw-r--r-- | src/systemc/ext/core/sc_module.hh | 6 | ||||
| -rw-r--r-- | src/systemc/ext/core/sc_sensitive.hh | 27 |
3 files changed, 79 insertions, 4 deletions
diff --git a/src/systemc/core/sc_sensitive.cc b/src/systemc/core/sc_sensitive.cc index b254f6861..9b8ae2de4 100644 --- a/src/systemc/core/sc_sensitive.cc +++ b/src/systemc/core/sc_sensitive.cc @@ -29,6 +29,9 @@ #include "base/logging.hh" #include "systemc/core/process.hh" +#include "systemc/ext/channel/sc_in.hh" +#include "systemc/ext/channel/sc_inout.hh" +#include "systemc/ext/channel/sc_signal_in_if.hh" #include "systemc/ext/core/sc_interface.hh" #include "systemc/ext/core/sc_sensitive.hh" @@ -72,4 +75,51 @@ sc_sensitive::operator << (::sc_gem5::Process *p) return *this; } + +void +sc_sensitive::operator () (::sc_gem5::Process *p, + const sc_signal_in_if<bool> &i) +{ + sc_gem5::newStaticSensitivityEvent(p, &i.posedge_event()); +} + +void +sc_sensitive::operator () (::sc_gem5::Process *p, + const sc_signal_in_if<sc_dt::sc_logic> &i) +{ + sc_gem5::newStaticSensitivityEvent(p, &i.posedge_event()); +} + +void +sc_sensitive::operator () (::sc_gem5::Process *p, const sc_in<bool> &port) +{ + sc_gem5::newStaticSensitivityFinder(p, &port.pos()); +} + +void +sc_sensitive::operator () (::sc_gem5::Process *p, + const sc_in<sc_dt::sc_logic> &port) +{ + sc_gem5::newStaticSensitivityFinder(p, &port.pos()); +} + +void +sc_sensitive::operator () (::sc_gem5::Process *p, const sc_inout<bool> &port) +{ + sc_gem5::newStaticSensitivityFinder(p, &port.pos()); +} + +void +sc_sensitive::operator () (::sc_gem5::Process *p, + const sc_inout<sc_dt::sc_logic> &port) +{ + sc_gem5::newStaticSensitivityFinder(p, &port.pos()); +} + +void +sc_sensitive::operator () (::sc_gem5::Process *p, sc_event_finder &f) +{ + sc_gem5::newStaticSensitivityFinder(p, &f); +} + } // namespace sc_core diff --git a/src/systemc/ext/core/sc_module.hh b/src/systemc/ext/core/sc_module.hh index e5e4c2086..d318a755e 100644 --- a/src/systemc/ext/core/sc_module.hh +++ b/src/systemc/ext/core/sc_module.hh @@ -310,10 +310,8 @@ bool timed_out(); #name, new ::sc_gem5::ProcessMemberFuncWrapper< \ SC_CURRENT_USER_MODULE>(this, \ &SC_CURRENT_USER_MODULE::name)); \ - if (p) { \ - this->sensitive << p; \ - this->sensitive << clk; \ - } \ + if (p) \ + this->sensitive(p, clk); \ } // Nonstandard diff --git a/src/systemc/ext/core/sc_sensitive.hh b/src/systemc/ext/core/sc_sensitive.hh index 72d401f68..51ee45900 100644 --- a/src/systemc/ext/core/sc_sensitive.hh +++ b/src/systemc/ext/core/sc_sensitive.hh @@ -37,6 +37,13 @@ class Process; } // namespace sc_gem5 +namespace sc_dt +{ + +class sc_logic; + +} // namespace sc_dt + namespace sc_core { @@ -46,6 +53,15 @@ class sc_interface; class sc_module; class sc_port_base; +template <class T> +class sc_signal_in_if; + +template <class T> +class sc_in; + +template <class T> +class sc_inout; + class sc_sensitive { public: @@ -56,6 +72,17 @@ class sc_sensitive sc_sensitive &operator << (::sc_gem5::Process *p); + // Nonstandard. + void operator () (::sc_gem5::Process *p, const sc_signal_in_if<bool> &); + void operator () (::sc_gem5::Process *p, + const sc_signal_in_if<sc_dt::sc_logic> &); + void operator () (::sc_gem5::Process *p, const sc_in<bool> &); + void operator () (::sc_gem5::Process *p, const sc_in<sc_dt::sc_logic> &); + void operator () (::sc_gem5::Process *p, const sc_inout<bool> &); + void operator () (::sc_gem5::Process *p, + const sc_inout<sc_dt::sc_logic> &); + void operator () (::sc_gem5::Process *p, sc_event_finder &); + private: friend class sc_module; |