Mirrors/RISCV-VP
7
0
Fork 1
mirror of https://github.com/Minres/RISCV-VP.git synced 2025-12-17 00:41:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

changes used c++ standard to c++20

Browse Source
This commit is contained in:
Eyck Jentzsch
2025-07-20 11:12:17 +02:00
parent 896ccf6b69
commit 52a1491400
6 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -22,3 +22,4 @@ CMakeSettings.json
/.cache /.cache
/CMakeUserPresets.json /CMakeUserPresets.json
/.envrc.* /.envrc.*
.clangd

35
CMakePresets.json
View File

@@ -10,31 +10,40 @@
}, },
"configurePresets": [ "configurePresets": [
{ {
"name": "Debug", "name": "Base",
"generator": "Ninja",
"binaryDir": "${sourceDir}/build/${presetName}",
"cacheVariables": { "cacheVariables": {
"CMAKE_POLICY_DEFAULT_CMP0091": "NEW", "CMAKE_POLICY_DEFAULT_CMP0091": "NEW",
"CMAKE_BUILD_TYPE": "Debug", "CMAKE_CXX_STANDARD": "20",
"CMAKE_CXX_STANDARD": "17", "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}",
"CMAKE_PROJECT_TOP_LEVEL_INCLUDES":"scc/cmake/conan_provider.cmake", "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
"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", "name": "RelWithDebInfo",
"inherits": "Base",
"displayName": "RelWithDebInfo build",
"cacheVariables": { "cacheVariables": {
"CMAKE_POLICY_DEFAULT_CMP0091": "NEW", "CMAKE_BUILD_TYPE": "RelWithDebInfo"
"CMAKE_BUILD_TYPE": "RelWithDebInfo",
"CMAKE_CXX_STANDARD": "17",
"CMAKE_PROJECT_TOP_LEVEL_INCLUDES":"scc/cmake/conan_provider.cmake"
} }
}, },
{ {
"name": "Release", "name": "Release",
"inherits": "Base",
"displayName": "Release build",
"cacheVariables": { "cacheVariables": {
"CMAKE_POLICY_DEFAULT_CMP0091": "NEW", "CMAKE_BUILD_TYPE": "Release"
"CMAKE_BUILD_TYPE": "Release",
"CMAKE_CXX_STANDARD": "17",
"CMAKE_PROJECT_TOP_LEVEL_INCLUDES":"scc/cmake/conan_provider.cmake"
} }
} }
] ]

2
dbt-rise-core

Submodule dbt-rise-core updated: 4d1bf6daed...2627112886

2
dbt-rise-riscv

Submodule dbt-rise-riscv updated: 383699c2ef...a13689b382

2
scc

Submodule scc updated: 8e6b9d87cd...3179717f71

2
src/vp/system.h
View File

@@ -47,7 +47,7 @@ public:
system(sc_core::sc_module_name nm); system(sc_core::sc_module_name nm);
private: private:
sysc::riscv_vp::core_complex<> core_complex{"core_complex"}; sysc::riscv::core_complex<> core_complex{"core_complex"};
scc::router<> ahb_router, apbBridge; scc::router<> ahb_router, apbBridge;
vpvper::minres::gpio_tl gpio0{"gpio0"}; vpvper::minres::gpio_tl gpio0{"gpio0"};
vpvper::minres::uart_tl uart0{"uart0"}; vpvper::minres::uart_tl uart0{"uart0"};