.cproject

@@ -1,253 +1,502 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+    	
     <storageModule moduleId="org.eclipse.cdt.core.settings">
+        		
         <cconfiguration id="cdt.managedbuild.config.gnu.exe.debug.1751741082">
+            			
             <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.debug.1751741082" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+                				
                 <externalSettings/>
+                				
                 <extensions>
+                    					
                     <extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+                    					
                     <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+                    					
                     <extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+                    					
                     <extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+                    					
                     <extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+                    				
                 </extensions>
+                			
             </storageModule>
+            			
             <storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.1751741082" name="Debug" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=" parent="cdt.managedbuild.config.gnu.exe.debug">
+                				
+                <configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.1751741082" name="Debug" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=" parent="cdt.managedbuild.config.gnu.exe.debug">
+                    					
                     <folderInfo id="cdt.managedbuild.config.gnu.exe.debug.1751741082." name="/" resourcePath="">
+                        						
                         <toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.1289745146" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.debug">
+                            							
                             <targetPlatform binaryParser="org.eclipse.cdt.core.GNU_ELF;org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.gnu.platform.exe.debug.1460698591" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>
+                            							
                             <builder buildPath="/RISCV-VP/build/Debug" id="de.marw.cdt.cmake.core.genscriptbuilder.2135578907" keepEnvironmentInBuildfile="false" name="CMake Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="de.marw.cdt.cmake.core.genscriptbuilder"/>
+                            							
                             <tool id="cdt.managedbuild.tool.gnu.archiver.base.366643800" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
+                            							
                             <tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.1510612390" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug">
+                                								
                                 <option id="gnu.cpp.compiler.exe.debug.option.optimization.level.1768317780" name="Optimization Level" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
+                                								
                                 <option id="gnu.cpp.compiler.exe.debug.option.debugging.level.276552358" name="Debug Level" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
+                                								
                                 <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1565574494" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
+                                							
                             </tool>
+                            							
                             <tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1306991179" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.debug">
+                                								
                                 <option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.exe.debug.option.optimization.level.1780201794" name="Optimization Level" superClass="gnu.c.compiler.exe.debug.option.optimization.level" useByScannerDiscovery="false" valueType="enumerated"/>
+                                								
                                 <option id="gnu.c.compiler.exe.debug.option.debugging.level.1818423232" name="Debug Level" superClass="gnu.c.compiler.exe.debug.option.debugging.level" useByScannerDiscovery="false" value="gnu.c.debugging.level.max" valueType="enumerated"/>
+                                								
                                 <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.140891728" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+                                							
                             </tool>
+                            							
                             <tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.42216846" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug"/>
+                            							
                             <tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug.254057410" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug">
+                                								
                                 <inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.196770635" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
+                                    									
                                     <additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+                                    									
                                     <additionalInput kind="additionalinput" paths="$(LIBS)"/>
+                                    								
                                 </inputType>
+                                							
                             </tool>
+                            							
                             <tool id="cdt.managedbuild.tool.gnu.assembler.exe.debug.1296290560" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.debug">
+                                								
                                 <inputType id="cdt.managedbuild.tool.gnu.assembler.input.769565493" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+                                							
                             </tool>
+                            						
                         </toolChain>
+                        					
                     </folderInfo>
+                    				
                 </configuration>
+                			
             </storageModule>
+            			
             <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+            			
             <storageModule buildDir="build/${ConfigName}" moduleId="de.marw.cdt.cmake.core.settings">
+                				
                 <options/>
+                				
                 <linux command="cmake" generator="UnixMakefiles" use-default="true">
+                    					
                     <defs>
+                        						
                         <def name="CMAKE_VERBOSE_MAKEFILE" type="BOOL" val="ON"/>
+                        					
                     </defs>
+                    				
                 </linux>
+                				
                 <win32 command="cmake" generator="MinGWMakefiles" use-default="true">
+                    					
                     <defs/>
+                    					
                     <undefs/>
+                    				
                 </win32>
+                			
             </storageModule>
+            		
         </cconfiguration>
+        		
         <cconfiguration id="cdt.managedbuild.config.gnu.exe.release.1745230171">
+            			
             <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.release.1745230171" moduleId="org.eclipse.cdt.core.settings" name="Release">
+                				
                 <externalSettings/>
+                				
                 <extensions>
+                    					
                     <extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+                    					
                     <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+                    					
                     <extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+                    					
                     <extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+                    					
                     <extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+                    				
                 </extensions>
+                			
             </storageModule>
+            			
             <storageModule moduleId="cdtBuildSystem" version="4.0.0">
+                				
                 <configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.release.1745230171" name="Release" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=" parent="cdt.managedbuild.config.gnu.exe.release">
+                    					
                     <folderInfo id="cdt.managedbuild.config.gnu.exe.release.1745230171." name="/" resourcePath="">
+                        						
                         <toolChain id="cdt.managedbuild.toolchain.gnu.exe.release.2006835092" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.release">
+                            							
                             <targetPlatform binaryParser="org.eclipse.cdt.core.GNU_ELF;org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.gnu.platform.exe.release.1630517313" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.release"/>
+                            							
                             <builder buildPath="/RISCV-VP/build/Release" id="de.marw.cdt.cmake.core.genscriptbuilder.1359576856" keepEnvironmentInBuildfile="false" name="CMake Builder (portable)" parallelBuildOn="true" parallelizationNumber="optimal" superClass="de.marw.cdt.cmake.core.genscriptbuilder"/>
+                            							
                             <tool id="cdt.managedbuild.tool.gnu.archiver.base.1428458401" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
+                            							
                             <tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.187095968" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release">
+                                								
                                 <option id="gnu.cpp.compiler.exe.release.option.optimization.level.73514910" name="Optimization Level" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
+                                								
                                 <option id="gnu.cpp.compiler.exe.release.option.debugging.level.1344774762" name="Debug Level" superClass="gnu.cpp.compiler.exe.release.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
+                                								
                                 <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1317114938" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
+                                							
                             </tool>
+                            							
                             <tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.release.1000860739" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.release">
+                                								
                                 <option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.exe.release.option.optimization.level.1354773741" name="Optimization Level" superClass="gnu.c.compiler.exe.release.option.optimization.level" useByScannerDiscovery="false" valueType="enumerated"/>
+                                								
                                 <option id="gnu.c.compiler.exe.release.option.debugging.level.1279440099" name="Debug Level" superClass="gnu.c.compiler.exe.release.option.debugging.level" useByScannerDiscovery="false" value="gnu.c.debugging.level.none" valueType="enumerated"/>
+                                								
                                 <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.2074474648" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+                                							
                             </tool>
+                            							
                             <tool id="cdt.managedbuild.tool.gnu.c.linker.exe.release.2000593303" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.release"/>
+                            							
                             <tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.release.97255379" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.release">
+                                								
                                 <inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.263809162" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
+                                    									
                                     <additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+                                    									
                                     <additionalInput kind="additionalinput" paths="$(LIBS)"/>
+                                    								
                                 </inputType>
+                                							
                             </tool>
+                            							
                             <tool id="cdt.managedbuild.tool.gnu.assembler.exe.release.2062863176" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.release">
+                                								
                                 <inputType id="cdt.managedbuild.tool.gnu.assembler.input.353015596" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+                                							
                             </tool>
+                            						
                         </toolChain>
+                        					
                     </folderInfo>
+                    				
                 </configuration>
+                			
             </storageModule>
+            			
             <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+            			
             <storageModule buildDir="build/${ConfigName}" moduleId="de.marw.cdt.cmake.core.settings">
+                				
                 <options/>
+                				
                 <linux command="cmake" generator="UnixMakefiles" use-default="true">
 				</linux>
+                				
                 <win32 command="cmake" generator="MinGWMakefiles" use-default="true">
 				</win32>
+                			
             </storageModule>
+            		
         </cconfiguration>
+        		
         <cconfiguration id="cdt.managedbuild.config.gnu.exe.release.1745230171.1259602404">
+            			
             <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.release.1745230171.1259602404" moduleId="org.eclipse.cdt.core.settings" name="RelWithDebInfo">
+                				
                 <externalSettings/>
+                				
                 <extensions>
+                    					
                     <extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+                    					
                     <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+                    					
                     <extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+                    					
                     <extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+                    					
                     <extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+                    				
                 </extensions>
+                			
             </storageModule>
+            			
             <storageModule moduleId="cdtBuildSystem" version="4.0.0">
+                				
                 <configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.release.1745230171.1259602404" name="RelWithDebInfo" optionalBuildProperties="" parent="cdt.managedbuild.config.gnu.exe.release">
+                    					
                     <folderInfo id="cdt.managedbuild.config.gnu.exe.release.1745230171.1259602404." name="/" resourcePath="">
+                        						
                         <toolChain id="cdt.managedbuild.toolchain.gnu.exe.release.1502160352" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.release">
+                            							
                             <targetPlatform binaryParser="org.eclipse.cdt.core.GNU_ELF;org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.gnu.platform.exe.release.689260696" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.release"/>
+                            							
                             <builder buildPath="/RISCV-VP/build/Release" id="de.marw.cdt.cmake.core.genscriptbuilder.775458297" keepEnvironmentInBuildfile="false" name="CMake Builder (portable)" parallelBuildOn="true" parallelizationNumber="optimal" superClass="de.marw.cdt.cmake.core.genscriptbuilder"/>
+                            							
                             <tool id="cdt.managedbuild.tool.gnu.archiver.base.1134372172" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
+                            							
                             <tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.1556984395" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release">
+                                								
                                 <option id="gnu.cpp.compiler.exe.release.option.optimization.level.1353963182" name="Optimization Level" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
+                                								
                                 <option id="gnu.cpp.compiler.exe.release.option.debugging.level.1769987567" name="Debug Level" superClass="gnu.cpp.compiler.exe.release.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
+                                								
                                 <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.228859511" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
+                                							
                             </tool>
+                            							
                             <tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.release.1020243188" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.release">
+                                								
                                 <option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.exe.release.option.optimization.level.681548571" name="Optimization Level" superClass="gnu.c.compiler.exe.release.option.optimization.level" useByScannerDiscovery="false" valueType="enumerated"/>
+                                								
                                 <option id="gnu.c.compiler.exe.release.option.debugging.level.987899513" name="Debug Level" superClass="gnu.c.compiler.exe.release.option.debugging.level" useByScannerDiscovery="false" value="gnu.c.debugging.level.none" valueType="enumerated"/>
+                                								
                                 <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.693742822" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+                                							
                             </tool>
+                            							
                             <tool id="cdt.managedbuild.tool.gnu.c.linker.exe.release.1626150212" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.release"/>
+                            							
                             <tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.release.1878716058" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.release">
+                                								
                                 <inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.471741232" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
+                                    									
                                     <additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+                                    									
                                     <additionalInput kind="additionalinput" paths="$(LIBS)"/>
+                                    								
                                 </inputType>
+                                							
                             </tool>
+                            							
                             <tool id="cdt.managedbuild.tool.gnu.assembler.exe.release.1237246932" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.release">
+                                								
                                 <inputType id="cdt.managedbuild.tool.gnu.assembler.input.1692363597" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+                                							
                             </tool>
+                            						
                         </toolChain>
+                        					
                     </folderInfo>
+                    				
                 </configuration>
+                			
             </storageModule>
+            			
             <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+            			
             <storageModule buildDir="build/${ConfigName}" moduleId="de.marw.cdt.cmake.core.settings">
+                				
                 <options/>
+                				
                 <linux command="cmake" generator="UnixMakefiles" use-default="true">
+                    					
                     <defs/>
+                    					
                     <undefs/>
+                    				
                 </linux>
+                				
                 <win32 command="cmake" generator="MinGWMakefiles" use-default="true">
+                    					
                     <defs/>
+                    					
                     <undefs/>
+                    				
                 </win32>
+                				
                 <defs>
+                    					
                     <def name="CMAKE_BUILD_TYPE" type="STRING" val="RelWithDebInfo"/>
+                    				
                 </defs>
+                			
             </storageModule>
+            		
         </cconfiguration>
+        	
     </storageModule>
+    	
     <storageModule moduleId="cdtBuildSystem" version="4.0.0">
+        		
         <project id="RISCV-VP.cdt.managedbuild.target.gnu.exe.1695631616" name="Executable" projectType="cdt.managedbuild.target.gnu.exe"/>
+        	
     </storageModule>
+    	
     <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+    	
     <storageModule moduleId="refreshScope" versionNumber="2">
+        		
         <configuration configurationName="RelWithDebInfo">
+            			
             <resource resourceType="PROJECT" workspacePath="/RISCV-VP"/>
+            		
         </configuration>
+        		
         <configuration configurationName="Default">
+            			
             <resource resourceType="PROJECT" workspacePath="/RISCV-VP"/>
+            		
         </configuration>
+        		
         <configuration configurationName="Debug">
+            			
             <resource resourceType="PROJECT" workspacePath="/RISCV-VP"/>
+            		
         </configuration>
+        		
         <configuration configurationName="Release">
+            			
             <resource resourceType="PROJECT" workspacePath="/RISCV-VP"/>
+            		
         </configuration>
+        	
     </storageModule>
+    	
     <storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+    	
     <storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
+    	
     <storageModule moduleId="scannerConfiguration">
+        		
         <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+        		
         <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.119132886.1995486963;cdt.managedbuild.config.gnu.exe.debug.119132886.1995486963.;cdt.managedbuild.tool.gnu.cpp.compiler.base.64491626;cdt.managedbuild.tool.gnu.cpp.compiler.input.550087631">
+            			
             <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+            		
         </scannerConfigBuildInfo>
+        		
         <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.119132886.1379881487;cdt.managedbuild.config.gnu.exe.debug.119132886.1379881487.;cdt.managedbuild.tool.gnu.c.compiler.base.2057848733;cdt.managedbuild.tool.gnu.c.compiler.input.449904153">
+            			
             <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+            		
         </scannerConfigBuildInfo>
+        		
         <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.119132886.712015637;cdt.managedbuild.config.gnu.exe.debug.119132886.712015637.;cdt.managedbuild.tool.gnu.cpp.compiler.base.1953432059;cdt.managedbuild.tool.gnu.cpp.compiler.input.333930787">
+            			
             <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+            		
         </scannerConfigBuildInfo>
+        		
         <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.119132886.1763523931;cdt.managedbuild.config.gnu.exe.debug.119132886.1763523931.;cdt.managedbuild.tool.gnu.cpp.compiler.base.755134990;cdt.managedbuild.tool.gnu.cpp.compiler.input.1581589600">
+            			
             <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+            		
         </scannerConfigBuildInfo>
+        		
         <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.1751741082;cdt.managedbuild.config.gnu.exe.debug.1751741082.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.1510612390;cdt.managedbuild.tool.gnu.cpp.compiler.input.1565574494">
+            			
             <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+            		
         </scannerConfigBuildInfo>
+        		
         <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.119132886.1995486963;cdt.managedbuild.config.gnu.exe.debug.119132886.1995486963.;cdt.managedbuild.tool.gnu.c.compiler.base.1188561719;cdt.managedbuild.tool.gnu.c.compiler.input.1094307690">
+            			
             <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+            		
         </scannerConfigBuildInfo>
+        		
         <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.446935686;cdt.managedbuild.config.gnu.exe.release.446935686.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.16714666;cdt.managedbuild.tool.gnu.c.compiler.input.1516553064">
+            			
             <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+            		
         </scannerConfigBuildInfo>
+        		
         <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.119132886.1379881487;cdt.managedbuild.config.gnu.exe.debug.119132886.1379881487.;cdt.managedbuild.tool.gnu.cpp.compiler.base.1040448746;cdt.managedbuild.tool.gnu.cpp.compiler.input.2028005770">
+            			
             <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+            		
         </scannerConfigBuildInfo>
+        		
         <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.119132886;cdt.managedbuild.config.gnu.exe.debug.119132886.;cdt.managedbuild.tool.gnu.c.compiler.base.492144561;cdt.managedbuild.tool.gnu.c.compiler.input.1379562984">
+            			
             <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+            		
         </scannerConfigBuildInfo>
+        		
         <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.119132886;cdt.managedbuild.config.gnu.exe.debug.119132886.;cdt.managedbuild.tool.gnu.cpp.compiler.base.1087323960;cdt.managedbuild.tool.gnu.cpp.compiler.input.839821702">
+            			
             <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+            		
         </scannerConfigBuildInfo>
+        		
         <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.119132886;cdt.managedbuild.config.gnu.exe.debug.119132886.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.428727540;cdt.managedbuild.tool.gnu.c.compiler.input.543284297">
+            			
             <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+            		
         </scannerConfigBuildInfo>
+        		
         <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.119132886;cdt.managedbuild.config.gnu.exe.debug.119132886.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.1194734114;cdt.managedbuild.tool.gnu.cpp.compiler.input.34242651">
+            			
             <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+            		
         </scannerConfigBuildInfo>
+        		
         <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.119132886.712015637;cdt.managedbuild.config.gnu.exe.debug.119132886.712015637.;cdt.managedbuild.tool.gnu.c.compiler.base.573692899;cdt.managedbuild.tool.gnu.c.compiler.input.2138116778">
+            			
             <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+            		
         </scannerConfigBuildInfo>
+        		
         <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.1745230171;cdt.managedbuild.config.gnu.exe.release.1745230171.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.187095968;cdt.managedbuild.tool.gnu.cpp.compiler.input.1317114938">
+            			
             <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+            		
         </scannerConfigBuildInfo>
+        		
         <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.1745230171.1259602404;cdt.managedbuild.config.gnu.exe.release.1745230171.1259602404.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.1556984395;cdt.managedbuild.tool.gnu.cpp.compiler.input.228859511">
+            			
             <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+            		
         </scannerConfigBuildInfo>
+        		
         <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.119132886.1763523931;cdt.managedbuild.config.gnu.exe.debug.119132886.1763523931.;cdt.managedbuild.tool.gnu.c.compiler.base.1252259913;cdt.managedbuild.tool.gnu.c.compiler.input.1578289923">
+            			
             <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+            		
         </scannerConfigBuildInfo>
+        		
         <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.1745230171;cdt.managedbuild.config.gnu.exe.release.1745230171.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.1000860739;cdt.managedbuild.tool.gnu.c.compiler.input.2074474648">
+            			
             <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+            		
         </scannerConfigBuildInfo>
+        		
         <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.446935686;cdt.managedbuild.config.gnu.exe.release.446935686.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.1265053613;cdt.managedbuild.tool.gnu.cpp.compiler.input.1842530130">
+            			
             <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+            		
         </scannerConfigBuildInfo>
+        		
         <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.1745230171.1259602404;cdt.managedbuild.config.gnu.exe.release.1745230171.1259602404.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.1020243188;cdt.managedbuild.tool.gnu.c.compiler.input.693742822">
+            			
             <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+            		
         </scannerConfigBuildInfo>
+        		
         <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.1751741082;cdt.managedbuild.config.gnu.exe.debug.1751741082.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1306991179;cdt.managedbuild.tool.gnu.c.compiler.input.140891728">
+            			
             <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+            		
         </scannerConfigBuildInfo>
+        	
     </storageModule>
+    
 </cproject>

CMakeLists.txt

@@ -65,7 +65,6 @@ setup_conan(TARGETS)
 
 # This line finds the boost lib and headers. 
 set(Boost_NO_BOOST_CMAKE ON) #  Don't do a find_package in config mode before searching for a regular boost install.
-set(BOOST_ROOT ${CONAN_BOOST_ROOT})
 
 find_package(Threads)
 find_package(Tcmalloc)

Jenkinsfile

@@ -1,108 +0,0 @@
-void checkout_hifive_vp() {
-    checkout([
-        $class: 'GitSCM',
-        branches: [[name: '*/develop']],
-        browser: [$class: 'GogsGit', repoUrl: ''],
-        doGenerateSubmoduleConfigurations: false,
-        extensions: [
-            [
-                $class: 'SubmoduleOption',
-                disableSubmodules: false,
-                parentCredentials: false,
-                recursiveSubmodules: true,
-                reference: '',
-                trackingSubmodules: true
-            ],
-            [$class: 'CleanBeforeCheckout'],
-            [$class: 'WipeWorkspace'],
-            [$class: 'RelativeTargetDirectory', relativeTargetDir: 'HIFIVE1-VP']
-        ],
-        submoduleCfg: [],
-        userRemoteConfigs: [[
-            credentialsId: 'gitea-jenkins',
-            url: 'https://git.minres.com/VP/HIFIVE1-VP.git'
-        ]]
-    ])
-}
-
-void build_hifive_vp() {
-    try {
-        sh("conan profile new default --detect --force")
-		sh("conan profile update settings.compiler.libcxx=libstdc++11 default")
-		sh("conan remote add minres https://api.bintray.com/conan/minres/conan-repo --force")
-		sh("conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan --force")
-        }
-    catch (exc) {
-            echo 'Conan configured'
-        }
-    sh("rm -rf HIFIVE1-VP/build-ubuntu")
-    sh("mkdir -p HIFIVE1-VP/build-ubuntu")
-    sh("cd HIFIVE1-VP && git submodule update --recursive")
-    sh("cd HIFIVE1-VP/build-ubuntu && MAKE_FLAGS='-j4' cmake .. && make -j4")
-	fingerprint 'HIFIVE1-VP/build-ubuntu/bin/riscv.vp'
-}
-
-void build_hifive_without_scv() {
-    try {
-        sh("conan profile new default --detect --force")
-		sh("conan profile update settings.compiler.libcxx=libstdc++11 default")
-		sh("conan remote add minres https://api.bintray.com/conan/minres/conan-repo --force")
-		sh("conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan --force")
-        }
-    catch (exc) {
-            echo 'Conan configured'
-        }
-    sh("rm -rf HIFIVE1-VP/build-ubuntu")
-    sh("mkdir -p HIFIVE1-VP/build-ubuntu")
-    sh("cd HIFIVE1-VP && git submodule update --recursive")
-	sh("cd  HIFIVE1-VP/build-ubuntu && MAKE_FLAGS='-j4' cmake .. -DENABLE_SCV=FALSE && make -j4")
-	fingerprint 'HIFIVE1-VP/build-ubuntu/bin/riscv.vp'
-}
-
-
-pipeline {
-    agent none
-
-	options { 
-		// using the Timestamper plugin we can add timestamps to the console log
-		timestamps() 
-		skipStagesAfterUnstable() 
-	}
-
-    stages {
-        stage('HiFive-VP pipeline') {
-   		parallel {
-			stage('ubuntu18'){
-				agent {docker { image 'ubuntu-18.04' } }
-				stages {
-					stage('Checkout on Ubuntu18.04') { steps {	checkout_hifive_vp() }}
-					stage('Build') { steps {	build_hifive_vp() }	}
-				}
-			}
-			stage('ubuntu20'){
-				agent {docker { image 'ubuntu-20.04' } }
-				stages {
-					stage('Checkout on Ubuntu20.04') { steps {	checkout_hifive_vp() }}
-					stage('Build') { steps {	build_hifive_vp() }	}
-				}
-			}
-			stage('Fedora28'){
-				agent {docker { image 'fedora28' } }
-				stages {
-					stage('Checkout on Fedora') { steps {checkout_hifive_vp()}}
-					stage('Build') { steps {build_hifive_vp()	}}
-				}
-			}
-			stage('No SCV'){
-				agent {docker { image 'ubuntu-18.04' } }
-				stages {
-					stage('Checkout on Ubuntu') { steps {checkout_hifive_vp()}}
-					stage('Build without SCV') { steps {build_hifive_without_scv()}
-					}
-				}
-			}
-
- 		}
-        }
-	}
-}

README.md

@@ -24,12 +24,21 @@ RISCV-VP uses libGIS (https://github.com/vsergeev/libGIS) as well as ELFIO (http
 * setup conan to use the minres repo:
 
 ```
-    conan profile new default --detect --force
-    conan profile update settings.compiler.libcxx=libstdc++11 default
     conan remote add minres https://api.bintray.com/conan/minres/conan-repo
     conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan
 ```
 
+* checkout source from git
+* start an out-of-source build:
+
+```
+    cd RISCV-VP
+    mkdir build
+    cd build
+    cmake ..
+    cmake --build .
+```
+
 * if you encounter issues when linking wrt. c++11 symbols you might have run into GCC ABI incompatibility introduced from GCC 5.0 onwards. You can fix this by adding '-s compiler.libcxx=libstdc++11' to the conan call or changing compiler.libcxx to
 
 ```
@@ -40,12 +49,12 @@ in $HOME/.conan/profiles/default
 
 **Detailed Setup steps**
 
-***prepare Ubuntu 18.04/20.04***
+***prepare Ubuntu 18.04***
 
 ```
-    sudo apt-get install -y git python3-pip build-essential cmake libloki-dev zlib1g-dev libncurses5-dev \	
+    sudo apt-get install -y git python-pip build-essential cmake libloki-dev zlib1g-dev libncurses5-dev \	
         libboost-dev libboost-program-options-dev libboost-system-dev libboost-thread-dev llvm-dev llvm-doc
-    pip3 install --user conan
+    pip install --user conan
 ```
 
 ***prepare Fedora 28***
@@ -61,11 +70,15 @@ in $HOME/.conan/profiles/default
 ***Build the ISS***
 
 ```
-    # checkout source from git: 
+    # configure conan
-    git clone --recursive https://git.minres.com/VP/HIFIVE1-VP.git
+    conan remote add minres https://api.bintray.com/conan/minres/conan-repo
-
+    conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan
-    # build ISS:
+    conan profile new default --detect
-    cd HIFIVE1-VP
+    # clone and build DBT-RISE-RISCV
+    git clone --recursive https://git.minres.com/VP/RISCV-VP.git
+    cd RISCV-VP/
+    git checkout develop
+    git submodule update --recursive
     mkdir build;cd build
     MAKE_FLAGS="-j4" cmake ..
     make -j4

conanfile.txt

@@ -1,23 +1,18 @@
 [requires]
     gsl_microsoft/20180102@bincrafters/stable
     fmt/6.1.2
-    seasocks/1.4.4
+    Seasocks/1.3.2@minres/stable
     SystemC/2.3.3@minres/stable
     SystemCVerification/2.0.1@minres/stable
     SystemC-CCI/1.0.0@minres/stable
     #fbrdb/0.1.0@minres/testing
     tcc/0.9.27@minres/stable
-    boost/1.71.0@conan/stable
-	zlib/1.2.11
 	
 [generators]
     cmake
 
 [options]
-    seasocks:shared=True
+    Seasocks:shared=True
-    boost:fPIC=True
-    boost:shared=False
-    boost:header_only=False
     fmt:header_only=True
     SystemC:stdcxx=11
     SystemC:shared=True

dbt-core

@@ -1 +1 @@
-Subproject commit d87dfff430e9ff3d394327bbf649a9f1bb05e396
+Subproject commit 715ffe5e74ee3e5ddfa214fba866d650d440f524

platform/src/CLIParser.cpp

@@ -68,7 +68,6 @@ CLIParser::CLIParser(int argc, char *argv[])
         // --help option
         if (vm_.count("help")) {
             std::cout << "DBT-RISE-RiscV simulator for RISC-V" << std::endl << desc << std::endl;
-            exit(0);
         }
         po::notify(vm_); // throws on error, so do after help in case there are any problems
         valid = true;
@@ -77,7 +76,7 @@ CLIParser::CLIParser(int argc, char *argv[])
         std::cerr << desc << std::endl;
     }
 
-    auto verbosity = !vm_["Verbose"].defaulted() ? vm_["Verbose"].as<unsigned>() : vm_.count("verbose") ? vm_["verbose"].as<unsigned>() : 3;
+    auto verbosity = !vm_["Verbose"].defaulted() ? vm_["Verbose"].as<unsigned>() : vm_["verbose"].as<unsigned>();
     auto colored_output = vm_["Verbose"].defaulted();
     auto dbg_level = vm_.count("debug-level")
                          ? vm_["debug-level"].as<scc::log>()
@@ -89,28 +88,24 @@ CLIParser::CLIParser(int argc, char *argv[])
         auto log_file_name   = vm_["log-file"].as<std::string>();
         scc::init_logging(scc::LogConfig()
         .logFileName(log_file_name)
-        .logLevel(dbg_level)
+        .logLevel(static_cast<scc::log>(dbg_level))
         .logFilterRegex(log_regex)
         .coloredOutput(colored_output)
         );
     } else {
         scc::init_logging(scc::LogConfig()
-        .logLevel(dbg_level)
+        .logLevel(static_cast<scc::log>(dbg_level))
         .logFilterRegex(log_regex)
         .coloredOutput(colored_output)
         );
     }
-    LOGGER(DEFAULT)::reporting_level()=static_cast<logging::log_level>(dbg_level);
-    LOGGER(DEFAULT)::print_time()=false;
-    LOGGER(DEFAULT)::print_severity()=false;
-    LOG_OUTPUT(DEFAULT)::ostream() = &std::cout;
 }
 
 void CLIParser::build() {
     // clang-format off
     desc.add_options()
             ("help,h", "Print help message")
-            ("verbose,v",      po::value<unsigned>()->implicit_value(4), "Sets logging verbosity")
+            ("verbose,v",      po::value<unsigned>()->implicit_value(3), "Sets logging verbosity")
             ("Verbose,V",      po::value<unsigned>()->default_value(logging::INFO), "Debug output level as with --verbose but print non-colored")
             ("debug-level,D",  po::value<scc::log>(), "Debug output level (textual) as with --verbose")
             ("log-file",       po::value<std::string>(), "Sets default log file.")
@@ -125,8 +120,6 @@ void CLIParser::build() {
             ("trace-default-on", "enables tracing for all unspecified modules")
             ("trace-file",     po::value<std::string>()->default_value("system"), "set th ename of the trace file")
             ("max_time,m",     po::value<std::string>(), "maximum time to run")
-            ("backend",        po::value<std::string>()->default_value("tcc"), "ISS engine to use")
-            ("heart-beat,b",   "Enable heartbeat printing")
             ("config-file,c",  po::value<std::string>()->default_value(""), "read configuration from file")
             ("dump-config,dc", po::value<std::string>()->default_value(""), "dump configuration to file file");
     // clang-format on

platform/src/CMakeLists.txt

@@ -31,7 +31,7 @@ set(LIB_SOURCES
 
 add_library(platform ${LIB_SOURCES})
 target_include_directories(platform PUBLIC ../incl)
-target_link_libraries(platform PUBLIC riscv_sc CONAN_PKG::seasocks external)
+target_link_libraries(platform PUBLIC riscv_sc CONAN_PKG::Seasocks external)
 set_target_properties(platform PROPERTIES
   VERSION ${PROJECT_VERSION}  # ${VERSION} was defined in the main CMakeLists.
   FRAMEWORK FALSE

platform/src/sc_main.cpp

@@ -36,7 +36,6 @@
 
 #include <scc/configurable_tracer.h>
 #include <scc/configurer.h>
-#include <scc/perf_estimator.h>
 #include <scc/report.h>
 #include <scc/scv_tr_db.h>
 #include <scc/tracer.h>
@@ -51,7 +50,6 @@
 #include <fstream>
 #include <sstream>
 
-using namespace sc_core;
 using namespace sysc;
 namespace po = boost::program_options;
 
@@ -70,8 +68,6 @@ int sc_main(int argc, char *argv[]) {
     // CLI argument parsing & logging setup
     ///////////////////////////////////////////////////////////////////////////
     CLIParser parser(argc, argv);
-    scc::stream_redirection cout_redir(std::cout, scc::log::INFO);
-    scc::stream_redirection cerr_redir(std::cerr, scc::log::ERROR);
     if (!parser.is_valid()) return ERROR_IN_COMMAND_LINE;
     ///////////////////////////////////////////////////////////////////////////
     // set up infrastructure
@@ -94,7 +90,6 @@ int sc_main(int argc, char *argv[]) {
     ///////////////////////////////////////////////////////////////////////////
     // instantiate top level
     ///////////////////////////////////////////////////////////////////////////
-    auto estimator = scc::make_unique<scc::perf_estimator>(parser.is_set("heart-beat") ? 10_us : SC_ZERO_TIME);
     auto i_system = scc::make_unique<sysc::system>("i_system");
     ///////////////////////////////////////////////////////////////////////////
     // add non-implemented 'enableTracing' properties
@@ -111,18 +106,17 @@ int sc_main(int argc, char *argv[]) {
     ///////////////////////////////////////////////////////////////////////////
     // overwrite config with command line settings
     ///////////////////////////////////////////////////////////////////////////
-    cfg.set_value("i_system.i_hifive1.i_fe310.i_core_complex.backend", parser.get<std::string>("backend"));
 	cfg.set_value("i_system.i_hifive1.i_fe310.i_core_complex.gdb_server_port", parser.get<unsigned short>("gdb-port"));
     cfg.set_value("i_system.i_hifive1.i_fe310.i_core_complex.dump_ir", parser.is_set("dump-ir"));
     if (parser.is_set("elf"))
         cfg.set_value("i_system.i_hifive1.i_fe310.i_core_complex.elf_file", parser.get<std::string>("elf"));
-    else if (parser.is_set("argv")){
+    else {
         auto args = parser.get<std::vector<std::string>>("argv");
         if(args.size())
             cfg.set_value("i_system.i_hifive1.i_fe310.i_core_complex.elf_file", args[0]);
     }
     if (parser.is_set("quantum"))
-        tlm::tlm_global_quantum::instance().set(sc_time(parser.get<unsigned>("quantum"), SC_NS));
+        tlm::tlm_global_quantum::instance().set(sc_core::sc_time(parser.get<unsigned>("quantum"), sc_core::SC_NS));
     if (parser.is_set("reset")) {
         auto str = parser.get<std::string>("reset");
         uint64_t start_address = str.find("0x") == 0 ? std::stoull(str.substr(2), nullptr, 16) : std::stoull(str, nullptr, 10);
@@ -143,22 +137,12 @@ int sc_main(int argc, char *argv[]) {
     ///////////////////////////////////////////////////////////////////////////
     try {
         if (parser.is_set("max_time")) {
-            sc_start(scc::parse_from_string(parser.get<std::string>("max_time")));
+            sc_core::sc_start(scc::parse_from_string(parser.get<std::string>("max_time")));
         } else
-            sc_start();
+            sc_core::sc_start();
-    } catch(sc_report& e) {
+        if (!sc_core::sc_end_of_simulation_invoked()) sc_core::sc_stop();
-        SCCERR() << "Caught sc_report exception during simulation: " << e.what() << ":" << e.get_msg();
+    } catch (sc_core::sc_report &rep) {
-    } catch(std::exception& e) {
+        sc_core::sc_report_handler::get_handler()(rep, sc_core::SC_DISPLAY | sc_core::SC_STOP);
-        SCCERR() << "Caught exception during simulation: " << e.what();
-    } catch(...) {
-        SCCERR() << "Caught unspecified exception during simulation";
     }
-    if(sc_is_running()) {
+    return 0;
-        SCCERR() << "Simulation timeout!"; // calls sc_stop
-    }
-    auto errcnt = sc_report_handler::get_count(SC_ERROR);
-    auto warncnt = sc_report_handler::get_count(SC_WARNING);
-    SCCINFO() << "Finished, there were " << errcnt << " error" << (errcnt == 1 ? "" : "s") << " and " << warncnt << " warning"
-              << (warncnt == 1 ? "" : "s");
-    return errcnt + warncnt;
 }

platform/src/sysc/sc_comm_singleton.cpp

@@ -62,7 +62,7 @@ inline void die() {
 
 sc_comm_singleton::sc_comm_singleton(sc_core::sc_module_name nm)
 : sc_core::sc_module(nm)
-, m_serv(new Server(std::make_shared<PrintfLogger>(Logger::Level::Warning)))
+, m_serv(new Server(std::make_shared<PrintfLogger>(Logger::Level::WARNING)))
 , needs_client(false)
 , client_started(false) {
     m_serv->addPageHandler(std::make_shared<DefaultPageHandler>(*this));

riscv

@@ -1 +1 @@
-Subproject commit 18976e2ce433db91d25c14d1a5c6b036f273b147
+Subproject commit edeff7add807ab0e524b5d05b16defe58be2a867

scc

@@ -1 +1 @@
-Subproject commit 529cb29a483e00bc2bfc1fba25dbbf595b077235
+Subproject commit 01458535fa10e3bd5794d50df82ce94f214bfbe1