[vmkit-commits] [vmkit] r145033 - in /vmkit/trunk: include/vmkit/JIT.h lib/J3/Compiler/JavaAOTCompiler.cpp lib/J3/Compiler/JavaJITCompiler.cpp lib/J3/Compiler/JavaLLVMCompiler.cpp lib/J3/Compiler/LLVMInfo.cpp lib/Mvm/Compiler/Disassembler.cpp lib/Mvm/Compiler/JIT.cpp tools/j3/Main.cpp tools/precompiler/Precompiler.cpp tools/vmjc/vmjc.cpp

Gael Thomas gael.thomas at lip6.fr
Mon Nov 21 02:32:27 PST 2011


Author: gthomas
Date: Mon Nov 21 04:32:27 2011
New Revision: 145033

URL: http://llvm.org/viewvc/llvm-project?rev=145033&view=rev
Log:
MvmModule is now VmkitModule

Modified:
    vmkit/trunk/include/vmkit/JIT.h
    vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp
    vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp
    vmkit/trunk/lib/J3/Compiler/JavaLLVMCompiler.cpp
    vmkit/trunk/lib/J3/Compiler/LLVMInfo.cpp
    vmkit/trunk/lib/Mvm/Compiler/Disassembler.cpp
    vmkit/trunk/lib/Mvm/Compiler/JIT.cpp
    vmkit/trunk/tools/j3/Main.cpp
    vmkit/trunk/tools/precompiler/Precompiler.cpp
    vmkit/trunk/tools/vmjc/vmjc.cpp

Modified: vmkit/trunk/include/vmkit/JIT.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/vmkit/JIT.h?rev=145033&r1=145032&r2=145033&view=diff
==============================================================================
--- vmkit/trunk/include/vmkit/JIT.h (original)
+++ vmkit/trunk/include/vmkit/JIT.h Mon Nov 21 04:32:27 2011
@@ -169,7 +169,7 @@
 };
 
 
-class MvmModule {
+class VmkitModule {
 public:
    static mvm::LockRecursive protectEngine;
 

Modified: vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp?rev=145033&r1=145032&r2=145033&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp Mon Nov 21 04:32:27 2011
@@ -1795,8 +1795,8 @@
   JavaLLVMCompiler(ModuleID) {
 
   std::string Error;
-  const Target* TheTarget(TargetRegistry::lookupTarget(mvm::MvmModule::getHostTriple(), Error));
-  TargetMachine* TM = TheTarget->createTargetMachine(mvm::MvmModule::getHostTriple(), "", "");
+  const Target* TheTarget(TargetRegistry::lookupTarget(mvm::VmkitModule::getHostTriple(), Error));
+  TargetMachine* TM = TheTarget->createTargetMachine(mvm::VmkitModule::getHostTriple(), "", "");
   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=145033&r1=145032&r2=145033&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp Mon Nov 21 04:32:27 2011
@@ -163,7 +163,7 @@
   executionEngine->RegisterJITEventListener(&listener);
   TheTargetData = executionEngine->getTargetData();
   TheModule->setDataLayout(TheTargetData->getStringRepresentation());
-  TheModule->setTargetTriple(mvm::MvmModule::getHostTriple());
+  TheModule->setTargetTriple(mvm::VmkitModule::getHostTriple());
   JavaIntrinsics.init(TheModule);
   initialiseAssessorInfo();  
 
@@ -320,7 +320,7 @@
 }
 
 void* JavaJITCompiler::materializeFunction(JavaMethod* meth, Class* customizeFor) {
-  mvm::MvmModule::protectIR();
+  mvm::VmkitModule::protectIR();
   Function* func = parseFunction(meth, customizeFor);
   void* res = executionEngine->getPointerToGlobal(func);
 
@@ -328,12 +328,12 @@
     llvm::GCFunctionInfo& GFI = GCInfo->getFunctionInfo(*func);
   
     Jnjvm* vm = JavaThread::get()->getJVM();
-    mvm::MvmModule::addToVM(vm, &GFI, (JIT*)executionEngine, allocator, meth);
+    mvm::VmkitModule::addToVM(vm, &GFI, (JIT*)executionEngine, allocator, meth);
 
     // Now that it's compiled, we don't need the IR anymore
     func->deleteBody();
   }
-  mvm::MvmModule::unprotectIR();
+  mvm::VmkitModule::unprotectIR();
   if (customizeFor == NULL || !getMethodInfo(meth)->isCustomizable) {
     meth->code = res;
   }
@@ -341,7 +341,7 @@
 }
 
 void* JavaJITCompiler::GenerateStub(llvm::Function* F) {
-  mvm::MvmModule::protectIR();
+  mvm::VmkitModule::protectIR();
   void* res = executionEngine->getPointerToGlobal(F);
  
   // If the stub was already generated through an equivalent signature,
@@ -350,12 +350,12 @@
     llvm::GCFunctionInfo& GFI = GCInfo->getFunctionInfo(*F);
   
     Jnjvm* vm = JavaThread::get()->getJVM();
-    mvm::MvmModule::addToVM(vm, &GFI, (JIT*)executionEngine, allocator, NULL);
+    mvm::VmkitModule::addToVM(vm, &GFI, (JIT*)executionEngine, allocator, NULL);
   
     // Now that it's compiled, we don't need the IR anymore
     F->deleteBody();
   }
-  mvm::MvmModule::unprotectIR();
+  mvm::VmkitModule::unprotectIR();
   return res;
 }
 
@@ -363,7 +363,7 @@
 extern "C" int StartJnjvmWithJIT(int argc, char** argv, char* mainClass) {
   llvm::llvm_shutdown_obj X; 
    
-  mvm::MvmModule::initialise(argc, argv);
+  mvm::VmkitModule::initialise(argc, argv);
   mvm::Collector::initialise(argc, argv);
  
   mvm::ThreadAllocator allocator;

Modified: vmkit/trunk/lib/J3/Compiler/JavaLLVMCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaLLVMCompiler.cpp?rev=145033&r1=145032&r2=145033&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaLLVMCompiler.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaLLVMCompiler.cpp Mon Nov 21 04:32:27 2011
@@ -35,18 +35,18 @@
   
 void JavaLLVMCompiler::resolveVirtualClass(Class* cl) {
   // Lock here because we may be called by a class resolver
-  mvm::MvmModule::protectIR();
+  mvm::VmkitModule::protectIR();
   LLVMClassInfo* LCI = (LLVMClassInfo*)getClassInfo(cl);
   LCI->getVirtualType();
-  mvm::MvmModule::unprotectIR();
+  mvm::VmkitModule::unprotectIR();
 }
 
 void JavaLLVMCompiler::resolveStaticClass(Class* cl) {
   // Lock here because we may be called by a class initializer
-  mvm::MvmModule::protectIR();
+  mvm::VmkitModule::protectIR();
   LLVMClassInfo* LCI = (LLVMClassInfo*)getClassInfo(cl);
   LCI->getStaticType();
-  mvm::MvmModule::unprotectIR();
+  mvm::VmkitModule::unprotectIR();
 }
 
 Function* JavaLLVMCompiler::getMethod(JavaMethod* meth, Class* customizeFor) {
@@ -59,17 +59,17 @@
   Function* func = LMI->getMethod(customizeFor);
   
   // We are jitting. Take the lock.
-  mvm::MvmModule::protectIR();
+  mvm::VmkitModule::protectIR();
   if (func->getLinkage() == GlobalValue::ExternalWeakLinkage) {
     JavaJIT jit(this, meth, func, customizeFor);
     if (isNative(meth->access)) {
       jit.nativeCompile();
-      mvm::MvmModule::runPasses(func, JavaNativeFunctionPasses);
-      mvm::MvmModule::runPasses(func, J3FunctionPasses);
+      mvm::VmkitModule::runPasses(func, JavaNativeFunctionPasses);
+      mvm::VmkitModule::runPasses(func, J3FunctionPasses);
     } else {
       jit.javaCompile();
-      mvm::MvmModule::runPasses(func, JavaFunctionPasses);
-      mvm::MvmModule::runPasses(func, J3FunctionPasses);
+      mvm::VmkitModule::runPasses(func, JavaFunctionPasses);
+      mvm::VmkitModule::runPasses(func, J3FunctionPasses);
     }
     func->setLinkage(GlobalValue::ExternalLinkage);
     if (!LMI->isCustomizable && jit.isCustomizable) {
@@ -82,7 +82,7 @@
       }
     }
   }
-  mvm::MvmModule::unprotectIR();
+  mvm::VmkitModule::unprotectIR();
 
   return func;
 }
@@ -115,7 +115,7 @@
   
   JavaFunctionPasses = new FunctionPassManager(TheModule);
   JavaFunctionPasses->add(new TargetData(TheModule));
-  mvm::MvmModule::addCommandLinePasses(JavaFunctionPasses);
+  mvm::VmkitModule::addCommandLinePasses(JavaFunctionPasses);
 }
 
 } // end namespace j3

Modified: vmkit/trunk/lib/J3/Compiler/LLVMInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/LLVMInfo.cpp?rev=145033&r1=145032&r2=145033&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/LLVMInfo.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/LLVMInfo.cpp Mon Nov 21 04:32:27 2011
@@ -267,7 +267,7 @@
 llvm::FunctionType* LLVMSignatureInfo::getVirtualType() {
  if (!virtualType) {
     // Lock here because we are called by arbitrary code
-    mvm::MvmModule::protectIR();
+    mvm::VmkitModule::protectIR();
     std::vector<llvm::Type*> llvmArgs;
     uint32 size = signature->nbArguments;
     Typedef* const* arguments = signature->getArgumentsType();
@@ -283,7 +283,7 @@
     LLVMAssessorInfo& LAI =
       Compiler->getTypedefInfo(signature->getReturnType());
     virtualType = FunctionType::get(LAI.llvmType, llvmArgs, false);
-    mvm::MvmModule::unprotectIR();
+    mvm::VmkitModule::unprotectIR();
   }
   return virtualType;
 }
@@ -291,7 +291,7 @@
 llvm::FunctionType* LLVMSignatureInfo::getStaticType() {
  if (!staticType) {
     // Lock here because we are called by arbitrary code
-    mvm::MvmModule::protectIR();
+    mvm::VmkitModule::protectIR();
     std::vector<llvm::Type*> llvmArgs;
     uint32 size = signature->nbArguments;
     Typedef* const* arguments = signature->getArgumentsType();
@@ -305,7 +305,7 @@
     LLVMAssessorInfo& LAI =
       Compiler->getTypedefInfo(signature->getReturnType());
     staticType = FunctionType::get(LAI.llvmType, llvmArgs, false);
-    mvm::MvmModule::unprotectIR();
+    mvm::VmkitModule::unprotectIR();
   }
   return staticType;
 }
@@ -313,7 +313,7 @@
 llvm::FunctionType* LLVMSignatureInfo::getNativeType() {
   if (!nativeType) {
     // Lock here because we are called by arbitrary code
-    mvm::MvmModule::protectIR();
+    mvm::VmkitModule::protectIR();
     std::vector<llvm::Type*> llvmArgs;
     uint32 size = signature->nbArguments;
     Typedef* const* arguments = signature->getArgumentsType();
@@ -341,14 +341,14 @@
       LAI.llvmType == Compiler->getIntrinsics()->JavaObjectType ?
         LAI.llvmTypePtr : LAI.llvmType;
     nativeType = FunctionType::get(RetType, llvmArgs, false);
-    mvm::MvmModule::unprotectIR();
+    mvm::VmkitModule::unprotectIR();
   }
   return nativeType;
 }
 
 llvm::FunctionType* LLVMSignatureInfo::getNativeStubType() {
   // Lock here because we are called by arbitrary code
-  mvm::MvmModule::protectIR();
+  mvm::VmkitModule::protectIR();
   std::vector<llvm::Type*> llvmArgs;
   uint32 size = signature->nbArguments;
   Typedef* const* arguments = signature->getArgumentsType();
@@ -377,7 +377,7 @@
     LAI.llvmType == Compiler->getIntrinsics()->JavaObjectType ?
       LAI.llvmTypePtr : LAI.llvmType;
   FunctionType* FTy = FunctionType::get(RetType, llvmArgs, false);
-  mvm::MvmModule::unprotectIR();
+  mvm::VmkitModule::unprotectIR();
   return FTy;
 }
 
@@ -718,7 +718,7 @@
 FunctionType* LLVMSignatureInfo::getVirtualBufType() {
   if (!virtualBufType) {
     // Lock here because we are called by arbitrary code
-    mvm::MvmModule::protectIR();
+    mvm::VmkitModule::protectIR();
     std::vector<llvm::Type*> Args;
     Args.push_back(Compiler->getIntrinsics()->ResolvedConstantPoolType); // ctp
     Args.push_back(getVirtualPtrType());
@@ -727,7 +727,7 @@
     LLVMAssessorInfo& LAI =
       Compiler->getTypedefInfo(signature->getReturnType());
     virtualBufType = FunctionType::get(LAI.llvmType, Args, false);
-    mvm::MvmModule::unprotectIR();
+    mvm::VmkitModule::unprotectIR();
   }
   return virtualBufType;
 }
@@ -735,7 +735,7 @@
 FunctionType* LLVMSignatureInfo::getStaticBufType() {
   if (!staticBufType) {
     // Lock here because we are called by arbitrary code
-    mvm::MvmModule::protectIR();
+    mvm::VmkitModule::protectIR();
     std::vector<llvm::Type*> Args;
     Args.push_back(Compiler->getIntrinsics()->ResolvedConstantPoolType); // ctp
     Args.push_back(getStaticPtrType());
@@ -743,7 +743,7 @@
     LLVMAssessorInfo& LAI =
       Compiler->getTypedefInfo(signature->getReturnType());
     staticBufType = FunctionType::get(LAI.llvmType, Args, false);
-    mvm::MvmModule::unprotectIR();
+    mvm::VmkitModule::unprotectIR();
   }
   return staticBufType;
 }
@@ -751,84 +751,84 @@
 Function* LLVMSignatureInfo::getVirtualBuf() {
   // Lock here because we are called by arbitrary code. Also put that here
   // because we are waiting on virtualBufFunction to have an address.
-  mvm::MvmModule::protectIR();
+  mvm::VmkitModule::protectIR();
   if (!virtualBufFunction) {
     virtualBufFunction = createFunctionCallBuf(true);
     signature->setVirtualCallBuf(Compiler->GenerateStub(virtualBufFunction));
   }
-  mvm::MvmModule::unprotectIR();
+  mvm::VmkitModule::unprotectIR();
   return virtualBufFunction;
 }
 
 Function* LLVMSignatureInfo::getVirtualAP() {
   // Lock here because we are called by arbitrary code. Also put that here
   // because we are waiting on virtualAPFunction to have an address.
-  mvm::MvmModule::protectIR();
+  mvm::VmkitModule::protectIR();
   if (!virtualAPFunction) {
     virtualAPFunction = createFunctionCallAP(true);
     signature->setVirtualCallAP(Compiler->GenerateStub(virtualAPFunction));
   }
-  mvm::MvmModule::unprotectIR();
+  mvm::VmkitModule::unprotectIR();
   return virtualAPFunction;
 }
 
 Function* LLVMSignatureInfo::getStaticBuf() {
   // Lock here because we are called by arbitrary code. Also put that here
   // because we are waiting on staticBufFunction to have an address.
-  mvm::MvmModule::protectIR();
+  mvm::VmkitModule::protectIR();
   if (!staticBufFunction) {
     staticBufFunction = createFunctionCallBuf(false);
     signature->setStaticCallBuf(Compiler->GenerateStub(staticBufFunction));
   }
-  mvm::MvmModule::unprotectIR();
+  mvm::VmkitModule::unprotectIR();
   return staticBufFunction;
 }
 
 Function* LLVMSignatureInfo::getStaticAP() {
   // Lock here because we are called by arbitrary code. Also put that here
   // because we are waiting on staticAPFunction to have an address.
-  mvm::MvmModule::protectIR();
+  mvm::VmkitModule::protectIR();
   if (!staticAPFunction) {
     staticAPFunction = createFunctionCallAP(false);
     signature->setStaticCallAP(Compiler->GenerateStub(staticAPFunction));
   }
-  mvm::MvmModule::unprotectIR();
+  mvm::VmkitModule::unprotectIR();
   return staticAPFunction;
 }
 
 Function* LLVMSignatureInfo::getStaticStub() {
   // Lock here because we are called by arbitrary code. Also put that here
   // because we are waiting on staticStubFunction to have an address.
-  mvm::MvmModule::protectIR();
+  mvm::VmkitModule::protectIR();
   if (!staticStubFunction) {
     staticStubFunction = createFunctionStub(false, false);
     signature->setStaticCallStub(Compiler->GenerateStub(staticStubFunction));
   }
-  mvm::MvmModule::unprotectIR();
+  mvm::VmkitModule::unprotectIR();
   return staticStubFunction;
 }
 
 Function* LLVMSignatureInfo::getSpecialStub() {
   // Lock here because we are called by arbitrary code. Also put that here
   // because we are waiting on specialStubFunction to have an address.
-  mvm::MvmModule::protectIR();
+  mvm::VmkitModule::protectIR();
   if (!specialStubFunction) {
     specialStubFunction = createFunctionStub(true, false);
     signature->setSpecialCallStub(Compiler->GenerateStub(specialStubFunction));
   }
-  mvm::MvmModule::unprotectIR();
+  mvm::VmkitModule::unprotectIR();
   return specialStubFunction;
 }
 
 Function* LLVMSignatureInfo::getVirtualStub() {
   // Lock here because we are called by arbitrary code. Also put that here
   // because we are waiting on virtualStubFunction to have an address.
-  mvm::MvmModule::protectIR();
+  mvm::VmkitModule::protectIR();
   if (!virtualStubFunction) {
     virtualStubFunction = createFunctionStub(false, true);
     signature->setVirtualCallStub(Compiler->GenerateStub(virtualStubFunction));
   }
-  mvm::MvmModule::unprotectIR();
+  mvm::VmkitModule::unprotectIR();
   return virtualStubFunction;
 }
 

Modified: vmkit/trunk/lib/Mvm/Compiler/Disassembler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Compiler/Disassembler.cpp?rev=145033&r1=145032&r2=145033&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/Compiler/Disassembler.cpp (original)
+++ vmkit/trunk/lib/Mvm/Compiler/Disassembler.cpp Mon Nov 21 04:32:27 2011
@@ -25,7 +25,7 @@
 
 // this is the only function exported from this file
 
-int mvm::MvmModule::disassemble(unsigned int *addr)
+int mvm::VmkitModule::disassemble(unsigned int *addr)
 {
   
   if (!initialised)
@@ -56,7 +56,7 @@
 static int			initialised= 0;
 
 
-int mvm::MvmModule::disassemble(unsigned int *addr)
+int mvm::VmkitModule::disassemble(unsigned int *addr)
 {
   if (!initialised)
     {
@@ -74,7 +74,7 @@
 
 #else
 
-int mvm::MvmModule::disassemble(unsigned int* addr) {
+int mvm::VmkitModule::disassemble(unsigned int* addr) {
   return 0;
 }
 
@@ -82,7 +82,7 @@
 
 #else
 
-int mvm::MvmModule::disassemble(unsigned int* addr) {
+int mvm::VmkitModule::disassemble(unsigned int* addr) {
   return 0;
 }
 

Modified: vmkit/trunk/lib/Mvm/Compiler/JIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Compiler/JIT.cpp?rev=145033&r1=145032&r2=145033&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/Compiler/JIT.cpp (original)
+++ vmkit/trunk/lib/Mvm/Compiler/JIT.cpp Mon Nov 21 04:32:27 2011
@@ -59,7 +59,7 @@
   void linkVmkitGC();
 }
 
-const char* MvmModule::getHostTriple() {
+const char* VmkitModule::getHostTriple() {
 #ifdef LLVM_HOSTTRIPLE
   return LLVM_HOSTTRIPLE;
 #else
@@ -81,7 +81,7 @@
 static llvm::cl::list<const llvm::PassInfo*, bool, llvm::PassNameParser>
 PassList(llvm::cl::desc("Optimizations available:"));
 
-void MvmModule::initialise(int argc, char** argv) {
+void VmkitModule::initialise(int argc, char** argv) {
   linkVmkitGC(); 
   llvm_start_multithreaded();
 
@@ -138,7 +138,7 @@
 }
 
 
-void MvmModule::runPasses(llvm::Function* func,
+void VmkitModule::runPasses(llvm::Function* func,
                           llvm::FunctionPassManager* pm) {
   pm->run(*func);
 }
@@ -194,7 +194,7 @@
   llvm::FunctionPass* createInlineMallocPass();
 }
 
-void MvmModule::addCommandLinePasses(FunctionPassManager* PM) {
+void VmkitModule::addCommandLinePasses(FunctionPassManager* PM) {
   addPass(PM, createVerifierPass());        // Verify that input is correct
 
   addPass(PM, createCFGSimplificationPass()); // Clean up disgusting code
@@ -241,15 +241,15 @@
   PM->doInitialization();
 }
 
-LockRecursive MvmModule::protectEngine;
+LockRecursive VmkitModule::protectEngine;
 
 // We protect the creation of IR with the protectEngine. Note that
 // codegen'ing a function may also create IR objects.
-void MvmModule::protectIR() {
+void VmkitModule::protectIR() {
   protectEngine.lock();
 }
 
-void MvmModule::unprotectIR() {
+void VmkitModule::unprotectIR() {
   protectEngine.unlock();
 }
 
@@ -382,7 +382,7 @@
 }
 
 
-Frames* MvmModule::addToVM(VirtualMachine* VM, GCFunctionInfo* FI, JIT* jit, BumpPtrAllocator& allocator, void* meta) {
+Frames* VmkitModule::addToVM(VirtualMachine* VM, GCFunctionInfo* FI, JIT* jit, BumpPtrAllocator& allocator, void* meta) {
   JITCodeEmitter* JCE = jit->getCodeEmitter();
   int NumDescriptors = 0;
   for (GCFunctionInfo::iterator J = FI->begin(), JE = FI->end(); J != JE; ++J) {

Modified: vmkit/trunk/tools/j3/Main.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/j3/Main.cpp?rev=145033&r1=145032&r2=145033&view=diff
==============================================================================
--- vmkit/trunk/tools/j3/Main.cpp (original)
+++ vmkit/trunk/tools/j3/Main.cpp Mon Nov 21 04:32:27 2011
@@ -34,7 +34,7 @@
   llvm::llvm_shutdown_obj X;
 
   // Initialize base components.  
-  MvmModule::initialise(argc, argv);
+  VmkitModule::initialise(argc, argv);
   Collector::initialise(argc, argv);
  
   // Create the allocator that will allocate the bootstrap loader and the JVM.

Modified: vmkit/trunk/tools/precompiler/Precompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/precompiler/Precompiler.cpp?rev=145033&r1=145032&r2=145033&view=diff
==============================================================================
--- vmkit/trunk/tools/precompiler/Precompiler.cpp (original)
+++ vmkit/trunk/tools/precompiler/Precompiler.cpp Mon Nov 21 04:32:27 2011
@@ -63,7 +63,7 @@
   std::string OutputFilename;
 
   // Initialize base components.  
-  MvmModule::initialise(argc, argv);
+  VmkitModule::initialise(argc, argv);
   Collector::initialise(argc, argv);
   
   // Create the allocator that will allocate the bootstrap loader and the JVM.

Modified: vmkit/trunk/tools/vmjc/vmjc.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmjc/vmjc.cpp?rev=145033&r1=145032&r2=145033&view=diff
==============================================================================
--- vmkit/trunk/tools/vmjc/vmjc.cpp (original)
+++ vmkit/trunk/tools/vmjc/vmjc.cpp Mon Nov 21 04:32:27 2011
@@ -121,7 +121,7 @@
     return 0;
   }
    
-  mvm::MvmModule::initialise(argc, argv);
+  mvm::VmkitModule::initialise(argc, argv);
   mvm::Collector::initialise(argc, argv);
 
   JavaAOTCompiler* Comp = new JavaAOTCompiler("AOT");





More information about the vmkit-commits mailing list