[vmkit-commits] [vmkit] r94815 - in /vmkit/trunk/lib/N3/VMCore: CLIJit.cpp CLIJitMeta.cpp LowerArrayLength.cpp MSCorlib.inc N3Initialise.cpp Opcodes.cpp VMCache.cpp VMClass.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Fri Jan 29 11:34:25 2010
New Revision: 94815

URL: http://llvm.org/viewvc/llvm-project?rev=94815&view=rev
Log:
Make N3 compile again.


Modified:
    vmkit/trunk/lib/N3/VMCore/CLIJit.cpp
    vmkit/trunk/lib/N3/VMCore/CLIJitMeta.cpp
    vmkit/trunk/lib/N3/VMCore/LowerArrayLength.cpp
    vmkit/trunk/lib/N3/VMCore/MSCorlib.inc
    vmkit/trunk/lib/N3/VMCore/N3Initialise.cpp
    vmkit/trunk/lib/N3/VMCore/Opcodes.cpp
    vmkit/trunk/lib/N3/VMCore/VMCache.cpp
    vmkit/trunk/lib/N3/VMCore/VMClass.cpp

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

==============================================================================
--- vmkit/trunk/lib/N3/VMCore/CLIJit.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/CLIJit.cpp Fri Jan 29 11:34:25 2010
@@ -29,6 +29,7 @@
 #include <llvm/Function.h>
 #include <llvm/Instructions.h>
 #include <llvm/LinkAllPasses.h>
+#include <llvm/LLVMContext.h>
 #include <llvm/Module.h>
 #include <llvm/Type.h>
 #include <llvm/Analysis/LoopPass.h>
@@ -1769,7 +1770,6 @@
   addPass(PM, createCFGSimplificationPass());    // Merge & remove BBs
   addPass(PM, createScalarReplAggregatesPass()); // Break up aggregate allocas
   addPass(PM, createInstructionCombiningPass()); // Combine silly seq's
-  addPass(PM, createCondPropagationPass());      // Propagate conditionals
   
   addPass(PM, createCFGSimplificationPass());    // Merge & remove BBs
   addPass(PM, createReassociatePass());          // Reassociate expressions
@@ -1787,7 +1787,6 @@
   // Run instcombine after redundancy elimination to exploit opportunities
   // opened up by them.
   addPass(PM, createInstructionCombiningPass());
-  addPass(PM, createCondPropagationPass());      // Propagate conditionals
 
   addPass(PM, createDeadStoreEliminationPass()); // Delete dead stores
   addPass(PM, createAggressiveDCEPass());        // Delete dead instructions

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

==============================================================================
--- vmkit/trunk/lib/N3/VMCore/CLIJitMeta.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/CLIJitMeta.cpp Fri Jan 29 11:34:25 2010
@@ -11,6 +11,7 @@
 
 #include "llvm/ExecutionEngine/GenericValue.h"
 #include "llvm/GlobalVariable.h"
+#include "llvm/LLVMContext.h"
 
 #include "types.h"
 

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

==============================================================================
--- vmkit/trunk/lib/N3/VMCore/LowerArrayLength.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/LowerArrayLength.cpp Fri Jan 29 11:34:25 2010
@@ -7,9 +7,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/Pass.h"
 #include "llvm/Function.h"
 #include "llvm/Instructions.h"
+#include "llvm/LLVMContext.h"
+#include "llvm/Pass.h"
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/Debug.h"
 

Modified: vmkit/trunk/lib/N3/VMCore/MSCorlib.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/MSCorlib.inc?rev=94815&r1=94814&r2=94815&view=diff

==============================================================================
--- vmkit/trunk/lib/N3/VMCore/MSCorlib.inc (original)
+++ vmkit/trunk/lib/N3/VMCore/MSCorlib.inc Fri Jan 29 11:34:25 2010
@@ -88,7 +88,8 @@
  
   N3* vm = VMThread::get()->getVM();
 
-  VMMethod* meth = vm->IPToMethod<VMMethod>(FRAME_IP(cur));
+  abort();
+  VMMethod* meth = NULL; //vm->IPToMethod<VMMethod>(FRAME_IP(cur));
 
   assert(meth && "Wrong stack");
   
@@ -107,10 +108,9 @@
   
   N3* vm = VMThread::get()->getVM();
 
-  VMMethod* meth = vm->IPToMethod<VMMethod>(FRAME_IP(cur));
-
+  abort();
+  VMMethod* meth = NULL; //vm->IPToMethod<VMMethod>(FRAME_IP(cur));
   assert(meth && "Wrong stack");
-  
   return meth->classDef->assembly->getAssemblyDelegatee();
 }
 

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

==============================================================================
--- vmkit/trunk/lib/N3/VMCore/N3Initialise.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/N3Initialise.cpp Fri Jan 29 11:34:25 2010
@@ -10,6 +10,8 @@
 
 #include <vector>
 
+#include "llvm/LLVMContext.h"
+
 #include "mvm/CompilationUnit.h"
 #include "mvm/JIT.h"
 #include "mvm/Threads/Locks.h"

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

==============================================================================
--- vmkit/trunk/lib/N3/VMCore/Opcodes.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/Opcodes.cpp Fri Jan 29 11:34:25 2010
@@ -13,6 +13,7 @@
 
 #include <llvm/Constants.h>
 #include <llvm/DerivedTypes.h>
+#include <llvm/LLVMContext.h>
 #include <llvm/Module.h>
 #include <llvm/Type.h>
 #include <llvm/Function.h>

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

==============================================================================
--- vmkit/trunk/lib/N3/VMCore/VMCache.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/VMCache.cpp Fri Jan 29 11:34:25 2010
@@ -11,6 +11,7 @@
 
 #include "llvm/DerivedTypes.h"
 #include "llvm/Instructions.h"
+#include "llvm/LLVMContext.h"
 
 #include "mvm/JIT.h"
 #include "mvm/Object.h"

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

==============================================================================
--- vmkit/trunk/lib/N3/VMCore/VMClass.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/VMClass.cpp Fri Jan 29 11:34:25 2010
@@ -11,6 +11,7 @@
 #include <vector>
 
 #include "llvm/DerivedTypes.h"
+#include "llvm/LLVMContext.h"
 #include "llvm/Module.h"
 
 #include "N3Debug.h"
@@ -805,7 +806,7 @@
 				void* res = mvm::MvmModule::executionEngine->getPointerToGlobal(methPtr);
 				code = res;
 				N3* vm = VMThread::get()->getVM();
-				vm->addMethodInFunctionMap(this, res);
+				// vm->addMethodInFunctionMap(this, res);
 			}
 			classDef->release();
 			classDef->resolveStatic(true, NULL);