DBT-RISE
/
DBT-RISE-TGC
11
0
Fork 0
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

Changed namespaces for LLVM related stuff

This commit is contained in:
Eyck Jentzsch 2019-12-09 00:24:14 +00:00
parent 3c30c47c90
commit 8b9775e06b
6 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gen_input/templates/vm-vm_CORENAME.cpp.gtl
View File

@ -47,7 +47,7 @@
#include <iss/debugger/riscv_target_adapter.h> #include <iss/debugger/riscv_target_adapter.h>
namespace iss { namespace iss {
namespace vm { namespace llvm {
namespace fp_impl { namespace fp_impl {
void add_fp_functions_2_module(llvm::Module *, unsigned, unsigned); void add_fp_functions_2_module(llvm::Module *, unsigned, unsigned);
} }
@ -91,7 +91,7 @@ protected:
void setup_module(Module* m) override { void setup_module(Module* m) override {
super::setup_module(m); super::setup_module(m);
iss::vm::fp_impl::add_fp_functions_2_module(m, traits<ARCH>::FP_REGS_SIZE, traits<ARCH>::XLEN); iss::llvm::fp_impl::add_fp_functions_2_module(m, traits<ARCH>::FP_REGS_SIZE, traits<ARCH>::XLEN);
} }
inline Value *gen_choose(Value *cond, Value *trueVal, Value *falseVal, unsigned size) { inline Value *gen_choose(Value *cond, Value *trueVal, Value *falseVal, unsigned size) {

2
src/internal/fp_functions.cpp
View File

@ -44,7 +44,7 @@ extern "C" {
#include <limits> #include <limits>
namespace iss { namespace iss {
namespace vm { namespace llvm {
namespace fp_impl { namespace fp_impl {
using namespace std; using namespace std;

8
src/internal/vm_rv32gc.cpp
View File

@ -47,7 +47,7 @@
#include <iss/debugger/riscv_target_adapter.h> #include <iss/debugger/riscv_target_adapter.h>
namespace iss { namespace iss {
namespace vm { namespace llvm {
namespace fp_impl { namespace fp_impl {
void add_fp_functions_2_module(llvm::Module *, unsigned, unsigned); void add_fp_functions_2_module(llvm::Module *, unsigned, unsigned);
} }
@ -57,11 +57,11 @@ namespace rv32gc {
using namespace iss::arch; using namespace iss::arch;
using namespace llvm; using namespace llvm;
using namespace iss::debugger; using namespace iss::debugger;
using namespace iss::vm::llvm; using namespace iss::llvm;
template <typename ARCH> class vm_impl : public vm_base<ARCH> { template <typename ARCH> class vm_impl : public vm_base<ARCH> {
public: public:
using super = typename iss::vm::llvm::vm_base<ARCH>; using super = typename iss::llvm::vm_base<ARCH>;
using virt_addr_t = typename super::virt_addr_t; using virt_addr_t = typename super::virt_addr_t;
using phys_addr_t = typename super::phys_addr_t; using phys_addr_t = typename super::phys_addr_t;
using code_word_t = typename super::code_word_t; using code_word_t = typename super::code_word_t;
@ -91,7 +91,7 @@ protected:
void setup_module(Module* m) override { void setup_module(Module* m) override {
super::setup_module(m); super::setup_module(m);
iss::vm::fp_impl::add_fp_functions_2_module(m, traits<ARCH>::FP_REGS_SIZE, traits<ARCH>::XLEN); iss::llvm::fp_impl::add_fp_functions_2_module(m, traits<ARCH>::FP_REGS_SIZE, traits<ARCH>::XLEN);
} }
inline Value *gen_choose(Value *cond, Value *trueVal, Value *falseVal, unsigned size) { inline Value *gen_choose(Value *cond, Value *trueVal, Value *falseVal, unsigned size) {

8
src/internal/vm_rv32imac.cpp
View File

@ -47,7 +47,7 @@
#include <iss/debugger/riscv_target_adapter.h> #include <iss/debugger/riscv_target_adapter.h>
namespace iss { namespace iss {
namespace vm { namespace llvm {
namespace fp_impl { namespace fp_impl {
void add_fp_functions_2_module(llvm::Module *, unsigned, unsigned); void add_fp_functions_2_module(llvm::Module *, unsigned, unsigned);
} }
@ -57,11 +57,11 @@ namespace rv32imac {
using namespace iss::arch; using namespace iss::arch;
using namespace llvm; using namespace llvm;
using namespace iss::debugger; using namespace iss::debugger;
using namespace iss::vm::llvm; using namespace iss::llvm;
template <typename ARCH> class vm_impl : public vm_base<ARCH> { template <typename ARCH> class vm_impl : public vm_base<ARCH> {
public: public:
using super = typename iss::vm::llvm::vm_base<ARCH>; using super = typename iss::llvm::vm_base<ARCH>;
using virt_addr_t = typename super::virt_addr_t; using virt_addr_t = typename super::virt_addr_t;
using phys_addr_t = typename super::phys_addr_t; using phys_addr_t = typename super::phys_addr_t;
using code_word_t = typename super::code_word_t; using code_word_t = typename super::code_word_t;
@ -91,7 +91,7 @@ protected:
void setup_module(Module* m) override { void setup_module(Module* m) override {
super::setup_module(m); super::setup_module(m);
iss::vm::fp_impl::add_fp_functions_2_module(m, traits<ARCH>::FP_REGS_SIZE, traits<ARCH>::XLEN); iss::llvm::fp_impl::add_fp_functions_2_module(m, traits<ARCH>::FP_REGS_SIZE, traits<ARCH>::XLEN);
} }
inline Value *gen_choose(Value *cond, Value *trueVal, Value *falseVal, unsigned size) { inline Value *gen_choose(Value *cond, Value *trueVal, Value *falseVal, unsigned size) {

8
src/internal/vm_rv64gc.cpp
View File

@ -47,7 +47,7 @@
#include <iss/debugger/riscv_target_adapter.h> #include <iss/debugger/riscv_target_adapter.h>
namespace iss { namespace iss {
namespace vm { namespace llvm {
namespace fp_impl { namespace fp_impl {
void add_fp_functions_2_module(llvm::Module *, unsigned, unsigned); void add_fp_functions_2_module(llvm::Module *, unsigned, unsigned);
} }
@ -57,11 +57,11 @@ namespace rv64gc {
using namespace iss::arch; using namespace iss::arch;
using namespace llvm; using namespace llvm;
using namespace iss::debugger; using namespace iss::debugger;
using namespace iss::vm::llvm; using namespace iss::llvm;
template <typename ARCH> class vm_impl : public vm_base<ARCH> { template <typename ARCH> class vm_impl : public vm_base<ARCH> {
public: public:
using super = typename iss::vm::llvm::vm_base<ARCH>; using super = typename iss::llvm::vm_base<ARCH>;
using virt_addr_t = typename super::virt_addr_t; using virt_addr_t = typename super::virt_addr_t;
using phys_addr_t = typename super::phys_addr_t; using phys_addr_t = typename super::phys_addr_t;
using code_word_t = typename super::code_word_t; using code_word_t = typename super::code_word_t;
@ -91,7 +91,7 @@ protected:
void setup_module(Module* m) override { void setup_module(Module* m) override {
super::setup_module(m); super::setup_module(m);
iss::vm::fp_impl::add_fp_functions_2_module(m, traits<ARCH>::FP_REGS_SIZE, traits<ARCH>::XLEN); iss::llvm::fp_impl::add_fp_functions_2_module(m, traits<ARCH>::FP_REGS_SIZE, traits<ARCH>::XLEN);
} }
inline Value *gen_choose(Value *cond, Value *trueVal, Value *falseVal, unsigned size) { inline Value *gen_choose(Value *cond, Value *trueVal, Value *falseVal, unsigned size) {

8
src/internal/vm_rv64i.cpp
View File

@ -47,7 +47,7 @@
#include <iss/debugger/riscv_target_adapter.h> #include <iss/debugger/riscv_target_adapter.h>
namespace iss { namespace iss {
namespace vm { namespace llvm {
namespace fp_impl { namespace fp_impl {
void add_fp_functions_2_module(llvm::Module *, unsigned, unsigned); void add_fp_functions_2_module(llvm::Module *, unsigned, unsigned);
} }
@ -57,11 +57,11 @@ namespace rv64i {
using namespace iss::arch; using namespace iss::arch;
using namespace llvm; using namespace llvm;
using namespace iss::debugger; using namespace iss::debugger;
using namespace iss::vm::llvm; using namespace iss::llvm;
template <typename ARCH> class vm_impl : public vm_base<ARCH> { template <typename ARCH> class vm_impl : public vm_base<ARCH> {
public: public:
using super = typename iss::vm::llvm::vm_base<ARCH>; using super = typename iss::llvm::vm_base<ARCH>;
using virt_addr_t = typename super::virt_addr_t; using virt_addr_t = typename super::virt_addr_t;
using phys_addr_t = typename super::phys_addr_t; using phys_addr_t = typename super::phys_addr_t;
using code_word_t = typename super::code_word_t; using code_word_t = typename super::code_word_t;
@ -91,7 +91,7 @@ protected:
void setup_module(Module* m) override { void setup_module(Module* m) override {
super::setup_module(m); super::setup_module(m);
iss::vm::fp_impl::add_fp_functions_2_module(m, traits<ARCH>::FP_REGS_SIZE, traits<ARCH>::XLEN); iss::llvm::fp_impl::add_fp_functions_2_module(m, traits<ARCH>::FP_REGS_SIZE, traits<ARCH>::XLEN);
} }
inline Value *gen_choose(Value *cond, Value *trueVal, Value *falseVal, unsigned size) { inline Value *gen_choose(Value *cond, Value *trueVal, Value *falseVal, unsigned size) {