[vmkit-commits] [vmkit] r74818 - in /vmkit/trunk: include/mvm/JIT.h lib/JnJVM/Compiler/JnjvmModule.cpp lib/Mvm/Compiler/JIT.cpp lib/N3/VMCore/N3.cpp tools/vmjc/vmjc.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Mon Jul  6 02:59:25 2009
New Revision: 74818

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


Modified:
    vmkit/trunk/include/mvm/JIT.h
    vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp
    vmkit/trunk/lib/Mvm/Compiler/JIT.cpp
    vmkit/trunk/lib/N3/VMCore/N3.cpp
    vmkit/trunk/tools/vmjc/vmjc.cpp

Modified: vmkit/trunk/include/mvm/JIT.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/JIT.h?rev=74818&r1=74817&r2=74818&view=diff

==============================================================================
--- vmkit/trunk/include/mvm/JIT.h (original)
+++ vmkit/trunk/include/mvm/JIT.h Mon Jul  6 02:59:25 2009
@@ -26,6 +26,7 @@
   class ExistingModuleProvider;
   class Function;
   class FunctionPassManager;
+  class LLVMContext;
   class Module;
   class ModuleProvider;
   class PointerType;
@@ -167,6 +168,7 @@
   static llvm::ExecutionEngine* executionEngine;
   static mvm::LockNormal protectEngine;
   static llvm::Module *globalModule;
+  static llvm::LLVMContext *globalContext;
   static llvm::ExistingModuleProvider *globalModuleProvider;
   static llvm::FunctionPassManager* globalFunctionPasses;
   static const llvm::TargetData* TheTargetData;

Modified: vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp?rev=74818&r1=74817&r2=74818&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp Mon Jul  6 02:59:25 2009
@@ -11,6 +11,7 @@
 #include "llvm/CallingConv.h"
 #include "llvm/Constants.h"
 #include "llvm/Instructions.h"
+#include "llvm/LLVMContext.h"
 #include "llvm/Module.h"
 #include "llvm/PassManager.h"
 #include "llvm/Target/TargetData.h"
@@ -81,7 +82,8 @@
 
 
 JavaLLVMCompiler::JavaLLVMCompiler(const std::string& str) :
-  TheModule(new llvm::Module(str)), JavaIntrinsics(TheModule) {
+  TheModule(new llvm::Module(str, *(new llvm::LLVMContext()))),
+  JavaIntrinsics(TheModule) {
 
   enabledException = true;
 }

Modified: vmkit/trunk/lib/Mvm/Compiler/JIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Compiler/JIT.cpp?rev=74818&r1=74817&r2=74818&view=diff

==============================================================================
--- vmkit/trunk/lib/Mvm/Compiler/JIT.cpp (original)
+++ vmkit/trunk/lib/Mvm/Compiler/JIT.cpp Mon Jul  6 02:59:25 2009
@@ -12,6 +12,7 @@
 #include <llvm/DerivedTypes.h>
 #include <llvm/Instructions.h>
 #include <llvm/LinkAllPasses.h>
+#include <llvm/LLVMContext.h>
 #include <llvm/Module.h>
 #include <llvm/ModuleProvider.h>
 #include <llvm/PassManager.h>
@@ -54,7 +55,8 @@
   llvm::ExceptionHandling = false;
 #endif
   if (!M) {
-    globalModule = new llvm::Module("bootstrap module");
+    globalContext = new llvm::LLVMContext();
+    globalModule = new llvm::Module("bootstrap module", *globalContext);
     globalModuleProvider = new ExistingModuleProvider (globalModule);
 
     InitializeNativeTarget();
@@ -258,6 +260,7 @@
 
 const llvm::TargetData* MvmModule::TheTargetData;
 llvm::Module *MvmModule::globalModule;
+llvm::LLVMContext *MvmModule::globalContext;
 llvm::ExistingModuleProvider *MvmModule::globalModuleProvider;
 llvm::FunctionPassManager* MvmModule::globalFunctionPasses;
 llvm::ExecutionEngine* MvmModule::executionEngine;

Modified: vmkit/trunk/lib/N3/VMCore/N3.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/N3.cpp?rev=74818&r1=74817&r2=74818&view=diff

==============================================================================
--- vmkit/trunk/lib/N3/VMCore/N3.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/N3.cpp Mon Jul  6 02:59:25 2009
@@ -8,6 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 
+#include "llvm/LLVMContext.h"
 #include "llvm/Module.h"
 #include "llvm/Support/CommandLine.h"
 
@@ -64,7 +65,7 @@
   std::string str = 
     mvm::MvmModule::executionEngine->getTargetData()->getStringRepresentation();
 
-  vm->LLVMModule = new llvm::Module("Bootstrap N3");
+  vm->LLVMModule = new llvm::Module("Bootstrap N3", *(new llvm::LLVMContext()));
   vm->module = new mvm::MvmModule(vm->LLVMModule);
   vm->getLLVMModule()->setDataLayout(str);
   vm->protectModule = new mvm::LockNormal();
@@ -88,7 +89,7 @@
   
   std::string str = 
     mvm::MvmModule::executionEngine->getTargetData()->getStringRepresentation();
-  vm->LLVMModule = new llvm::Module("Bootstrap N3");
+  vm->LLVMModule = new llvm::Module("Bootstrap N3", *(new llvm::LLVMContext()));
   vm->module = new mvm::MvmModule(vm->LLVMModule);
   vm->LLVMModule->setDataLayout(str);
   vm->protectModule = new mvm::LockNormal();

Modified: vmkit/trunk/tools/vmjc/vmjc.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmjc/vmjc.cpp?rev=74818&r1=74817&r2=74818&view=diff

==============================================================================
--- vmkit/trunk/tools/vmjc/vmjc.cpp (original)
+++ vmkit/trunk/tools/vmjc/vmjc.cpp Mon Jul  6 02:59:25 2009
@@ -177,7 +177,8 @@
    
     JavaCompiler* Comp = 0;
     if (WithClinit.empty()) {
-      Module* TheModule = new Module("bootstrap module");
+      Module* TheModule = new Module("bootstrap module",
+                                     *(new llvm::LLVMContext()));
       if (!TargetTriple.empty())
         TheModule->setTargetTriple(TargetTriple);
       else