VP/HIFIVE1-VP
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated to latest scc version

Browse Source
This commit is contained in:
Eyck Jentzsch 2020-01-09 19:40:19 +01:00
parent c199db7bfd
commit ad1804d23e
7 changed files with 11 additions and 29 deletions

2
CMakeLists.txt

@ -1,6 +1,8 @@
cmake_minimum_required(VERSION 3.3) cmake_minimum_required(VERSION 3.3)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_CURRENT_SOURCE_DIR}/scc/cmake) 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_SCV TRUE CACHE BOOL "Enable use of SCV")
set(ENABLE_SHARED TRUE CACHE BOOL "Build shared libraries") set(ENABLE_SHARED TRUE CACHE BOOL "Build shared libraries")

5
conanfile.txt

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

2
dbt-core

@ -1 +1 @@
Subproject commit c1d65b863b34d2ff9d459d3caa4e6972213f2026 Subproject commit c81fd4c5d73722f5d37f594c02b99616b9fcd478

6
platform/incl/sysc/top/hifive1.h

@ -30,8 +30,8 @@
* *
*******************************************************************************/ *******************************************************************************/
#ifndef _SIFIVE_HIFIVE1_H_ #ifndef _SYSC_TOP_HIFIVE1_H_
#define _SIFIVE_HIFIVE1_H_ #define _SYSC_TOP_HIFIVE1_H_
#include <sysc/top/terminal.h> #include <sysc/top/terminal.h>
#include <sysc/top/mcp_adc.h> #include <sysc/top/mcp_adc.h>
@ -65,4 +65,4 @@ protected:
} }
#endif /* _SYSC_SIFIVE_HIFIVE1_H_ */ #endif /* _SYSC_TOP_HIFIVE1_H_ */

21
platform/src/CLIParser.cpp

@ -42,11 +42,6 @@ using namespace sc_core;
CLIParser::CLIParser(int argc, char *argv[]) CLIParser::CLIParser(int argc, char *argv[])
: desc("Options") : desc("Options")
, valid(false) { , valid(false) {
scc::init_logging();
LOGGER(DEFAULT)::reporting_level() = logging::WARNING;
LOGGER(connection)::reporting_level() = logging::WARNING;
LOGGER(SystemC)::reporting_level() = logging::WARNING;
build(); build();
try { try {
// Variant 1: no non-options // Variant 1: no non-options
@ -90,21 +85,7 @@ CLIParser::CLIParser(int argc, char *argv[])
SC_FULL, // logging::TRACE SC_FULL, // logging::TRACE
SC_DEBUG}; // logging::TRACE+1 SC_DEBUG}; // logging::TRACE+1
auto log_level = vm_["verbose"].as<int>(); auto log_level = vm_["verbose"].as<int>();
auto l = logging::as_log_level(log_level > 6 ? 6 : log_level); scc::init_logging(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;
} }
} }

2
riscv

@ -1 +1 @@
Subproject commit d037141d98951287215c4eee76a88e625433f331 Subproject commit c39460ee34eb1c3705600c053dc54a6e5a586e60

2
scc

@ -1 +1 @@
Subproject commit 140a5a7067d9051cd15140f681428203843ced15 Subproject commit fbe11cf926d0078836d250910617b139e0581d5c