Extended reggistration of external functions

Minres · Apr 24, 2018 · d951285 · d951285
1 parent 2db0dd3
commit d951285
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/incl/iss/vm_base.h b/incl/iss/vm_base.h
@@ -116,7 +116,7 @@ template <typename ARCH> class vm_base : public debugger_if, public vm_if {
             auto build_if_needed = [this, &cont, &pc](llvm::Module* m)->llvm::Function*{
                 llvm::Function *func;
                 this->mod=m;
-                add_functions_2_module(m);
+                this->setup_module(m);
                 std::tie(cont, func) = disass(pc);
                 this->mod=nullptr;
                 this->func=nullptr;
@@ -207,6 +207,10 @@ template <typename ARCH> class vm_base : public debugger_if, public vm_if {
 		str += buf.data();
     }
 
+    virtual void setup_module(llvm::Module* m){
+        add_functions_2_module(m);
+    }
+
     virtual std::tuple<continuation_e, llvm::BasicBlock *>
     gen_single_inst_behavior(virt_addr_t &pc_v, unsigned int &inst_cnt, llvm::BasicBlock *this_block) = 0;
 

diff --git a/src/vm_base.cpp b/src/vm_base.cpp
@@ -48,9 +48,11 @@ llvm::cl::opt<uint32_t> LikelyBranchWeight("likely-branch-weight", llvm::cl::Hid
 llvm::cl::opt<uint32_t> UnlikelyBranchWeight("unlikely-branch-weight", llvm::cl::Hidden, llvm::cl::init(4),
                                              llvm::cl::desc("Weight of the branch unlikely to be taken (default = 4)"));
 
-#define INT_TYPE(L) IntegerType::get(mod->getContext(), L)
-#define VOID_TYPE Type::getVoidTy(mod->getContext())
-#define THIS_PTR_TYPE INT_TYPE(8)->getPointerTo()
+#define INT_TYPE(L)   Type::getIntNTy(mod->getContext(), L)
+#define FLOAT_TYPE    Type::getFloatTy(mod->getContext())
+#define DOUBLE_TYPE   Type::getDoubleTy(mod->getContext())
+#define VOID_TYPE     Type::getVoidTy(mod->getContext())
+#define THIS_PTR_TYPE Type::getIntNPtrTy(mod->getContext(), 8)
 #define FDECLL(NAME, RET, ...)                                                                                         \
     Function *NAME##_func = CurrentModule->getFunction(#NAME);                                                         \
     if (!NAME##_func) {                                                                                                \