From 448866f0f6dd806864508a9e7b7d536f56186ce7 Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Fri, 14 Jul 2023 12:55:00 +0200
Subject: [PATCH] adds update dbt-rise modules

---
 .cproject                            | 5 +++--
 CMakeLists.txt                       | 1 -
 contrib/eclipse_launch/TGC-VP.launch | 8 ++++----
 scc                                  | 2 +-
 src/CMakeLists.txt                   | 6 ++++--
 tgc-iss/dbt-rise-tgc                 | 2 +-
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.cproject b/.cproject
index de923df..28139f2 100644
--- a/.cproject
+++ b/.cproject
@@ -46,11 +46,11 @@
 					<def name="BUILD_SHARED_LIBS" type="STRING" val="ON"/>
 				</defs>
 			</storageModule>
-			<storageModule buildDir="build/${ConfigName}" dirtyTs="1687934527300" moduleId="de.marw.cmake4eclipse.mbs.settings">
+			<storageModule buildDir="build/${ConfigName}" dirtyTs="1689326163013" moduleId="de.marw.cmake4eclipse.mbs.settings">
 				<options/>
 				<defs>
 					<def name="CMAKE_BUILD_TYPE" type="STRING" val="Debug"/>
-					<def name="ENABLE_TCC" type="STRING" val="OFF"/>
+					<def name="USE_CWR_SYSTEMC" type="BOOL" val="OFF"/>
 				</defs>
 			</storageModule>
 		</cconfiguration>
@@ -106,6 +106,7 @@
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 	<storageModule moduleId="refreshScope" versionNumber="2">
+		<configuration configurationName="Debug-PA"/>
 		<configuration configurationName="Default">
 			<resource resourceType="PROJECT" workspacePath="/TGFS-VP"/>
 		</configuration>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 874005e..b6d9da5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,7 +122,6 @@ find_package(fmt)
 find_package(spdlog)
 find_package(gsl-lite)
 set(Boost_NO_BOOST_CMAKE ON) #  Don't do a find_package in config mode before searching for a regular boost install.
-
 find_package(Boost REQUIRED COMPONENTS program_options QUIET)
 
 set(CLANG_FORMAT_EXCLUDE_PATTERNS "scc")
diff --git a/contrib/eclipse_launch/TGC-VP.launch b/contrib/eclipse_launch/TGC-VP.launch
index f28407a..9b2a268 100644
--- a/contrib/eclipse_launch/TGC-VP.launch
+++ b/contrib/eclipse_launch/TGC-VP.launch
@@ -12,17 +12,17 @@
     <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="2"/>
+    <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 fw/hello-world/hello -p pctrace=contrib/TGC_C_cycles.json"/>
-    <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/hello -p pctrace=contrib/TGC_C_cycles.json --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.PROJECT_ATTR" value="TGC-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="/TGC-VP"/>
diff --git a/scc b/scc
index 76f36cc..dc31600 160000
--- a/scc
+++ b/scc
@@ -1 +1 @@
-Subproject commit 76f36cc6068e2e586675289e4d48559146560ec0
+Subproject commit dc3160065b24cfbb1aec570b64070a8f6b7bdc59
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f848d17..2d73139 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,9 +4,10 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 cmake_minimum_required(VERSION 3.12)
-
 project(tgc-vp LANGUAGES C CXX VERSION 0.0.1)
 
+include(flink)
+
 find_package(Boost COMPONENTS program_options thread REQUIRED)
 ###############################################################################
 # SiFive
@@ -18,7 +19,8 @@ add_executable(${PROJECT_NAME}
 	tgc_vp/system.cpp
 )
 target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_LIST_DIR})
-target_link_libraries(${PROJECT_NAME} PUBLIC dbt-rise-tgc_sc vpvper_generic vpvper_sifive ${BOOST_program_options_LIBRARY})
+target_force_link_libraries(${PROJECT_NAME} PUBLIC dbt-rise-tgc_sc)
+target_link_libraries(${PROJECT_NAME} PUBLIC vpvper_generic vpvper_sifive ${BOOST_program_options_LIBRARY})
 if(TARGET Boost::program_options)
 	target_link_libraries(${PROJECT_NAME} PUBLIC Boost::program_options Boost::thread)
 else()
diff --git a/tgc-iss/dbt-rise-tgc b/tgc-iss/dbt-rise-tgc
index 0b719a4..720236e 160000
--- a/tgc-iss/dbt-rise-tgc
+++ b/tgc-iss/dbt-rise-tgc
@@ -1 +1 @@
-Subproject commit 0b719a4b576a3ea1520193ab5a28442a939a5e4b
+Subproject commit 720236ec3faf87246d15252278532a054c042875