[vmkit-commits] [vmkit] r70843 - in /vmkit/trunk: include/mvm/JIT.h lib/Mvm/Compiler/JIT.cpp tools/vmjc/vmjc.cpp tools/vmkit/Launcher.cpp
Nicolas Geoffray
nicolas.geoffray at lip6.fr
Mon May 4 01:14:13 PDT 2009
Author: geoffray
Date: Mon May 4 03:14:12 2009
New Revision: 70843
URL: http://llvm.org/viewvc/llvm-project?rev=70843&view=rev
Log:
Move to the new LLVM JIT API.
Modified:
vmkit/trunk/include/mvm/JIT.h
vmkit/trunk/lib/Mvm/Compiler/JIT.cpp
vmkit/trunk/tools/vmjc/vmjc.cpp
vmkit/trunk/tools/vmkit/Launcher.cpp
Modified: vmkit/trunk/include/mvm/JIT.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/JIT.h?rev=70843&r1=70842&r2=70843&view=diff
==============================================================================
--- vmkit/trunk/include/mvm/JIT.h (original)
+++ vmkit/trunk/include/mvm/JIT.h Mon May 4 03:14:12 2009
@@ -16,6 +16,8 @@
#include "types.h"
+#include "llvm/Target/TargetMachine.h"
+
namespace llvm {
class Constant;
class ConstantFP;
@@ -171,7 +173,8 @@
static uint64 getTypeSize(const llvm::Type* type);
static void runPasses(llvm::Function* func, llvm::FunctionPassManager*);
- static void initialise(bool Fast = false, llvm::Module* TheModule = 0,
+ static void initialise(llvm::CodeGenOpt::Level = llvm::CodeGenOpt::Default,
+ llvm::Module* TheModule = 0,
llvm::TargetMachine* TheTarget = 0);
static int disassemble(unsigned int* addr);
Modified: vmkit/trunk/lib/Mvm/Compiler/JIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Compiler/JIT.cpp?rev=70843&r1=70842&r2=70843&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/Compiler/JIT.cpp (original)
+++ vmkit/trunk/lib/Mvm/Compiler/JIT.cpp Mon May 4 03:14:12 2009
@@ -41,7 +41,8 @@
}
}
-void MvmModule::initialise(bool Fast, Module* M, TargetMachine* T) {
+void MvmModule::initialise(CodeGenOpt::Level level, Module* M,
+ TargetMachine* T) {
llvm::NoFramePointerElim = true;
#if DWARF_EXCEPTIONS
llvm::ExceptionHandling = true;
@@ -53,7 +54,7 @@
globalModuleProvider = new ExistingModuleProvider (globalModule);
executionEngine = ExecutionEngine::createJIT(globalModuleProvider, 0,
- 0, Fast);
+ 0, level);
std::string str =
executionEngine->getTargetData()->getStringRepresentation();
Modified: vmkit/trunk/tools/vmjc/vmjc.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmjc/vmjc.cpp?rev=70843&r1=70842&r2=70843&view=diff
==============================================================================
--- vmkit/trunk/tools/vmjc/vmjc.cpp (original)
+++ vmkit/trunk/tools/vmjc/vmjc.cpp Mon May 4 03:14:12 2009
@@ -206,10 +206,10 @@
getStringRepresentation());
- mvm::MvmModule::initialise(false, TheModule, TheTarget);
+ mvm::MvmModule::initialise(CodeGenOpt::Default, TheModule, TheTarget);
Comp = new JavaAOTCompiler("AOT");
} else {
- mvm::MvmModule::initialise(true);
+ mvm::MvmModule::initialise();
Comp = new JavaJITCompiler("JIT");
}
Modified: vmkit/trunk/tools/vmkit/Launcher.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmkit/Launcher.cpp?rev=70843&r1=70842&r2=70843&view=diff
==============================================================================
--- vmkit/trunk/tools/vmkit/Launcher.cpp (original)
+++ vmkit/trunk/tools/vmkit/Launcher.cpp Mon May 4 03:14:12 2009
@@ -132,7 +132,7 @@
}
}
- mvm::MvmModule::initialise(Fast);
+ mvm::MvmModule::initialise(Fast ? CodeGenOpt::None : CodeGenOpt::Aggressive);
mvm::Object::initialise();
Collector::initialise(0);
More information about the vmkit-commits
mailing list