Adapted namespace changes in sc-components
This commit is contained in:
@ -17,13 +17,13 @@
|
||||
#ifndef _AON_H_
|
||||
#define _AON_H_
|
||||
|
||||
#include <sysc/tlm_target.h>
|
||||
#include "scc/tlm_target.h"
|
||||
|
||||
namespace sysc {
|
||||
|
||||
class aon_regs;
|
||||
|
||||
class aon : public sc_core::sc_module, public tlm_target<> {
|
||||
class aon : public sc_core::sc_module, public scc::tlm_target<> {
|
||||
public:
|
||||
SC_HAS_PROCESS(aon);
|
||||
sc_core::sc_in<sc_core::sc_time> clk_i;
|
||||
|
@ -17,7 +17,7 @@
|
||||
#ifndef _CLINT_H_
|
||||
#define _CLINT_H_
|
||||
|
||||
#include <sysc/tlm_target.h>
|
||||
#include "scc/tlm_target.h"
|
||||
|
||||
namespace iss {
|
||||
namespace arch {
|
||||
@ -32,7 +32,7 @@ namespace SiFive {
|
||||
class core_complex;
|
||||
}
|
||||
|
||||
class clint : public sc_core::sc_module, public tlm_target<> {
|
||||
class clint : public sc_core::sc_module, public scc::tlm_target<> {
|
||||
public:
|
||||
SC_HAS_PROCESS(clint);
|
||||
sc_core::sc_in<sc_core::sc_time> clk_i;
|
||||
|
@ -37,13 +37,13 @@
|
||||
#ifndef _SYSC_SIFIVE_FE310_H_
|
||||
#define _SYSC_SIFIVE_FE310_H_
|
||||
|
||||
#include <sysc/ext_attribute.h>
|
||||
#include <sysc/initiator_mixin.h>
|
||||
#include <sysc/traceable.h>
|
||||
#include <sysc/utilities.h>
|
||||
#include <tlm>
|
||||
#include <tlm_utils/tlm_quantumkeeper.h>
|
||||
#include <util/range_lut.h>
|
||||
#include "scc/ext_attribute.h"
|
||||
#include "scc/initiator_mixin.h"
|
||||
#include "scc/traceable.h"
|
||||
#include "scc/utilities.h"
|
||||
|
||||
namespace iss {
|
||||
class vm_if;
|
||||
@ -67,25 +67,25 @@ public:
|
||||
namespace SiFive {
|
||||
class core_wrapper;
|
||||
|
||||
class core_complex : public sc_core::sc_module, public sysc::traceable {
|
||||
class core_complex : public sc_core::sc_module, public scc::traceable {
|
||||
public:
|
||||
SC_HAS_PROCESS(core_complex);
|
||||
|
||||
sysc::initiator_mixin<tlm::tlm_initiator_socket<32>> initiator;
|
||||
scc::initiator_mixin<tlm::tlm_initiator_socket<32>> initiator;
|
||||
|
||||
sc_core::sc_in<sc_core::sc_time> clk_i;
|
||||
|
||||
sc_core::sc_in<bool> rst_i;
|
||||
|
||||
sysc::ext_attribute<std::string> elf_file;
|
||||
scc::ext_attribute<std::string> elf_file;
|
||||
|
||||
sysc::ext_attribute<bool> enable_disass;
|
||||
scc::ext_attribute<bool> enable_disass;
|
||||
|
||||
sysc::ext_attribute<uint64_t> reset_address;
|
||||
scc::ext_attribute<uint64_t> reset_address;
|
||||
|
||||
sysc::ext_attribute<unsigned short> gdb_server_port;
|
||||
scc::ext_attribute<unsigned short> gdb_server_port;
|
||||
|
||||
sysc::ext_attribute<bool> dump_ir;
|
||||
scc::ext_attribute<bool> dump_ir;
|
||||
|
||||
core_complex(sc_core::sc_module_name name);
|
||||
|
||||
|
@ -36,14 +36,14 @@
|
||||
#ifndef _AON_REGS_H_
|
||||
#define _AON_REGS_H_
|
||||
|
||||
#include <sysc/register.h>
|
||||
#include <sysc/tlm_target.h>
|
||||
#include <sysc/utilities.h>
|
||||
#include <util/bit_field.h>
|
||||
#include "scc/register.h"
|
||||
#include "scc/tlm_target.h"
|
||||
#include "scc/utilities.h"
|
||||
|
||||
namespace sysc {
|
||||
|
||||
class aon_regs : public sc_core::sc_module, public sysc::resetable {
|
||||
class aon_regs : public sc_core::sc_module, public scc::resetable {
|
||||
public:
|
||||
// storage declarations
|
||||
uint32_t r_wdogcfg;
|
||||
@ -97,29 +97,29 @@ public:
|
||||
uint32_t r_pmukey;
|
||||
|
||||
// register declarations
|
||||
sysc::sc_register<uint32_t> wdogcfg;
|
||||
sysc::sc_register<uint32_t> wdogcount;
|
||||
sysc::sc_register<uint32_t> wdogs;
|
||||
sysc::sc_register<uint32_t> wdogfeed;
|
||||
sysc::sc_register<uint32_t> wdogkey;
|
||||
sysc::sc_register<uint32_t> wdogcmp;
|
||||
sysc::sc_register<uint32_t> rtccfg;
|
||||
sysc::sc_register<uint32_t> rtclo;
|
||||
sysc::sc_register<uint32_t> rtchi;
|
||||
sysc::sc_register<uint32_t> rtcs;
|
||||
sysc::sc_register<uint32_t> rtccmp;
|
||||
sysc::sc_register<uint32_t> lfrosccfg;
|
||||
sysc::sc_register_indexed<uint32_t, 32> backup;
|
||||
sysc::sc_register_indexed<pmuwakeupi_t, 8> pmuwakeupi;
|
||||
sysc::sc_register_indexed<pmusleepi_t, 8> pmusleepi;
|
||||
sysc::sc_register<uint32_t> pmuie;
|
||||
sysc::sc_register<uint32_t> pmucause;
|
||||
sysc::sc_register<uint32_t> pmusleep;
|
||||
sysc::sc_register<uint32_t> pmukey;
|
||||
scc::sc_register<uint32_t> wdogcfg;
|
||||
scc::sc_register<uint32_t> wdogcount;
|
||||
scc::sc_register<uint32_t> wdogs;
|
||||
scc::sc_register<uint32_t> wdogfeed;
|
||||
scc::sc_register<uint32_t> wdogkey;
|
||||
scc::sc_register<uint32_t> wdogcmp;
|
||||
scc::sc_register<uint32_t> rtccfg;
|
||||
scc::sc_register<uint32_t> rtclo;
|
||||
scc::sc_register<uint32_t> rtchi;
|
||||
scc::sc_register<uint32_t> rtcs;
|
||||
scc::sc_register<uint32_t> rtccmp;
|
||||
scc::sc_register<uint32_t> lfrosccfg;
|
||||
scc::sc_register_indexed<uint32_t, 32> backup;
|
||||
scc::sc_register_indexed<pmuwakeupi_t, 8> pmuwakeupi;
|
||||
scc::sc_register_indexed<pmusleepi_t, 8> pmusleepi;
|
||||
scc::sc_register<uint32_t> pmuie;
|
||||
scc::sc_register<uint32_t> pmucause;
|
||||
scc::sc_register<uint32_t> pmusleep;
|
||||
scc::sc_register<uint32_t> pmukey;
|
||||
|
||||
aon_regs(sc_core::sc_module_name nm);
|
||||
|
||||
template <unsigned BUSWIDTH = 32> void registerResources(sysc::tlm_target<BUSWIDTH> &target);
|
||||
template <unsigned BUSWIDTH = 32> void registerResources(scc::tlm_target<BUSWIDTH> &target);
|
||||
};
|
||||
}
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
@ -148,7 +148,7 @@ inline sysc::aon_regs::aon_regs(sc_core::sc_module_name nm)
|
||||
, NAMED(pmusleep, r_pmusleep, 0, *this)
|
||||
, NAMED(pmukey, r_pmukey, 0, *this) {}
|
||||
|
||||
template <unsigned BUSWIDTH> inline void sysc::aon_regs::registerResources(sysc::tlm_target<BUSWIDTH> &target) {
|
||||
template <unsigned BUSWIDTH> inline void sysc::aon_regs::registerResources(scc::tlm_target<BUSWIDTH> &target) {
|
||||
target.addResource(wdogcfg, 0x0UL);
|
||||
target.addResource(wdogcount, 0x8UL);
|
||||
target.addResource(wdogs, 0x10UL);
|
||||
|
@ -36,14 +36,14 @@
|
||||
#ifndef _CLINT_REGS_H_
|
||||
#define _CLINT_REGS_H_
|
||||
|
||||
#include <sysc/register.h>
|
||||
#include <sysc/tlm_target.h>
|
||||
#include <sysc/utilities.h>
|
||||
#include <util/bit_field.h>
|
||||
#include "scc/register.h"
|
||||
#include "scc/tlm_target.h"
|
||||
#include "scc/utilities.h"
|
||||
|
||||
namespace sysc {
|
||||
|
||||
class clint_regs : public sc_core::sc_module, public sysc::resetable {
|
||||
class clint_regs : public sc_core::sc_module, public scc::resetable {
|
||||
public:
|
||||
// storage declarations
|
||||
BEGIN_BF_DECL(msip_t, uint32_t);
|
||||
@ -55,13 +55,13 @@ public:
|
||||
uint64_t r_mtime;
|
||||
|
||||
// register declarations
|
||||
sysc::sc_register<msip_t> msip;
|
||||
sysc::sc_register<uint64_t> mtimecmp;
|
||||
sysc::sc_register<uint64_t> mtime;
|
||||
scc::sc_register<msip_t> msip;
|
||||
scc::sc_register<uint64_t> mtimecmp;
|
||||
scc::sc_register<uint64_t> mtime;
|
||||
|
||||
clint_regs(sc_core::sc_module_name nm);
|
||||
|
||||
template <unsigned BUSWIDTH = 32> void registerResources(sysc::tlm_target<BUSWIDTH> &target);
|
||||
template <unsigned BUSWIDTH = 32> void registerResources(scc::tlm_target<BUSWIDTH> &target);
|
||||
};
|
||||
}
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
@ -74,7 +74,7 @@ inline sysc::clint_regs::clint_regs(sc_core::sc_module_name nm)
|
||||
, NAMED(mtimecmp, r_mtimecmp, 0, *this)
|
||||
, NAMED(mtime, r_mtime, 0, *this) {}
|
||||
|
||||
template <unsigned BUSWIDTH> inline void sysc::clint_regs::registerResources(sysc::tlm_target<BUSWIDTH> &target) {
|
||||
template <unsigned BUSWIDTH> inline void sysc::clint_regs::registerResources(scc::tlm_target<BUSWIDTH> &target) {
|
||||
target.addResource(msip, 0x0UL);
|
||||
target.addResource(mtimecmp, 0x4000UL);
|
||||
target.addResource(mtime, 0xbff8UL);
|
||||
|
@ -2,7 +2,7 @@
|
||||
#define _E300_PLAT_MAP_H_
|
||||
// need double braces, see
|
||||
// https://stackoverflow.com/questions/6893700/how-to-construct-stdarray-object-with-initializer-list#6894191
|
||||
const std::array<sysc::target_memory_map_entry<32>, 8> e300_plat_map = {{
|
||||
const std::array<scc::target_memory_map_entry<32>, 8> e300_plat_map = {{
|
||||
{&i_clint, 0x2000000, 0xc000},
|
||||
{&i_plic, 0xc000000, 0x200008},
|
||||
{&i_aon, 0x10000000, 0x150},
|
||||
|
@ -36,14 +36,14 @@
|
||||
#ifndef _GPIO_REGS_H_
|
||||
#define _GPIO_REGS_H_
|
||||
|
||||
#include <sysc/register.h>
|
||||
#include <sysc/tlm_target.h>
|
||||
#include <sysc/utilities.h>
|
||||
#include <util/bit_field.h>
|
||||
#include "scc/register.h"
|
||||
#include "scc/tlm_target.h"
|
||||
#include "scc/utilities.h"
|
||||
|
||||
namespace sysc {
|
||||
|
||||
class gpio_regs : public sc_core::sc_module, public sysc::resetable {
|
||||
class gpio_regs : public sc_core::sc_module, public scc::resetable {
|
||||
public:
|
||||
// storage declarations
|
||||
uint32_t r_value;
|
||||
@ -81,27 +81,27 @@ public:
|
||||
uint32_t r_out_xor;
|
||||
|
||||
// register declarations
|
||||
sysc::sc_register<uint32_t> value;
|
||||
sysc::sc_register<uint32_t> input_en;
|
||||
sysc::sc_register<uint32_t> output_en;
|
||||
sysc::sc_register<uint32_t> port;
|
||||
sysc::sc_register<uint32_t> pue;
|
||||
sysc::sc_register<uint32_t> ds;
|
||||
sysc::sc_register<uint32_t> rise_ie;
|
||||
sysc::sc_register<uint32_t> rise_ip;
|
||||
sysc::sc_register<uint32_t> fall_ie;
|
||||
sysc::sc_register<uint32_t> fall_ip;
|
||||
sysc::sc_register<uint32_t> high_ie;
|
||||
sysc::sc_register<uint32_t> high_ip;
|
||||
sysc::sc_register<uint32_t> low_ie;
|
||||
sysc::sc_register<uint32_t> low_ip;
|
||||
sysc::sc_register<uint32_t> iof_en;
|
||||
sysc::sc_register<uint32_t> iof_sel;
|
||||
sysc::sc_register<uint32_t> out_xor;
|
||||
scc::sc_register<uint32_t> value;
|
||||
scc::sc_register<uint32_t> input_en;
|
||||
scc::sc_register<uint32_t> output_en;
|
||||
scc::sc_register<uint32_t> port;
|
||||
scc::sc_register<uint32_t> pue;
|
||||
scc::sc_register<uint32_t> ds;
|
||||
scc::sc_register<uint32_t> rise_ie;
|
||||
scc::sc_register<uint32_t> rise_ip;
|
||||
scc::sc_register<uint32_t> fall_ie;
|
||||
scc::sc_register<uint32_t> fall_ip;
|
||||
scc::sc_register<uint32_t> high_ie;
|
||||
scc::sc_register<uint32_t> high_ip;
|
||||
scc::sc_register<uint32_t> low_ie;
|
||||
scc::sc_register<uint32_t> low_ip;
|
||||
scc::sc_register<uint32_t> iof_en;
|
||||
scc::sc_register<uint32_t> iof_sel;
|
||||
scc::sc_register<uint32_t> out_xor;
|
||||
|
||||
gpio_regs(sc_core::sc_module_name nm);
|
||||
|
||||
template <unsigned BUSWIDTH = 32> void registerResources(sysc::tlm_target<BUSWIDTH> &target);
|
||||
template <unsigned BUSWIDTH = 32> void registerResources(scc::tlm_target<BUSWIDTH> &target);
|
||||
};
|
||||
}
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
@ -128,7 +128,7 @@ inline sysc::gpio_regs::gpio_regs(sc_core::sc_module_name nm)
|
||||
, NAMED(iof_sel, r_iof_sel, 0, *this)
|
||||
, NAMED(out_xor, r_out_xor, 0, *this) {}
|
||||
|
||||
template <unsigned BUSWIDTH> inline void sysc::gpio_regs::registerResources(sysc::tlm_target<BUSWIDTH> &target) {
|
||||
template <unsigned BUSWIDTH> inline void sysc::gpio_regs::registerResources(scc::tlm_target<BUSWIDTH> &target) {
|
||||
target.addResource(value, 0x0UL);
|
||||
target.addResource(input_en, 0x4UL);
|
||||
target.addResource(output_en, 0x8UL);
|
||||
|
@ -36,14 +36,14 @@
|
||||
#ifndef _PLIC_REGS_H_
|
||||
#define _PLIC_REGS_H_
|
||||
|
||||
#include <sysc/register.h>
|
||||
#include <sysc/tlm_target.h>
|
||||
#include <sysc/utilities.h>
|
||||
#include <util/bit_field.h>
|
||||
#include "scc/register.h"
|
||||
#include "scc/tlm_target.h"
|
||||
#include "scc/utilities.h"
|
||||
|
||||
namespace sysc {
|
||||
|
||||
class plic_regs : public sc_core::sc_module, public sysc::resetable {
|
||||
class plic_regs : public sc_core::sc_module, public scc::resetable {
|
||||
public:
|
||||
// storage declarations
|
||||
BEGIN_BF_DECL(priority_t, uint32_t);
|
||||
@ -62,15 +62,15 @@ public:
|
||||
uint32_t r_claim_complete;
|
||||
|
||||
// register declarations
|
||||
sysc::sc_register_indexed<priority_t, 255> priority;
|
||||
sysc::sc_register<uint32_t> pending;
|
||||
sysc::sc_register<uint32_t> enabled;
|
||||
sysc::sc_register<threshold_t> threshold;
|
||||
sysc::sc_register<uint32_t> claim_complete;
|
||||
scc::sc_register_indexed<priority_t, 255> priority;
|
||||
scc::sc_register<uint32_t> pending;
|
||||
scc::sc_register<uint32_t> enabled;
|
||||
scc::sc_register<threshold_t> threshold;
|
||||
scc::sc_register<uint32_t> claim_complete;
|
||||
|
||||
plic_regs(sc_core::sc_module_name nm);
|
||||
|
||||
template <unsigned BUSWIDTH = 32> void registerResources(sysc::tlm_target<BUSWIDTH> &target);
|
||||
template <unsigned BUSWIDTH = 32> void registerResources(scc::tlm_target<BUSWIDTH> &target);
|
||||
};
|
||||
}
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
@ -85,7 +85,7 @@ inline sysc::plic_regs::plic_regs(sc_core::sc_module_name nm)
|
||||
, NAMED(threshold, r_threshold, 0, *this)
|
||||
, NAMED(claim_complete, r_claim_complete, 0, *this) {}
|
||||
|
||||
template <unsigned BUSWIDTH> inline void sysc::plic_regs::registerResources(sysc::tlm_target<BUSWIDTH> &target) {
|
||||
template <unsigned BUSWIDTH> inline void sysc::plic_regs::registerResources(scc::tlm_target<BUSWIDTH> &target) {
|
||||
target.addResource(priority, 0x4UL);
|
||||
target.addResource(pending, 0x1000UL);
|
||||
target.addResource(enabled, 0x2000UL);
|
||||
|
@ -36,14 +36,14 @@
|
||||
#ifndef _PRCI_REGS_H_
|
||||
#define _PRCI_REGS_H_
|
||||
|
||||
#include <sysc/register.h>
|
||||
#include <sysc/tlm_target.h>
|
||||
#include <sysc/utilities.h>
|
||||
#include <util/bit_field.h>
|
||||
#include "scc/register.h"
|
||||
#include "scc/tlm_target.h"
|
||||
#include "scc/utilities.h"
|
||||
|
||||
namespace sysc {
|
||||
|
||||
class prci_regs : public sc_core::sc_module, public sysc::resetable {
|
||||
class prci_regs : public sc_core::sc_module, public scc::resetable {
|
||||
public:
|
||||
// storage declarations
|
||||
BEGIN_BF_DECL(hfrosccfg_t, uint32_t);
|
||||
@ -73,15 +73,15 @@ public:
|
||||
uint32_t r_coreclkcfg;
|
||||
|
||||
// register declarations
|
||||
sysc::sc_register<hfrosccfg_t> hfrosccfg;
|
||||
sysc::sc_register<hfxosccfg_t> hfxosccfg;
|
||||
sysc::sc_register<pllcfg_t> pllcfg;
|
||||
sysc::sc_register<uint32_t> plloutdiv;
|
||||
sysc::sc_register<uint32_t> coreclkcfg;
|
||||
scc::sc_register<hfrosccfg_t> hfrosccfg;
|
||||
scc::sc_register<hfxosccfg_t> hfxosccfg;
|
||||
scc::sc_register<pllcfg_t> pllcfg;
|
||||
scc::sc_register<uint32_t> plloutdiv;
|
||||
scc::sc_register<uint32_t> coreclkcfg;
|
||||
|
||||
prci_regs(sc_core::sc_module_name nm);
|
||||
|
||||
template <unsigned BUSWIDTH = 32> void registerResources(sysc::tlm_target<BUSWIDTH> &target);
|
||||
template <unsigned BUSWIDTH = 32> void registerResources(scc::tlm_target<BUSWIDTH> &target);
|
||||
};
|
||||
}
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
@ -96,7 +96,7 @@ inline sysc::prci_regs::prci_regs(sc_core::sc_module_name nm)
|
||||
, NAMED(plloutdiv, r_plloutdiv, 0, *this)
|
||||
, NAMED(coreclkcfg, r_coreclkcfg, 0, *this) {}
|
||||
|
||||
template <unsigned BUSWIDTH> inline void sysc::prci_regs::registerResources(sysc::tlm_target<BUSWIDTH> &target) {
|
||||
template <unsigned BUSWIDTH> inline void sysc::prci_regs::registerResources(scc::tlm_target<BUSWIDTH> &target) {
|
||||
target.addResource(hfrosccfg, 0x0UL);
|
||||
target.addResource(hfxosccfg, 0x4UL);
|
||||
target.addResource(pllcfg, 0x8UL);
|
||||
|
@ -36,14 +36,14 @@
|
||||
#ifndef _SPI_REGS_H_
|
||||
#define _SPI_REGS_H_
|
||||
|
||||
#include <sysc/register.h>
|
||||
#include <sysc/tlm_target.h>
|
||||
#include <sysc/utilities.h>
|
||||
#include <util/bit_field.h>
|
||||
#include "scc/register.h"
|
||||
#include "scc/tlm_target.h"
|
||||
#include "scc/utilities.h"
|
||||
|
||||
namespace sysc {
|
||||
|
||||
class spi_regs : public sc_core::sc_module, public sysc::resetable {
|
||||
class spi_regs : public sc_core::sc_module, public scc::resetable {
|
||||
public:
|
||||
// storage declarations
|
||||
BEGIN_BF_DECL(sckdiv_t, uint32_t);
|
||||
@ -124,26 +124,26 @@ public:
|
||||
END_BF_DECL() r_ip;
|
||||
|
||||
// register declarations
|
||||
sysc::sc_register<sckdiv_t> sckdiv;
|
||||
sysc::sc_register<sckmode_t> sckmode;
|
||||
sysc::sc_register<uint32_t> csid;
|
||||
sysc::sc_register<uint32_t> csdef;
|
||||
sysc::sc_register<csmode_t> csmode;
|
||||
sysc::sc_register<delay0_t> delay0;
|
||||
sysc::sc_register<delay1_t> delay1;
|
||||
sysc::sc_register<fmt_t> fmt;
|
||||
sysc::sc_register<txdata_t> txdata;
|
||||
sysc::sc_register<rxdata_t> rxdata;
|
||||
sysc::sc_register<txmark_t> txmark;
|
||||
sysc::sc_register<rxmark_t> rxmark;
|
||||
sysc::sc_register<fctrl_t> fctrl;
|
||||
sysc::sc_register<ffmt_t> ffmt;
|
||||
sysc::sc_register<ie_t> ie;
|
||||
sysc::sc_register<ip_t> ip;
|
||||
scc::sc_register<sckdiv_t> sckdiv;
|
||||
scc::sc_register<sckmode_t> sckmode;
|
||||
scc::sc_register<uint32_t> csid;
|
||||
scc::sc_register<uint32_t> csdef;
|
||||
scc::sc_register<csmode_t> csmode;
|
||||
scc::sc_register<delay0_t> delay0;
|
||||
scc::sc_register<delay1_t> delay1;
|
||||
scc::sc_register<fmt_t> fmt;
|
||||
scc::sc_register<txdata_t> txdata;
|
||||
scc::sc_register<rxdata_t> rxdata;
|
||||
scc::sc_register<txmark_t> txmark;
|
||||
scc::sc_register<rxmark_t> rxmark;
|
||||
scc::sc_register<fctrl_t> fctrl;
|
||||
scc::sc_register<ffmt_t> ffmt;
|
||||
scc::sc_register<ie_t> ie;
|
||||
scc::sc_register<ip_t> ip;
|
||||
|
||||
spi_regs(sc_core::sc_module_name nm);
|
||||
|
||||
template <unsigned BUSWIDTH = 32> void registerResources(sysc::tlm_target<BUSWIDTH> &target);
|
||||
template <unsigned BUSWIDTH = 32> void registerResources(scc::tlm_target<BUSWIDTH> &target);
|
||||
};
|
||||
}
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
@ -169,7 +169,7 @@ inline sysc::spi_regs::spi_regs(sc_core::sc_module_name nm)
|
||||
, NAMED(ie, r_ie, 0, *this)
|
||||
, NAMED(ip, r_ip, 0, *this) {}
|
||||
|
||||
template <unsigned BUSWIDTH> inline void sysc::spi_regs::registerResources(sysc::tlm_target<BUSWIDTH> &target) {
|
||||
template <unsigned BUSWIDTH> inline void sysc::spi_regs::registerResources(scc::tlm_target<BUSWIDTH> &target) {
|
||||
target.addResource(sckdiv, 0x0UL);
|
||||
target.addResource(sckmode, 0x4UL);
|
||||
target.addResource(csid, 0x10UL);
|
||||
|
@ -36,14 +36,14 @@
|
||||
#ifndef _UART_REGS_H_
|
||||
#define _UART_REGS_H_
|
||||
|
||||
#include <sysc/register.h>
|
||||
#include <sysc/tlm_target.h>
|
||||
#include <sysc/utilities.h>
|
||||
#include <util/bit_field.h>
|
||||
#include "scc/register.h"
|
||||
#include "scc/tlm_target.h"
|
||||
#include "scc/utilities.h"
|
||||
|
||||
namespace sysc {
|
||||
|
||||
class uart_regs : public sc_core::sc_module, public sysc::resetable {
|
||||
class uart_regs : public sc_core::sc_module, public scc::resetable {
|
||||
public:
|
||||
// storage declarations
|
||||
BEGIN_BF_DECL(txdata_t, uint32_t);
|
||||
@ -82,17 +82,17 @@ public:
|
||||
END_BF_DECL() r_div;
|
||||
|
||||
// register declarations
|
||||
sysc::sc_register<txdata_t> txdata;
|
||||
sysc::sc_register<rxdata_t> rxdata;
|
||||
sysc::sc_register<txctrl_t> txctrl;
|
||||
sysc::sc_register<rxctrl_t> rxctrl;
|
||||
sysc::sc_register<ie_t> ie;
|
||||
sysc::sc_register<ip_t> ip;
|
||||
sysc::sc_register<div_t> div;
|
||||
scc::sc_register<txdata_t> txdata;
|
||||
scc::sc_register<rxdata_t> rxdata;
|
||||
scc::sc_register<txctrl_t> txctrl;
|
||||
scc::sc_register<rxctrl_t> rxctrl;
|
||||
scc::sc_register<ie_t> ie;
|
||||
scc::sc_register<ip_t> ip;
|
||||
scc::sc_register<div_t> div;
|
||||
|
||||
uart_regs(sc_core::sc_module_name nm);
|
||||
|
||||
template <unsigned BUSWIDTH = 32> void registerResources(sysc::tlm_target<BUSWIDTH> &target);
|
||||
template <unsigned BUSWIDTH = 32> void registerResources(scc::tlm_target<BUSWIDTH> &target);
|
||||
};
|
||||
}
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
@ -109,7 +109,7 @@ inline sysc::uart_regs::uart_regs(sc_core::sc_module_name nm)
|
||||
, NAMED(ip, r_ip, 0, *this)
|
||||
, NAMED(div, r_div, 0, *this) {}
|
||||
|
||||
template <unsigned BUSWIDTH> inline void sysc::uart_regs::registerResources(sysc::tlm_target<BUSWIDTH> &target) {
|
||||
template <unsigned BUSWIDTH> inline void sysc::uart_regs::registerResources(scc::tlm_target<BUSWIDTH> &target) {
|
||||
target.addResource(txdata, 0x0UL);
|
||||
target.addResource(rxdata, 0x4UL);
|
||||
target.addResource(txctrl, 0x8UL);
|
||||
|
@ -17,13 +17,13 @@
|
||||
#ifndef _GPIO_H_
|
||||
#define _GPIO_H_
|
||||
|
||||
#include <sysc/tlm_target.h>
|
||||
#include "scc/tlm_target.h"
|
||||
|
||||
namespace sysc {
|
||||
|
||||
class gpio_regs;
|
||||
|
||||
class gpio : public sc_core::sc_module, public tlm_target<> {
|
||||
class gpio : public sc_core::sc_module, public scc::tlm_target<> {
|
||||
public:
|
||||
SC_HAS_PROCESS(gpio);
|
||||
sc_core::sc_in<sc_core::sc_time> clk_i;
|
||||
|
@ -33,10 +33,10 @@
|
||||
|
||||
#include <array>
|
||||
#include <sysc/kernel/sc_module.h>
|
||||
#include <sysc/memory.h>
|
||||
#include <sysc/router.h>
|
||||
#include <sysc/utilities.h>
|
||||
|
||||
#include "scc/memory.h"
|
||||
#include "scc/router.h"
|
||||
#include "scc/utilities.h"
|
||||
#include "core_complex.h"
|
||||
|
||||
namespace sysc {
|
||||
@ -46,7 +46,7 @@ public:
|
||||
SC_HAS_PROCESS(platform);
|
||||
|
||||
SiFive::core_complex i_core_complex;
|
||||
router<> i_router;
|
||||
scc::router<> i_router;
|
||||
uart i_uart0, i_uart1;
|
||||
spi i_spi;
|
||||
gpio i_gpio;
|
||||
@ -55,8 +55,8 @@ public:
|
||||
prci i_prci;
|
||||
clint i_clint;
|
||||
|
||||
memory<512_MB, 32> i_mem_qspi;
|
||||
memory<128_kB, 32> i_mem_ram;
|
||||
scc::memory<512_MB, 32> i_mem_qspi;
|
||||
scc::memory<128_kB, 32> i_mem_ram;
|
||||
sc_core::sc_signal<sc_core::sc_time> s_clk;
|
||||
sc_core::sc_signal<bool> s_rst, s_mtime_int, s_msie_int;
|
||||
|
||||
|
@ -17,13 +17,13 @@
|
||||
#ifndef _PLIC_H_
|
||||
#define _PLIC_H_
|
||||
|
||||
#include <sysc/tlm_target.h>
|
||||
#include "scc/tlm_target.h"
|
||||
|
||||
namespace sysc {
|
||||
|
||||
class plic_regs;
|
||||
|
||||
class plic : public sc_core::sc_module, public tlm_target<> {
|
||||
class plic : public sc_core::sc_module, public scc::tlm_target<> {
|
||||
public:
|
||||
SC_HAS_PROCESS(plic);
|
||||
sc_core::sc_in<sc_core::sc_time> clk_i;
|
||||
|
@ -17,13 +17,13 @@
|
||||
#ifndef _PRCI_H_
|
||||
#define _PRCI_H_
|
||||
|
||||
#include <sysc/tlm_target.h>
|
||||
#include "scc/tlm_target.h"
|
||||
|
||||
namespace sysc {
|
||||
|
||||
class prci_regs;
|
||||
|
||||
class prci : public sc_core::sc_module, public tlm_target<> {
|
||||
class prci : public sc_core::sc_module, public scc::tlm_target<> {
|
||||
public:
|
||||
SC_HAS_PROCESS(prci);
|
||||
sc_core::sc_in<sc_core::sc_time> clk_i;
|
||||
|
@ -17,13 +17,13 @@
|
||||
#ifndef _SPI_H_
|
||||
#define _SPI_H_
|
||||
|
||||
#include <sysc/tlm_target.h>
|
||||
#include "scc/tlm_target.h"
|
||||
|
||||
namespace sysc {
|
||||
|
||||
class spi_regs;
|
||||
|
||||
class spi : public sc_core::sc_module, public tlm_target<> {
|
||||
class spi : public sc_core::sc_module, public scc::tlm_target<> {
|
||||
public:
|
||||
SC_HAS_PROCESS(spi);
|
||||
sc_core::sc_in<sc_core::sc_time> clk_i;
|
||||
|
@ -17,13 +17,13 @@
|
||||
#ifndef _UART_H_
|
||||
#define _UART_H_
|
||||
|
||||
#include <sysc/tlm_target.h>
|
||||
#include "scc/tlm_target.h"
|
||||
|
||||
namespace sysc {
|
||||
|
||||
class uart_regs;
|
||||
|
||||
class uart : public sc_core::sc_module, public tlm_target<> {
|
||||
class uart : public sc_core::sc_module, public scc::tlm_target<> {
|
||||
public:
|
||||
SC_HAS_PROCESS(uart);
|
||||
sc_core::sc_in<sc_core::sc_time> clk_i;
|
||||
|
Reference in New Issue
Block a user