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

[Nicolas Geoffray]

Author: geoffray
Date: Wed Mar 18 04:07:49 2009
New Revision: 67188

URL: http://llvm.org/viewvc/llvm-project?rev=67188&view=rev
Log:
Avoid type conversion.


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

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.cpp Wed Mar 18 04:07:49 2009
@@ -322,7 +322,8 @@
     nativeArgs.push_back(i);
   }
   
-  Value* nativeFunc = TheCompiler->getNativeFunction(compilingMethod, (void*)natPtr);
+  Value* nativeFunc = TheCompiler->getNativeFunction(compilingMethod,
+                                                     (void*)natPtr);
 
   if (TheCompiler->isStaticCompiling()) {
     Value* Arg = TheCompiler->getMethodInClass(compilingMethod); 
@@ -339,7 +340,8 @@
     BranchInst::Create(unloadedBlock, endBlock, cmp, currentBlock);
     currentBlock = unloadedBlock;
 
-    Value* res = CallInst::Create(TheCompiler->NativeLoader, Arg, "", currentBlock);
+    Value* res = CallInst::Create(TheCompiler->NativeLoader, Arg, "",
+                                  currentBlock);
 
     res = new BitCastInst(res, Ty, "", currentBlock);
     new StoreInst(res, nativeFunc, currentBlock);
@@ -1221,7 +1223,7 @@
 
 Instruction* JavaJIT::invokeInline(JavaMethod* meth, 
                                    std::vector<Value*>& args) {
-  JavaJIT jit(meth, llvmFunction);
+  JavaJIT jit(TheCompiler, meth, llvmFunction);
   jit.unifiedUnreachable = unifiedUnreachable;
   jit.inlineMethods = inlineMethods;
   jit.inlineMethods[meth] = true;

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.h (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.h Wed Mar 18 04:07:49 2009
@@ -55,11 +55,11 @@
 public:
  
   /// JavaJIT - Default constructor.
-  JavaJIT(JavaMethod* meth, llvm::Function* func) {
+  JavaJIT(JavaLLVMCompiler* C, JavaMethod* meth, llvm::Function* func) {
     nbEnveloppes = 0;
     compilingMethod = meth;
     compilingClass = meth->classDef;
-    TheCompiler = (JavaLLVMCompiler*)compilingClass->classLoader->getModule();
+    TheCompiler = C;
     module = TheCompiler->getIntrinsics();
     llvmFunction = func;
     inlining = false;

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp Wed Mar 18 04:07:49 2009
@@ -508,7 +508,7 @@
   if (func->hasNotBeenReadFromBitcode()) {
     // We are jitting. Take the lock.
     JnjvmModule::protectIR();
-    JavaJIT jit(meth, func);
+    JavaJIT jit(this, meth, func);
     if (isNative(meth->access)) {
       jit.nativeCompile();
       JnjvmModule::runPasses(func, JavaNativeFunctionPasses);