[vmkit-commits] [vmkit] r92356 - in /vmkit/trunk: include/mvm/JIT.h lib/J3/Compiler/JavaJIT.h lib/J3/Compiler/JavaJITOpcodes.cpp lib/Mvm/Compiler/JIT.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Thu Dec 31 06:18:25 2009
New Revision: 92356

URL: http://llvm.org/viewvc/llvm-project?rev=92356&view=rev
Log:
Disable metadata for now, llvm is changing its API.


Modified:
    vmkit/trunk/include/mvm/JIT.h
    vmkit/trunk/lib/J3/Compiler/JavaJIT.h
    vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp
    vmkit/trunk/lib/Mvm/Compiler/JIT.cpp

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

==============================================================================
--- vmkit/trunk/include/mvm/JIT.h (original)
+++ vmkit/trunk/include/mvm/JIT.h Thu Dec 31 06:18:25 2009
@@ -185,7 +185,7 @@
    static llvm::FunctionPassManager* globalFunctionPasses;
    static const llvm::TargetData* TheTargetData;
    static mvm::BumpPtrAllocator* Allocator;
-   static unsigned MetadataTypeKind;
+   //static unsigned MetadataTypeKind;
 
    static uint64 getTypeSize(const llvm::Type* type);
    static void runPasses(llvm::Function* func, llvm::FunctionPassManager*);

Modified: vmkit/trunk/lib/J3/Compiler/JavaJIT.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaJIT.h?rev=92356&r1=92355&r2=92356&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaJIT.h (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaJIT.h Thu Dec 31 06:18:25 2009
@@ -249,10 +249,13 @@
   }
 
   void addHighLevelType(llvm::Instruction* V, CommonClass* cl) {
+    // Enable this when it will be actually used.
+#if 0
     llvm::Value* A[1] = 
       { TheCompiler->getNativeClass(cl ? cl : upcalls->OfObject) };
     llvm::MDNode* Node = llvm::MDNode::get(*llvmContext, A, 1);
-    llvmContext->getMetadata().addMD(module->MetadataTypeKind, Node, V);
+    V->setMetadata(module->MetadataTypeKind, Node);
+#endif
   }
 
   /// pop - Pop a value from the stack and return it.

Modified: vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp?rev=92356&r1=92355&r2=92356&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaJITOpcodes.cpp Thu Dec 31 06:18:25 2009
@@ -171,7 +171,7 @@
     if (currentBlock->getTerminator() != 0) { 
       currentBlock = createBasicBlock("gcj bug");
     }
-#if JNJVM_EXECUTE > 1
+    if (compilingMethod->name->equals(compilingClass->classLoader->asciizConstructUTF8("of")))
     {
       Value* args[3] = {
         ConstantInt::get(Type::getInt32Ty(*llvmContext), (int64_t)bytecodes[i]),
@@ -183,7 +183,6 @@
       CallInst::Create(module->PrintExecutionFunction, args, args + 3, "",
                        currentBlock);
     }
-#endif
     
     switch (bytecodes[i]) {
       

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

==============================================================================
--- vmkit/trunk/lib/Mvm/Compiler/JIT.cpp (original)
+++ vmkit/trunk/lib/Mvm/Compiler/JIT.cpp Thu Dec 31 06:18:25 2009
@@ -147,7 +147,7 @@
   mvm::llvm_runtime::makeLLVMModuleContents(globalModule);
   
   LLVMContext& Context = globalModule->getContext();
-  MetadataTypeKind = Context.getMetadata().registerMDKind("HighLevelType");
+  //MetadataTypeKind = Context.getMDKindID("HighLevelType");
   // Type declaration
   ptrType = PointerType::getUnqual(Type::getInt8Ty(Context));
   ptr32Type = PointerType::getUnqual(Type::getInt32Ty(Context));
@@ -450,7 +450,7 @@
 llvm::ExecutionEngine* MvmModule::executionEngine;
 mvm::LockRecursive MvmModule::protectEngine;
 mvm::BumpPtrAllocator* MvmModule::Allocator;
-unsigned MvmModule::MetadataTypeKind;
+//unsigned MvmModule::MetadataTypeKind;
 
 uint64 MvmModule::getTypeSize(const llvm::Type* type) {
   return TheTargetData->getTypeAllocSize(type);