diff --git a/.cproject b/.cproject
index 34846f4..0d6f091 100644
--- a/.cproject
+++ b/.cproject
@@ -14,9 +14,9 @@
-
+
-
+
-
+
-
-
+
-
+
@@ -128,7 +127,7 @@
-
+
@@ -164,11 +163,10 @@
-
+
-
@@ -193,14 +191,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
diff --git a/.envrc b/.envrc
new file mode 100644
index 0000000..1698db7
--- /dev/null
+++ b/.envrc
@@ -0,0 +1,9 @@
+module load ./Modulefile
+distro=`/bin/lsb_release -i -s`
+if [ $distro == "CentOS" ]; then
+ . /opt/rh/devtoolset-8/enable
+ . /opt/rh/llvm-toolset-7/enable
+ . /opt/rh/rh-python38/enable
+fi
+layout python3
+[ -f .envrc.$USER ] && . .envrc.$USER
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 89c5a41..e217f4d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,10 @@
cmake_minimum_required(VERSION 3.16)
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/scc/cmake)
-project(TGFS-ISS VERSION 1.0.0 LANGUAGES CXX)
+project(TGC-ISS VERSION 1.0.0 LANGUAGES CXX)
set(WITH_LLVM FALSE CACHE BOOL "Build LLVM based backend")
-if(CMAKE_PROJECT_NAME STREQUAL "TGFS-ISS")
+if(CMAKE_PROJECT_NAME STREQUAL "TGC-ISS")
###########################################################################
# stand alone build settings
###########################################################################
@@ -143,7 +143,7 @@ if(CMAKE_PROJECT_NAME STREQUAL "TGFS-ISS")
find_package(spdlog)
find_package(lz4)
find_package(gsl-lite)
-
+ find_package(yaml-cpp)
set(Boost_NO_BOOST_CMAKE ON) # Don't do a find_package in config mode before searching for a regular boost install.
set(BOOST_ROOT ${CONAN_BOOST_ROOT})
find_package(Threads)
@@ -159,13 +159,14 @@ if(CMAKE_PROJECT_NAME STREQUAL "TGFS-ISS")
riscvfw
GIT_REPOSITORY https://git.minres.com/VP/Firmwares.git
GIT_TAG main
- UPDATE_DISCONNECTED FALSE
+ GIT_SHALLOW OFF
+ UPDATE_DISCONNECTED ON
)
FetchContent_GetProperties(riscvfw)
if(NOT riscvfw_POPULATED)
FetchContent_Populate(riscvfw)
endif()
- add_subdirectory(${riscvfw_SOURCE_DIR})
+ add_subdirectory(${riscvfw_SOURCE_DIR})
endif()
endif()
diff --git a/Modulefile b/Modulefile
index 6a191ef..ac18f92 100644
--- a/Modulefile
+++ b/Modulefile
@@ -13,6 +13,7 @@ if { $distro == "CentOS" && ![info exists ::env(PROJECT)] && ![info exists ::env
puts stderr "Don't forget to execute 'scl enable devtoolset-7 bash'"
}
+#module load tools/utilities
module load tools/cmake
#module load tools/gcc-riscv64/9.2.0
module load tools/gcc-riscv32-unknown-elf/11
diff --git a/dbt-rise-core b/dbt-rise-core
index 82c3c80..1d76c89 160000
--- a/dbt-rise-core
+++ b/dbt-rise-core
@@ -1 +1 @@
-Subproject commit 82c3c80a26fbc9d54ce736324e3b0bb1c1084f10
+Subproject commit 1d76c895dba794d706f246e42d6e64224abec2a6
diff --git a/dbt-rise-tgc b/dbt-rise-tgc
index 5fd226b..82c26ac 160000
--- a/dbt-rise-tgc
+++ b/dbt-rise-tgc
@@ -1 +1 @@
-Subproject commit 5fd226b6706db7bdabec43ddd70c331d4f0ec910
+Subproject commit 82c26acfc871c0ba82a69481f8383733ad174509
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..5cbe7e7
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1 @@
+conan==1.59
diff --git a/scc b/scc
index baba121..a21316a 160000
--- a/scc
+++ b/scc
@@ -1 +1 @@
-Subproject commit baba1214d358ee8ced775de9df6a01b454018f96
+Subproject commit a21316a97fff4953a3c08d32f6b97cf6d11d441e
diff --git a/makeJitOutputReadable.py b/scripts/makeJitOutputReadable.py
similarity index 100%
rename from makeJitOutputReadable.py
rename to scripts/makeJitOutputReadable.py
diff --git a/run_riscv_tests.sh b/scripts/run_riscv_tests.sh
similarity index 100%
rename from run_riscv_tests.sh
rename to scripts/run_riscv_tests.sh