Merge pull request #1 from Minres/feature/updated_implementation

use updated dbt-rise implementation

.cproject

@@ -12,7 +12,7 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="${ProjName}" buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.base.1730410661" name="Debug" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=" parent="org.eclipse.cdt.build.core.emptycfg">
+				<configuration artifactName="${ProjName}" buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.base.1730410661" name="Debug" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=" parent="org.eclipse.cdt.build.core.emptycfg">
 					<folderInfo id="cdt.managedbuild.toolchain.gnu.base.1730410661.218663890" name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.gnu.base.953157788" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.base">
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.GNU_ELF" id="cdt.managedbuild.target.gnu.platform.base.1034252621" name="Debug Platform" osList="linux,hpux,aix,qnx" superClass="cdt.managedbuild.target.gnu.platform.base"/>

.gitignore

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

.launch/RISCV-VP asmjit dhrystone.launch

@@ -12,16 +12,16 @@
     <stringAttribute key="org.eclipse.cdt.dsf.gdb.TRACEPOINT_MODE" value="TP_NORMAL_ONLY"/>
     <booleanAttribute key="org.eclipse.cdt.dsf.gdb.UPDATE_THREADLIST_ON_SUSPEND" value="false"/>
     <booleanAttribute key="org.eclipse.cdt.dsf.gdb.internal.ui.launching.LocalApplicationCDebuggerTab.DEFAULTS_SET" value="true"/>
-    <intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="0"/>
+    <intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="1"/>
     <stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
     <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_ID" value="gdb"/>
     <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="run"/>
     <booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="false"/>
     <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="sc_main"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_ARGUMENTS" value="-f build/riscvfw-src/benchmarks/dhrystone/dhrystone.elf&#10;--backend=interp&#10;--quantum 10000"/>
+    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_ARGUMENTS" value="-f build/riscvfw-src/benchmarks/dhrystone/dhrystone.elf&#10;--backend=asmjit&#10;--quantum 100000"/>
     <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/${config_name:RISCV-VP}/src/riscv-vp"/>
     <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="RISCV-VP"/>
-    <booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
+    <booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="false"/>
     <stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value=""/>
     <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
     <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
@@ -30,6 +30,21 @@
     <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
         <listEntry value="4"/>
     </listAttribute>
+    <stringAttribute key="org.eclipse.debug.ui.ATTR_CAPTURE_IN_FILE" value="${workspace_loc:/RISCV-VP}/RISCV-VP_asmjit_dhrystone.log"/>
     <stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&lt;memoryBlockExpressionList context=&quot;reserved-for-future-use&quot;/&gt;"/>
+    <booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.DefaultEvent" value="true"/>
+    <booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.HideUnresolvedSymbols" value="true"/>
+    <stringAttribute key="org.eclipse.linuxtools.internal.perf.attr.Kernel.Location" value=""/>
+    <booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.Kernel.SourceLineNumbers" value="false"/>
+    <booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.ModuleSymbols" value="false"/>
+    <booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.MultipleEvents" value="false"/>
+    <booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.Record.Realtime" value="false"/>
+    <intAttribute key="org.eclipse.linuxtools.internal.perf.attr.Record.Realtime.Priority" value="1"/>
+    <booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.Record.Verbose" value="false"/>
+    <booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.ShowSourceDisassembly" value="false"/>
+    <booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.ShowStat" value="false"/>
+    <booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.SourceLineNumbers" value="true"/>
+    <intAttribute key="org.eclipse.linuxtools.internal.perf.attr.StatRunCount" value="1"/>
     <stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
+    <stringAttribute key="provider" value="org.eclipse.linuxtools.perf.provider"/>
 </launchConfiguration>

.launch/RISCV-VP interp dhrystone.launch

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.cdt.launch.applicationLaunchType">
+    <booleanAttribute key="org.eclipse.cdt.dsf.gdb.AUTO_SOLIB" value="true"/>
+    <listAttribute key="org.eclipse.cdt.dsf.gdb.AUTO_SOLIB_LIST"/>
+    <stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="gdb"/>
+    <booleanAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_ON_FORK" value="false"/>
+    <stringAttribute key="org.eclipse.cdt.dsf.gdb.GDB_INIT" value=".gdbinit"/>
+    <booleanAttribute key="org.eclipse.cdt.dsf.gdb.NON_STOP" value="false"/>
+    <booleanAttribute key="org.eclipse.cdt.dsf.gdb.REVERSE" value="false"/>
+    <stringAttribute key="org.eclipse.cdt.dsf.gdb.REVERSE_MODE" value="UseSoftTrace"/>
+    <listAttribute key="org.eclipse.cdt.dsf.gdb.SOLIB_PATH"/>
+    <stringAttribute key="org.eclipse.cdt.dsf.gdb.TRACEPOINT_MODE" value="TP_NORMAL_ONLY"/>
+    <booleanAttribute key="org.eclipse.cdt.dsf.gdb.UPDATE_THREADLIST_ON_SUSPEND" value="false"/>
+    <booleanAttribute key="org.eclipse.cdt.dsf.gdb.internal.ui.launching.LocalApplicationCDebuggerTab.DEFAULTS_SET" value="true"/>
+    <intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="1"/>
+    <stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
+    <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_ID" value="gdb"/>
+    <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="run"/>
+    <booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="false"/>
+    <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="sc_main"/>
+    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_ARGUMENTS" value="-f build/riscvfw-src/benchmarks/dhrystone/dhrystone.elf&#10;--backend=interp&#10;--quantum 100000"/>
+    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/${config_name:RISCV-VP}/src/riscv-vp"/>
+    <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="RISCV-VP"/>
+    <booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="false"/>
+    <stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value=""/>
+    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+        <listEntry value="/RISCV-VP"/>
+    </listAttribute>
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+        <listEntry value="4"/>
+    </listAttribute>
+    <stringAttribute key="org.eclipse.debug.ui.ATTR_CAPTURE_IN_FILE" value="${workspace_loc:/RISCV-VP}/RISCV-VP_interp_dhrystone.log"/>
+    <stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&lt;memoryBlockExpressionList context=&quot;reserved-for-future-use&quot;/&gt;"/>
+    <booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.DefaultEvent" value="true"/>
+    <booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.HideUnresolvedSymbols" value="true"/>
+    <stringAttribute key="org.eclipse.linuxtools.internal.perf.attr.Kernel.Location" value=""/>
+    <booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.Kernel.SourceLineNumbers" value="false"/>
+    <booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.ModuleSymbols" value="false"/>
+    <booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.MultipleEvents" value="false"/>
+    <booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.Record.Realtime" value="false"/>
+    <intAttribute key="org.eclipse.linuxtools.internal.perf.attr.Record.Realtime.Priority" value="1"/>
+    <booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.Record.Verbose" value="false"/>
+    <booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.ShowSourceDisassembly" value="false"/>
+    <booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.ShowStat" value="false"/>
+    <booleanAttribute key="org.eclipse.linuxtools.internal.perf.attr.SourceLineNumbers" value="true"/>
+    <intAttribute key="org.eclipse.linuxtools.internal.perf.attr.StatRunCount" value="1"/>
+    <stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
+    <stringAttribute key="provider" value="org.eclipse.linuxtools.perf.provider"/>
+</launchConfiguration>

.launch/TGC-VP interp dhrystone ce fast.launch

@@ -22,7 +22,7 @@
     <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/${config_name:RISCV-VP}/src/riscv-vp"/>
     <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="RISCV-VP"/>
     <booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="cdt.managedbuild.toolchain.gnu.base.1730410661.719145049"/>
+    <stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value=""/>
     <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
     <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
         <listEntry value="/RISCV-VP"/>

.vscode/launch.json

@@ -40,10 +40,8 @@
             "request": "launch",
             "name": "VP-Debug",
             "cwd": "${workspaceRoot}",
-            "valuesFormatting": "parseText",
+            "program": "${workspaceFolder}/out/build/Debug/src/riscv-vp",
-            "target": "./build/src/tgc-vp",
+            "arguments": "--isa ? -f fw/hello-world/hello"
-            "printCalls": false,
-            "arguments": "-f fw/hello-world/hello"
         },
     ],
     "compounds": [

CMakeLists.txt

@@ -8,6 +8,7 @@ option(ENABLE_COVERAGE "Enable code coverage" OFF)
 option(ENABLE_SANITIZER "Enable address sanitizer" OFF)
 option(ENABLE_CLANGTIDY "Enable static analysis with clang-tidy." OFF)
 option(ENABLE_FW_BUILD "Enable build of firmware of MIRES Firmware repo." OFF)
+option(ENABLE_GPROF "Enable gprof profiling" OFF)
 
 set(SCC_LIB_ONLY ON)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -19,17 +20,21 @@ include(GNUInstallDirs)
 
 # add address sanitizer
 if(ENABLE_SANITIZER)
-	set(CMAKE_C_FLAGS             "${CMAKE_C_FLAGS} -fsanitize=address")
+	set(CMAKE_C_FLAGS             "${CMAKE_C_FLAGS} -fno-omit-frame-pointer -fsanitize=address,thread")
-	set(CMAKE_CXX_FLAGS           "${CMAKE_CXX_FLAGS} -fsanitize=address")
+	set(CMAKE_CXX_FLAGS           "${CMAKE_CXX_FLAGS} -fno-omit-frame-pointer -fsanitize=address,thread")
 	set(CMAKE_EXE_LINKER_FLAGS    "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")
 	set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fsanitize=address")
 endif()
+if(ENABLE_GPROF)
+	set(CMAKE_C_FLAGS             "${CMAKE_C_FLAGS} -pg")
+	set(CMAKE_CXX_FLAGS           "${CMAKE_CXX_FLAGS} -pg")
+endif()
 if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
     add_compile_options(/vmg /wd26812) # suppress Warnung C26812: "enum class" gegenüber "enum" (Enum.3) bevorzugen
 endif()
 
 find_package(elfio)
-find_package(Boost REQUIRED COMPONENTS program_options QUIET)
+find_package(Boost REQUIRED COMPONENTS program_options date_time QUIET)
 include(SystemCPackage)
 
 if(ENABLE_COVERAGE)
@@ -57,6 +62,7 @@ endif ()
 
 set(USE_SC_SIGNAL4IRQ ON)
 set(CLANG_FORMAT_EXCLUDE_PATTERNS /build/ /scc/ /dbt-rise-core/ /dbt-rise-riscv/)
+set(USE_SC_SIGNAL4IRQ ON)
 add_subdirectory(scc)
 add_subdirectory(dbt-rise-core)
 add_subdirectory(dbt-rise-riscv)
@@ -87,6 +93,7 @@ if(FW_BUILD)
 	if(NOT riscvfw_POPULATED)
 	  	FetchContent_Populate(riscvfw)
 	endif()
-	set(BOARD ehrenberg)
+	set(BOARD moonlight)
+	set(LINK_TARGET ram)
  	add_subdirectory(${riscvfw_SOURCE_DIR})
 endif()

CMakePresets.json

@@ -10,30 +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": "20",
-                "CMAKE_CXX_STANDARD": "17",
+                "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}",
-                "CMAKE_PROJECT_TOP_LEVEL_INCLUDES":"dbt-rise-riscv/cmake-conan/conan_provider.cmake"
+                "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_BUILD_TYPE": "RelWithDebInfo",
-                "CMAKE_CXX_STANDARD": "17",
-                "CMAKE_PROJECT_TOP_LEVEL_INCLUDES":"dbt-rise-riscv/cmake-conan/conan_provider.cmake"
             }
         },
         {
             "name": "Release",
+            "inherits": "Base",
+            "displayName": "Release build",
             "cacheVariables": {
-                "CMAKE_POLICY_DEFAULT_CMP0091": "NEW",
+                "CMAKE_BUILD_TYPE": "Release"
-                "CMAKE_BUILD_TYPE": "Release",
-                "CMAKE_CXX_STANDARD": "17",
-                "CMAKE_PROJECT_TOP_LEVEL_INCLUDES":"dbt-rise-riscv/cmake-conan/conan_provider.cmake"
             }
         }
     ]

conanfile.py

@@ -0,0 +1,60 @@
+import os
+
+from conan import ConanFile
+from conan.tools.cmake import cmake_layout
+
+
+class Pkg(ConanFile):
+    settings = "os", "compiler", "build_type", "arch"
+    generators = (
+        "CMakeDeps",
+        "CMakeToolchain",
+    )
+    default_options = {
+        "llvm-core/*:targets": "X86",
+        "boost/*:fPIC": "True",
+        "boost/*:header_only": "False",
+        "boost/*:without_contract": "True",
+        "boost/*:without_fiber": "True",
+        "boost/*:without_graph": "True",
+        "boost/*:without_graph_parallel": "True",
+        "boost/*:without_iostreams": "True",
+        "boost/*:without_json": "True",
+        "boost/*:without_locale": "True",
+        "boost/*:without_log": "True",
+        "boost/*:without_math": "True",
+        "boost/*:without_mpi": "True",
+        "boost/*:without_nowide": "True",
+        "boost/*:without_python": "True",
+        "boost/*:without_random": "True",
+        "boost/*:without_regex": "True",
+        "boost/*:without_stacktrace": "True",
+        "boost/*:without_test": "True",
+        "boost/*:without_timer": "True",
+        "boost/*:without_type_erasure": "True",
+        "boost/*:without_wave": "True",
+        "systemc/*:shared": "True"
+    }
+
+    def requirements(self):
+        self.requires("systemc/3.0.1")
+        self.requires("fmt/8.0.1")
+        self.requires("spdlog/1.9.2")
+        self.requires("boost/1.85.0")
+        self.requires("abseil/20250127.0")
+        self.requires("elfio/3.12")
+        self.requires("lz4/1.9.3")
+        self.requires("yaml-cpp/0.8.0")
+        self.requires("jsoncpp/1.9.5")
+        self.requires("zlib/1.2.12")
+        self.requires("asmjit/cci.20240531")
+        if "WITH_LLVM" in os.environ:
+            self.requires("llvm-core/19.1.7")
+        if os.path.isdir("dbt-rise-plugins"):
+            self.requires("lua/5.4.3")
+
+    def build_requirements(self):
+        pass
+
+    def layout(self):
+        cmake_layout(self)

conanfile.txt

@@ -1,48 +0,0 @@
-[requires]
-yaml-cpp/0.8.0
-jsoncpp/1.9.5
-boost/1.85.0
-asmjit/cci.20240531
-elfio/3.12
-fmt/8.0.1
-spdlog/1.9.2
-gsl-lite/0.41.0
-lz4/1.9.3 
-zlib/1.2.13
-seasocks/1.4.6
-systemc/2.3.4
-
-[options]
-boost/*:fPIC=True
-boost/*:header_only=False 
-boost/*:without_contract=True
-boost/*:without_fiber=True
-boost/*:without_graph=True
-boost/*:without_graph_parallel=True
-boost/*:without_iostreams=True
-boost/*:without_json=True
-boost/*:without_locale=True
-boost/*:without_log=True
-boost/*:without_math=True
-boost/*:without_mpi=True
-boost/*:without_nowide=True
-boost/*:without_python=True
-boost/*:without_random=True
-boost/*:without_regex=True
-boost/*:without_stacktrace=True
-boost/*:without_test=True
-boost/*:without_timer=True
-boost/*:without_type_erasure=True
-boost/*:without_wave=True
-fmt/*:header_only=True
-libiconv/*:shared=False
-asmjit/*:shared=False
-systemc/*:shared=True
-systemc/*:disable_virtual_bind=False
-
-[generators]
-CMakeDeps
-CMakeToolchain
-
-[layout]
-cmake_layout

src/sc_main.cpp

@@ -76,15 +76,16 @@ int sc_main(int argc, char* argv[]) {
         auto tx_trace_type =
             static_cast<scc::tracer::file_type>(trace_level >> 1); // bit3-bit1 define the kind of transaction trace
         auto trace_default_on = parser.is_set("trace-default-on");
-        cfg.set_value("$$$scc_tracer$$$.tx_trace_type", static_cast<unsigned>(scc::tracer::file_type::FTR));
+        if(parser.is_set("trace-default-off"))
-        cfg.set_value("$$$scc_tracer$$$.sig_trace_type", static_cast<unsigned>(scc::tracer::file_type::SC_VCD));
+            cfg.set_value("scc_tracer.default_trace_enable", false);
-        tracer =
+        cfg.set_value("scc_tracer.tx_trace_type", static_cast<unsigned>(scc::tracer::file_type::FTR));
-            scc::make_unique<scc::configurable_tracer>(file_name, tx_trace_type, enable_sig_trace, trace_default_on);
+        cfg.set_value("scc_tracer.sig_trace_type", static_cast<unsigned>(scc::tracer::file_type::FST));
+        tracer = scc::make_unique<scc::configurable_tracer>(file_name, tx_trace_type, enable_sig_trace);
     }
     ///////////////////////////////////////////////////////////////////////////
     // instantiate top level
     ///////////////////////////////////////////////////////////////////////////
-    auto i_system = scc::make_unique<tgc_vp::tb>("tb");
+    auto i_system = scc::make_unique<vp::tb>("tb");
     ///////////////////////////////////////////////////////////////////////////
     // add non-implemented 'enableTracing' properties
     ///////////////////////////////////////////////////////////////////////////

src/vp/rst_gen.h

@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2019 -2021 MINRES Technolgies GmbH
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#pragma once
-
-#include <systemc>
-namespace tgc_vp {
-
-class rst_gen : public sc_core::sc_module {
-    SC_HAS_PROCESS(rst_gen);
-
-public:
-    rst_gen(sc_core::sc_module_name const& nm) { SC_THREAD(run); }
-    sc_core::sc_out<bool> rst_n{"rst_n"};
-
-private:
-    void run() {
-        rst_n.write(false);
-        wait(100_ns);
-        rst_n.write(true);
-    }
-};
-
-} /* namespace tgc_vp */

src/vp/system.cpp

@@ -4,13 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "../vp/system.h"
+#include "system.h"
 
-#include "minres/timer.h"
+#include <minres/timer.h>
-#include "minres/uart.h"
+#include <minres/uart.h>
-#include "scc/utilities.h"
+#include <scc/utilities.h>
+
+namespace vp {
 
-namespace tgc_vp {
 using namespace sc_core;
 using namespace vpvper::minres;
 
@@ -24,7 +25,7 @@ system::system(sc_core::sc_module_name nm)
     ahb_router.initiator.at(0)(qspi.xip_sck);
     ahb_router.set_target_range(0, 0xE0000000, 16_MB);
     ahb_router.initiator.at(1)(mem_ram.target);
-    ahb_router.set_target_range(1, 0x80000000, 32_kB);
+    ahb_router.set_target_range(1, 0xC0000000, 128_kB);
     ahb_router.initiator.at(2)(apbBridge.target[0]);
     ahb_router.set_target_range(2, 0xF0000000, 256_MB);
 
@@ -77,10 +78,7 @@ system::system(sc_core::sc_module_name nm)
     timer0.clear_i(t0_clear_i);
     timer0.tick_i(t0_tick_i);
 
-    qspi.ssclk_o(ssclk_o);
+    qspi.spi_i(mspi0);
-    qspi.dq_o(dq_o);
-    qspi.dq_i(dq_i);
-    qspi.oe_o(dq_oe_o);
 
     SC_METHOD(gen_reset);
     sensitive << erst_n;
@@ -92,4 +90,4 @@ void system::gen_reset() {
         rst_s = 1;
 }
 
-} // namespace tgc_vp
+} // namespace vp

src/vp/system.h

@@ -4,17 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _PLATFORM_H_
+#ifndef SRC_VP_SYSTEM_H_
-#define _PLATFORM_H_
+#define SRC_VP_SYSTEM_H_
 
-#include "minres/irq.h"
-#include "minres/timer.h"
-#include <array>
 #include <cci_configuration>
-#include <memory>
 #include <minres/aclint.h>
 #include <minres/gpio.h>
+#include <minres/irq.h>
 #include <minres/qspi.h>
+#include <minres/timer.h>
 #include <minres/uart.h>
 #include <scc/memory.h>
 #include <scc/router.h>
@@ -27,7 +25,7 @@
 #include <sysc/utils/sc_vector.h>
 #include <tlm/scc/tlm_signal_sockets.h>
 
-namespace tgc_vp {
+namespace vp {
 
 class system : public sc_core::sc_module {
 public:
@@ -40,10 +38,7 @@ public:
     sc_core::sc_in<bool> uart0_rx_i{"uart0_rx_i"};
     sc_core::sc_vector<sc_core::sc_in<bool>> t0_clear_i{"t0_clear_i", vpvper::minres::timer::CLEAR_CNT};
     sc_core::sc_vector<sc_core::sc_in<bool>> t0_tick_i{"t0_tick_i", vpvper::minres::timer::TICK_CNT - 1};
-    sc_core::sc_out<bool> ssclk_o{"ssclk_o"};
+    spi::spi_pkt_initiator_socket<> mspi0{"mspi0"};
-    sc_core::sc_vector<sc_core::sc_out<bool>> dq_o{"dq_o", 4};
-    sc_core::sc_vector<sc_core::sc_out<bool>> dq_oe_o{"dq_oe_o", 4};
-    sc_core::sc_vector<sc_core::sc_in<bool>> dq_i{"dq_i", 4};
 
     sc_core::sc_in<sc_core::sc_time> clk_i{"clk_i"};
 
@@ -52,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"};
@@ -75,6 +70,6 @@ private:
 #include "../vp/gen/PipelinedMemoryBusToApbBridge.h"
 };
 
-} // namespace tgc_vp
+} // namespace vp
 
-#endif /* _PLATFORM_H_ */
+#endif /* SRC_VP_SYSTEM_H_ */

src/vp/tb.cpp

@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "../vp/tb.h"
+#include "tb.h"
-
 #include <sysc/kernel/sc_time.h>
-namespace tgc_vp {
+
+namespace vp {
 
 SC_HAS_PROCESS(tb);
 tb::tb(const sc_core::sc_module_name& nm)
 : sc_core::sc_module(nm) {
     top.erst_n(rst_n);
-    rst_gen.rst_n(rst_n);
+    rst_gen.rst_o(rst_n);
     top.pins_o(pins_o);
     top.pins_i(pins_i);
     top.pins_oe_o(pins_oe_o);
@@ -21,11 +21,10 @@ tb::tb(const sc_core::sc_module_name& nm)
     top.uart0_tx_o(uart0_tx_o);
     top.t0_clear_i(t0_clear_i);
     top.t0_tick_i(t0_tick_i);
-    top.ssclk_o(ssclk_o);
+    top.mspi0(spi());
-    top.dq_o(dq_o);
+    spi(0)(qspi_mem.spi_t);
-    top.dq_i(dq_i);
-    top.dq_oe_o(dq_oe_o);
     top.clk_i(clk_i);
     clk_i = 10_ns;
+    rst_gen.active_level = false;
 }
-} // namespace tgc_vp
+} // namespace vp

src/vp/tb.h

@@ -7,18 +7,19 @@
 #ifndef SRC_VP_TB_H_
 #define SRC_VP_TB_H_
 
+#include "system.h"
+#include <generic/rst_gen.h>
+#include <generic/spi_mem.h>
 #include <generic/terminal.h>
 #include <systemc>
 
-#include "../vp/rst_gen.h"
+namespace vp {
-#include "../vp/system.h"
-namespace tgc_vp {
 
 class tb : public sc_core::sc_module {
 public:
     tb(sc_core::sc_module_name const& nm);
-    tgc_vp::system top{"top"};
+    vp::system top{"top"};
-    tgc_vp::rst_gen rst_gen{"rst_gen"};
+    vpvper::generic::rst_gen rst_gen{"rst_gen"};
     sc_core::sc_signal<bool> rst_n{"rst_n"};
     sc_core::sc_vector<sc_core::sc_signal<bool>> pins_o{"pins_o", 32};
     sc_core::sc_vector<sc_core::sc_signal<bool>> pins_oe_o{"pins_oe_o", 32};
@@ -27,13 +28,11 @@ public:
     sc_core::sc_signal<bool> uart0_rx_i{"uart0_rx_i"};
     sc_core::sc_vector<sc_core::sc_signal<bool>> t0_clear_i{"t0_clear_i", vpvper::minres::timer::CLEAR_CNT};
     sc_core::sc_vector<sc_core::sc_signal<bool>> t0_tick_i{"t0_tick_i", vpvper::minres::timer::TICK_CNT - 1};
-    sc_core::sc_signal<bool> ssclk_o{"ssclk_o"};
+    spi::spi_channel spi{"spi", 1};
-    sc_core::sc_vector<sc_core::sc_signal<bool>> dq_o{"dq_o", 4};
+    vpvper::generic::spi_mem qspi_mem{"qspi_mem"};
-    sc_core::sc_vector<sc_core::sc_signal<bool>> dq_oe_o{"dq_oe_o", 4};
-    sc_core::sc_vector<sc_core::sc_signal<bool>> dq_i{"dq_i", 4};
     sc_core::sc_signal<sc_core::sc_time> clk_i{"clk_i"};
 };
 
-} /* namespace tgc_vp */
+} // namespace vp
 
 #endif /* SRC_VP_TB_H_ */