[vmkit-commits] [vmkit] r147268 - in /vmkit/trunk/lib: j3/Compiler/JavaAOTCompiler.cpp j3/Compiler/JavaJITCompiler.cpp j3/Compiler/LLVMInfo.cpp vmkit/Compiler/JIT.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Sun Dec 25 12:25:50 2011
New Revision: 147268

URL: http://llvm.org/viewvc/llvm-project?rev=147268&view=rev
Log:
Move to new LLVM API.


Modified:
    vmkit/trunk/lib/j3/Compiler/JavaAOTCompiler.cpp
    vmkit/trunk/lib/j3/Compiler/JavaJITCompiler.cpp
    vmkit/trunk/lib/j3/Compiler/LLVMInfo.cpp
    vmkit/trunk/lib/vmkit/Compiler/JIT.cpp

Modified: vmkit/trunk/lib/j3/Compiler/JavaAOTCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/Compiler/JavaAOTCompiler.cpp?rev=147268&r1=147267&r2=147268&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/Compiler/JavaAOTCompiler.cpp (original)
+++ vmkit/trunk/lib/j3/Compiler/JavaAOTCompiler.cpp Sun Dec 25 12:25:50 2011
@@ -1806,8 +1806,12 @@
   JavaLLVMCompiler(ModuleID) {
 
   std::string Error;
-  const Target* TheTarget(TargetRegistry::lookupTarget(vmkit::VmkitModule::getHostTriple(), Error));
-  TargetMachine* TM = TheTarget->createTargetMachine(vmkit::VmkitModule::getHostTriple(), "", "");
+  const Target* TheTarget(TargetRegistry::lookupTarget(
+      vmkit::VmkitModule::getHostTriple(), Error));
+  TargetOptions options;
+  options.NoFramePointerElim = true;
+  TargetMachine* TM = TheTarget->createTargetMachine(
+      vmkit::VmkitModule::getHostTriple(), "", "", options);
   TheTargetData = TM->getTargetData();
   TheModule->setDataLayout(TheTargetData->getStringRepresentation());
   TheModule->setTargetTriple(TM->getTargetTriple());

Modified: vmkit/trunk/lib/j3/Compiler/JavaJITCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/Compiler/JavaJITCompiler.cpp?rev=147268&r1=147267&r2=147268&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/Compiler/JavaJITCompiler.cpp (original)
+++ vmkit/trunk/lib/j3/Compiler/JavaJITCompiler.cpp Sun Dec 25 12:25:50 2011
@@ -157,9 +157,14 @@
 
   EmitFunctionName = false;
   GCInfo = NULL;
+  
+  EngineBuilder engine(TheModule);
+  TargetOptions options;
+  options.NoFramePointerElim = true;
+  engine.setTargetOptions(options);
+  engine.setEngineKind(EngineKind::JIT);
+  executionEngine = engine.create();
 
-  executionEngine = ExecutionEngine::createJIT(TheModule, 0,
-                                               0, llvm::CodeGenOpt::Default, false);
   executionEngine->RegisterJITEventListener(&listener);
   TheTargetData = executionEngine->getTargetData();
   TheModule->setDataLayout(TheTargetData->getStringRepresentation());

Modified: vmkit/trunk/lib/j3/Compiler/LLVMInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/Compiler/LLVMInfo.cpp?rev=147268&r1=147267&r2=147268&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/Compiler/LLVMInfo.cpp (original)
+++ vmkit/trunk/lib/j3/Compiler/LLVMInfo.cpp Sun Dec 25 12:25:50 2011
@@ -136,10 +136,6 @@
   return virtualSizeConstant;
 }
 
-namespace llvm {
-  extern bool JITEmitDebugInfo;
-}
-
 static char* GetMethodName(vmkit::ThreadAllocator& allocator,
                            JavaMethod* methodDef,
                            Class* customizeFor) {
@@ -180,7 +176,7 @@
   }
 
   if (result == NULL) {
-    if (Compiler->emitFunctionName() || JITEmitDebugInfo) {
+    if (Compiler->emitFunctionName()) {
       vmkit::ThreadAllocator allocator;
       char* buf = GetMethodName(
           allocator, methodDef, customizing ? customizeFor : NULL);
@@ -216,7 +212,7 @@
 void LLVMMethodInfo::setCustomizedVersion(Class* cl, llvm::Function* F) {
   assert(customizedVersions.size() == 0);
   vmkit::ThreadAllocator allocator;
-  if (Compiler->emitFunctionName() || JITEmitDebugInfo) {
+  if (Compiler->emitFunctionName()) {
     char* buf = GetMethodName(allocator, methodDef, cl);
     F->setName(buf);
   }

Modified: vmkit/trunk/lib/vmkit/Compiler/JIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/vmkit/Compiler/JIT.cpp?rev=147268&r1=147267&r2=147268&view=diff
==============================================================================
--- vmkit/trunk/lib/vmkit/Compiler/JIT.cpp (original)
+++ vmkit/trunk/lib/vmkit/Compiler/JIT.cpp Sun Dec 25 12:25:50 2011
@@ -98,7 +98,6 @@
   initializeTarget(Registry);
   InitializeNativeTarget(); 
   
-  NoFramePointerElim = true;
   DisablePrettyStackTrace = true;
 
   ThreadAllocator allocator;