colin
/
risc-v-tlm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added command line arguments

This commit is contained in:
mariusmonton 2019-02-12 14:08:40 +01:00
parent 1d4c3ec553
commit e31eae3f9e
2 changed files with 53 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Log.cpp
View File

@ -34,6 +34,7 @@ std::ofstream& Log::SC_log(enum LogLevel level) {
} }
void Log::setLogLevel(enum LogLevel newLevel) { void Log::setLogLevel(enum LogLevel newLevel) {
std::cout << "LogLevel set to " << newLevel << std::endl;
currentLogLevel = newLevel; currentLogLevel = newLevel;
} }

61
src/Simulator.cpp
View File

@ -13,6 +13,7 @@
#include "tlm_utils/simple_target_socket.h" #include "tlm_utils/simple_target_socket.h"
#include <signal.h> #include <signal.h>
#include <unistd.h>
#include "CPU.h" #include "CPU.h"
#include "Memory.h" #include "Memory.h"
@ -28,7 +29,7 @@ string filename;
/** /**
* @class Simulator * @class Simulator
* This class instiates all necessary modules, connects its ports and starts * This class instantiates all necessary modules, connects its ports and starts
* the simulation. * the simulation.
* *
* @brief Top simulation entity * @brief Top simulation entity
@ -40,14 +41,13 @@ SC_MODULE(Simulator)
BusCtrl* Bus; BusCtrl* Bus;
Trace *trace; Trace *trace;
Timer *timer; Timer *timer;
Log *log; // Log *log;
uint32_t start_PC; uint32_t start_PC;
SC_CTOR(Simulator) SC_CTOR(Simulator)
{ {
log = Log::getInstance(); // log = Log::getInstance();
log->setLogLevel(Log::INFO);
MainMemory = new Memory("Main_Memory", filename); MainMemory = new Memory("Main_Memory", filename);
start_PC = MainMemory->getPCfromHEX(); start_PC = MainMemory->getPCfromHEX();
@ -88,20 +88,63 @@ void intHandler(int dummy) {
exit(-1); exit(-1);
} }
void process_arguments(int argc, char* argv[]) {
int c;
int debug_level;
Log *log;
log = Log::getInstance();
log->setLogLevel(Log::ERROR);
while ((c = getopt (argc, argv, "D:f:?")) != -1) {
switch (c) {
case 'D':
debug_level = atoi(optarg);
switch (debug_level) {
case 3:
log->setLogLevel(Log::INFO);
break;
case 2:
log->setLogLevel(Log::WARNING);
break;
case 1:
log->setLogLevel(Log::DEBUG);
break;
case 0:
log->setLogLevel(Log::ERROR);
break;
default:
log->setLogLevel(Log::INFO);
break;
}
break;
case 'f' :
filename = std::string(optarg);
break;
case '?' :
std::cout << "Call ./RISCV_TLM -D <debuglevel> (0..4) filename.hex" << std::endl;
break;
}
}
if (filename.empty()) {
filename = std::string(argv[optind]);
}
}
int sc_main(int argc, char* argv[]) int sc_main(int argc, char* argv[])
{ {
/* Capture Ctrl+C and finish the simulation */ /* Capture Ctrl+C and finish the simulation */
signal(SIGINT, intHandler); signal(SIGINT, intHandler);
/* SystemC time resolution set to 1 ns*/ /* SystemC time resolution set to 1 ns*/
sc_set_time_resolution(1, SC_NS); sc_set_time_resolution(1, SC_NS);
if (argv[1] == nullptr) { /* Parse and process program arguments. -f is mandatory */
cerr << "Filename needed for hex memory" << endl; process_arguments(argc, argv);
return -1;
}
filename = argv[1];
top = new Simulator("top"); top = new Simulator("top");
sc_start(); sc_start();