Merge branch 'develop'

Merge branch 'develop' into main
2025-01-10 07:59:24 +01:00 · 2024-06-04 10:20:31 +02:00 · 2024-06-04 10:14:01 +02:00
51 changed files with 428 additions and 1234 deletions
--- a/.envrc
+++ b/.envrc
@@ -1,8 +1,4 @@
-module load tools/utilities
-module load tools/cmake/3.28
-module load tools/clang/14.0
-module load tools/vscode
-
+module load ./Modulefile
 distro=`/bin/lsb_release -i -s`
 if [ $distro == "CentOS" ]; then 
    . /opt/rh/devtoolset-8/enable
--- a/.gitignore
+++ b/.gitignore
@@ -48,4 +48,3 @@
 /.venv/
 /.cache
 /CMakeUserPresets.json
-*.scview
--- a/.launch/.gitignore
+++ b/.launch/.gitignore
@@ -1 +0,0 @@
-/cxs_tlm single-packet.launch
--- a/.launch/ace_pin_level.launch
+++ b/.launch/ace_pin_level.launch
@@ -1,33 +0,0 @@
-<?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="2"/>
-    <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="true"/>
-    <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/${config_name:SystemC-Components-Test}/tests/ace_pin_level/ace_pin_level"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="SystemC-Components-Test"/>
-    <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="/SystemC-Components-Test"/>
-    </listAttribute>
-    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-        <listEntry value="4"/>
-    </listAttribute>
-    <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;"/>
-    <stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
-</launchConfiguration>
--- a/ahb_delayed_read_write.launch
+++ b/ahb_delayed_read_write.launch
@@ -1,38 +0,0 @@
-<?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.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="ahb_delayed_read_write"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/${config_name:SystemC-Components-Test}/tests/ahb_pin_level/ahb_pin_level"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="SystemC-Components-Test"/>
-    <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="/SystemC-Components-Test"/>
-    </listAttribute>
-    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-        <listEntry value="4"/>
-    </listAttribute>
-    <mapAttribute key="org.eclipse.debug.core.environmentVariables">
-        <mapEntry key="SCC_TEST_TRACE" value="1"/>
-        <mapEntry key="SCC_TEST_VERBOSE" value="1"/>
-    </mapAttribute>
-    <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;"/>
-    <stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
-</launchConfiguration>
--- a/ahb_narrow_read_write.launch
+++ b/ahb_narrow_read_write.launch
@@ -1,38 +0,0 @@
-<?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.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="ahb_narrow_read_write"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/${config_name:SystemC-Components-Test}/tests/ahb_pin_level/ahb_pin_level"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="SystemC-Components-Test"/>
-    <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="/SystemC-Components-Test"/>
-    </listAttribute>
-    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-        <listEntry value="4"/>
-    </listAttribute>
-    <mapAttribute key="org.eclipse.debug.core.environmentVariables">
-        <mapEntry key="SCC_TEST_TRACE" value="1"/>
-        <mapEntry key="SCC_TEST_VERBOSE" value="1"/>
-    </mapAttribute>
-    <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;"/>
-    <stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
-</launchConfiguration>
--- a/ahb_read_write.launch
+++ b/ahb_read_write.launch
@@ -1,38 +0,0 @@
-<?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.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="ahb_read_write"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/${config_name:SystemC-Components-Test}/tests/ahb_pin_level/ahb_pin_level"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="SystemC-Components-Test"/>
-    <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="/SystemC-Components-Test"/>
-    </listAttribute>
-    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-        <listEntry value="4"/>
-    </listAttribute>
-    <mapAttribute key="org.eclipse.debug.core.environmentVariables">
-        <mapEntry key="SCC_TEST_TRACE" value="1"/>
-        <mapEntry key="SCC_TEST_VERBOSE" value="1"/>
-    </mapAttribute>
-    <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;"/>
-    <stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
-</launchConfiguration>
--- a/apb_narrow_read_write.launch
+++ b/apb_narrow_read_write.launch
@@ -1,38 +0,0 @@
-<?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.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="apb_narrow_read_write"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/${config_name:SystemC-Components-Test}/tests/apb_pin_level/apb_pin_level"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="SystemC-Components-Test"/>
-    <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="/SystemC-Components-Test"/>
-    </listAttribute>
-    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-        <listEntry value="4"/>
-    </listAttribute>
-    <mapAttribute key="org.eclipse.debug.core.environmentVariables">
-        <mapEntry key="SCC_TEST_TRACE" value="1"/>
-        <mapEntry key="SCC_TEST_VERBOSE" value="1"/>
-    </mapAttribute>
-    <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;"/>
-    <stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
-</launchConfiguration>
--- a/.launch/apb_pin_level.launch
+++ b/.launch/apb_pin_level.launch
@@ -1,37 +0,0 @@
-<?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.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_NAME" value="build/${config_name:SystemC-Components-Test}/tests/apb_pin_level/apb_pin_level"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="SystemC-Components-Test"/>
-    <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="/SystemC-Components-Test"/>
-    </listAttribute>
-    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-        <listEntry value="4"/>
-    </listAttribute>
-    <mapAttribute key="org.eclipse.debug.core.environmentVariables">
-        <mapEntry key="SCC_TEST_TRACE" value="1"/>
-        <mapEntry key="SCC_TEST_VERBOSE" value="1"/>
-    </mapAttribute>
-    <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;"/>
-    <stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
-</launchConfiguration>
--- a/axi4_narrow_burst.launch
+++ b/axi4_narrow_burst.launch
@@ -1,37 +0,0 @@
-<?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.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="main"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_ARGUMENTS" value="axi4_narrow_burst"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/${config_name:SystemC-Components-Test}/tests/axi4_pin_level/axi4_pin_level"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="SystemC-Components-Test"/>
-    <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="/SystemC-Components-Test"/>
-    </listAttribute>
-    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-        <listEntry value="4"/>
-    </listAttribute>
-    <mapAttribute key="org.eclipse.debug.core.environmentVariables">
-        <mapEntry key="SCC_TEST_TRACE" value="1"/>
-    </mapAttribute>
-    <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;"/>
-    <stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
-</launchConfiguration>
--- a/.launch/axi4_pin_level.launch
+++ b/.launch/axi4_pin_level.launch
@@ -1,37 +0,0 @@
-<?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.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="main"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_ARGUMENTS" value="axi4_burst_alignment_unaligned_addr"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/${config_name:SystemC-Components-Test}/tests/axi4_pin_level/axi4_pin_level"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="SystemC-Components-Test"/>
-    <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="/SystemC-Components-Test"/>
-    </listAttribute>
-    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-        <listEntry value="4"/>
-    </listAttribute>
-    <mapAttribute key="org.eclipse.debug.core.environmentVariables">
-        <mapEntry key="SCC_TEST_TRACE" value="1"/>
-    </mapAttribute>
-    <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;"/>
-    <stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
-</launchConfiguration>
--- a/.launch/configurer.launch
+++ b/.launch/configurer.launch
@@ -1,34 +0,0 @@
-<?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.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_NAME" value="build/${config_name:SystemC-Components-Test}/tests/configurer/configurer"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="SystemC-Components-Test"/>
-    <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=""/>
-    <stringAttribute key="org.eclipse.cdt.launch.WORKING_DIRECTORY" value="${workspace_loc:SystemC-Components-Test/tests/configurer}"/>
-    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
-    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-        <listEntry value="/SystemC-Components-Test"/>
-    </listAttribute>
-    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-        <listEntry value="4"/>
-    </listAttribute>
-    <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;"/>
-    <stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
-</launchConfiguration>
--- a/.launch/cxs_tlm.launch
+++ b/.launch/cxs_tlm.launch
@@ -1,37 +0,0 @@
-<?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.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_NAME" value="build/${config_name:SystemC-Components-Test}/tests/cxs_tlm/cxs_tlm"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="SystemC-Components-Test"/>
-    <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="/SystemC-Components-Test"/>
-    </listAttribute>
-    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-        <listEntry value="4"/>
-    </listAttribute>
-    <mapAttribute key="org.eclipse.debug.core.environmentVariables">
-        <mapEntry key="SCC_TEST_TRACE" value="1"/>
-        <mapEntry key="SCC_TEST_VERBOSE" value="0"/>
-    </mapAttribute>
-    <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;"/>
-    <stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
-</launchConfiguration>
--- a/.launch/memory_subsys.launch
+++ b/.launch/memory_subsys.launch
@@ -1,37 +0,0 @@
-<?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.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_NAME" value="build/${config_name:SystemC-Components-Test}/tests/memory_subsys/memory_subsys"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="SystemC-Components-Test"/>
-    <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="/SystemC-Components-Test"/>
-    </listAttribute>
-    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-        <listEntry value="4"/>
-    </listAttribute>
-    <mapAttribute key="org.eclipse.debug.core.environmentVariables">
-        <mapEntry key="SCC_TEST_TRACE" value="1"/>
-        <mapEntry key="SCC_TEST_VERBOSE_" value="1"/>
-    </mapAttribute>
-    <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;"/>
-    <stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
-</launchConfiguration>
--- a/.launch/sc_fixed_tracing.launch
+++ b/.launch/sc_fixed_tracing.launch
@@ -1,33 +0,0 @@
-<?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.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="true"/>
-    <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="sc_main"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/${config_name:SystemC-Components-Test}/tests/sc_fixed_tracing/sc_fixed_tracing"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="SystemC-Components-Test"/>
-    <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="/SystemC-Components-Test"/>
-    </listAttribute>
-    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-        <listEntry value="4"/>
-    </listAttribute>
-    <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;"/>
-    <stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
-</launchConfiguration>
--- a/.launch/sim_performance.launch
+++ b/.launch/sim_performance.launch
@@ -1,32 +0,0 @@
-<?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="2"/>
-    <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="true"/>
-    <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/${config_name:SystemC-Components-Test}/tests/sim_performance/sim_performance"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="SystemC-Components-Test"/>
-    <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="/SystemC-Components-Test"/>
-    </listAttribute>
-    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-        <listEntry value="4"/>
-    </listAttribute>
-    <stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
-</launchConfiguration>
--- a/.launch/transaction_recording.launch
+++ b/.launch/transaction_recording.launch
@@ -1,33 +0,0 @@
-<?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="2"/>
-    <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="true"/>
-    <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="sc_main"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/${config_name:SystemC-Components-Test}/scc/examples/transaction_recording/transaction_recording_ftr"/>
-    <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="SystemC-Components-Test"/>
-    <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="/SystemC-Components-Test"/>
-    </listAttribute>
-    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-        <listEntry value="4"/>
-    </listAttribute>
-    <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;"/>
-    <stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
-</launchConfiguration>
--- a/.project
+++ b/.project
@@ -28,6 +28,5 @@
 		<nature>org.eclipse.cdt.core.ccnature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-		<nature>org.python.pydev.pythonNature</nature>
 	</natures>
 </projectDescription>
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,16 +0,0 @@
-{
-    "recommendations": [
-        "mkhl.direnv",
-        "sanaajani.taskrunnercode",
-        "ms-vscode.cpptools-themes",
-        "cnshenj.vscode-task-manager",
-        "twxs.cmake",
-        "kylinideteam.cmake-intellisence",
-        "kylinideteam.kylin-cmake-tools",
-        "llvm-vs-code-extensions.vscode-clangd",
-        "eclipse-cdt.cdt-gdb-vscode",
-        "eclipse-cdt.memory-inspector",
-        "eclipse-cdt.peripheral-inspector",
-        "ms-python.python"
-    ]
-}
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -1,68 +1,25 @@
 {
-  // Use IntelliSense to learn about possible attributes.
-  // Hover to view descriptions of existing attributes.
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "type": "gdb",
-      "request": "launch",
-      "name": "quantum_keeper_mt",
-      "program": "${workspaceFolder}/build/Debug/tests/quantum_keeper_mt/quantum_keeper_mt"
-    },
-    {
-      "name": "cppdbg quantum_keeper_mt",
-      "type": "cppdbg",
-      "request": "launch",
-      "program": "${workspaceRoot}/build/Debug/tests/quantum_keeper_mt/quantum_keeper_mt",
-      "args": [],
-      "stopAtEntry": false,
-      "cwd": "${fileDirname}",
-      "environment": [],
-      "externalConsole": false,
-      "MIMode": "gdb",
-      "setupCommands": [
-        {
-          "description": "Enable pretty-printing for gdb",
-          "text": "-enable-pretty-printing",
-          "ignoreFailures": true
-        },
-        {
-          "description": "Set Disassembly Flavor to Intel",
-          "text": "-gdb-set disassembly-flavor intel",
-          "ignoreFailures": true
-        }
-      ]
-    },
-    {
-      "name": "cci_param_restricted",
-      "type": "gdb",
-      "request": "launch",
-      "cwd": "${workspaceRoot}",
-      "program": "${workspaceRoot}/build/Debug/tests/cci_param_restricted/cci_param_restricted",
-      "preLaunchTask": "CMake: build"
-    },
-    {
-      "name": "dmi_access",
-      "type": "gdb",
-      "request": "launch",
-      "cwd": "${workspaceRoot}",
-      "program": "${workspaceRoot}/build/Debug/tests/memory_subsys/memory_subsys",
-      "preLaunchTask": "CMake: build"
-    },
-    {
-      "name": "cxs_tlm",
-      "type": "gdb",
-      "request": "launch",
-      "cwd": "${workspaceRoot}",
-      "program": "${workspaceRoot}/build/Debug/tests/cxs_tlm/cxs_tlm",
-      "arguments": "-n single-packet",
-      "preLaunchTask": "CMake: build",
-      "environment": {
-        "SCC_TEST_TRACE": "1",
-        "SCC_TEST_VERBOSE": "1"
-      },
-      "openGdbConsole": true
-    }
-  ]
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [{
+        "name": "cci_param_restricted",
+        "type": "cppdbg",
+        "request": "launch",
+        "cwd": "${workspaceRoot}",
+        "program": "${workspaceRoot}/build/tests/cci_param_restricted/cci_param_restricted",
+        "linux": {
+            "MIMode": "gdb",
+            "miDebuggerPath": "/usr/bin/gdb"
+          },
+          "setupCommands": [
+            {
+                "description": "Enable pretty-printing for gdb",
+                "text": "-enable-pretty-printing",
+                "ignoreFailures": true
+            }
+        ],
+        "preLaunchTask": "CMake: build"
+      }]
 }
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,36 +0,0 @@
-{
-    "editor.rulers": [
-        {
-            "column": 140,
-            "comment": "clang-format"
-        }
-    ],
-    "editor.formatOnSave": true,
-    "editor.hover.delay": 1500,
-    "clangd.arguments": [
-        "--pretty",
-        "--background-index",
-        "--compile-commands-dir=${workspaceFolder}/build"
-    ],
-    "cmake.buildDirectory": "${workspaceRoot}/build/${buildType}",
-    //"cmake.configureArgs": ["-B", "${workspaceRoot}/build/${buildType}"],
-    "cmake.configureOnOpen": false,
-    "cmake.configureOnEdit": true,
-    "cmake.autoSelectActiveFolder": true,
-    "cmake.exportCompileCommandsFile": true,
-    "cmake.skipConfigureIfCachePresent": false,
-    "cmake.copyCompileCommands": "${workspaceFolder}/build/compile_commands.json",
-    "cmake.options.statusBarVisibility": "hidden",
-    "cmake.options.advanced": {
-        "configure": {
-            "projectStatusVisibility": "visible"
-        },
-        "build": {
-            "statusBarVisibility": "visible"
-        }
-    },
-    "todo-tree.ripgrep.ripgrep": "/bin/rg",
-    "files.watcherExclude": {
-        "**/build": true
-    }
-}
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -0,0 +1,16 @@
+{
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"type": "cmake",
+			"label": "CMake: build",
+			"command": "build",
+			"targets": [
+				"all"
+			],
+			"group": "build",
+			"problemMatcher": ["$gcc"],
+			"detail": "CMake template build task", 
+		}
+	]
+}
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,7 +59,7 @@ include(CTest)
 include(Catch)

 enable_testing()
-set(WITH_SCP4SCC ON)
+
 add_subdirectory(scc)
 add_subdirectory(src)
 add_subdirectory(tests)
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -10,54 +10,31 @@
    },
    "configurePresets": [
        {
-            "name": "Base",
-            "generator": "Ninja",
-            "binaryDir": "${sourceDir}/build/${presetName}",
+            "name": "Debug",
            "cacheVariables": {
                "CMAKE_POLICY_DEFAULT_CMP0091": "NEW",
+                "CMAKE_BUILD_TYPE": "Debug",
                "CMAKE_CXX_STANDARD": "17",
-                "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}",
-                "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
-                "CMAKE_PROJECT_TOP_LEVEL_INCLUDES": "cmake-conan/conan_provider.cmake",
-                "CONAN_BUILD_PROFILE": "auto-cmake"
+                "CMAKE_PROJECT_TOP_LEVEL_INCLUDES": "cmake-conan/conan_provider.cmake"
            }
        },
-        {
-            "name": "Debug",
-            "inherits": "Base",
-            "cacheVariables": {
-                "CMAKE_BUILD_TYPE": "Debug"
-            }
-        },
-		{
-		    "name": "DebugCXX20",
-		    "inherits": "Base",
-		    "cacheVariables": {
-				"CMAKE_CXX_STANDARD": "20",
-		        "CMAKE_BUILD_TYPE": "Debug"
-		    }
-		},
        {
            "name": "RelWithDebInfo",
-            "inherits": "Base",
            "cacheVariables": {
-                "CMAKE_BUILD_TYPE": "RelWithDebInfo"
+                "CMAKE_POLICY_DEFAULT_CMP0091": "NEW",
+                "CMAKE_BUILD_TYPE": "RelWithDebInfo",
+                "CMAKE_CXX_STANDARD": "17",
+                "CMAKE_PROJECT_TOP_LEVEL_INCLUDES": "cmake-conan/conan_provider.cmake"
            }
        },
        {
            "name": "Release",
-            "inherits": "Base",
            "cacheVariables": {
-                "CMAKE_BUILD_TYPE": "Release"
+                "CMAKE_POLICY_DEFAULT_CMP0091": "NEW",
+                "CMAKE_BUILD_TYPE": "Release",
+                "CMAKE_CXX_STANDARD": "17",
+                "CMAKE_PROJECT_TOP_LEVEL_INCLUDES": "cmake-conan/conan_provider.cmake"
            }
        }
-    ],
-    "testPresets": [
-        {
-            "name": "test-all",
-            "description": "run all test with Debug build",
-            "displayName": "",
-            "configurePreset": "Debug"
-        }
    ]
 }
--- a/26
+++ b/26
@@ -35,7 +35,6 @@ void build_n_test_project() {
 		. .venv/bin/activate
 		pip3 install -r requirements.txt
        cmake -S . -B build --preset Release
-        cmake --build build --target format-check
        cmake --build build -j12
        cmake --build build --target test
    '''
@@ -53,25 +52,34 @@ pipeline {
        stage('SCC test pipeline') {
            parallel {
                stage('ubuntu-22.04') {
-                    agent {docker { 
-                        image 'ubuntu-22.04'
-                        args ' -e CONAN_HOME=/var/jenkins_home/workspace/conan-jammy'
-                    } }
+                    agent {docker { image 'ubuntu-22.04' } }
                    stages {
                        stage('Checkout') { steps { checkout_project() }}
                        stage('Build & test') { steps { build_n_test_project() }}
                    }
                }
                stage('rockylinux8') {
-                    agent {docker {
-                        image 'rockylinux8'
-                        args ' -e CONAN_HOME=/var/jenkins_home/workspace/conan-rocky8'
-                    } }
+                    agent {docker { image 'rockylinux8' } }
                    stages {
                        stage('Checkout') { steps { checkout_project() }}
                        stage('Build & test') { steps { build_n_test_project() }}
                    }
                }
+                stage('Format check') {
+                    agent {docker { image 'ubuntu-22.04' } }
+                    stages {
+                        stage('Checkout') { steps { checkout_project() }}
+                        stage('Build & check format') { steps { 
+						 	sh'''
+						 		python3 -mvenv .venv
+								. .venv/bin/activate
+								pip3 install -r requirements.txt
+						        cmake -S . -B build --preset Release
+						        cmake --build build --target format-check
+						    '''
+						}}
+                    }
+                }
            }
        }
    }
--- a/17
+++ b/17
@@ -0,0 +1,17 @@
+#%Module######################################################################
+##
+##      Project Module
+##
+proc ModulesHelp { } {
+  puts stderr "\tThe SCC Tests Project Module\n"
+  puts stderr "\tThis module loads PATHs and variables for SCC tests."
+}
+
+set distro [exec /usr/bin/lsb_release -i -s]
+if { $distro == "CentOS" && ![info exists ::env(PROJECT)] && ![info exists ::env(PCP_DIR)] } {
+    puts stderr     "Don't forget to execute 'scl enable devtoolset-7 llvm-toolset-7 bash'"
+}
+
+module load tools/utilities
+module load tools/cmake/3.28
+module load tools/clang/14.0
--- a/README.md
+++ b/README.md
@@ -13,9 +13,9 @@ In Console:
    python3 -mvenv .venv
    . .venv/bin/activate
    pip3 install -r requirements.txt
-    cmake --preset Release
-    cmake --build build/Release -j30
-    cmake --build build/Release --target test
+    cmake -S . -B build --preset Release
+    cmake --build build -j30
+    cmake --build build --target test
    

 	
--- a/2
+++ b/2
--- a/cmake/GetGitRevisionDescription.cmake
+++ b/cmake/GetGitRevisionDescription.cmake
@@ -0,0 +1,130 @@
+# - Returns a version string from Git
+#
+# These functions force a re-configure on each git commit so that you can
+# trust the values of the variables in your build system.
+#
+#  get_git_head_revision(<refspecvar> <hashvar> [<additional arguments to git describe> ...])
+#
+# Returns the refspec and sha hash of the current head revision
+#
+#  git_describe(<var> [<additional arguments to git describe> ...])
+#
+# Returns the results of git describe on the source tree, and adjusting
+# the output so that it tests false if an error occurs.
+#
+#  git_get_exact_tag(<var> [<additional arguments to git describe> ...])
+#
+# Returns the results of git describe --exact-match on the source tree,
+# and adjusting the output so that it tests false if there was no exact
+# matching tag.
+#
+# Requires CMake 2.6 or newer (uses the 'function' command)
+#
+# Original Author:
+# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+#
+# Copyright Iowa State University 2009-2010.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+if(__get_git_revision_description)
+	return()
+endif()
+set(__get_git_revision_description YES)
+
+# We must run the following at "include" time, not at function call time,
+# to find the path to this module rather than the path to a calling list file
+get_filename_component(_gitdescmoddir ${CMAKE_CURRENT_LIST_FILE} PATH)
+
+function(get_git_head_revision _refspecvar _hashvar)
+	set(GIT_PARENT_DIR "${CMAKE_CURRENT_LIST_DIR}")
+	set(GIT_DIR "${GIT_PARENT_DIR}/.git")
+	while(NOT EXISTS "${GIT_DIR}")	# .git dir not found, search parent directories
+		set(GIT_PREVIOUS_PARENT "${GIT_PARENT_DIR}")
+		get_filename_component(GIT_PARENT_DIR ${GIT_PARENT_DIR} PATH)
+		if(GIT_PARENT_DIR STREQUAL GIT_PREVIOUS_PARENT)
+			# We have reached the root directory, we are not in git
+			set(${_refspecvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
+			set(${_hashvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
+			return()
+		endif()
+		set(GIT_DIR "${GIT_PARENT_DIR}/.git")
+	endwhile()
+	# check if this is a submodule
+	if(NOT IS_DIRECTORY ${GIT_DIR})
+		file(READ ${GIT_DIR} submodule)
+		string(REGEX REPLACE "gitdir: (.*)\n$" "\\1" GIT_DIR_RELATIVE ${submodule})
+		get_filename_component(SUBMODULE_DIR ${GIT_DIR} PATH)
+		get_filename_component(GIT_DIR ${SUBMODULE_DIR}/${GIT_DIR_RELATIVE} ABSOLUTE)
+	endif()
+	set(GIT_DATA "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/git-data")
+	if(NOT EXISTS "${GIT_DATA}")
+		file(MAKE_DIRECTORY "${GIT_DATA}")
+	endif()
+
+	if(NOT EXISTS "${GIT_DIR}/HEAD")
+		return()
+	endif()
+	set(HEAD_FILE "${GIT_DATA}/HEAD")
+	configure_file("${GIT_DIR}/HEAD" "${HEAD_FILE}" COPYONLY)
+
+	configure_file("${_gitdescmoddir}/GetGitRevisionDescription.cmake.in"
+		"${GIT_DATA}/grabRef.cmake"
+		@ONLY)
+	include("${GIT_DATA}/grabRef.cmake")
+
+	set(${_refspecvar} "${HEAD_REF}" PARENT_SCOPE)
+	set(${_hashvar} "${HEAD_HASH}" PARENT_SCOPE)
+endfunction()
+
+function(git_describe _var)
+	if(NOT GIT_FOUND)
+		find_package(Git QUIET)
+	endif()
+	get_git_head_revision(refspec hash)
+	if(NOT GIT_FOUND)
+		set(${_var} "GIT-NOTFOUND" PARENT_SCOPE)
+		return()
+	endif()
+	if(NOT hash)
+		set(${_var} "HEAD-HASH-NOTFOUND" PARENT_SCOPE)
+		return()
+	endif()
+
+	# TODO sanitize
+	#if((${ARGN}" MATCHES "&&") OR
+	#	(ARGN MATCHES "||") OR
+	#	(ARGN MATCHES "\\;"))
+	#	message("Please report the following error to the project!")
+	#	message(FATAL_ERROR "Looks like someone's doing something nefarious with git_describe! Passed arguments ${ARGN}")
+	#endif()
+
+	#message(STATUS "Arguments to execute_process: ${ARGN}")
+
+	execute_process(COMMAND
+		"${GIT_EXECUTABLE}"
+		describe
+		${hash}
+		${ARGN}
+		WORKING_DIRECTORY
+		"${CMAKE_SOURCE_DIR}"
+		RESULT_VARIABLE
+		res
+		OUTPUT_VARIABLE
+		out
+		ERROR_QUIET
+		OUTPUT_STRIP_TRAILING_WHITESPACE)
+	if(NOT res EQUAL 0)
+		set(out "${out}-${res}-NOTFOUND")
+	endif()
+
+	set(${_var} "${out}" PARENT_SCOPE)
+endfunction()
+
+function(git_get_exact_tag _var)
+	git_describe(out --exact-match ${ARGN})
+	set(${_var} "${out}" PARENT_SCOPE)
+endfunction()
--- a/cmake/GetGitRevisionDescription.cmake.in
+++ b/cmake/GetGitRevisionDescription.cmake.in
@@ -0,0 +1,41 @@
+#
+# Internal file for GetGitRevisionDescription.cmake
+#
+# Requires CMake 2.6 or newer (uses the 'function' command)
+#
+# Original Author:
+# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+#
+# Copyright Iowa State University 2009-2010.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+set(HEAD_HASH)
+
+file(READ "@HEAD_FILE@" HEAD_CONTENTS LIMIT 1024)
+
+string(STRIP "${HEAD_CONTENTS}" HEAD_CONTENTS)
+if(HEAD_CONTENTS MATCHES "ref")
+	# named branch
+	string(REPLACE "ref: " "" HEAD_REF "${HEAD_CONTENTS}")
+	if(EXISTS "@GIT_DIR@/${HEAD_REF}")
+		configure_file("@GIT_DIR@/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY)
+	else()
+		configure_file("@GIT_DIR@/packed-refs" "@GIT_DATA@/packed-refs" COPYONLY)
+		file(READ "@GIT_DATA@/packed-refs" PACKED_REFS)
+		if(${PACKED_REFS} MATCHES "([0-9a-z]*) ${HEAD_REF}")
+			set(HEAD_HASH "${CMAKE_MATCH_1}")
+		endif()
+	endif()
+else()
+	# detached HEAD
+	configure_file("@GIT_DIR@/HEAD" "@GIT_DATA@/head-ref" COPYONLY)
+endif()
+
+if(NOT HEAD_HASH)
+	file(READ "@GIT_DATA@/head-ref" HEAD_HASH LIMIT 1024)
+	string(STRIP "${HEAD_HASH}" HEAD_HASH)
+endif()
--- a/cmake/PackageConfigurator.cmake
+++ b/cmake/PackageConfigurator.cmake
@@ -0,0 +1,44 @@
+# Create package-config files :
+#  - <projectname>ConfigVersion.cmake
+#  - <projectname>Config.cmake
+# They are installed in lib/cmake/<projectname>.
+#
+# Required variables :
+#  - VERSION
+#  - PROJECT_NAME
+#
+
+# Include needed for 'write_basic_package_version_file'
+include(CMakePackageConfigHelpers)
+
+write_basic_package_version_file(
+  "${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}ConfigVersion.cmake"
+  VERSION ${VERSION}
+  COMPATIBILITY AnyNewerVersion
+)
+
+configure_file(cmake/${PROJECT_NAME}Config.cmake
+  "${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}Config.cmake"
+  COPYONLY
+)
+
+# Destination
+set(config_install_dir lib/cmake/${PROJECT_NAME})
+
+# Config installation
+#   * <prefix>/lib/cmake/<project>/<project>Targets.cmake
+install(
+  EXPORT ${PROJECT_NAME}Targets
+  DESTINATION ${config_install_dir}
+)
+
+# Config installation
+#   * <prefix>/lib/cmake/<project>/<project>Config.cmake
+#   * <prefix>/lib/cmake/<project>/<project>ConfigVersion.cmake
+install(
+  FILES
+    cmake/${PROJECT_NAME}Config.cmake
+    "${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}ConfigVersion.cmake"
+  DESTINATION ${config_install_dir}
+  COMPONENT devel
+)
--- a/cmake/Submodules.cmake
+++ b/cmake/Submodules.cmake
@@ -0,0 +1,57 @@
+if(EXISTS "${PROJECT_SOURCE_DIR}/.gitmodules")
+message(STATUS "Updating submodules to their latest/fixed versions")
+message(STATUS "(this can take a while, please be patient)")
+
+### First, get all submodules in
+if(${GIT_SUBMODULES_CHECKOUT_QUIET})
+    execute_process(
+        COMMAND             git submodule update --init --recursive
+        WORKING_DIRECTORY   ${PROJECT_SOURCE_DIR}
+        OUTPUT_QUIET
+        ERROR_QUIET
+    )
+else()
+    execute_process(
+        COMMAND             git submodule update --init --recursive
+        WORKING_DIRECTORY   ${PROJECT_SOURCE_DIR}
+    )
+endif()
+
+### Then, checkout each submodule to the specified commit
+# Note: Execute separate processes here, to make sure each one is run,
+# should one crash (because of branch not existing, this, that ... whatever)
+foreach(GIT_SUBMODULE ${GIT_SUBMODULES})
+
+    if( "${GIT_SUBMODULE_VERSION_${GIT_SUBMODULE}}" STREQUAL "" )
+        message(STATUS "no specific version given for submodule ${GIT_SUBMODULE}, checking out master")
+        if( "${GIT_SUBMODULE_BRANCH_${GIT_SUBMODULE}}" STREQUAL "" )
+            set(GIT_SUBMODULE_VERSION_${GIT_SUBMODULE} "master")
+        else()
+            set(GIT_SUBMODULE_VERSION_${GIT_SUBMODULE} ${GIT_SUBMODULE_BRANCH_${GIT_SUBMODULE}})
+        endif()
+    endif()
+
+    if( "${GIT_SUBMODULE_DIR_${GIT_SUBMODULE}}" STREQUAL "" )
+        set(GIT_SUBMODULES_DIRECTORY external)
+    else()
+        set(GIT_SUBMODULES_DIRECTORY ${GIT_SUBMODULE_DIR_${GIT_SUBMODULE}})
+    endif()
+
+    if(${GIT_SUBMODULES_CHECKOUT_QUIET})
+        execute_process(
+            COMMAND             git checkout ${GIT_SUBMODULE_VERSION_${GIT_SUBMODULE}}
+            WORKING_DIRECTORY   ${PROJECT_SOURCE_DIR}/${GIT_SUBMODULES_DIRECTORY}/${GIT_SUBMODULE}
+            OUTPUT_QUIET
+            ERROR_QUIET
+        )
+    else()
+        message(STATUS "checking out ${GIT_SUBMODULE}'s commit/tag ${GIT_SUBMODULE_VERSION_${GIT_SUBMODULE}}")
+        execute_process(
+            COMMAND             git checkout ${GIT_SUBMODULE_VERSION_${GIT_SUBMODULE}}
+            WORKING_DIRECTORY   ${PROJECT_SOURCE_DIR}/${GIT_SUBMODULES_DIRECTORY}/${GIT_SUBMODULE}
+        )
+    endif()
+
+endforeach(${GIT_SUBMODULE})
+
+endif()
--- a/conanfile.py
+++ b/conanfile.py
@@ -1,58 +0,0 @@
-from conan import ConanFile
-from conan.tools.cmake import cmake_layout
-from conan.tools.cmake.toolchain.toolchain import CMakeToolchain
-import os
-
-
-class Pkg(ConanFile):
-    settings = "os", "compiler", "build_type", "arch"
-    generators = (
-        "CMakeDeps"
-    )
-    default_options = {
-        "systemc/*:shared": "True",
-        "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",
-    }
-
-    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("catch2/3.1.0")
-        self.requires("lz4/1.9.3")
-        self.requires("yaml-cpp/0.7.0")
-        self.requires("jsoncpp/1.9.5")
-        self.requires("zlib/1.2.12")
-
-    def build_requirements(self):
-        pass
-
-    def layout(self):
-        cmake_layout(self)
-    
-    def generate(self):
-        tc = CMakeToolchain(self)
-        tc.user_presets_path = False
-        tc.generate()
-        
--- a/conanfile.txt
+++ b/conanfile.txt
@@ -0,0 +1,44 @@
+[requires]
+jsoncpp/1.9.5
+yaml-cpp/0.6.3
+spdlog/1.9.2
+fmt/8.0.1
+boost/1.85.0
+gsl-lite/0.37.0
+systemc/2.3.4
+catch2/3.1.0
+zlib/1.2.11
+lz4/1.9.4
+rapidjson/cci.20230929
+
+[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
+systemc/*:shared=False
+systemc/*:disable_virtual_bind=False
+
+[generators]
+CMakeDeps
+CMakeToolchain
+
+[layout]
+cmake_layout
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,3 @@
 conan>=2.0
-cmake<4.0
+cmake
 clang-format==14.0
--- a/2
+++ b/2
--- a/src/sc_main.cpp
+++ b/src/sc_main.cpp
@@ -10,7 +10,6 @@
 #include <csetjmp>
 #include <csignal>
 #include <cstdlib>
-#include <scc/configurer.h>
 #include <scc/report.h>
 #include <scc/trace.h>
 #include <scc/tracer.h>
@@ -28,12 +27,10 @@ int sc_main(int argc, char* argv[]) {
    auto level = getenv("SCC_TEST_VERBOSE");
    auto log_lvl = level ? static_cast<scc::log>(std::min(strtoul(level, nullptr, 10) + 4, 7UL)) : log::FATAL;
    scc::init_logging(LogConfig().logLevel(log_lvl).logAsync(false).msgTypeFieldWidth(35));
-    scc::configurer cfg("");
    // create tracer if environment variable SCC_TEST_TRACE is defined
    std::unique_ptr<scc::tracer> tracer;
    if(auto* test_trace = getenv("SCC_TEST_TRACE")) {
        tracer = std::make_unique<scc::tracer>(my_name, scc::tracer::ENABLE, scc::tracer::ENABLE);
-        cfg.set_value("scc_tracer.default_trace_enable", true);
    }
    int result = -1;
    if(setjmp(abrt) == 0) {
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -9,10 +9,6 @@ add_subdirectory(configuration)
 add_subdirectory(configurer)
 add_subdirectory(sc_fixed_tracing)
 add_subdirectory(cxs_tlm)
-add_subdirectory(tlm_memory)
-add_subdirectory(memory_subsys)
-add_subdirectory(quantum_keeper_mt)
-add_subdirectory(sim_speed)
 if(FULL_TEST_SUITE)
 	add_subdirectory(sim_performance)
 endif()
--- a/tests/cxs_tlm/csx_packet_test.cpp
+++ b/tests/cxs_tlm/csx_packet_test.cpp
@@ -5,6 +5,7 @@
 #undef CHECK
 #include <catch2/catch_all.hpp>
 #include <deque>
+#include <unordered_map>

 using namespace sc_core;
 namespace cxs {
@@ -12,10 +13,10 @@ factory::add<testbench<256>> tb8;
 factory::add<testbench<512>> tb9;
 factory::add<testbench<1024>> tb10;

-template <unsigned WIDTH, typename STATE> unsigned run_scenario(STATE& state) {
+template <unsigned WIDTH, typename STATE> unsigned run_scenario(STATE& state, unsigned burst_factor = 0) {
    auto& dut = factory::get<testbench<WIDTH>>();
-    dut.tx.burst_len.set_value(state.burst_factor);
-    dut.rx.max_credit.set_value(state.credits);
+    if(burst_factor)
+        dut.tx.burst_len.set_value(burst_factor);
    dut.rst.write(true);
    sc_start(state.reset_cycles * dut.clk.period());
    dut.rst.write(false);
@@ -66,7 +67,7 @@ template <unsigned WIDTH, typename STATE> unsigned run_scenario(STATE& state) {
    return cycles;
 }

-template <typename STATE> unsigned run_scenario(int width, STATE& state) {
+template <typename STATE> unsigned run_scenario(int width, STATE& state, unsigned burst_factor = 0) {
    switch(width) {
    case 8:
    case 256:
@@ -84,40 +85,32 @@ template <typename STATE> unsigned run_scenario(int width, STATE& state) {
 TEST_CASE("single-packet", "[CXS][tlm-level]") {
    struct {
        unsigned int reset_cycles{4};
-        unsigned int max_cycles = 20000;
+        unsigned int max_cycles = 5000;
        std::vector<unsigned int> packet_sizes;
        unsigned granularity{1};
        unsigned resp_cnt{0};
-        unsigned burst_factor{1};
-        unsigned credits{1};
    } state;

    state.packet_sizes.assign({4, 8, 16, 32, 64, 128, 256, 1024});
-    std::array<unsigned, 3> credits{1, 4, 15};
    for(auto width = 8; width < 11; ++width) {
-        for(auto credit : credits) {
-            state.resp_cnt = 0;
-            state.credits = credit;
-            auto cycles = run_scenario(width, state);
+        state.resp_cnt = 0;
+        auto cycles = run_scenario(width, state);

-            REQUIRE(cycles < state.max_cycles);
-            REQUIRE(sc_report_handler::get_count(SC_ERROR) == 0);
-            REQUIRE(sc_report_handler::get_count(SC_WARNING) == 0);
+        REQUIRE(cycles < state.max_cycles);
+        REQUIRE(sc_report_handler::get_count(SC_ERROR) == 0);
+        REQUIRE(sc_report_handler::get_count(SC_WARNING) == 0);

-            REQUIRE(state.resp_cnt == state.packet_sizes.size());
-        }
+        REQUIRE(state.resp_cnt == state.packet_sizes.size());
    }
 }

 TEST_CASE("multi-packet", "[CXS][tlm-level]") {
    struct {
        unsigned int reset_cycles{4};
-        unsigned int max_cycles = 20000;
+        unsigned int max_cycles = 5000;
        std::vector<unsigned int> packet_sizes;
        unsigned granularity{2};
        unsigned resp_cnt{0};
-        unsigned burst_factor{1};
-        unsigned credits{15};
    } state;

    state.packet_sizes.assign({4, 8, 16, 32, 16, 64, 16, 128, 16, 256, 16, 1024});
@@ -135,18 +128,16 @@ TEST_CASE("multi-packet", "[CXS][tlm-level]") {
 TEST_CASE("single-packet-burst2", "[CXS][tlm-level]") {
    struct {
        unsigned int reset_cycles{4};
-        unsigned int max_cycles = 20000;
+        unsigned int max_cycles = 5000;
        std::vector<unsigned int> packet_sizes;
        unsigned granularity{1};
        unsigned resp_cnt{0};
-        unsigned burst_factor{2};
-        unsigned credits{2};
    } state;

    state.packet_sizes.assign({4, 8, 16, 32, 64, 128, 256, 1024});
    for(auto width = 8; width < 11; ++width) {
        state.resp_cnt = 0;
-        auto cycles = run_scenario(width, state);
+        auto cycles = run_scenario(width, state, 2);

        REQUIRE(cycles < state.max_cycles);
        REQUIRE(sc_report_handler::get_count(SC_ERROR) == 0);
@@ -159,18 +150,16 @@ TEST_CASE("single-packet-burst2", "[CXS][tlm-level]") {
 TEST_CASE("multi-packet-burst2", "[CXS][tlm-level]") {
    struct {
        unsigned int reset_cycles{4};
-        unsigned int max_cycles = 20000;
+        unsigned int max_cycles = 5000;
        std::vector<unsigned int> packet_sizes;
        unsigned granularity{2};
        unsigned resp_cnt{0};
-        unsigned burst_factor{2};
-        unsigned credits{2};
    } state;

    state.packet_sizes.assign({4, 8, 16, 32, 16, 64, 16, 128, 16, 256, 16, 1024});
    for(auto width = 8; width < 11; ++width) {
        state.resp_cnt = 0;
-        auto cycles = run_scenario(width, state);
+        auto cycles = run_scenario(width, state, 2);

        REQUIRE(cycles < state.max_cycles);
        REQUIRE(sc_report_handler::get_count(SC_ERROR) == 0);
--- a/tests/cxs_tlm/testbench.h
+++ b/tests/cxs_tlm/testbench.h
@@ -2,13 +2,12 @@
 #define _TESTBENCH_H_

 #include <cxs/cxs_tlm.h>
-#include <cxs/scv/tlm_recording.h>
 #include <scc/cci_util.h>
 #include <scc/configurer.h>
-#include <scc/fifo_w_cb.h>
 #include <scc/observer.h>
 #include <scc/sc_variable.h>
 #include <scc/tracer.h>
+#include <string>
 #include <systemc>
 #include <tlm/nw/initiator_mixin.h>
 #include <tlm/nw/target_mixin.h>
@@ -28,11 +27,9 @@ template <unsigned PHIT_WIDTH> struct testbench : public sc_core::sc_module {
    sc_core::sc_signal<bool> rst{"rst"};
    tlm::nw::initiator_mixin<cxs_pkt_initiator_socket<>, cxs_packet_types> isck{"isck"};
    cxs_transmitter<PHIT_WIDTH> tx{"tx"};
-    tlm::nw::scv::tlm_recorder_module<CXS_CMD, PHIT_WIDTH, cxs_flit_types> tx_rec{"tx_rec"};
    cxs_channel<PHIT_WIDTH> cxs_chan{"cxs_chan"};
-    tlm::nw::scv::tlm_recorder_module<CXS_CMD, PHIT_WIDTH, cxs_flit_types> rx_rec{"rx_rec"};
    cxs_receiver<PHIT_WIDTH> rx{"rx"};
-    tlm::nw::target_mixin<cxs_pkt_target_socket<>, false, cxs_packet_types> tsck{"tsck"};
+    tlm::nw::target_mixin<cxs_pkt_target_socket<>, cxs_packet_types> tsck{"tsck"};

    testbench()
    : testbench(sc_core::sc_gen_unique_name("testbench", false)) {}
@@ -46,31 +43,18 @@ template <unsigned PHIT_WIDTH> struct testbench : public sc_core::sc_module {
        isck(tx.tsck);
        tx.clk_i(clk);
        tx.rst_i(rst);
-        cxs_chan.tx_clk_i(clk);
-        cxs_chan.rx_clk_i(clk);
-#if 0
        tx.isck(cxs_chan.tsck);
        cxs_chan.isck(rx.tsck);
-#else
-        tx.isck(tx_rec.ts);
-        tx_rec.is(cxs_chan.tsck);
-        cxs_chan.isck(rx_rec.ts);
-        rx_rec.is(rx.tsck);
-#endif
        rx.clk_i(clk);
        rx.rst_i(rst);
        rx.isck(tsck);
-        tx.clock_period.set_value(1_ns);
-        cxs_chan.tx_clock_period.set_value(1_ns);
        cxs_chan.channel_delay.set_value(100_ns);
-        cxs_chan.rx_clock_period.set_value(1_ns);
-        rx.clock_period.set_value(1_ns);
        rx.max_credit.set_value(15);
    }

    tlm::tlm_sync_enum nb_transport_fw(transaction_type& trans, phase_type& phase, sc_core::sc_time& t) {
        if(phase == tlm::nw::REQUEST) {
-            SCCDEBUG(SCMOD) << "Received non-blocking transaction with phase " << phase.get_name();
+            SCCINFO(SCMOD) << "Received non-blocking transaction with phase " << phase.get_name();
            recv.push_back(&trans);
            phase = tlm::nw::CONFIRM;
            return tlm::TLM_UPDATED;
--- a/tests/memory_subsys/CMakeLists.txt
+++ b/tests/memory_subsys/CMakeLists.txt
@@ -1,8 +0,0 @@
-project (memory_subsys)
-add_executable(${PROJECT_NAME} 
-	memory_test.cpp
-	${test_util_SOURCE_DIR}/sc_main.cpp
-)
-target_link_libraries (${PROJECT_NAME} PUBLIC scc::components test_util)
-
-catch_discover_tests(${PROJECT_NAME})
--- a/tests/memory_subsys/memory_test.cpp
+++ b/tests/memory_subsys/memory_test.cpp
@@ -1,72 +0,0 @@
-
-#include "testbench.h"
-#include <factory.h>
-#include <tlm/scc/tlm_gp_shared.h>
-#undef CHECK
-#include <array>
-#include <catch2/catch_all.hpp>
-#include <cstdint>
-#include <deque>
-#include <unordered_map>
-
-using namespace sc_core;
-namespace scc {
-factory::add<testbench> tb;
-
-template <typename T> void prepare_trans(tlm::tlm_generic_payload& trans, tlm::tlm_command cmd, uint64_t addr, T val) {
-    unsigned len = cmd == tlm::TLM_IGNORE_COMMAND ? 0 : sizeof(val);
-    unsigned char* data = len ? new unsigned char[len] : nullptr;
-    if(cmd == tlm::TLM_WRITE_COMMAND) {
-        memcpy(data, &val, len);
-        trans.set_command(cmd);
-    }
-    if(cmd == tlm::TLM_READ_COMMAND) {
-        memset(data, 0, len);
-        trans.set_command(tlm::TLM_READ_COMMAND);
-    }
-    trans.set_address(addr);
-    trans.set_data_ptr(data);
-    trans.set_data_length(len);
-    trans.set_streaming_width(len);
-    trans.set_response_status(tlm::TLM_INCOMPLETE_RESPONSE);
-}
-
-template <typename T> void do_dmi_access(T& isck, uint64_t address, uint64_t expected_size) {
-    tlm::tlm_generic_payload gp;
-    tlm::tlm_dmi dmi;
-    gp.set_address(address);
-    auto res = isck->get_direct_mem_ptr(gp, dmi);
-    REQUIRE(res == true);
-    REQUIRE(dmi.get_start_address() == address);
-    REQUIRE(dmi.get_end_address() == (address + expected_size - 1));
-    REQUIRE(dmi.is_read_write_allowed());
-}
-
-TEST_CASE("dmi_access", "[memory][tlm-level]") {
-    auto& dut = factory::get<testbench>();
-    std::array<unsigned char, 256> ref_data;
-    auto val = 256;
-    for(auto& e : ref_data)
-        e = --val;
-    dut.rst.write(true);
-    sc_start(10 * dut.clk.read());
-    dut.rst.write(false);
-    sc_start(dut.clk.read());
-
-    do_dmi_access(dut.isck0, 0, 1_kB);
-    do_dmi_access(dut.isck0, 1_kB, 1_kB);
-    do_dmi_access(dut.isck0, 16_MB, 16_MB);
-    do_dmi_access(dut.isck0, 32_MB, 16_MB);
-    do_dmi_access(dut.isck0, 48_MB, 4_MB);
-    do_dmi_access(dut.isck0, 64_MB, 16_MB);
-    do_dmi_access(dut.isck0, 80_MB, 4_MB);
-    do_dmi_access(dut.isck1, 0 - 1_MB, 1_kB);
-    do_dmi_access(dut.isck1, 1_kB - 1_MB, 1_kB);
-    do_dmi_access(dut.isck1, 16_MB - 1_MB, 16_MB);
-    do_dmi_access(dut.isck1, 32_MB - 1_MB, 16_MB);
-    do_dmi_access(dut.isck1, 48_MB - 1_MB, 4_MB);
-    do_dmi_access(dut.isck0, 128_MB, 16_MB);
-    sc_start(dut.clk.read());
-}
-
-} // namespace scc
--- a/tests/memory_subsys/testbench.h
+++ b/tests/memory_subsys/testbench.h
@@ -1,63 +0,0 @@
-#ifndef _TESTBENCH_H_
-#define _TESTBENCH_H_
-
-#include <cxs/cxs_tlm.h>
-#include <scc/cci_util.h>
-#include <scc/configurer.h>
-#include <scc/memory.h>
-#include <scc/observer.h>
-#include <scc/router.h>
-#include <scc/sc_variable.h>
-#include <scc/tracer.h>
-#include <string>
-#include <systemc>
-#include <tlm/scc/initiator_mixin.h>
-
-using namespace sc_core;
-using namespace sc_dt;
-using namespace std;
-namespace scc {
-
-const char* sc_gen_unique_name(const char*, bool preserve_first);
-struct testbench : public sc_core::sc_module {
-
-    using transaction_type = tlm::tlm_base_protocol_types::tlm_payload_type;
-    using phase_type = tlm::tlm_base_protocol_types::tlm_phase_type;
-
-    sc_core::sc_signal<sc_core::sc_time> clk{"clk"};
-    sc_core::sc_signal<bool> rst{"rst"};
-    tlm::scc::initiator_mixin<tlm::tlm_initiator_socket<scc::LT>> isck0{"isck0"};
-    tlm::scc::initiator_mixin<tlm::tlm_initiator_socket<scc::LT>> isck1{"isck1"};
-    scc::router<scc::LT> router{"router", 6, 2};
-    scc::memory_tl<1_kB, scc::LT> mem0{"mem0"};
-    scc::memory_tl<1_kB, scc::LT> mem1{"mem1"};
-    scc::memory_tl<18_MB, scc::LT> mem2{"mem2"};
-    scc::memory_tl<24_MB, scc::LT> mem3{"mem3"};
-    scc::memory_tl<88_MB, scc::LT> mem4{"mem4"};
-    scc::memory<4_GB> mem5{"mem5"};
-
-    testbench()
-    : testbench(sc_core::sc_gen_unique_name("testbench", false)) {}
-
-    testbench(sc_core::sc_module_name const& nm)
-    : sc_module(nm) {
-        isck0(router.target[0]);
-        isck1(router.target[1]);
-        router.set_initiator_base(1, 1_MB);
-        router.bind_target(mem0.target, 0, 0, 1_kB);
-        router.bind_target(mem1.target, 1, 1_kB, 1_kB);
-        router.bind_target(mem2.target, 2, 16_MB, 16_MB);
-        router.bind_target(mem3.target, 3, 32_MB, 20_MB);
-        router.bind_target(mem4.target, 4, 64_MB, 20_MB, false);
-        router.initiator[5].bind(mem5.target);
-        router.set_default_target(5);
-        mem0.clk_i(clk);
-        mem1.clk_i(clk);
-        mem2.clk_i(clk);
-        mem3.clk_i(clk);
-        mem4.clk_i(clk);
-    }
-    void start_of_simulation() { clk = 10_ns; }
-};
-} // namespace scc
-#endif // _TESTBENCH_H_
--- a/tests/quantum_keeper_mt/CMakeLists.txt
+++ b/tests/quantum_keeper_mt/CMakeLists.txt
@@ -1,5 +0,0 @@
-add_executable (quantum_keeper_mt
-    sc_main.cpp
-)
-target_link_libraries (quantum_keeper_mt LINK_PUBLIC scc-sysc)
-add_test(NAME quantum_keeper_mt COMMAND quantum_keeper_mt)
--- a/tests/quantum_keeper_mt/sc_main.cpp
+++ b/tests/quantum_keeper_mt/sc_main.cpp
@@ -1,38 +0,0 @@
-#include "top_module.h"
-#include <csetjmp>
-#include <csignal>
-#include <cstdlib>
-#include <scc/configurer.h>
-#include <scc/report.h>
-#include <scc/trace.h>
-#include <scc/tracer.h>
-#include <util/ities.h>
-
-using namespace scc;
-using namespace sc_core;
-
-jmp_buf abrt;
-void ABRThandler(int sig) { longjmp(abrt, 1); }
-
-int sc_main(int argc, char* argv[]) {
-    signal(SIGABRT, ABRThandler);
-    auto my_name = util::split(argv[0], '/').back();
-    auto level = "7"; // getenv("SCC_TEST_VERBOSE");
-    auto log_lvl = level ? static_cast<scc::log>(std::min(strtoul(level, nullptr, 10) + 4, 7UL)) : log::FATAL;
-    scc::init_logging(LogConfig().logLevel(log_lvl).logAsync(false).msgTypeFieldWidth(35));
-    scc::configurer cfg("");
-    // create tracer if environment variable SCC_TEST_TRACE is defined
-    std::unique_ptr<scc::tracer> tracer;
-    if(auto* test_trace = getenv("SCC_TEST_TRACE")) {
-        tracer = std::make_unique<scc::tracer>(my_name, scc::tracer::ENABLE, scc::tracer::ENABLE);
-        cfg.set_value("scc_tracer.default_trace_enable", true);
-    }
-    int result = -1;
-    if(setjmp(abrt) == 0) {
-        // instantiate design(s)
-        top_module top_mod("top_module_inst");
-        // Start the simulation
-        sc_core::sc_start(1140, sc_core::SC_NS);
-    }
-    return result;
-}
--- a/tests/quantum_keeper_mt/top_module.h
+++ b/tests/quantum_keeper_mt/top_module.h
@@ -1,44 +0,0 @@
-#ifndef _TOP_MODULE_H_
-#define _TOP_MODULE_H_
-
-#include <atomic>
-#include <scc/async_queue.h>
-#include <scc/async_thread.h>
-#include <scc/report.h>
-#include <sysc/kernel/sc_initializer_function.h>
-#include <tlm/scc/quantum_keeper.h>
-#include <tlm>
-
-struct top_module : ::sc_core ::sc_module {
-    top_module(sc_core::sc_module_name nm)
-    : sc_core::sc_module(nm) {
-        SC_THREAD(run);
-    }
-
-    ~top_module() {}
-
-private:
-    void run() {
-        wait(sc_core::SC_ZERO_TIME); // separate from elaboration phase
-        do {
-            quantum_keeper.reset();
-            core_executor.start([this]() { thread_exec(); });
-            wait(core_executor.thread_finish_event());
-        } while(!finish.load(std::memory_order_relaxed));
-        sc_core::sc_stop();
-    }
-
-    void thread_exec() {
-        for(auto i = 0u; i < 16; ++i) {
-            SCCINFO(SCMOD) << "[" << __PRETTY_FUNCTION__ << "]" << " local time " << quantum_keeper.get_local_absolute_time();
-            quantum_keeper.check_and_sync(1_us);
-        }
-        finish.store(true, std::memory_order_release);
-    }
-    tlm::scc::quantumkeeper_mt quantum_keeper;
-    std::atomic_bool finish{false};
-    scc::async_thread core_executor;
-};
-// top_module
-
-#endif // _TOP_MODULE_H_
--- a/tests/sim_speed/CMakeLists.txt
+++ b/tests/sim_speed/CMakeLists.txt
@@ -1,3 +0,0 @@
-project (sim_speed)
-add_executable(${PROJECT_NAME} sc_main.cpp)
-target_link_libraries (${PROJECT_NAME} LINK_PUBLIC scc-sysc)
--- a/tests/sim_speed/sc_main.cpp
+++ b/tests/sim_speed/sc_main.cpp
@@ -1,24 +0,0 @@
-#include <chrono>
-#include <stdint.h>
-#include <systemc>
-
-using namespace sc_core;
-
-int sc_main(int argc, char* argv[]) {
-    const uint64_t NS_VAL = 100000000;
-
-    sc_clock clk("clk", 1, SC_NS);
-    sc_time run_time(NS_VAL, SC_NS);
-
-    auto start = std::chrono::high_resolution_clock::now();
-    sc_start(run_time);
-    auto end = std::chrono::high_resolution_clock::now();
-    auto duration = std::chrono::duration_cast<std::chrono::microseconds>(end - start);
-
-    double simulated_cycles = (double)NS_VAL;
-    double real_us = duration.count();
-    double speed_Mhz = simulated_cycles / real_us;
-    std::cout << "Simulation speed: " << speed_Mhz << " MHz\n";
-
-    return 0;
-}
--- a/tests/tlm_memory/CMakeLists.txt
+++ b/tests/tlm_memory/CMakeLists.txt
@@ -1,8 +0,0 @@
-project (tlm_memory)
-add_executable(${PROJECT_NAME} 
-	memory_test.cpp
-	${test_util_SOURCE_DIR}/sc_main.cpp
-)
-target_link_libraries (${PROJECT_NAME} PUBLIC scc::components test_util)
-
-catch_discover_tests(${PROJECT_NAME})
--- a/tests/tlm_memory/memory_test.cpp
+++ b/tests/tlm_memory/memory_test.cpp
@@ -1,137 +0,0 @@
-
-#include "testbench.h"
-#include <factory.h>
-#include <tlm/scc/tlm_gp_shared.h>
-#undef CHECK
-#include <array>
-#include <catch2/catch_all.hpp>
-#include <cstdint>
-#include <deque>
-#include <unordered_map>
-
-using namespace sc_core;
-namespace scc {
-factory::add<testbench> tb;
-
-template <typename T> void prepare_trans(tlm::tlm_generic_payload& trans, tlm::tlm_command cmd, uint64_t addr, T val) {
-    unsigned len = cmd == tlm::TLM_IGNORE_COMMAND ? 0 : sizeof(val);
-    unsigned char* data = len ? new unsigned char[len] : nullptr;
-    if(cmd == tlm::TLM_WRITE_COMMAND) {
-        memcpy(data, &val, len);
-        trans.set_command(cmd);
-    }
-    if(cmd == tlm::TLM_READ_COMMAND) {
-        memset(data, 0, len);
-        trans.set_command(tlm::TLM_READ_COMMAND);
-    }
-    trans.set_address(addr);
-    trans.set_data_ptr(data);
-    trans.set_data_length(len);
-    trans.set_streaming_width(len);
-    trans.set_response_status(tlm::TLM_INCOMPLETE_RESPONSE);
-}
-
-TEST_CASE("simple_read_write_with host memory map", "[memory][tlm-level]") {
-    auto& dut = factory::get<testbench>();
-    std::array<unsigned char, 256> ref_data;
-    auto val = 256;
-    for(auto& e : ref_data)
-        e = --val;
-    dut.rst.write(true);
-    sc_start(10 * dut.clk.read());
-    dut.rst.write(false);
-    sc_start(dut.clk.read());
-    {
-        tlm::tlm_generic_payload gp;
-        sc_core::sc_time t;
-        for(uint64_t addr = 0; addr < 1024; addr += sizeof(uint64_t)) {
-            prepare_trans(gp, tlm::TLM_WRITE_COMMAND, addr, 123456789ULL);
-            dut.isck->b_transport(gp, t);
-            delete gp.get_data_ptr();
-            sc_start(dut.clk.read());
-        }
-    }
-    {
-        tlm::tlm_generic_payload gp;
-        prepare_trans(gp, tlm::TLM_READ_COMMAND, 256, 0ULL);
-        sc_core::sc_time t;
-        dut.isck->b_transport(gp, t);
-        uint64_t res;
-        memcpy(&res, gp.get_data_ptr(), sizeof(uint64_t));
-        REQUIRE(res == 123456789ULL);
-        delete gp.get_data_ptr();
-    }
-    sc_start(dut.clk.read());
-    {
-        tlm::tlm_generic_payload gp;
-        gp.set_command(tlm::TLM_IGNORE_COMMAND);
-        gp.set_address(256);
-        gp.set_data_ptr(nullptr);
-        gp.set_data_length(256);
-        gp.set_streaming_width(256);
-        gp.set_response_status(tlm::TLM_INCOMPLETE_RESPONSE);
-        auto ext = new scc::host_mem_map_extension(ref_data.data());
-        gp.set_extension(ext);
-        dut.isck->transport_dbg(gp);
-    }
-    sc_start(dut.clk.read());
-    {
-        tlm::tlm_generic_payload gp;
-        prepare_trans(gp, tlm::TLM_READ_COMMAND, 256, 0ULL);
-        sc_core::sc_time t;
-        dut.isck->b_transport(gp, t);
-        uint64_t res;
-        memcpy(&res, gp.get_data_ptr(), sizeof(uint64_t));
-        REQUIRE(res == 0xf8f9fafbfcfdfeffULL);
-        delete gp.get_data_ptr();
-    }
-    sc_start(dut.clk.read());
-    {
-        tlm::tlm_generic_payload gp;
-        prepare_trans(gp, tlm::TLM_READ_COMMAND, 384, 0ULL);
-        sc_core::sc_time t;
-        dut.isck->b_transport(gp, t);
-        uint64_t res;
-        memcpy(&res, gp.get_data_ptr(), sizeof(uint64_t));
-        REQUIRE(res == 0x78797a7b7c7d7e7fULL);
-        delete gp.get_data_ptr();
-    }
-    sc_start(dut.clk.read());
-    {
-        tlm::tlm_generic_payload gp;
-        gp.set_command(tlm::TLM_IGNORE_COMMAND);
-        gp.set_address(256);
-        gp.set_data_ptr(nullptr);
-        gp.set_data_length(256);
-        gp.set_streaming_width(256);
-        gp.set_response_status(tlm::TLM_INCOMPLETE_RESPONSE);
-        auto ext = new scc::host_mem_map_extension(nullptr);
-        gp.set_extension(ext);
-        dut.isck->transport_dbg(gp);
-    }
-    sc_start(dut.clk.read());
-    {
-        tlm::tlm_generic_payload gp;
-        prepare_trans(gp, tlm::TLM_READ_COMMAND, 256, 0ULL);
-        sc_core::sc_time t;
-        dut.isck->b_transport(gp, t);
-        uint64_t res;
-        memcpy(&res, gp.get_data_ptr(), sizeof(uint64_t));
-        REQUIRE(res == 123456789ULL);
-        delete gp.get_data_ptr();
-    }
-    sc_start(dut.clk.read());
-    {
-        tlm::tlm_generic_payload gp;
-        prepare_trans(gp, tlm::TLM_READ_COMMAND, 256, 0ULL);
-        sc_core::sc_time t;
-        dut.isck->b_transport(gp, t);
-        uint64_t res;
-        memcpy(&res, gp.get_data_ptr(), sizeof(uint64_t));
-        REQUIRE(res == 123456789ULL);
-        delete gp.get_data_ptr();
-    }
-    sc_start(dut.clk.read());
-}
-
-} // namespace scc
--- a/tests/tlm_memory/testbench.h
+++ b/tests/tlm_memory/testbench.h
@@ -1,42 +0,0 @@
-#ifndef _TESTBENCH_H_
-#define _TESTBENCH_H_
-
-#include <cxs/cxs_tlm.h>
-#include <scc/cci_util.h>
-#include <scc/configurer.h>
-#include <scc/memory.h>
-#include <scc/observer.h>
-#include <scc/sc_variable.h>
-#include <scc/tracer.h>
-#include <string>
-#include <systemc>
-#include <tlm/scc/initiator_mixin.h>
-
-using namespace sc_core;
-using namespace sc_dt;
-using namespace std;
-namespace scc {
-
-const char* sc_gen_unique_name(const char*, bool preserve_first);
-struct testbench : public sc_core::sc_module {
-
-    using transaction_type = tlm::tlm_base_protocol_types::tlm_payload_type;
-    using phase_type = tlm::tlm_base_protocol_types::tlm_phase_type;
-
-    sc_core::sc_signal<sc_core::sc_time> clk{"clk"};
-    sc_core::sc_signal<bool> rst{"rst"};
-    tlm::scc::initiator_mixin<tlm::tlm_initiator_socket<scc::LT>> isck{"isck"};
-    scc::memory_tl<1_kB, scc::LT> mem{"mem"};
-
-    testbench()
-    : testbench(sc_core::sc_gen_unique_name("testbench", false)) {}
-
-    testbench(sc_core::sc_module_name const& nm)
-    : sc_module(nm) {
-        isck(mem.target);
-        mem.clk_i(clk);
-    }
-    void start_of_simulation() { clk = 10_ns; }
-};
-} // namespace scc
-#endif // _TESTBENCH_H_
Author	SHA1	Message	Date
Eyck Jentzsch	c684bbf891	Merge branch 'develop'	2025-01-10 07:59:24 +01:00
Eyck Jentzsch	e91e5de6ab	Merge branch 'develop' into main	2024-06-04 10:20:31 +02:00
Eyck Jentzsch	c30656841c	Merge branch 'develop' into main	2024-06-04 10:14:01 +02:00