From ad1804d23ef4c1d7aed735d8478b70e6a5d56250 Mon Sep 17 00:00:00 2001
From: eyck <eyck@minres.com>
Date: Thu, 9 Jan 2020 19:40:19 +0100
Subject: [PATCH] Updated to latest scc version

---
 CMakeLists.txt                   |  2 ++
 conanfile.txt                    |  5 ++---
 dbt-core                         |  2 +-
 platform/incl/sysc/top/hifive1.h |  6 +++---
 platform/src/CLIParser.cpp       | 21 +--------------------
 riscv                            |  2 +-
 scc                              |  2 +-
 7 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b67b0bb..7c0372f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 3.3)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_CURRENT_SOURCE_DIR}/scc/cmake)
 
+project(RISCV-VP LANGUAGES CXX)
+
 set(ENABLE_SCV TRUE CACHE BOOL "Enable use of SCV")
 set(ENABLE_SHARED TRUE CACHE BOOL "Build shared libraries")
 
diff --git a/conanfile.txt b/conanfile.txt
index 6cffc7e..61c2407 100644
--- a/conanfile.txt
+++ b/conanfile.txt
@@ -1,8 +1,7 @@
 [requires]
     gsl_microsoft/20180102@bincrafters/stable
-    spdlog/0.16.3@bincrafters/stable
-    #fmt/5.2.1@bincrafters/stable 
-    fmt/4.1.0@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
diff --git a/dbt-core b/dbt-core
index c1d65b8..c81fd4c 160000
--- a/dbt-core
+++ b/dbt-core
@@ -1 +1 @@
-Subproject commit c1d65b863b34d2ff9d459d3caa4e6972213f2026
+Subproject commit c81fd4c5d73722f5d37f594c02b99616b9fcd478
diff --git a/platform/incl/sysc/top/hifive1.h b/platform/incl/sysc/top/hifive1.h
index 030bb95..f63965b 100644
--- a/platform/incl/sysc/top/hifive1.h
+++ b/platform/incl/sysc/top/hifive1.h
@@ -30,8 +30,8 @@
  *
  *******************************************************************************/
 
-#ifndef _SIFIVE_HIFIVE1_H_
-#define _SIFIVE_HIFIVE1_H_
+#ifndef _SYSC_TOP_HIFIVE1_H_
+#define _SYSC_TOP_HIFIVE1_H_
 
 #include <sysc/top/terminal.h>
 #include <sysc/top/mcp_adc.h>
@@ -65,4 +65,4 @@ protected:
 
 }
 
-#endif /* _SYSC_SIFIVE_HIFIVE1_H_ */
+#endif /* _SYSC_TOP_HIFIVE1_H_ */
diff --git a/platform/src/CLIParser.cpp b/platform/src/CLIParser.cpp
index c388744..8ac6628 100644
--- a/platform/src/CLIParser.cpp
+++ b/platform/src/CLIParser.cpp
@@ -42,11 +42,6 @@ using namespace sc_core;
 CLIParser::CLIParser(int argc, char *argv[])
 : desc("Options")
 , valid(false) {
-    scc::init_logging();
-    LOGGER(DEFAULT)::reporting_level() = logging::WARNING;
-    LOGGER(connection)::reporting_level() = logging::WARNING;
-    LOGGER(SystemC)::reporting_level() = logging::WARNING;
-
     build();
     try {
         // Variant 1: no non-options
@@ -90,21 +85,7 @@ CLIParser::CLIParser(int argc, char *argv[])
                                               SC_FULL,   // logging::TRACE
                                               SC_DEBUG}; // logging::TRACE+1
         auto log_level = vm_["verbose"].as<int>();
-        auto l = logging::as_log_level(log_level > 6 ? 6 : log_level);
-        LOGGER(DEFAULT)::reporting_level() = l;
-        LOGGER(DEFAULT)::print_time() = false;
-        LOGGER(connection)::reporting_level() = l;
-        LOGGER(connection)::print_time() = false;
-        LOGGER(SystemC)::reporting_level() = l;
-        LOGGER(SystemC)::print_time() = false;
-        sc_report_handler::set_verbosity_level(verbosity[log_level]);
-    }
-    if (vm_.count("log-file")) {
-        // configure the connection logger
-        auto f = fopen(vm_["log-file"].as<std::string>().c_str(), "w");
-        LOG_OUTPUT(DEFAULT)::stream() = f;
-        LOG_OUTPUT(connection)::stream() = f;
-        LOG_OUTPUT(SystemC)::stream() = f;
+        scc::init_logging(logging::as_log_level(log_level > 6 ? 6 : log_level));
     }
 }
 
diff --git a/riscv b/riscv
index d037141..c39460e 160000
--- a/riscv
+++ b/riscv
@@ -1 +1 @@
-Subproject commit d037141d98951287215c4eee76a88e625433f331
+Subproject commit c39460ee34eb1c3705600c053dc54a6e5a586e60
diff --git a/scc b/scc
index 140a5a7..fbe11cf 160000
--- a/scc
+++ b/scc
@@ -1 +1 @@
-Subproject commit 140a5a7067d9051cd15140f681428203843ced15
+Subproject commit fbe11cf926d0078836d250910617b139e0581d5c