From d6a71a20651dc6aa21b15dbea5caefffb13838de Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Fri, 8 Aug 2025 09:36:34 +0200
Subject: [PATCH] updates submodules and setup  files

---
 .vscode/launch.json     | 17 +++++++++++++----
 .vscode/tasks.json      |  8 ++++----
 CMakePresets.json       |  1 +
 conanfile.py            |  2 +-
 dbt-rise-riscv          |  2 +-
 fw/hello-world/Makefile |  2 +-
 scc                     |  2 +-
 7 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 0dd1d4f..1856298 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -18,7 +18,7 @@
             "cwd": "${workspaceRoot}",
             "gdb": "riscv64-unknown-elf-gdb",
             "presentation": {
-                "hidden": true,
+                "hidden": false,
                 "group": "FW Debug",
                 "order": 2
             }
@@ -29,9 +29,9 @@
             "name": "Launch VP with gdbserver",
             "cwd": "${workspaceRoot}",
             "program": "${workspaceFolder}/build/Debug/src/riscv-vp",
-            "arguments": "-f fw/hello-world/hello.elf -g 10000",
+            "arguments": "--isa 'rv32gc|msu_vp' -v DEBUG --disass -f fw/hello-world/hello.elf -g 10000",
             "presentation": {
-                "hidden": true,
+                "hidden": false,
                 "group": "FW Debug",
                 "order": 1
             }
@@ -42,9 +42,18 @@
             "name": "Launch VP",
             "cwd": "${workspaceRoot}",
             "program": "${workspaceFolder}/build/Debug/src/riscv-vp",
-            "arguments": "-v DEBUG --isa tgc5c -f fw/hello-world/hello.elf",
+            "arguments": "-v DEBUG -t 3 --isa tgc5c -f fw/hello-world/hello.elf",
             "openGdbConsole": true
         },
+        {
+            "type": "gdb",
+            "request": "launch",
+            "name": "Launch VP (asmjit)",
+            "cwd": "${workspaceRoot}",
+            "program": "${workspaceFolder}/build/Debug/src/riscv-vp",
+            "arguments": "--isa tgc5c --backend asmjit -f fw/hello-world/hello.elf",
+            "openGdbConsole": true
+        }
     ],
     "compounds": [
         {
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 18fdf26..6d68af2 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -4,7 +4,7 @@
 		{
 			"label": "CMake-and-make",
 			"type": "shell",
-			"command": "source .venv/bin/activate && cmake -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON && cmake --build build",
+			"command": "cmake --preset Release -B build/Release  && cmake --build build/Release",
 			"problemMatcher": [],
 			"presentation": {
 				"echo": true,
@@ -22,7 +22,7 @@
 		{
 			"label": "Build-FW",
 			"type": "shell",
-			"command": "cd fw/hello-world/ && make",
+			"command": "make -C fw/hello-world clean all",
 			"problemMatcher": [],
 			"presentation": {
 				"echo": true,
@@ -36,7 +36,7 @@
 		{
 			"label": "Execute-VP",
 			"type": "shell",
-			"command": "build/src/tgc-vp -f fw/hello-world/hello -p pctrace=contrib/TGC_C_cycles.json",
+			"command": "build/Debug/src/riscv-vp -f fw/hello-world/hello.elf -p pctrace=contrib/TGC_C_cycles.json",
 			"problemMatcher": [],
 			"presentation": {
 				"echo": true,
@@ -50,7 +50,7 @@
 		{
 			"label": "VP-GDB-Server",
 			"type": "shell",
-			"command": "build/src/tgc-vp -f fw/hello-world/hello -g 10000",
+			"command": "build/Debug/src/riscv-vp -v TRACEALL --disass -f fw/hello-world/hello.elf -g 10000",
 			"problemMatcher": [],
 			"presentation": {
 				"echo": true,
diff --git a/CMakePresets.json b/CMakePresets.json
index 7128e62..4bc9be5 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -19,6 +19,7 @@
                 "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}",
                 "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
                 "CMAKE_PROJECT_TOP_LEVEL_INCLUDES": "scc/cmake/conan_provider.cmake",
+                "CONAN_BUILD_PROFILE": "auto-cmake",
                 "WITH_TCC": "OFF"
             }
         },
diff --git a/conanfile.py b/conanfile.py
index 5a25656..c7e147e 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -33,7 +33,7 @@ class Pkg(ConanFile):
         "boost/*:without_timer": "True",
         "boost/*:without_type_erasure": "True",
         "boost/*:without_wave": "True",
-        "systemc/*:shared": "True"
+        "systemc/*:shared": "True",
     }
 
     def requirements(self):
diff --git a/dbt-rise-riscv b/dbt-rise-riscv
index c000fd6..1c8e1be 160000
--- a/dbt-rise-riscv
+++ b/dbt-rise-riscv
@@ -1 +1 @@
-Subproject commit c000fd68059681b639c8ec79ef7f9b2b2ef5ea91
+Subproject commit 1c8e1bef1c7b897612c370785159f6123a45d3ba
diff --git a/fw/hello-world/Makefile b/fw/hello-world/Makefile
index 25c3cf6..e344dd1 100644
--- a/fw/hello-world/Makefile
+++ b/fw/hello-world/Makefile
@@ -8,7 +8,7 @@ BOARD=riscv_vp
 LINK_TARGET=flash
 RISCV_ARCH:=rv32imc
 RISCV_ABI:=ilp32
-LDFLAGS := -march=$(RISCV_ARCH) -mabi=$(RISCV_ABI)
+LDFLAGS := -g -march=$(RISCV_ARCH) -mabi=$(RISCV_ABI)
 
 compiler := $(shell which riscv64-unknown-elf-gcc)
 TOOL_DIR=$(dir $(compiler))
diff --git a/scc b/scc
index 13d2138..badc373 160000
--- a/scc
+++ b/scc
@@ -1 +1 @@
-Subproject commit 13d2138e7e0b390cf9fd503c81d03e790b150b1a
+Subproject commit badc373aae58a9745dac803862edb522e6674321