diff --git a/dbt-rise-riscv b/dbt-rise-riscv index 1c8e1be..82b7653 160000 --- a/dbt-rise-riscv +++ b/dbt-rise-riscv @@ -1 +1 @@ -Subproject commit 1c8e1bef1c7b897612c370785159f6123a45d3ba +Subproject commit 82b765336f08787899f6030d5eb8918247e34c4a diff --git a/src/vp/system.cpp b/src/vp/system.cpp index 6229636..543fd0b 100644 --- a/src/vp/system.cpp +++ b/src/vp/system.cpp @@ -53,6 +53,7 @@ system::system(sc_core::sc_module_name nm) qspi.rst_i(rst_s); core_complex.rst_i(rst_s); + 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); @@ -63,6 +64,7 @@ system::system(sc_core::sc_module_name nm) timer0.interrupt_o[1](irq_int_s[2]); 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); diff --git a/src/vp/system.h b/src/vp/system.h index c7674c1..e9f0889 100644 --- a/src/vp/system.h +++ b/src/vp/system.h @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -59,13 +60,11 @@ private: scc::memory<128_kB, scc::LT> mem_ram{"mem_ram"}; scc::memory<8_kB, scc::LT> boot_rom{"boot_rom"}; - sc_core::sc_signal rst_s{"rst_s"}, mtime_int_s{"mtime_int_s"}, - msip_int_s{"msip_int_s"}; + sc_core::sc_signal rst_s{"rst_s"}, mtime_int_s{"mtime_int_s"}, msip_int_s{"msip_int_s"}; - sc_core::sc_vector> irq_int_s{"irq_int_s", 32}, - local_int_s{"local_int_s", 16}; + sc_core::sc_vector> irq_int_s{"irq_int_s", 32}, local_int_s{"local_int_s", 16}; sc_core::sc_signal core_int_s{"core_int_s"}; - + sc_core::sc_signal mtime_s{"mtime_s"}; void gen_reset(); #include "../vp/gen/PipelinedMemoryBusToApbBridge.h" // IWYU pragma: keep }; diff --git a/vpvper b/vpvper index 77b5ffa..ec61cb9 160000 --- a/vpvper +++ b/vpvper @@ -1 +1 @@ -Subproject commit 77b5ffa40d50f63f4adac0b32076d9da590a4c51 +Subproject commit ec61cb97a50cd8c71df1c64c3a43c1947a9f6af4