simplifies clint_irq signal interface

Author: eyck

src/sysc/core_complex.cpp

@@ -230,13 +230,7 @@ template <unsigned int BUSWIDTH, typename QK> void core_complex<BUSWIDTH, QK>::i
             return tlm::TLM_COMPLETED;
         });
 #else
-    SC_METHOD(sw_irq_cb);
-    sensitive << sw_irq_i;
-    SC_METHOD(timer_irq_cb);
-    sensitive << timer_irq_i;
-    SC_METHOD(ext_irq_cb);
-    sensitive << ext_irq_i;
-    SC_METHOD(local_irq_cb);
+    SC_METHOD(clint_irq_cb);
     for(auto pin : clint_irq_i)
         sensitive << pin;
 #endif
@@ -362,21 +356,6 @@ template <unsigned int BUSWIDTH, typename QK> void core_complex<BUSWIDTH, QK>::r
 }
 
 #ifndef USE_TLM_SIGNAL
-template <unsigned int BUSWIDTH, typename QK> void core_complex<BUSWIDTH, QK>::sw_irq_cb() {
-    if(!rst_i->read() && sc_core::sc_time_stamp().value())
-        core->local_irq(3, sw_irq_i.read());
-}
-
-template <unsigned int BUSWIDTH, typename QK> void core_complex<BUSWIDTH, QK>::timer_irq_cb() {
-    if(!rst_i->read() && sc_core::sc_time_stamp().value())
-        core->local_irq(7, timer_irq_i.read());
-}
-
-template <unsigned int BUSWIDTH, typename QK> void core_complex<BUSWIDTH, QK>::ext_irq_cb() {
-    if(!rst_i->read() && sc_core::sc_time_stamp().value())
-        core->local_irq(11, ext_irq_i.read());
-}
-
 template <unsigned int BUSWIDTH, typename QK> void core_complex<BUSWIDTH, QK>::clint_irq_cb() {
     for(auto i = 0U; i < clint_irq_i.size(); ++i) {
         if(clint_irq_i[i].event()) {

src/sysc/core_complex.h

@@ -84,6 +84,8 @@ using irq_signal_t = tlm::scc::tlm_signal_bool_opt_in;
 using irq_signal_t = sc_core::sc_in<bool>;
 #endif
 
+enum { SW_IRQ = 3, TIMER_IRQ = 7, EXT_IRQ = 11 };
+
 template <unsigned int BUSWIDTH = scc::LT, typename QK = tlm::scc::quantumkeeper>
 class core_complex : public sc_core::sc_module, public scc::traceable, public core_complex_if {
 public:
@@ -95,12 +97,6 @@ class core_complex : public sc_core::sc_module, public scc::traceable, public co
 
     sc_core::sc_in<bool> rst_i{"rst_i"};
 
-    irq_signal_t ext_irq_i{"ext_irq_i"};
-
-    irq_signal_t timer_irq_i{"timer_irq_i"};
-
-    irq_signal_t sw_irq_i{"sw_irq_i"};
-
     sc_core::sc_vector<irq_signal_t> clint_irq_i{"local_irq_i", 16};
 
 #ifndef CWR_SYSTEMC
@@ -232,9 +228,6 @@ class core_complex : public sc_core::sc_module, public scc::traceable, public co
     void run();
     void rst_cb();
 #ifndef USE_TLM_SIGNAL
-    void sw_irq_cb();
-    void timer_irq_cb();
-    void ext_irq_cb();
     void clint_irq_cb();
 #endif
     ///////////////////////////////////////////////////////////////////////////////