From 52a149140096c22b12cc3ac8f299656ccb3440e9 Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Sun, 20 Jul 2025 11:12:17 +0200
Subject: [PATCH] changes used c++ standard to c++20

---
 .gitignore        |  1 +
 CMakePresets.json | 35 ++++++++++++++++++++++-------------
 dbt-rise-core     |  2 +-
 dbt-rise-riscv    |  2 +-
 scc               |  2 +-
 src/vp/system.h   |  2 +-
 6 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 63dc490..d2d7f29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ CMakeSettings.json
 /.cache
 /CMakeUserPresets.json
 /.envrc.*
+.clangd
diff --git a/CMakePresets.json b/CMakePresets.json
index 6103d55..7128e62 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -10,31 +10,40 @@
     },
     "configurePresets": [
         {
-            "name": "Debug",
+            "name": "Base",
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/build/${presetName}",
             "cacheVariables": {
                 "CMAKE_POLICY_DEFAULT_CMP0091": "NEW",
-                "CMAKE_BUILD_TYPE": "Debug",
-                "CMAKE_CXX_STANDARD": "17",
-                "CMAKE_PROJECT_TOP_LEVEL_INCLUDES":"scc/cmake/conan_provider.cmake",
-                "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+                "CMAKE_CXX_STANDARD": "20",
+                "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}",
+                "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
+                "CMAKE_PROJECT_TOP_LEVEL_INCLUDES": "scc/cmake/conan_provider.cmake",
+                "WITH_TCC": "OFF"
+            }
+        },
+        {
+            "name": "Debug",
+            "inherits": "Base",
+            "displayName": "Debug build",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug"
             }
         },
         {
             "name": "RelWithDebInfo",
+            "inherits": "Base",
+            "displayName": "RelWithDebInfo build",
             "cacheVariables": {
-                "CMAKE_POLICY_DEFAULT_CMP0091": "NEW",
-                "CMAKE_BUILD_TYPE": "RelWithDebInfo",
-                "CMAKE_CXX_STANDARD": "17",
-                "CMAKE_PROJECT_TOP_LEVEL_INCLUDES":"scc/cmake/conan_provider.cmake"
+                "CMAKE_BUILD_TYPE": "RelWithDebInfo"
             }
         },
         {
             "name": "Release",
+            "inherits": "Base",
+            "displayName": "Release build",
             "cacheVariables": {
-                "CMAKE_POLICY_DEFAULT_CMP0091": "NEW",
-                "CMAKE_BUILD_TYPE": "Release",
-                "CMAKE_CXX_STANDARD": "17",
-                "CMAKE_PROJECT_TOP_LEVEL_INCLUDES":"scc/cmake/conan_provider.cmake"
+                "CMAKE_BUILD_TYPE": "Release"
             }
         }
     ]
diff --git a/dbt-rise-core b/dbt-rise-core
index 4d1bf6d..2627112 160000
--- a/dbt-rise-core
+++ b/dbt-rise-core
@@ -1 +1 @@
-Subproject commit 4d1bf6daed1958597987b4f5b3d851c9a42e478c
+Subproject commit 2627112886005ba7e7415972bd9e76424c219e91
diff --git a/dbt-rise-riscv b/dbt-rise-riscv
index 383699c..a13689b 160000
--- a/dbt-rise-riscv
+++ b/dbt-rise-riscv
@@ -1 +1 @@
-Subproject commit 383699c2ef51a4e9e5e60fe077a2ef995d907188
+Subproject commit a13689b3826b4f7b27fa400208599184e3956580
diff --git a/scc b/scc
index 8e6b9d8..3179717 160000
--- a/scc
+++ b/scc
@@ -1 +1 @@
-Subproject commit 8e6b9d87cd9cd442f9a307ea6b5e3cb06f64de55
+Subproject commit 3179717f71478bf25f11a3961808fa7920ae7932
diff --git a/src/vp/system.h b/src/vp/system.h
index c6a6594..3ae7b54 100644
--- a/src/vp/system.h
+++ b/src/vp/system.h
@@ -47,7 +47,7 @@ public:
     system(sc_core::sc_module_name nm);
 
 private:
-    sysc::riscv_vp::core_complex<> core_complex{"core_complex"};
+    sysc::riscv::core_complex<> core_complex{"core_complex"};
     scc::router<> ahb_router, apbBridge;
     vpvper::minres::gpio_tl gpio0{"gpio0"};
     vpvper::minres::uart_tl uart0{"uart0"};