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
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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_ */

21
platform/src/CLIParser.cpp
View File

@ -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));
}
}