diff --git a/.cproject b/.cproject
index 1382e75..448b21e 100644
--- a/.cproject
+++ b/.cproject
@@ -46,12 +46,13 @@
-
+
+
@@ -66,7 +67,7 @@
-
+
@@ -100,10 +101,11 @@
-
+
+
diff --git a/.launch/TGC-VP interp dhrystone.launch b/.launch/TGC-VP interp dhrystone.launch
index c2be0be..b2db581 100644
--- a/.launch/TGC-VP interp dhrystone.launch
+++ b/.launch/TGC-VP interp dhrystone.launch
@@ -18,7 +18,7 @@
-
+
diff --git a/.launch/TGC-VP llvm dhrystone.launch b/.launch/TGC-VP llvm dhrystone.launch
new file mode 100644
index 0000000..240fd47
--- /dev/null
+++ b/.launch/TGC-VP llvm dhrystone.launch
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.launch/TGC-VP llvm hello.launch b/.launch/TGC-VP llvm hello.launch
new file mode 100644
index 0000000..8430b30
--- /dev/null
+++ b/.launch/TGC-VP llvm hello.launch
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.launch/TGC-VP tcc dhrystone.launch b/.launch/TGC-VP tcc dhrystone.launch
index 33341c6..e1ef794 100644
--- a/.launch/TGC-VP tcc dhrystone.launch
+++ b/.launch/TGC-VP tcc dhrystone.launch
@@ -18,7 +18,7 @@
-
+
diff --git a/.launch/TGC-VP tcc hello.launch b/.launch/TGC-VP tcc hello.launch
index e8c7187..45071a4 100644
--- a/.launch/TGC-VP tcc hello.launch
+++ b/.launch/TGC-VP tcc hello.launch
@@ -18,7 +18,7 @@
-
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 844dd70..0546968 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,7 +75,8 @@ set(CONAN_PACKAGE_LIST
elfio/3.8
lz4/1.9.3
yaml-cpp/0.7.0
- jsoncpp/1.9.5
+ jsoncpp/1.9.5
+ zlib/1.2.13
)
set(CONAN_PACKAGE_OPTIONS fmt:header_only=True ${CONAN_BOOST_OPTIONS})
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND WITH_TCC)
@@ -84,7 +85,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND WITH_TCC)
endif()
if(WITH_LLVM)
list(APPEND CONAN_PACKAGE_LIST llvm-core/13.0.0)
- list(APPEND CONAN_PACKAGE_OPTIONS libiconv:shared=True)
+ list(APPEND CONAN_PACKAGE_OPTIONS libiconv:shared=False)
endif()
if(WITH_ASMJIT)
list(APPEND CONAN_PACKAGE_LIST asmjit/cci.20230325)
@@ -190,6 +191,7 @@ if(FW_BUILD)
if(NOT riscvfw_POPULATED)
FetchContent_Populate(riscvfw)
endif()
+ set(BOARD tgc-vp)
add_subdirectory(${riscvfw_SOURCE_DIR})
endif()
diff --git a/src/CLIParser.cpp b/src/CLIParser.cpp
index 418e0ae..25e6924 100644
--- a/src/CLIParser.cpp
+++ b/src/CLIParser.cpp
@@ -18,7 +18,7 @@ namespace po = boost::program_options;
using namespace sc_core;
namespace {
-std::unordered_set backend_opts = {"interp", "tcc", "asmjit"};
+std::unordered_set backend_opts = {"interp", "tcc", "llvm", "asmjit"};
}
CLIParser::CLIParser(int argc, char *argv[])
: desc("Options")
diff --git a/src/sc_main.cpp b/src/sc_main.cpp
index 193ca75..a3e8228 100644
--- a/src/sc_main.cpp
+++ b/src/sc_main.cpp
@@ -14,6 +14,9 @@
#include
#include
#include
+#ifdef WITH_LLVM
+#include
+#endif
#include
#include
@@ -47,6 +50,12 @@ int sc_main(int argc, char *argv[]) {
if (!parser.is_valid()) return ERRORR_IN_COMMAND_LINE;
scc::stream_redirection cout_redir(std::cout, scc::log::INFO);
scc::stream_redirection cerr_redir(std::cerr, scc::log::ERROR);
+ ///////////////////////////////////////////////////////////////////////////
+ // set up infrastructure
+ ///////////////////////////////////////////////////////////////////////////
+#ifdef WITH_LLVM
+ iss::init_jit_debug(argc, argv);
+#endif
///////////////////////////////////////////////////////////////////////////
// create the performance estimation module
///////////////////////////////////////////////////////////////////////////
diff --git a/tgc-iss/dbt-rise-core b/tgc-iss/dbt-rise-core
index dd49af2..61382ae 160000
--- a/tgc-iss/dbt-rise-core
+++ b/tgc-iss/dbt-rise-core
@@ -1 +1 @@
-Subproject commit dd49af2893df8ef768de3e1e72a182908dd68b66
+Subproject commit 61382ae53b86a21654f48cf37e5e3bede8657b63
diff --git a/tgc-iss/dbt-rise-tgc b/tgc-iss/dbt-rise-tgc
index 980c803..09db0cd 160000
--- a/tgc-iss/dbt-rise-tgc
+++ b/tgc-iss/dbt-rise-tgc
@@ -1 +1 @@
-Subproject commit 980c8031c30cc42f75525d0f796486e77c907da4
+Subproject commit 09db0cd35d1324c81f697af7e6abfb902f64d96f