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

[Nicolas Geoffray]

Author: geoffray
Date: Mon Nov 16 03:58:21 2009
New Revision: 88906

URL: http://llvm.org/viewvc/llvm-project?rev=88906&view=rev
Log:
Remove useless function.


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

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.cpp Mon Nov 16 03:58:21 2009
@@ -1434,12 +1434,11 @@
     if (it->get() == Type::getInt64Ty(getGlobalContext()) || it->get() == Type::getDoubleTy(getGlobalContext())) {
       pop();
     }
-    bool unsign = topIsUnsigned();
     Value* tmp = pop();
     
     const Type* type = it->get();
     if (tmp->getType() != type) { // int8 or int16
-      convertValue(tmp, type, currentBlock, unsign);
+      convertValue(tmp, type, currentBlock, false);
     }
     args[i] = tmp;
 
@@ -1996,7 +1995,6 @@
  
 
 void JavaJIT::setStaticField(uint16 index) {
-  bool unsign = topIsUnsigned();
   Value* val = pop(); 
   
   Typedef* sign = compilingClass->ctpInfo->infoOfField(index);
@@ -2010,7 +2008,7 @@
   Value* ptr = ldResolved(index, true, 0, type, LAI.llvmTypePtr);
   
   if (type != val->getType()) { // int1, int8, int16
-    convertValue(val, type, currentBlock, unsign);
+    convertValue(val, type, currentBlock, false);
   }
   
   new StoreInst(val, ptr, false, currentBlock);
@@ -2083,7 +2081,6 @@
 }
 
 void JavaJIT::setVirtualField(uint16 index) {
-  bool unsign = topIsUnsigned();
   Value* val = pop();
   Typedef* sign = compilingClass->ctpInfo->infoOfField(index);
   LLVMAssessorInfo& LAI = TheCompiler->getTypedefInfo(sign);
@@ -2098,7 +2095,7 @@
   Value* ptr = ldResolved(index, false, object, type, LAI.llvmTypePtr);
 
   if (type != val->getType()) { // int1, int8, int16
-    convertValue(val, type, currentBlock, unsign);
+    convertValue(val, type, currentBlock, false);
   }
 
   new StoreInst(val, ptr, false, currentBlock);

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.h (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JavaJIT.h Mon Nov 16 03:58:21 2009
@@ -276,10 +276,6 @@
     return stack.back();
   }
  
-  bool topIsUnsigned() {
-    return false;
-  }
-
   /// stackSize - Return the size of the stack.
   uint32 stackSize() {
     return stack.size();    

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JavaJITOpcodes.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JavaJITOpcodes.cpp Mon Nov 16 03:58:21 2009
@@ -754,7 +754,7 @@
         break;
 
       case DUP :
-        push(top(), topIsUnsigned());
+        push(top(), false);
         break;
 
       case DUP_X1 : {
@@ -1804,14 +1804,7 @@
         Opinfo& def = opcodeInfos[tmp + readU4(bytecodes, i)];
         uint32 nbs = readU4(bytecodes, i);
         
-        bool unsign = topIsUnsigned();
         Value* key = pop();
-        const Type* type = key->getType();
-        if (unsign) {
-          key = new ZExtInst(key, Type::getInt32Ty(*llvmContext), "", currentBlock);
-        } else if (type == Type::getInt8Ty(*llvmContext) || type == Type::getInt16Ty(*llvmContext)) {
-          key = new SExtInst(key, Type::getInt32Ty(*llvmContext), "", currentBlock);
-        }
         for (uint32 cur = 0; cur < nbs; ++cur) {
           Value* val = ConstantInt::get(Type::getInt32Ty(*llvmContext), readU4(bytecodes, i));
           Value* cmp = new ICmpInst(*currentBlock, ICmpInst::ICMP_EQ, val, key,
@@ -1826,10 +1819,9 @@
         break;
       }
       case IRETURN : {
-        bool unsign = topIsUnsigned();
         Value* val = pop();
         assert(val->getType()->isInteger());
-        convertValue(val, endNode->getType(), currentBlock, unsign);
+        convertValue(val, endNode->getType(), currentBlock, false);
         endNode->addIncoming(val, currentBlock);
         BranchInst::Create(endBlock, currentBlock);
         break;