From f234849bd1bb2206fbcdeb523427c89e44e34fd4 Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Sat, 6 Dec 2025 21:24:45 +0100
Subject: [PATCH] updates dbt-rise-riscv and vpvper

---
 dbt-rise-riscv    |  2 +-
 scc               |  2 +-
 src/vp/system.cpp | 12 ++++--------
 src/vp/system.h   |  6 +++---
 vpvper            |  2 +-
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/dbt-rise-riscv b/dbt-rise-riscv
index 3678067..4990d15 160000
--- a/dbt-rise-riscv
+++ b/dbt-rise-riscv
@@ -1 +1 @@
-Subproject commit 36780673209c7db9928f4e1b9d03dd530d7083bc
+Subproject commit 4990d15a355fc5209bd5d7ced6c46dea726fa523
diff --git a/scc b/scc
index 3f5d963..c54fc1b 160000
--- a/scc
+++ b/scc
@@ -1 +1 @@
-Subproject commit 3f5d963ae0f7e83a340674d44c3a8e5125d221ef
+Subproject commit c54fc1b08431607a9b89567c62a7f941b423b06f
diff --git a/src/vp/system.cpp b/src/vp/system.cpp
index 3d48159..8d1ed42 100644
--- a/src/vp/system.cpp
+++ b/src/vp/system.cpp
@@ -5,7 +5,6 @@
  */
 
 #include "system.h"
-
 #include <minres/timer.h>
 #include <minres/uart.h>
 #include <scc/utilities.h>
@@ -57,9 +56,9 @@ system::system(sc_core::sc_module_name nm)
 
     aclint.mtime_clk_i(mtime_clk);
     aclint.mtime_o(mtime_s);
-    aclint.mtime_int_o(mtime_int_s);
-    aclint.msip_int_o(msip_int_s);
-    irq_ctrl.irq_o(core_int_s);
+    aclint.mtime_int_o[0](clint_int_s[sysc::riscv::TIMER_IRQ]);
+    aclint.msip_int_o[0](clint_int_s[sysc::riscv::SW_IRQ]);
+    irq_ctrl.irq_o(clint_int_s[sysc::riscv::EXT_IRQ]);
     irq_ctrl.pending_irq_i(irq_int_s);
 
     uart0.irq_o(irq_int_s[0]);
@@ -68,10 +67,7 @@ system::system(sc_core::sc_module_name nm)
     qspi.irq_o(irq_int_s[3]);
 
     core_complex.mtime_i(mtime_s);
-    core_complex.timer_irq_i(mtime_int_s);
-    core_complex.ext_irq_i(core_int_s);
-    core_complex.local_irq_i(local_int_s);
-    core_complex.sw_irq_i(msip_int_s);
+    core_complex.clint_irq_i(clint_int_s);
 
     gpio0.pins_i(pins_i);
     gpio0.pins_o(pins_o);
diff --git a/src/vp/system.h b/src/vp/system.h
index 8bd7197..e3e1fd0 100644
--- a/src/vp/system.h
+++ b/src/vp/system.h
@@ -63,10 +63,10 @@ private:
     scc::memory<8_kB, scc::LT> boot_rom{"boot_rom"};
 
     sc_core::sc_signal<sc_core::sc_time> mtime_clk{"mtime_clk"};
-    sc_core::sc_signal<bool, sc_core::SC_MANY_WRITERS> rst_s{"rst_s"}, mtime_int_s{"mtime_int_s"}, msip_int_s{"msip_int_s"};
+    sc_core::sc_signal<bool, sc_core::SC_MANY_WRITERS> rst_s{"rst_s"};
 
-    sc_core::sc_vector<sc_core::sc_signal<bool, sc_core::SC_MANY_WRITERS>> irq_int_s{"irq_int_s", 32}, local_int_s{"local_int_s", 16};
-    sc_core::sc_signal<bool, sc_core::SC_MANY_WRITERS> core_int_s{"core_int_s"};
+    sc_core::sc_vector<sc_core::sc_signal<bool, sc_core::SC_MANY_WRITERS>> irq_int_s{"irq_int_s", 32};
+    sc_core::sc_vector<sc_core::sc_signal<bool, sc_core::SC_MANY_WRITERS>> clint_int_s{"clint_int_s", 16};
     sc_core::sc_signal<uint64_t> mtime_s{"mtime_s"};
     void gen_reset();
 };
diff --git a/vpvper b/vpvper
index 6413f14..d9c206f 160000
--- a/vpvper
+++ b/vpvper
@@ -1 +1 @@
-Subproject commit 6413f14b18658eab8223b30fbbe1216f6d26cc86
+Subproject commit d9c206f61aa3479d67a71bff47b0ded71673fd7d