Merge pull request #2 from Minres/develop

use updated implementation of dbt-rise
2025-12-17 00:41:35 +00:00 · 2025-07-20 11:16:40 +02:00
parent 679ad10bb5 a45db1d245
commit 7cbac99d9b
37 changed files with 457 additions and 296 deletions
--- a/.cproject
+++ b/.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"/>
@@ -46,11 +46,13 @@
 					<def name="BUILD_SHARED_LIBS" type="STRING" val="ON"/>
 				</defs>
 			</storageModule>
-			<storageModule buildDir="build/${ConfigName}" dirtyTs="1719760605215" moduleId="de.marw.cmake4eclipse.mbs.settings">
-				<options otherArguments="--preset ${ConfigName}"/>
+			<storageModule buildDir="build/${ConfigName}" dirtyTs="1724861871570" moduleId="de.marw.cmake4eclipse.mbs.settings">
+				<options otherArguments="--preset Debug"/>
 				<defs>
 					<def name="FW_BUILD" type="BOOL" val="ON"/>
 					<def name="WITH_LLVM" type="BOOL" val="OFF"/>
+					<def name="BUILD_SHARED_LIBS" type="BOOL" val="ON"/>
+					<def name="ENABLE_SANITIZER" type="BOOL" val="OFF"/>
 				</defs>
 			</storageModule>
 		</cconfiguration>
@@ -99,12 +101,67 @@
 					<def name="BUILD_SHARED_LIBS" type="STRING" val="ON"/>
 				</defs>
 			</storageModule>
-			<storageModule buildDir="build/${ConfigName}" dirtyTs="1719771199774" moduleId="de.marw.cmake4eclipse.mbs.settings">
+			<storageModule buildDir="build/${ConfigName}" dirtyTs="1724859263747" moduleId="de.marw.cmake4eclipse.mbs.settings">
 				<options otherArguments="--preset Release"/>
+				<defs>
+					<def name="FW_BUILD" type="BOOL" val="ON"/>
+					<def name="WITH_LLVM" type="BOOL" val="OFF"/>
+					<def name="BUILD_SHARED_LIBS" type="BOOL" val="OFF"/>
+				</defs>
+			</storageModule>
+		</cconfiguration>
+		<cconfiguration id="cdt.managedbuild.toolchain.gnu.base.1730410661.1815596741">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.base.1730410661.1815596741" moduleId="org.eclipse.cdt.core.settings" name="RelWithDebInfo">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactName="${ProjName}" buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.base.1730410661.1815596741" name="RelWithDebInfo" 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.1815596741." name="/" resourcePath="">
+						<toolChain id="cdt.managedbuild.toolchain.gnu.base.325690815" 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.1682155251" name="Debug Platform" osList="linux,hpux,aix,qnx" superClass="cdt.managedbuild.target.gnu.platform.base"/>
+							<builder buildPath="/TGC-VP/build/Debug" id="cmake4eclipse.mbs.builder.1435159305" keepEnvironmentInBuildfile="false" name="CMake Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="cmake4eclipse.mbs.builder"/>
+							<tool id="cdt.managedbuild.tool.gnu.archiver.base.1320779496" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
+							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.403851991" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
+								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1517445208" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.c.compiler.base.37905683" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.base">
+								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1586416147" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.c.linker.base.273012660" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.base"/>
+							<tool id="cdt.managedbuild.tool.gnu.cpp.linker.base.270497919" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.base">
+								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1943197789" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.assembler.base.1405544754" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.base">
+								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1742100872" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+							</tool>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+			<storageModule buildDir="build/${ConfigName}" moduleId="de.marw.cdt.cmake.core.settings">
+				<options/>
+				<defs>
+					<def name="CMAKE_BUILD_TYPE" type="STRING" val="${ConfigName}"/>
+					<def name="BUILD_SHARED_LIBS" type="STRING" val="ON"/>
+				</defs>
+			</storageModule>
+			<storageModule buildDir="build/${ConfigName}" dirtyTs="1724354418168" moduleId="de.marw.cmake4eclipse.mbs.settings">
+				<options otherArguments="--preset RelWithDebInfo"/>
 				<defs>
 					<def name="FW_BUILD" type="BOOL" val="ON"/>
 					<def name="WITH_LLVM" type="BOOL" val="OFF"/>
 					<def name="BUILD_SHARED_LIBS" type="BOOL" val="ON"/>
+					<def name="ENABLE_SANITIZER" type="BOOL" val="ON"/>
 				</defs>
 			</storageModule>
 		</cconfiguration>
@@ -114,6 +171,7 @@
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 	<storageModule moduleId="refreshScope" versionNumber="2">
+		<configuration configurationName="RelWithDebInfo"/>
 		<configuration configurationName="Debug-PA"/>
 		<configuration configurationName="Default">
 			<resource resourceType="PROJECT" workspacePath="/TGFS-VP"/>
@@ -122,11 +180,30 @@
 		<configuration configurationName="Release"/>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.base.1730410661.719145049;cdt.managedbuild.toolchain.gnu.base.1730410661.719145049.;cdt.managedbuild.tool.gnu.cpp.compiler.base.1534023345;cdt.managedbuild.tool.gnu.cpp.compiler.input.1510234384">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.base.1730410661.719145049;cdt.managedbuild.toolchain.gnu.base.1730410661.719145049.;cdt.managedbuild.tool.gnu.c.compiler.base.1971017117;cdt.managedbuild.tool.gnu.c.compiler.input.1521427508">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.base.1730410661;cdt.managedbuild.toolchain.gnu.base.1730410661.218663890;cdt.managedbuild.tool.gnu.c.compiler.base.415892287;cdt.managedbuild.tool.gnu.c.compiler.input.1806041557">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.base.1730410661;cdt.managedbuild.toolchain.gnu.base.1730410661.218663890;cdt.managedbuild.tool.gnu.cpp.compiler.base.1878089590;cdt.managedbuild.tool.gnu.cpp.compiler.input.705150349">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule cmakelistsFolder="" moduleId="de.marw.cmake4eclipse.mbs.settings">
+		<targets>
+			<target name=""/>
+		</targets>
+	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
 		<buildTargets>
 			<target name="fw-hello-world" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>CMAKE_BUILD_TOOL</buildCommand>
-				<buildArguments/>
 				<buildTarget>fw-hello-world</buildTarget>
 				<stopOnError>true</stopOnError>
 				<useDefaultCommand>true</useDefaultCommand>
@@ -148,26 +225,22 @@
 				<useDefaultCommand>false</useDefaultCommand>
 				<runAllBuilders>true</runAllBuilders>
 			</target>
+			<target name="format" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments>$&lt;cmake4eclipse_dyn&gt;</buildArguments>
+				<buildTarget>format</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="format-check" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments>$&lt;cmake4eclipse_dyn&gt;</buildArguments>
+				<buildTarget>format-check</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
 		</buildTargets>
 	</storageModule>
-	<storageModule moduleId="scannerConfiguration">
-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.base.1730410661.719145049;cdt.managedbuild.toolchain.gnu.base.1730410661.719145049.;cdt.managedbuild.tool.gnu.cpp.compiler.base.1534023345;cdt.managedbuild.tool.gnu.cpp.compiler.input.1510234384">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.base.1730410661.719145049;cdt.managedbuild.toolchain.gnu.base.1730410661.719145049.;cdt.managedbuild.tool.gnu.c.compiler.base.1971017117;cdt.managedbuild.tool.gnu.c.compiler.input.1521427508">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.base.1730410661;cdt.managedbuild.toolchain.gnu.base.1730410661.218663890;cdt.managedbuild.tool.gnu.c.compiler.base.415892287;cdt.managedbuild.tool.gnu.c.compiler.input.1806041557">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.base.1730410661;cdt.managedbuild.toolchain.gnu.base.1730410661.218663890;cdt.managedbuild.tool.gnu.cpp.compiler.base.1878089590;cdt.managedbuild.tool.gnu.cpp.compiler.input.705150349">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-	</storageModule>
-	<storageModule cmakelistsFolder="" moduleId="de.marw.cmake4eclipse.mbs.settings">
-		<targets>
-			<target name=""/>
-		</targets>
-	</storageModule>
 </cproject>
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,5 @@ CMakeSettings.json
 /.direnv
 /.cache
 /CMakeUserPresets.json
+/.envrc.*
+.clangd
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,15 +4,12 @@
 [submodule "vpvper"]
 	path = vpvper
 	url = https://github.com/VP-Vibes/VPV-Peripherals.git
-[submodule "tgc-iss/dbt-rise-core"]
-	path = tgc-iss/dbt-rise-core
-	url = https://github.com/Minres/DBT-RISE-Core.git
-[submodule "tgc-iss/dbt-rise-tgc"]
-	path = tgc-iss/dbt-rise-tgc
-	url = https://git.minres.com/DBT-RISE/DBT-RISE-TGC.git
 [submodule "fw/bsp"]
 	path = fw/bsp
 	url = https://git.minres.com/Firmware/MNRS-BM-BSP.git
 [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
--- a/dhrystone.launch
+++ b/dhrystone.launch
@@ -18,10 +18,10 @@
    <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 ${project_loc:dhrystone}/dhrystone&#10;--backend=interp&#10;--quantum 100"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/${config_name:TGC-VP}/src/tgc-vp"/>
+    <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>
--- a/dhrystone.launch
+++ b/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>
--- a/.launch/TGC-VP
+++ b/.launch/TGC-VP
@@ -18,8 +18,8 @@
    <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 fw/hello-world/hello &#10;-p ${workspace_loc:TGC-VP}/build/${config_name:TGC-VP}/tgc-iss/dbt-rise-plugins/pctrace/pctrace.so=tgc-iss/dbt-rise-tgc/contrib/instr/TGC5C_instr.yaml &#10;--backend=asmjit"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/${config_name:TGC-VP}/src/tgc-vp"/>
+    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_ARGUMENTS" value="-f fw/hello-world/prebuilt/hello.elf&#10;--backend=asmjit"/>
+    <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=""/>
--- a/.launch/TGC-VP
+++ b/.launch/TGC-VP
@@ -19,7 +19,7 @@
    <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 ${project_loc:dhrystone}/dhrystone&#10;-p ce=tgc-iss/dbt-rise-tgc/contrib/instr/TGC5C_instr.yaml&#10;--backend=interp&#10;--disass -v INFO"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/${config_name:TGC-VP}/src/tgc-vp"/>
+    <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=""/>
--- a/.launch/TGC-VP
+++ b/.launch/TGC-VP
@@ -19,10 +19,10 @@
    <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 ${project_loc:dhrystone}/dhrystone&#10;-p ce=tgc-iss/dbt-rise-tgc/contrib/instr/TGC5C_slow.yaml&#10;--backend=interp&#10;--disass -v INFO"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/${config_name:TGC-VP}/src/tgc-vp"/>
+    <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=""/>
+    <stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="cdt.managedbuild.toolchain.gnu.base.1730410661.719145049"/>
    <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"/>
--- a/.launch/TGC-VP
+++ b/.launch/TGC-VP
@@ -18,8 +18,8 @@
    <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 fw/hello-world/hello&#10;-p ce=tgc-iss/dbt-rise-tgc/contrib/instr/TGC5C_instr.yaml&#10;--quantum=10000&#10;-v INFO"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/${config_name:TGC-VP}/src/tgc-vp"/>
+    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_ARGUMENTS" value="-f fw/hello-world/prebuilt/hello.elf&#10;-p ce=tgc-iss/dbt-rise-tgc/contrib/instr/TGC5C_instr.yaml&#10;--quantum=10000&#10;-v INFO"/>
+    <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=""/>
--- a/.launch/TGC-VP
+++ b/.launch/TGC-VP
@@ -18,8 +18,8 @@
    <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 fw/hello-world/hello&#10;-p ce=tgc-iss/dbt-rise-tgc/contrib/instr/TGC5C_slow.yaml&#10;--dump-structure=tgc_vp.json"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/${config_name:TGC-VP}/src/tgc-vp"/>
+    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_ARGUMENTS" value="-f fw/hello-world/prebuilt/hello.elf&#10;-p ce=tgc-iss/dbt-rise-tgc/contrib/instr/TGC5C_slow.yaml&#10;--dump-structure=tgc_vp.json"/>
+    <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=""/>
--- a/pctrace.launch
+++ b/pctrace.launch
@@ -18,8 +18,8 @@
    <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 fw/hello-world/hello&#10;-p ${workspace_loc:TGC-VP}/build/${config_name:TGC-VP}/tgc-iss/dbt-rise-plugins/pctrace/pctrace.so=tgc-iss/dbt-rise-tgc/contrib/instr/TGC5C_instr.yaml&#10;--dump-structure=tgc_vp.json"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/${config_name:TGC-VP}/src/tgc-vp"/>
+    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_ARGUMENTS" value="-f fw/hello-world/prebuilt/hello.elf&#10;-p ${workspace_loc:TGC-VP}/build/${config_name:TGC-VP}/tgc-iss/dbt-rise-plugins/pctrace/pctrace.so=tgc-iss/dbt-rise-tgc/contrib/instr/TGC5C_instr.yaml&#10;--dump-structure=tgc_vp.json"/>
+    <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=""/>
--- a/.launch/TGC-VP
+++ b/.launch/TGC-VP
@@ -16,13 +16,13 @@
    <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"/>
+    <booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
    <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="sc_main"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_ARGUMENTS" value="-f fw/hello-world/hello&#10;--dump-structure=tgc_vp.json&#10;--config cfg.yaml&#10;-t 3"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/${config_name:TGC-VP}/src/tgc-vp"/>
+    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_ARGUMENTS" value="-f fw/hello-world/prebuilt/hello.elf"/>
+    <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"/>
--- a/.launch/TGC-VP
+++ b/.launch/TGC-VP
@@ -18,8 +18,8 @@
    <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 fw/hello-world/hello &#10;--backend=llvm"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/${config_name:TGC-VP}/src/tgc-vp"/>
+    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_ARGUMENTS" value="-f fw/hello-world/prebuilt/hello.elf&#10;--backend=llvm"/>
+    <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=""/>
--- a/dhrystone.launch
+++ b/dhrystone.launch
@@ -19,7 +19,7 @@
    <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 ${project_loc:dhrystone}/dhrystone&#10;--backend=tcc&#10;--quantum 100"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/${config_name:TGC-VP}/src/tgc-vp"/>
+    <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=""/>
--- a/.launch/TGC-VP
+++ b/.launch/TGC-VP
@@ -18,8 +18,8 @@
    <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 fw/hello-world/hello &#10;--backend=tcc"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/${config_name:TGC-VP}/src/tgc-vp"/>
+    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_ARGUMENTS" value="-f fw/hello-world/prebuilt/hello.elf&#10;--backend=tcc"/>
+    <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=""/>
--- a/.launch/TGC-VP-FW-Debug.launch
+++ b/.launch/TGC-VP-FW-Debug.launch
@@ -25,10 +25,10 @@
    <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="remote"/>
    <booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
    <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="fw/hello-world/hello"/>
+    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="fw/hello-world/prebuilt/hello.elf"/>
    <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.cdt.launch.remote.RemoteCDSFDebuggerTab.DEFAULTS_SET" value="true"/>
    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
    <stringAttribute key="org.eclipse.debug.core.ATTR_GDBSERVER_COMMAND" value="gdbserver"/>
@@ -36,7 +36,7 @@
    <stringAttribute key="org.eclipse.debug.core.ATTR_GDBSERVER_PORT" value="2345"/>
    <stringAttribute key="org.eclipse.debug.core.ATTR_PRERUN_CMDS" value=""/>
    <booleanAttribute key="org.eclipse.debug.core.ATTR_SKIP_DOWNLOAD_TO_TARGET" value="false"/>
-    <stringAttribute key="org.eclipse.debug.core.ATTR_TARGET_PATH" value=""/>
+    <stringAttribute key="org.eclipse.debug.core.ATTR_TARGET_PATH" value="/scratch/eyck/workarea/MINRES/RISCV-VP/fw/hello-world/hello"/>
    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
        <listEntry value="/RISCV-VP"/>
    </listAttribute>
--- a/.launch/TGC-VP-GDBServer.launch
+++ b/.launch/TGC-VP-GDBServer.launch
@@ -18,11 +18,12 @@
    <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="run"/>
    <booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
    <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_ARGUMENTS" value="-f fw/hello-world/hello&#10;-g 10000"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/Debug/src/tgc-vp"/>
+    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_ARGUMENTS" value="-f fw/hello-world/prebuilt/hello.elf&#10;-g 10000"/>
+    <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"/>
+    <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>
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -40,10 +40,8 @@
            "request": "launch",
            "name": "VP-Debug",
            "cwd": "${workspaceRoot}",
-            "valuesFormatting": "parseText",
-            "target": "./build/src/tgc-vp",
-            "printCalls": false,
-            "arguments": "-f fw/hello-world/hello"
+            "program": "${workspaceFolder}/out/build/Debug/src/riscv-vp",
+            "arguments": "--isa ? -f fw/hello-world/hello"
        },
    ],
    "compounds": [
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -2,5 +2,16 @@
    "files.associations": {
        "platform.h": "c"
    },
-    "debug.allowBreakpointsEverywhere": true
+    "debug.allowBreakpointsEverywhere": true,
+    "editor.rulers": [
+        {
+            "column": 120,
+            "comment": "clang-format"
+        }
+    ],
+    "cmake.configureArgs": [
+        "--preset",
+        "Debug",
+        "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON"
+    ]
 }
--- a/CMakeLists.txt
+++ b/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,22 +20,23 @@ include(GNUInstallDirs)

 # add address sanitizer
 if(ENABLE_SANITIZER)
-	set(CMAKE_C_FLAGS             "${CMAKE_C_FLAGS} -fsanitize=address")
-	set(CMAKE_CXX_FLAGS           "${CMAKE_CXX_FLAGS} -fsanitize=address")
+	set(CMAKE_C_FLAGS             "${CMAKE_C_FLAGS} -fno-omit-frame-pointer -fsanitize=address,thread")
+	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)

-set(CLANG_FORMAT_EXCLUDE_PATTERNS "scc" "dbt-rise-riscv")
-find_package(ClangFormat)
-
 if(ENABLE_COVERAGE)
    include(CodeCoverage)
    append_coverage_compiler_flags()
@@ -58,8 +60,13 @@ if(ENABLE_CLANGTIDY)
    endif()
 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)
+
 if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dbt-rise-plugins)
 	add_subdirectory(dbt-rise-plugins)
 endif()
@@ -70,6 +77,8 @@ if(NOT LIBS_ONLY)
 	add_subdirectory(src)
 endif()

+find_package(ClangFormat)
+
 if(FW_BUILD)
 	include(FetchContent)
 	set(FETCHCONTENT_BASE_DIR ${CMAKE_CURRENT_BINARY_DIR}/..)
@@ -84,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()
--- a/CMakePresets.json
+++ b/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": "17",
-                "CMAKE_PROJECT_TOP_LEVEL_INCLUDES":"dbt-rise-riscv/cmake-conan/conan_provider.cmake"
+                "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":"dbt-rise-riscv/cmake-conan/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":"dbt-rise-riscv/cmake-conan/conan_provider.cmake"
+                "CMAKE_BUILD_TYPE": "Release"
            }
        }
    ]
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ To install conan.io version 2.0 and above (see also http://docs.conan.io/en/late
 python3 -m venv .venv
 . .venv/bin/activate
 pip3 install conan
-conan profile new default --detect
+conan profile detect
 ```

 Building the VP is as simple as:
--- a/conanfile.py
+++ b/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)
--- a/conanfile.txt
+++ b/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=False
-systemc/*:disable_virtual_bind=False
-
-[generators]
-CMakeDeps
-CMakeToolchain
-
-[layout]
-cmake_layout
--- a/1
+++ b/1
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/src/CLIParser.cpp
+++ b/src/CLIParser.cpp
@@ -5,7 +5,6 @@
 */

 #include "CLIParser.h"
-#include <scc/report.h>
 #include <iostream>
 #include <iss/log_categories.h>
 #include <scc/report.h>
@@ -41,10 +40,13 @@ CLIParser::CLIParser(int argc, char *argv[])
    }
    auto log_level = vm_["verbose"].as<scc::log>();
    auto log_level_num = static_cast<unsigned>(log_level);
-    LOGGER(DEFAULT)::reporting_level() = logging::as_log_level(log_level_num > 6 ? 6 : log_level_num);;
+    LOGGER(DEFAULT)::reporting_level() = logging::as_log_level(log_level_num > 6 ? 6 : log_level_num);
+    ;
    LOGGER(DEFAULT)::print_time() = false;
    LOG_OUTPUT(DEFAULT)::ostream() = &std::cout;
-    LOGGER(connection)::reporting_level() = logging::as_log_level(log_level_num > 4 ? log_level_num-1 : log_level_num);;
+    LOGGER(connection)::reporting_level() =
+        logging::as_log_level(log_level_num > 4 ? log_level_num - 1 : log_level_num);
+    ;
    LOGGER(connection)::print_time() = false;
    LOG_OUTPUT(connection)::ostream() = &std::cout;
    ///////////////////////////////////////////////////////////////////////////
@@ -59,7 +61,8 @@ CLIParser::CLIParser(int argc, char *argv[])
    scc::stream_redirection cerr_redir(std::cerr, scc::log::ERROR);
    sc_core::sc_report_handler::set_actions("/IEEE_Std_1666/deprecated", sc_core::SC_DO_NOTHING);
    sc_core::sc_report_handler::set_actions(sc_core::SC_ID_MORE_THAN_ONE_SIGNAL_DRIVER_, sc_core::SC_DO_NOTHING);
-    sc_core::sc_report_handler::set_actions(sc_core::SC_ERROR, sc_core::SC_LOG | sc_core::SC_CACHE_REPORT | sc_core::SC_DISPLAY | sc_core::SC_STOP);
+    sc_core::sc_report_handler::set_actions(sc_core::SC_ERROR, sc_core::SC_LOG | sc_core::SC_CACHE_REPORT |
+                                                                   sc_core::SC_DISPLAY | sc_core::SC_STOP);
 }

 void CLIParser::build() {
--- a/src/CLIParser.h
+++ b/src/CLIParser.h
@@ -8,8 +8,8 @@
 #define PLATFORM_SRC_CLIPARSER_H_

 #include <boost/program_options.hpp>
-#include <scc/report.h>
 #include <memory>
+#include <scc/report.h>

 class CLIParser {
 public:
--- a/src/sc_main.cpp
+++ b/src/sc_main.cpp
@@ -10,18 +10,18 @@
 #include <scc/configurable_tracer.h>
 #include <scc/configurer.h>
 #include <scc/hierarchy_dumper.h>
+#include <scc/perf_estimator.h>
 #include <scc/report.h>
 #include <scc/scv/scv_tr_db.h>
 #include <scc/tracer.h>
-#include <scc/perf_estimator.h>
 #ifdef WITH_LLVM
 #include <iss/llvm/jit_helper.h>
 #endif

-#include <boost/program_options.hpp>
 #include "vp/tb.h"
-#include <iostream>
+#include <boost/program_options.hpp>
 #include <fstream>
+#include <iostream>
 #include <sstream>
 #ifdef ERROR
 #undef ERROR
@@ -47,7 +47,8 @@ int sc_main(int argc, char *argv[]) {
    // CLI argument parsing & logging setup
    ///////////////////////////////////////////////////////////////////////////
    CLIParser parser(argc, argv);
-    if (!parser.is_valid()) return ERRORR_IN_COMMAND_LINE;
+    if(!parser.is_valid())
+        return ERRORR_IN_COMMAND_LINE;
    scc::stream_redirection cout_redir(std::cout, scc::log::INFO);
    scc::stream_redirection cerr_redir(std::cerr, scc::log::ERROR);
    ///////////////////////////////////////////////////////////////////////////
@@ -72,31 +73,37 @@ int sc_main(int argc, char *argv[]) {
    if(auto trace_level = parser.get<unsigned>("trace-level")) {
        auto file_name = parser.get<std::string>("trace-file");
        auto enable_sig_trace = (trace_level & 0x1) != 0; // bit0 enables sig trace
-        auto tx_trace_type = static_cast<scc::tracer::file_type>(trace_level >> 1); // bit3-bit1 define the kind of transaction trace
+        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));
-        cfg.set_value("$$$scc_tracer$$$.sig_trace_type", static_cast<unsigned>(scc::tracer::file_type::SC_VCD));
-        tracer = scc::make_unique<scc::configurable_tracer>(file_name, tx_trace_type, enable_sig_trace, trace_default_on);
+        if(parser.is_set("trace-default-off"))
+            cfg.set_value("scc_tracer.default_trace_enable", false);
+        cfg.set_value("scc_tracer.tx_trace_type", static_cast<unsigned>(scc::tracer::file_type::FTR));
+        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
    ///////////////////////////////////////////////////////////////////////////
-    if(tracer) tracer->add_control();
+    if(tracer)
+        tracer->add_control();
    ///////////////////////////////////////////////////////////////////////////
    // dump configuration if requested
    ///////////////////////////////////////////////////////////////////////////
    if(parser.get<std::string>("dump-config").size() > 0) {
        std::ofstream of{parser.get<std::string>("dump-config")};
-        if (of.is_open()) cfg.dump_configuration(of, true);
+        if(of.is_open())
+            cfg.dump_configuration(of, true);
    }
    cfg.configure();
    std::unique_ptr<scc::hierarchy_dumper> dumper;
    if(parser.is_set("dump-structure"))
-        dumper.reset(new scc::hierarchy_dumper(parser.get<std::string>("dump-structure"), scc::hierarchy_dumper::D3JSON));
+        dumper.reset(
+            new scc::hierarchy_dumper(parser.get<std::string>("dump-structure"), scc::hierarchy_dumper::D3JSON));
    ///////////////////////////////////////////////////////////////////////////
    // overwrite config with command line settings
    ///////////////////////////////////////////////////////////////////////////
@@ -108,12 +115,14 @@ int sc_main(int argc, char *argv[]) {
        auto plugins = util::join(parser.get<std::vector<std::string>>("plugin"), ",");
        cfg.set_value(core_path + ".plugins", plugins);
    }
-    if (parser.is_set("elf")) cfg.set_value(core_path + ".elf_file", parser.get<std::string>("elf"));
+    if(parser.is_set("elf"))
+        cfg.set_value(core_path + ".elf_file", parser.get<std::string>("elf"));
    if(parser.is_set("quantum"))
        tlm::tlm_global_quantum::instance().set(sc_core::sc_time(parser.get<unsigned>("quantum"), sc_core::SC_NS));
    if(parser.is_set("reset")) {
        auto str = parser.get<std::string>("reset");
-        uint64_t start_address = str.find("0x") == 0 ? std::stoull(str.substr(2), nullptr, 16) : std::stoull(str, nullptr, 10);
+        uint64_t start_address =
+            str.find("0x") == 0 ? std::stoull(str.substr(2), nullptr, 16) : std::stoull(str, nullptr, 10);
        cfg.set_value(core_path + ".reset_address", start_address);
    }
    if(parser.is_set("disass")) {
@@ -134,7 +143,8 @@ int sc_main(int argc, char *argv[]) {
            sc_core::sc_start(scc::parse_from_string(parser.get<std::string>("max_time")));
        } else
            sc_core::sc_start();
-        if (!sc_core::sc_end_of_simulation_invoked()) sc_core::sc_stop();
+        if(!sc_core::sc_end_of_simulation_invoked())
+            sc_core::sc_stop();
    } catch(sc_core::sc_report& rep) {
        sc_core::sc_report_handler::get_handler()(rep, sc_core::SC_DISPLAY | sc_core::SC_STOP);
    }
--- a/src/vp/gen/PipelinedMemoryBusToApbBridge.h
+++ b/src/vp/gen/PipelinedMemoryBusToApbBridge.h
@@ -9,7 +9,8 @@

 #pragma once

-// need double braces, see https://stackoverflow.com/questions/6893700/how-to-construct-stdarray-object-with-initializer-list#6894191
+// need double braces, see
+// https://stackoverflow.com/questions/6893700/how-to-construct-stdarray-object-with-initializer-list#6894191
 const std::array<scc::target_memory_map_entry<scc::LT>, 7> PipelinedMemoryBusToApbBridge_map = {{
    {gpio0.socket, 0x0, 0xc},
    {uart0.socket, 0x1000, 0x14},
--- a/src/vp/rst_gen.h
+++ b/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 */
--- a/src/vp/system.cpp
+++ b/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/uart.h"
-#include "scc/utilities.h"
+#include <minres/timer.h>
+#include <minres/uart.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.dq_o(dq_o);
-    qspi.dq_i(dq_i);
-    qspi.oe_o(dq_oe_o);
+    qspi.spi_i(mspi0);

    SC_METHOD(gen_reset);
    sensitive << erst_n;
@@ -88,8 +86,8 @@ system::system(sc_core::sc_module_name nm)
 void system::gen_reset() {
    if(erst_n.read())
        rst_s = 0;
-    else rst_s = 1;
+    else
+        rst_s = 1;
 }

-
-} /* namespace sysc */
+} // namespace vp
--- a/src/vp/system.h
+++ b/src/vp/system.h
@@ -4,30 +4,28 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-#ifndef _PLATFORM_H_
-#define _PLATFORM_H_
+#ifndef SRC_VP_SYSTEM_H_
+#define SRC_VP_SYSTEM_H_

-#include "minres/irq.h"
-#include "minres/timer.h"
+#include <cci_configuration>
 #include <minres/aclint.h>
 #include <minres/gpio.h>
+#include <minres/irq.h>
 #include <minres/qspi.h>
-#include <sysc/communication/sc_clock.h>
-#include <sysc/communication/sc_signal_ports.h>
-#include <sysc/core_complex.h>
+#include <minres/timer.h>
 #include <minres/uart.h>
-#include <cci_configuration>
 #include <scc/memory.h>
 #include <scc/router.h>
 #include <scc/utilities.h>
+#include <sysc/communication/sc_clock.h>
+#include <sysc/communication/sc_signal_ports.h>
+#include <sysc/core_complex.h>
+#include <sysc/kernel/sc_module.h>
 #include <sysc/kernel/sc_time.h>
 #include <sysc/utils/sc_vector.h>
 #include <tlm/scc/tlm_signal_sockets.h>
-#include <array>
-#include <memory>
-#include <sysc/kernel/sc_module.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"};
-    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};
+    spi::spi_pkt_initiator_socket<> mspi0{"mspi0"};

    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"};
@@ -64,15 +59,17 @@ private:
    scc::memory<128_kB, scc::LT> mem_ram{"mem_ram"};
    scc::memory<8_kB, scc::LT> boot_rom{"boot_rom"};

-    sc_core::sc_signal<bool, sc_core::SC_MANY_WRITERS> rst_s{"rst_s"}, mtime_int_s{"mtime_int_s"}, msip_int_s{"msip_int_s"};
+    sc_core::sc_signal<bool, sc_core::SC_MANY_WRITERS> rst_s{"rst_s"}, mtime_int_s{"mtime_int_s"},
+        msip_int_s{"msip_int_s"};

-    sc_core::sc_vector<sc_core::sc_signal<bool, sc_core::SC_MANY_WRITERS>> irq_int_s{"irq_int_s", 32}, local_int_s{"local_int_s", 16};
+    sc_core::sc_vector<sc_core::sc_signal<bool, sc_core::SC_MANY_WRITERS>> irq_int_s{"irq_int_s", 32},
+        local_int_s{"local_int_s", 16};
    sc_core::sc_signal<bool, sc_core::SC_MANY_WRITERS> core_int_s{"core_int_s"};

    void gen_reset();
 #include "../vp/gen/PipelinedMemoryBusToApbBridge.h"
 };

-} /* namespace sysc */
+} // namespace vp

-#endif /* _PLATFORM_H_ */
+#endif /* SRC_VP_SYSTEM_H_ */
--- a/src/vp/tb.cpp
+++ b/src/vp/tb.cpp
@@ -4,15 +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) {
+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);
@@ -20,11 +21,10 @@ tb::tb(const sc_core::sc_module_name &nm): sc_core::sc_module(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.dq_o(dq_o);
-    top.dq_i(dq_i);
-    top.dq_oe_o(dq_oe_o);
+    top.mspi0(spi());
+    spi(0)(qspi_mem.spi_t);
    top.clk_i(clk_i);
    clk_i = 10_ns;
+    rst_gen.active_level = false;
 }
-}
+} // namespace vp
--- a/src/vp/tb.h
+++ b/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"
-#include "../vp/system.h"
-namespace tgc_vp {
+namespace vp {

 class tb : public sc_core::sc_module {
 public:
    tb(sc_core::sc_module_name const& nm);
-    tgc_vp::system top{"top"};
-    tgc_vp::rst_gen rst_gen{"rst_gen"};
+    vp::system top{"top"};
+    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"};
-    sc_core::sc_vector<sc_core::sc_signal<bool>> dq_o{"dq_o", 4};
-    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};
+    spi::spi_channel spi{"spi", 1};
+    vpvper::generic::spi_mem qspi_mem{"qspi_mem"};
    sc_core::sc_signal<sc_core::sc_time> clk_i{"clk_i"};
 };

-} /* namespace tgc_vp */
+} // namespace vp

 #endif /* SRC_VP_TB_H_ */
--- a/2
+++ b/2