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

Fixed compile issues with upcoming SystemC 2.3.2

This commit is contained in:
Eyck Jentzsch 2017-10-06 06:47:07 +02:00
parent 9d24ad728f
commit d01a0c3251
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
riscv.sc/gen_input/fe310.rdl
View File

@ -14,6 +14,6 @@ addrmap e300_plat_t {
prci_regs prci @0x10008000; prci_regs prci @0x10008000;
gpio_regs gpio @0x10012000; gpio_regs gpio @0x10012000;
uart_regs uart0 @0x10013000; uart_regs uart0 @0x10013000;
uart_regs uart1 @0x10023000;
spi_regs spi @0x10014000; spi_regs spi @0x10014000;
uart_regs uart1 @0x10023000;
} e300_plat; } e300_plat;

5
riscv.sc/src/sc_main.cpp
View File

@ -23,7 +23,6 @@
#include <boost/program_options.hpp> #include <boost/program_options.hpp>
#include <iss/jit/MCJIThelper.h> #include <iss/jit/MCJIThelper.h>
#include <iss/log_categories.h> #include <iss/log_categories.h>
#include <sr_report/sr_report.h>
#include <sstream> #include <sstream>
#include <sysc/SiFive/platform.h> #include <sysc/SiFive/platform.h>
#include "scc/configurer.h" #include "scc/configurer.h"
@ -137,7 +136,7 @@ int sc_main(int argc, char *argv[]) {
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// run simulation // run simulation
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
sc_start(); sc_core::sc_start();
if (!sc_end_of_simulation_invoked()) sc_stop(); if (!sc_core::sc_end_of_simulation_invoked()) sc_core::sc_stop();
return 0; return 0;
} }

2
sc-components

@ -1 +1 @@
Subproject commit 26297107a0f1a36b320ff26e41cd42e808841321 Subproject commit 7b45d22eb3431f09c318938fc11f83088318a9d3