Merge branch 'develop' of https://git.minres.com/VP/RISCV-VP.git into

develop

Conflicts:
	conanfile.txt
	dbt-core
	platform/src/CLIParser.cpp
	riscv
	scc

.project

@@ -23,6 +23,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.eclipse.linuxtools.tmf.project.nature</nature>
 	</natures>
 </projectDescription>

conanfile.txt

@@ -1,7 +1,6 @@
 [requires]
     gsl_microsoft/20180102@bincrafters/stable
     fmt/5.2.1@bincrafters/stable 
-    #fmt/4.1.0@bincrafters/stable 
     Seasocks/1.3.2@minres/stable
     SystemC/2.3.3@minres/stable
     SystemCVerification/2.0.1@minres/stable

etc/riscv-sim Release dhrystone.launch

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.cdt.launch.applicationLaunchType">
+    <booleanAttribute key="de.toem.impulse.launchactivateLaunch" value="false"/>
+    <booleanAttribute key="de.toem.impulse.launchactivateTermination" value="false"/>
+    <intAttribute key="de.toem.impulse.launchdelayLaunch" value="0"/>
+    <intAttribute key="de.toem.impulse.launchlaunch" value="2"/>
+    <intAttribute key="de.toem.impulse.launchmode" value="3"/>
+    <stringAttribute key="de.toem.impulse.launchport" value=""/>
+    <booleanAttribute key="de.toem.impulse.launchrestart" value="true"/>
+    <intAttribute key="de.toem.impulse.launchterminate" value="1"/>
+    <booleanAttribute key="org.eclipse.cdt.dsf.gdb.AUTO_SOLIB" value="true"/>
+    <listAttribute key="org.eclipse.cdt.dsf.gdb.AUTO_SOLIB_LIST"/>
+    <stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="gdb"/>
+    <booleanAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_ON_FORK" value="false"/>
+    <stringAttribute key="org.eclipse.cdt.dsf.gdb.GDB_INIT" value=".gdbinit"/>
+    <booleanAttribute key="org.eclipse.cdt.dsf.gdb.NON_STOP" value="false"/>
+    <booleanAttribute key="org.eclipse.cdt.dsf.gdb.REVERSE" value="false"/>
+    <stringAttribute key="org.eclipse.cdt.dsf.gdb.REVERSE_MODE" value="UseSoftTrace"/>
+    <listAttribute key="org.eclipse.cdt.dsf.gdb.SOLIB_PATH"/>
+    <stringAttribute key="org.eclipse.cdt.dsf.gdb.TRACEPOINT_MODE" value="TP_NORMAL_ONLY"/>
+    <booleanAttribute key="org.eclipse.cdt.dsf.gdb.UPDATE_THREADLIST_ON_SUSPEND" value="false"/>
+    <booleanAttribute key="org.eclipse.cdt.dsf.gdb.internal.ui.launching.LocalApplicationCDebuggerTab.DEFAULTS_SET" value="true"/>
+    <intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="1"/>
+    <stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
+    <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_ID" value="gdb"/>
+    <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="run"/>
+    <booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
+    <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
+    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_ARGUMENTS" value="-v4&#10;${project_loc:dhrystone}/dhrystone"/>
+    <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/Release/riscv/bin/riscv-sim"/>
+    <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="RISCV-VP"/>
+    <booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="false"/>
+    <stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="cdt.managedbuild.config.gnu.exe.release.1745230171"/>
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+        <listEntry value="/RISCV-VP"/>
+    </listAttribute>
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+        <listEntry value="4"/>
+    </listAttribute>
+    <stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;memoryBlockExpressionList context=&quot;reserved-for-future-use&quot;/&gt;&#10;"/>
+    <stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
+</launchConfiguration>

platform/src/CLIParser.cpp

@@ -75,17 +75,28 @@ CLIParser::CLIParser(int argc, char *argv[])
         std::cerr << "ERROR: " << e.what() << std::endl << std::endl;
         std::cerr << desc << std::endl;
     }
-    if (vm_.count("verbose")) {                          // NONE, FATAL, ERROR, WARNING, INFO, DEBUG, TRACE
+    auto log_level = vm_["verbose"].as<int>();
-        const std::array<int, 8> verbosity = {SC_NONE,   // Logging::NONE
+    auto verbosity       = !vm_["Verbose"].defaulted()?vm_["Verbose"].as<unsigned>():vm_["verbose"].as<unsigned>();
-                                              SC_LOW,    // Logging::FATAL
+    auto colored_output  = vm_["Verbose"].defaulted();
-                                              SC_LOW,    // Logging::ERROR
+    auto dbg_level       = std::min<unsigned>(logging::DBGTRACE, verbosity);
-                                              SC_LOW,    // Logging::WARNING
+
-                                              SC_MEDIUM, // Logging::INFO
+    auto l = logging::as_log_level(log_level > 6 ? 6 : log_level);
-                                              SC_HIGH,   // logging::DEBUG
+    auto log_regex       = vm_["log-filter"].as<std::string>();
-                                              SC_FULL,   // logging::TRACE
+
-                                              SC_DEBUG}; // logging::TRACE+1
+    if (vm_.count("log-file")) {
-        auto log_level = vm_["verbose"].as<int>();
+        auto log_file_name   = vm_["log-file"].as<std::string>();
-        scc::init_logging(logging::as_log_level(log_level > 6 ? 6 : log_level));
+        scc::init_logging(scc::LogConfig()
+        .logFileName(log_file_name)
+        .logLevel(static_cast<logging::log_level>(dbg_level))
+        .logFilterRegex(log_regex)
+        .coloredOutput(colored_output)
+        );
+    } else {
+        scc::init_logging(scc::LogConfig()
+        .logLevel(static_cast<logging::log_level>(dbg_level))
+        .logFilterRegex(log_regex)
+        .coloredOutput(colored_output)
+        );
     }
 }
 
@@ -94,7 +105,9 @@ void CLIParser::build() {
     desc.add_options()
             ("help,h", "Print help message")
             ("verbose,v", po::value<int>()->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")
             ("log-file", po::value<std::string>(), "Sets default log file.")
+            ("log-filter", po::value<std::string>()->default_value(""), "log filter regular expression name")
             ("disass,d", po::value<std::string>()->implicit_value(""), "Enables disassembly")
             ("elf,l", po::value<std::string>(), "ELF file to load")
             ("gdb-port,g", po::value<unsigned short>()->default_value(0), "enable gdb server and specify port to use")

riscv

@@ -1 +1 @@
-Subproject commit c39460ee34eb1c3705600c053dc54a6e5a586e60
+Subproject commit f357e563f29f5994b4eab783155ccead264e52eb