Adapted to vm_base refactoring (move into llvm package)

2018-11-22 20:28:36 +01:00 · 2018-11-22 20:28:36 +01:00 · df03e90181
parent 58a446e6bc
commit df03e90181
9 changed files with 1346 additions and 1343 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit d73fee68dd164c016721ae76d1538136513e6b37
+Subproject commit 0b499d216a2835015b889180ca5108b2daaed9b9
--- a/platform/src/sc_main.cpp
+++ b/platform/src/sc_main.cpp
@ -32,7 +32,6 @@

 #include "CLIParser.h"
 #include <sysc/top/system.h>
-#include <iss/jit/jit_helper.h>
 #include <iss/log_categories.h>

 #include <scc/configurable_tracer.h>
@ -45,6 +44,7 @@
 #include <cci_utils/broker.h>

 #include <boost/program_options.hpp>
+#include <iss/llvm/jit_helper.h>
 #include <fstream>
 #include <sstream>

--- a/riscv/gen_input/templates/vm-vm_CORENAME.cpp.gtl
+++ b/riscv/gen_input/templates/vm-vm_CORENAME.cpp.gtl
@ -35,7 +35,7 @@
 #include <iss/debugger/gdb_session.h>
 #include <iss/debugger/server.h>
 #include <iss/iss.h>
-#include <iss/vm_base.h>
+#include <iss/llvm/vm_base.h>
 #include <util/logging.h>

 #include <boost/format.hpp>
--- a/riscv/gen_input/templates/vm_riscv.in.cpp
+++ b/riscv/gen_input/templates/vm_riscv.in.cpp
@ -35,7 +35,7 @@
 #include <iss/debugger/gdb_session.h>
 #include <iss/debugger/server.h>
 #include <iss/iss.h>
-#include <iss/vm_base.h>
+#include <iss/llvm/vm_base.h>
 #include <util/logging.h>

 #include <boost/format.hpp>
--- a/riscv/src/internal/fp_functions.cpp
+++ b/riscv/src/internal/fp_functions.cpp
@ -33,7 +33,7 @@
 ////////////////////////////////////////////////////////////////////////////////

 #include <iss/iss.h>
-#include <iss/vm_base.h>
+#include <iss/llvm/vm_base.h>

 extern "C" {
 #include <softfloat.h>
--- a/riscv/src/internal/vm_rv32gc.cpp
+++ b/riscv/src/internal/vm_rv32gc.cpp
--- a/riscv/src/internal/vm_rv32imac.cpp
+++ b/riscv/src/internal/vm_rv32imac.cpp
--- a/riscv/src/internal/vm_rv64ia.cpp
+++ b/riscv/src/internal/vm_rv64ia.cpp
--- a/riscv/src/main.cpp
+++ b/riscv/src/main.cpp
@ -39,7 +39,7 @@
 #include <iss/arch/rv32imac.h>
 #include <iss/arch/rv32gc.h>
 #include <iss/arch/rv64ia.h>
-#include <iss/jit/jit_helper.h>
+#include <iss/llvm/jit_helper.h>
 #include <iss/log_categories.h>
 #include <iss/plugin/cycle_estimate.h>
 #include <iss/plugin/instruction_count.h>