[vmkit-commits] [vmkit] r60342 - in /vmkit/trunk: include/mvm/VirtualMachine.h lib/JnJVM/VMCore/JavaJIT.cpp lib/JnJVM/VMCore/JnjvmClassLoader.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Mon Dec  1 02:20:36 2008
New Revision: 60342

URL: http://llvm.org/viewvc/llvm-project?rev=60342&view=rev
Log:
Fix SERVICE build.


Modified:
    vmkit/trunk/include/mvm/VirtualMachine.h
    vmkit/trunk/lib/JnJVM/VMCore/JavaJIT.cpp
    vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp

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

==============================================================================
--- vmkit/trunk/include/mvm/VirtualMachine.h (original)
+++ vmkit/trunk/include/mvm/VirtualMachine.h Mon Dec  1 02:20:36 2008
@@ -55,6 +55,8 @@
   uint64_t gcTriggered;
   uint64_t executionTime;
   uint64_t numThreads;
+  CompilationUnit* CU;
+  void stopService();
 #endif
 
   mvm::Allocator gcAllocator;

Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaJIT.cpp?rev=60342&r1=60341&r2=60342&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaJIT.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaJIT.cpp Mon Dec  1 02:20:36 2008
@@ -1008,7 +1008,7 @@
                                                module->constantFour, "",
                                                currentBlock);
      
-    Isolate = new LoadInst(IsolatePtr, "", currentBlock);
+    Isolate = new LoadInst(Isolate, "", currentBlock);
     Isolate = new BitCastInst(Isolate, module->ptrPtrType, "", currentBlock);
     Value* Status = GetElementPtrInst::Create(Isolate, module->constantOne, "",
                                               currentBlock);
@@ -1025,6 +1025,7 @@
     BranchInst::Create(endExceptionBlock, currentBlock); 
 
     currentBlock = continueBlock;
+  }
 #endif
     
     Value* cmp = CallInst::Create(module->CompareExceptionFunction, cl, "",
@@ -1057,7 +1058,6 @@
       node->addIncoming(exc, cur->nativeHandler);
     }
 #if defined(SERVICE)
-  JnjvmClassLoader* loader = compilingClass->classLoader;;
   Value* threadId = 0;
   Value* OldIsolateID = 0;
   Value* IsolateIDPtr = 0;

Modified: vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp?rev=60342&r1=60341&r2=60342&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp Mon Dec  1 02:20:36 2008
@@ -254,7 +254,7 @@
   /// a new one each time a class loader is allocated.
   if (isolate->appClassLoader) {
     isolate = gc_new(Jnjvm)(bootstrapLoader);
-
+    isolate->CU = this;
     mvm::Thread* th = mvm::Thread::get();
     mvm::VirtualMachine* OldVM = th->MyVM;
     th->MyVM = isolate;