diff --git a/.cproject b/.cproject
index 81be607..de923df 100644
--- a/.cproject
+++ b/.cproject
@@ -12,11 +12,11 @@
-
+
-
+
@@ -46,10 +46,11 @@
-
+
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ed48f7..6a4e233 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,6 +12,7 @@ option(EN_EXT_DEBUG "Enable extended debug output at runtime" OFF)
option(ENABLE_COVERAGE "Enable code coverage" OFF)
option(ENABLE_SANITIZER "Enable address sanitizer" OFF)
option(ENABLE_CLANGTIDY "Enable static analysis with clang-tidy." OFF)
+option(ENABLE_TCC "Enable the use of TCC" ON)
set(SCC_LIB_ONLY ON)
set(CMAKE_CXX_STANDARD 14)
@@ -67,9 +68,12 @@ set(CONAN_PACKAGE_LIST
jsoncpp/1.9.5
)
-if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND ENABLE_TCC)
list(APPEND CONAN_BOOST_OPTIONS boost:fPIC=True lua:compile_as_cpp=False)
- list(APPEND CONAN_PACKAGE_LIST tcc/0.9.27 seasocks/1.4.4 lua/5.4.3)
+ if(ENABLE_TCC)
+ list(APPEND CONAN_PACKAGE_LIST tcc/0.9.27)
+ endif()
+ list(APPEND CONAN_PACKAGE_LIST seasocks/1.4.4 lua/5.4.3)
endif()
set(CONAN_PACKAGE_OPTIONS fmt:header_only=True ${CONAN_BOOST_OPTIONS})
if(NOT USE_CWR_SYSTEMC AND NOT USE_NCSC_SYSTEMC AND NOT DEFINED ENV{SYSTEMC_HOME})
diff --git a/fw/hello-world/Makefile b/fw/hello-world/Makefile
index c8ea51e..6e7d998 100644
--- a/fw/hello-world/Makefile
+++ b/fw/hello-world/Makefile
@@ -13,6 +13,5 @@ LDFLAGS := -march=$(RISCV_ARCH) -mabi=$(RISCV_ABI)
compiler := $(shell which riscv32-unknown-elf-gcc)
TOOL_DIR=$(dir $(compiler))
-TRIPLET=riscv32-unknown-elf
BSP_BASE = ../bsp
include $(BSP_BASE)/env/common-gcc.mk
diff --git a/scc b/scc
index e0c3b9a..fbc21a0 160000
--- a/scc
+++ b/scc
@@ -1 +1 @@
-Subproject commit e0c3b9ab6a4e2fe1a3a3c87d84a617a9d674941d
+Subproject commit fbc21a0509e01f3697a16dc407eaa40b9d6a5cbb
diff --git a/src/tgc_vp/gen/platform_mmap.h b/src/tgc_vp/gen/platform_mmap.h
index a821ba4..ddf5500 100644
--- a/src/tgc_vp/gen/platform_mmap.h
+++ b/src/tgc_vp/gen/platform_mmap.h
@@ -7,7 +7,7 @@
#define _PLATFORM_MMAP_H_
// need double braces, see
// https://stackoverflow.com/questions/6893700/how-to-construct-stdarray-object-with-initializer-list#6894191
-const std::array, 13> platfrom_mmap = {{
+const std::array, 13> platfrom_mmap = {{
{clint.socket, 0x2000000, 0xc000},
{plic.socket, 0xc000000, 0x200008},
{aon.socket, 0x10000000, 0x150},
diff --git a/src/tgc_vp/system.cpp b/src/tgc_vp/system.cpp
index 900e90d..178a017 100644
--- a/src/tgc_vp/system.cpp
+++ b/src/tgc_vp/system.cpp
@@ -13,7 +13,7 @@ using namespace sysc::tgfs;
system::system(sc_core::sc_module_name nm)
: sc_core::sc_module(nm)
-, NAMED(router, platfrom_mmap.size() + 2, 1)
+, NAMED(router, platfrom_mmap.size() + 2, 2)
, NAMEDC(qspi0_ptr, spi, spi_impl::beh)
, NAMEDC(qspi1_ptr, spi, spi_impl::beh)
, NAMEDC(qspi2_ptr, spi, spi_impl::beh)
@@ -24,7 +24,8 @@ system::system(sc_core::sc_module_name nm)
auto& qspi0 = *qspi0_ptr;
auto& qspi1 = *qspi1_ptr;
auto& qspi2 = *qspi2_ptr;
- core_complex.initiator(router.target[0]);
+ core_complex.ibus(router.target[0]);
+ core_complex.dbus(router.target[1]);
size_t i = 0;
for (const auto &e : platfrom_mmap) {
router.initiator.at(i)(e.target);
diff --git a/src/tgc_vp/system.h b/src/tgc_vp/system.h
index ae19a4c..70577d0 100644
--- a/src/tgc_vp/system.h
+++ b/src/tgc_vp/system.h
@@ -52,9 +52,9 @@ private:
vpvper::sifive::prci prci{"prci"};
vpvper::sifive::clint clint{"clint"};
- using mem_qspi_t = scc::memory<512_MB, 32>;
+ using mem_qspi_t = scc::memory<512_MB, scc::LT>;
mem_qspi_t mem_qspi{"mem_qspi"};
- using mem_ram_t = scc::memory<128_kB, 32>;
+ using mem_ram_t = scc::memory<128_kB, scc::LT>;
mem_ram_t mem_ram{"mem_ram"};
sc_core::sc_signal tlclk_s{"tlclk_s"};
diff --git a/tgc-iss/dbt-rise-core b/tgc-iss/dbt-rise-core
index 8a2fe18..c669f78 160000
--- a/tgc-iss/dbt-rise-core
+++ b/tgc-iss/dbt-rise-core
@@ -1 +1 @@
-Subproject commit 8a2fe18cba1e799aebd018d0d5434fb00d94b29f
+Subproject commit c669f78a90084d55b6a04d41cf7f92558d73e75a
diff --git a/tgc-iss/dbt-rise-tgc b/tgc-iss/dbt-rise-tgc
index ec55efd..4dbc743 160000
--- a/tgc-iss/dbt-rise-tgc
+++ b/tgc-iss/dbt-rise-tgc
@@ -1 +1 @@
-Subproject commit ec55efd3229b201dde1778d5b7f6e68876d2c99f
+Subproject commit 4dbc7433a5ce58e367d2e740e191929df50e39ef
diff --git a/vpvper b/vpvper
index 55f81f2..755a9a3 160000
--- a/vpvper
+++ b/vpvper
@@ -1 +1 @@
-Subproject commit 55f81f21494eba59e30925527d3d2cf4cde7b884
+Subproject commit 755a9a3f19cd6c3364a17ac15c521c09de71341d