[vmkit-commits] [vmkit] r60244 - in /vmkit/trunk/lib/JnJVM/VMCore: JavaJIT.cpp JnjvmModule.cpp JnjvmModule.h

[Nicolas Geoffray]

Author: geoffray
Date: Sat Nov 29 03:52:57 2008
New Revision: 60244

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


Modified:
    vmkit/trunk/lib/JnJVM/VMCore/JavaJIT.cpp
    vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp
    vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.h

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaJIT.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaJIT.cpp Sat Nov 29 03:52:57 2008
@@ -674,8 +674,7 @@
                                            currentBlock);
      
     OldIsolate = new LoadInst(IsolatePtr, "", currentBlock);
-    NewIsolate = module->getIsolate(loader->getIsolate());
-    NewIsolate = new LoadInst(NewIsolate, "", currentBlock);
+    NewIsolate = module->getIsolate(loader->getIsolate(), currentBlock);
     new StoreInst(NewIsolate, IsolatePtr, currentBlock);
 
 #if DEBUG
@@ -1059,8 +1058,7 @@
                                            cur->javaHandler);
      
     OldIsolate = new LoadInst(IsolatePtr, "", cur->javaHandler);
-    NewIsolate = module->getIsolate(loader->getIsolate());
-    NewIsolate = new LoadInst(NewIsolate, "", cur->javaHandler);
+    NewIsolate = module->getIsolate(loader->getIsolate(), currentBlock);
     new StoreInst(NewIsolate, IsolatePtr, cur->javaHandler);
 
   }

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp Sat Nov 29 03:52:57 2008
@@ -1371,8 +1371,8 @@
 }
 
 #ifdef SERVICE
-Value* JnjvmModule::getIsolate(Jnjvm* isolate) {
-  if (staticCompilation)Â {
+Value* JnjvmModule::getIsolate(Jnjvm* isolate, Value* Where) {
+  if (staticCompilation) {
     llvm::GlobalVariable* varGV = 0;
     isolate_iterator End = isolates.end();
     isolate_iterator I = isolates.find(isolate);
@@ -1400,7 +1400,7 @@
     }
   } else {
     ConstantInt* CI = ConstantInt::get(Type::Int64Ty, uint64_t(isolate));
-    return ConstantExpr::get(CI, ptrType);
+    return ConstantExpr::getIntToPtr(CI, ptrType);
   }
 }
 #endif

Modified: vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.h?rev=60244&r1=60243&r2=60244&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.h Sat Nov 29 03:52:57 2008
@@ -394,7 +394,7 @@
   typedef std::map<const Jnjvm*, llvm::GlobalVariable*>::iterator
     isolate_iterator;
   
-  llvm::Value* getIsolate(Jnjvm* vm);
+  llvm::Value* getIsolate(Jnjvm* vm, llvm::Value* Where);
 #endif
   
 private: