fixes CLINT interrupt handling

Author: eyck

src/sysc/core2sc_adapter.h

@@ -35,8 +35,6 @@
 #ifndef _SYSC_CORE2SC_ADAPTER_H_
 #define _SYSC_CORE2SC_ADAPTER_H_
 
-#include "core_complex.h"
-#include "iss/log_categories.h"
 #include "sc2core_if.h"
 #include "util/delegate.h"
 #include "util/logging.h"
@@ -48,6 +46,7 @@
 #include <scc/async_event.h>
 #include <scc/report.h>
 #include <shared_mutex>
+#include <sysc/kernel/sc_time.h>
 #include <util/instance_logger.h>
 #include <util/ities.h>
 
@@ -245,7 +244,7 @@ template <typename PLAT> class core2sc_adapter : public PLAT, public sc2core_if
     void wait_until(uint64_t flags) {
         SCCDEBUG(owner->hier_name()) << "Sleeping until interrupt";
         PLAT::wait_until(flags);
-        while(this->reg.pending_trap == 0 && (this->csr[iss::arch::mip] & this->csr[iss::arch::mie]) == 0) {
+        while((this->csr[iss::arch::mip] & this->csr[iss::arch::mie]) == 0) {
             sc_core::wait(wfi_evt);
         }
     }
@@ -289,21 +288,8 @@ template <typename PLAT> class core2sc_adapter : public PLAT, public sc2core_if
 
     void _local_irq(short id, bool value) {
         reg_t mask = 0;
-        switch(id) {
-        case 3: // SW
-            mask = 1 << 3;
-            break;
-        case 7: // timer
-            mask = 1 << 7;
-            break;
-        case 11: // external
-            mask = 1 << 11;
-            break;
-        default:
-            if(id > 15)
-                mask = 1 << id;
-            break;
-        }
+        assert(id < 32 && "CLINT cannot handle more tahn 32 irq");
+        mask = 1 << id;
         if(value) {
             this->csr[iss::arch::mip] |= mask;
             wfi_evt.notify();
@@ -313,6 +299,7 @@ template <typename PLAT> class core2sc_adapter : public PLAT, public sc2core_if
         if(value)
             SCCTRACE(owner->hier_name()) << "Triggering interrupt " << id << " Pending trap: " << this->reg.pending_trap;
     }
+
     void _local_irq_mt(short id, bool value) {
         std::unique_lock<mutex_t> lock(sync_mtx);
         _local_irq(id, value);

src/sysc/core_complex.cpp

@@ -231,8 +231,8 @@ template <unsigned int BUSWIDTH, typename QK> void core_complex<BUSWIDTH, QK>::i
         });
 #else
     SC_METHOD(clint_irq_cb);
-    for(auto pin : clint_irq_i)
-        sensitive << pin;
+    dont_initialize();
+    sensitive << clint_irq_i;
 #endif
 
     SC_METHOD(forward);
@@ -359,7 +359,7 @@ template <unsigned int BUSWIDTH, typename QK> void core_complex<BUSWIDTH, QK>::r
 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()) {
-            core->local_irq(16 + i, clint_irq_i[i].read());
+            core->local_irq(i, clint_irq_i[i].read());
         }
     }
 }

src/sysc/core_complex.h

@@ -97,7 +97,7 @@ class core_complex : public sc_core::sc_module, public scc::traceable, public co
 
     sc_core::sc_in<bool> rst_i{"rst_i"};
 
-    sc_core::sc_vector<irq_signal_t> clint_irq_i{"local_irq_i", 16};
+    sc_core::sc_vector<irq_signal_t> clint_irq_i{"clint_irq_i", 32};
 
 #ifndef CWR_SYSTEMC
     sc_core::sc_in<sc_core::sc_time> clk_i{"clk_i"};
@@ -186,11 +186,6 @@ class core_complex : public sc_core::sc_module, public scc::traceable, public co
     void sync(uint64_t cycle) override {
         auto core_inc = curr_clk * (cycle - last_sync_cycle);
         quantum_keeper.check_and_sync(core_inc);
-        // quantum_keeper.inc(core_inc);
-        // if(quantum_keeper.need_sync()) {
-        //     wait(quantum_keeper.get_local_time());
-        //     quantum_keeper.reset();
-        // }
         last_sync_cycle = cycle;
     }