[vmkit-commits] [vmkit] r198283 - The old JIT is completely removed!

[Gael Thomas]

Author: gthomas
Date: Wed Jan  1 15:39:59 2014
New Revision: 198283

URL: http://llvm.org/viewvc/llvm-project?rev=198283&view=rev
Log:
The old JIT is completely removed! 


Modified:
    vmkit/branches/mcjit/include/j3/j3classloader.h
    vmkit/branches/mcjit/include/vmkit/compiler.h
    vmkit/branches/mcjit/lib/vmkit/compiler.cc

Modified: vmkit/branches/mcjit/include/j3/j3classloader.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/include/j3/j3classloader.h?rev=198283&r1=198282&r2=198283&view=diff
==============================================================================
--- vmkit/branches/mcjit/include/j3/j3classloader.h (original)
+++ vmkit/branches/mcjit/include/j3/j3classloader.h Wed Jan  1 15:39:59 2014
@@ -14,10 +14,6 @@ namespace vmkit {
 	class Symbol;
 }
 
-namespace llvm {
-	class ExecutionEngine;
-}
-
 namespace j3 {
 	class J3ZipArchive;
 	class J3ClassBytes;
@@ -63,9 +59,6 @@ namespace j3 {
 		pthread_mutex_t                      _mutexMethods;
 		MethodRefMap                         methods;      /* all te known method */
 
-		llvm::ExecutionEngine*               _ee;
-		llvm::ExecutionEngine*               _oldee;
-
 		void                          wrongType(J3Class* from, const vmkit::Name* type);
 		J3Type*                       getTypeInternal(J3Class* from, const vmkit::Name* type, uint32_t start, uint32_t* end);
 

Modified: vmkit/branches/mcjit/include/vmkit/compiler.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/include/vmkit/compiler.h?rev=198283&r1=198282&r2=198283&view=diff
==============================================================================
--- vmkit/branches/mcjit/include/vmkit/compiler.h (original)
+++ vmkit/branches/mcjit/include/vmkit/compiler.h Wed Jan  1 15:39:59 2014
@@ -42,7 +42,6 @@ namespace vmkit {
 		SymbolMap               _symbolTable;
 		pthread_mutex_t         _mutexSymbolTable;
 		llvm::ExecutionEngine*  _ee;
-		llvm::ExecutionEngine*  _oldee;
 		llvm::PassManager*      pm;
 
 	protected:
@@ -64,7 +63,6 @@ namespace vmkit {
 
 		BumpAllocator*          allocator() { return _allocator; }
 		llvm::ExecutionEngine*  ee() { return _ee; }
-		llvm::ExecutionEngine*  oldee() { return _oldee; }
 
 		void                    compileModule(llvm::Module* module);
 	};

Modified: vmkit/branches/mcjit/lib/vmkit/compiler.cc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/vmkit/compiler.cc?rev=198283&r1=198282&r2=198283&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/vmkit/compiler.cc (original)
+++ vmkit/branches/mcjit/lib/vmkit/compiler.cc Wed Jan  1 15:39:59 2014
@@ -58,15 +58,6 @@ CompilationUnit::CompilationUnit(BumpAll
 
 	ee()->finalizeObject();
 
-	_oldee = llvm::EngineBuilder(new llvm::Module("old ee", Thread::get()->vm()->llvmContext()))
-		.setErrorStr(&err)
-		.create();
-
-	if (!oldee())
-		Thread::get()->vm()->internalError(L"Error while creating execution engine: %s\n", err.c_str());
-
-	oldee()->DisableLazyCompilation(0);
-
 	pm = new llvm::PassManager();
 	//pm->add(new llvm::TargetData(*ee->getTargetData()));
 
@@ -112,7 +103,6 @@ CompilationUnit::CompilationUnit(BumpAll
 CompilationUnit::~CompilationUnit() {
 	delete pm;
 	delete _ee;
-	delete _oldee;
 }
 
 void CompilationUnit::destroy(CompilationUnit* unit) {