SCC refactoring
This commit is contained in:
parent
b7c0fb2b1c
commit
c941890901
|
@ -52,7 +52,7 @@ endif()
|
||||||
add_library(riscv SHARED ${LIB_SOURCES})
|
add_library(riscv SHARED ${LIB_SOURCES})
|
||||||
target_compile_options(riscv PRIVATE -Wno-shift-count-overflow)
|
target_compile_options(riscv PRIVATE -Wno-shift-count-overflow)
|
||||||
target_include_directories(riscv PUBLIC incl ../external/elfio)
|
target_include_directories(riscv PUBLIC incl ../external/elfio)
|
||||||
target_link_libraries(riscv PUBLIC softfloat scc-util)
|
target_link_libraries(riscv PUBLIC softfloat scc-util jsoncpp)
|
||||||
target_link_libraries(riscv PUBLIC -Wl,--whole-archive dbt-core -Wl,--no-whole-archive)
|
target_link_libraries(riscv PUBLIC -Wl,--whole-archive dbt-core -Wl,--no-whole-archive)
|
||||||
set_target_properties(riscv PROPERTIES
|
set_target_properties(riscv PROPERTIES
|
||||||
VERSION ${PROJECT_VERSION}
|
VERSION ${PROJECT_VERSION}
|
||||||
|
|
|
@ -33,10 +33,10 @@
|
||||||
#ifndef _SYSC_SIFIVE_FE310_H_
|
#ifndef _SYSC_SIFIVE_FE310_H_
|
||||||
#define _SYSC_SIFIVE_FE310_H_
|
#define _SYSC_SIFIVE_FE310_H_
|
||||||
|
|
||||||
#include "scc/initiator_mixin.h"
|
#include "tlm/scc/initiator_mixin.h"
|
||||||
#include "scc/traceable.h"
|
#include "scc/traceable.h"
|
||||||
#include "scc/utilities.h"
|
#include "scc/utilities.h"
|
||||||
#include "scv4tlm/tlm_rec_initiator_socket.h"
|
#include "tlm/scc/scv4tlm/tlm_rec_initiator_socket.h"
|
||||||
#include <cci_configuration>
|
#include <cci_configuration>
|
||||||
#include <tlm>
|
#include <tlm>
|
||||||
#include <tlm_core/tlm_1/tlm_req_rsp/tlm_1_interfaces/tlm_core_ifs.h>
|
#include <tlm_core/tlm_1/tlm_req_rsp/tlm_1_interfaces/tlm_core_ifs.h>
|
||||||
|
@ -75,7 +75,7 @@ class core_wrapper;
|
||||||
|
|
||||||
class core_complex : public sc_core::sc_module, public scc::traceable {
|
class core_complex : public sc_core::sc_module, public scc::traceable {
|
||||||
public:
|
public:
|
||||||
scc::initiator_mixin<scv4tlm::tlm_rec_initiator_socket<32>> initiator{"intor"};
|
tlm::scc::initiator_mixin<scv4tlm::tlm_rec_initiator_socket<32>> initiator{"intor"};
|
||||||
|
|
||||||
sc_core::sc_in<sc_core::sc_time> clk_i{"clk_i"};
|
sc_core::sc_in<sc_core::sc_time> clk_i{"clk_i"};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue