diff --git a/.cproject b/.cproject
index f2a8b0a..722c94d 100644
--- a/.cproject
+++ b/.cproject
@@ -46,11 +46,13 @@
-
-
+
+
+
+
@@ -65,7 +67,7 @@
-
+
@@ -99,12 +101,12 @@
-
+
-
+
diff --git a/.gitignore b/.gitignore
index 9d73bd5..63dc490 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ CMakeSettings.json
/.direnv
/.cache
/CMakeUserPresets.json
+/.envrc.*
diff --git a/.gitmodules b/.gitmodules
index a1c90b8..d0d8283 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,6 @@
[submodule "dbt-rise-riscv"]
path = dbt-rise-riscv
url = https://github.com/Minres/DBT-RISE-RISCV.git
+[submodule "dbt-rise-core"]
+ path = dbt-rise-core
+ url = https://github.com/Minres/DBT-RISE-Core.git
diff --git a/.launch/TGC-VP asmjit hello.launch b/.launch/TGC-VP asmjit hello.launch
index 866dd02..ff4efbc 100644
--- a/.launch/TGC-VP asmjit hello.launch
+++ b/.launch/TGC-VP asmjit hello.launch
@@ -18,8 +18,8 @@
-
-
+
+
diff --git a/.launch/TGC-VP interp dhrystone ce fast.launch b/.launch/TGC-VP interp dhrystone ce fast.launch
index cfe0483..5668914 100644
--- a/.launch/TGC-VP interp dhrystone ce fast.launch
+++ b/.launch/TGC-VP interp dhrystone ce fast.launch
@@ -19,10 +19,10 @@
-
+
-
+
diff --git a/.launch/TGC-VP interp dhrystone ce slow.launch b/.launch/TGC-VP interp dhrystone ce slow.launch
index 7dd892c..bf259ab 100644
--- a/.launch/TGC-VP interp dhrystone ce slow.launch
+++ b/.launch/TGC-VP interp dhrystone ce slow.launch
@@ -19,10 +19,10 @@
-
+
-
+
diff --git a/.launch/TGC-VP interp dhrystone.launch b/.launch/TGC-VP interp dhrystone.launch
index c655467..646c9cf 100644
--- a/.launch/TGC-VP interp dhrystone.launch
+++ b/.launch/TGC-VP interp dhrystone.launch
@@ -19,10 +19,10 @@
-
+
-
+
diff --git a/.launch/TGC-VP interp hello cycle-estimate fast.launch b/.launch/TGC-VP interp hello cycle-estimate fast.launch
index ffdd03c..8bbd7a3 100644
--- a/.launch/TGC-VP interp hello cycle-estimate fast.launch
+++ b/.launch/TGC-VP interp hello cycle-estimate fast.launch
@@ -18,8 +18,8 @@
-
-
+
+
diff --git a/.launch/TGC-VP interp hello cycle-estimate slow.launch b/.launch/TGC-VP interp hello cycle-estimate slow.launch
index 415d359..f97370a 100644
--- a/.launch/TGC-VP interp hello cycle-estimate slow.launch
+++ b/.launch/TGC-VP interp hello cycle-estimate slow.launch
@@ -18,8 +18,8 @@
-
-
+
+
diff --git a/.launch/TGC-VP interp hello pctrace.launch b/.launch/TGC-VP interp hello pctrace.launch
index 98004c9..de457ee 100644
--- a/.launch/TGC-VP interp hello pctrace.launch
+++ b/.launch/TGC-VP interp hello pctrace.launch
@@ -18,8 +18,8 @@
-
-
+
+
diff --git a/.launch/TGC-VP interp hello.launch b/.launch/TGC-VP interp hello.launch
index dd07431..6170202 100644
--- a/.launch/TGC-VP interp hello.launch
+++ b/.launch/TGC-VP interp hello.launch
@@ -16,13 +16,13 @@
-
+
-
-
+
+
-
+
diff --git a/.launch/TGC-VP llvm hello.launch b/.launch/TGC-VP llvm hello.launch
index e29c3e2..00190e9 100644
--- a/.launch/TGC-VP llvm hello.launch
+++ b/.launch/TGC-VP llvm hello.launch
@@ -18,8 +18,8 @@
-
-
+
+
diff --git a/.launch/TGC-VP tcc dhrystone.launch b/.launch/TGC-VP tcc dhrystone.launch
index 4c41daa..ec9c3a0 100644
--- a/.launch/TGC-VP tcc dhrystone.launch
+++ b/.launch/TGC-VP tcc dhrystone.launch
@@ -19,7 +19,7 @@
-
+
diff --git a/.launch/TGC-VP tcc hello.launch b/.launch/TGC-VP tcc hello.launch
index 14a8547..a8a47c7 100644
--- a/.launch/TGC-VP tcc hello.launch
+++ b/.launch/TGC-VP tcc hello.launch
@@ -18,8 +18,8 @@
-
-
+
+
diff --git a/.launch/TGC-VP-FW-Debug.launch b/.launch/TGC-VP-FW-Debug.launch
index 9ec2929..de24dad 100644
--- a/.launch/TGC-VP-FW-Debug.launch
+++ b/.launch/TGC-VP-FW-Debug.launch
@@ -25,10 +25,10 @@
-
+
-
+
@@ -36,7 +36,7 @@
-
+
diff --git a/.launch/TGC-VP-GDBServer.launch b/.launch/TGC-VP-GDBServer.launch
index 88fe43e..f0f403b 100644
--- a/.launch/TGC-VP-GDBServer.launch
+++ b/.launch/TGC-VP-GDBServer.launch
@@ -18,11 +18,12 @@
-
-
+
+
-
+
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3fc3c6c..6c7ba73 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,6 +59,7 @@ if(ENABLE_CLANGTIDY)
endif ()
add_subdirectory(scc)
+add_subdirectory(dbt-rise-core)
add_subdirectory(dbt-rise-riscv)
if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dbt-rise-plugins)
add_subdirectory(dbt-rise-plugins)
diff --git a/conanfile.txt b/conanfile.txt
index 8979eab..4c0e3fa 100644
--- a/conanfile.txt
+++ b/conanfile.txt
@@ -37,7 +37,7 @@ boost/*:without_wave=True
fmt/*:header_only=True
libiconv/*:shared=False
asmjit/*:shared=False
-systemc/*:shared=False
+systemc/*:shared=True
systemc/*:disable_virtual_bind=False
[generators]
diff --git a/dbt-rise-core b/dbt-rise-core
new file mode 160000
index 0000000..7680458
--- /dev/null
+++ b/dbt-rise-core
@@ -0,0 +1 @@
+Subproject commit 7680458096f966db7ec3755d5b1f6c6b621a57ec
diff --git a/vpvper b/vpvper
index 899316d..99f8c5d 160000
--- a/vpvper
+++ b/vpvper
@@ -1 +1 @@
-Subproject commit 899316db7ec527a46c968199a9c0e0f64e48fc2b
+Subproject commit 99f8c5dd4a9e523998f3247cfb6c756ee660e3d1