harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mfur...@apache.org
Subject svn commit: r568941 [4/4] - in /harmony/enhanced/drlvm/trunk: build/custom/msvc_2005/ build/custom/msvc_2005/gc_gen/ build/custom/msvc_2005/jitrino/ build/custom/msvc_2005/jthread/ build/custom/msvc_2005/vmcore/ vm/jitrino/src/codegenerator/ia32/ vm/ji...
Date Thu, 23 Aug 2007 11:47:53 GMT
Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32BCMap.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32BCMap.h?rev=568941&r1=568940&r2=568941&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32BCMap.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32BCMap.h Thu Aug 23
04:47:52 2007
@@ -43,11 +43,11 @@
     BcMap(MemoryManager& memMgr) : theMap(memMgr) {}
 
     uint32 getByteSize() const {
-        return 4 /*size*/+theMap.size() * (4 + 2/*native offset + bc offset*/);
+        return 4 /*size*/+(uint32)theMap.size() * (4 + 2/*native offset + bc offset*/);
     }
 
     void write(Byte* image) {
-        *((uint32*)image)=theMap.size();
+        *((uint32*)image)=(uint32)theMap.size();
         uint32 imageOffset = 4;
         for (BCByNCMap::const_iterator it = theMap.begin(), end = theMap.end(); it!=end;
it++) {
             uint32 nativeOffset = it->first;

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeEmitter.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeEmitter.cpp?rev=568941&r1=568940&r2=568941&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeEmitter.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeEmitter.cpp Thu
Aug 23 04:47:52 2007
@@ -388,7 +388,7 @@
                 Log::out()<<" global-bc-offset="<<globalBCMapOffset<<std::endl;
             }
             if (globalBCMapOffset!=ILLEGAL_BC_MAPPING_VALUE) {
-                bcMap->setEntry(nativeInstStartOffset, globalBCMapOffset);
+                bcMap->setEntry((uint32)nativeInstStartOffset, globalBCMapOffset);
             }
         }
     }
@@ -948,7 +948,7 @@
                             // The rest ones are generated directly to the memory using encoder.
                             // Taking this into account:
                             assert(nextAddr > instAddr);
-                            instSizeMap[instAddr] = nextAddr-instAddr;
+                            instSizeMap[instAddr] = (uint32)(nextAddr-instAddr);
                         } else {
                             instSizeMap[instAddr] = instSize;
                         }

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Inst.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Inst.cpp?rev=568941&r1=568940&r2=568941&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Inst.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Inst.cpp Thu Aug 23
04:47:52 2007
@@ -584,7 +584,7 @@
 void * Inst::getCodeStartAddr() const 
 {
     if (hasKind(Inst::Kind_PseudoInst)) {
-        return (void*)0xDEADBEEF;
+        return (void*)(POINTER_SIZE_INT)0xDEADBEEF;
     }
     BasicBlock* bb = getBasicBlock();
     return bb!=NULL?(uint8*)bb->getCodeStartAddr()+codeOffset:0;

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32WebMaker.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32WebMaker.cpp?rev=568941&r1=568940&r2=568941&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32WebMaker.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32WebMaker.cpp Thu Aug
23 04:47:52 2007
@@ -386,7 +386,7 @@
                             opndxp->opdefs.push_back(OpDef());
                             OpDef& opdef = opndxp->opdefs.back();
                             opdef.visited = false;
-                            opdef.linkx = &opdef - &opndxp->opdefs.front();
+                            opdef.linkx = (unsigned int)(&opdef - &opndxp->opdefs.front());
                             opdef.globid = -1;
                             opdef.defp   = instp;
                             opdef.useps  = 0;

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/CodeGenerator.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/CodeGenerator.cpp?rev=568941&r1=568940&r2=568941&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/CodeGenerator.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/CodeGenerator.cpp Thu Aug 23 04:47:52
2007
@@ -85,7 +85,7 @@
         return sizeof(uint32);
     }
     return getIndexSize(entryByOffset.size())   //index size
-          + entries.size() * sizeof(Entry); //all entries size;
+          + (uint32)(entries.size() * sizeof(Entry)); //all entries size;
 }
 
 void
@@ -128,7 +128,7 @@
         Entry* imageEntry = entriesInImage + entryIdx;
         *header = nativeOffset;
         header++;
-        *header = (char*)imageEntry - (char*)image;
+        *header = (uint32)((char*)imageEntry - (char*)image);
         header++;
     }
     *header = 0;

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/abcd/classic_abcd.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/abcd/classic_abcd.cpp?rev=568941&r1=568940&r2=568941&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/abcd/classic_abcd.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/abcd/classic_abcd.cpp Thu Aug 23
04:47:52 2007
@@ -386,7 +386,7 @@
         if ( negate ) {
             constant = (-1) * constant;
         }
-        _igraph->addEdge(src->getID(), dst->getID(), constant);
+        _igraph->addEdge(src->getID(), dst->getID(), (int32)constant);
         return true;
     }
     return false;
@@ -400,7 +400,7 @@
     if ( from->isUnconstrained() || !inInt32(c) ) {
         return;
     }
-    _igraph->addEdgeSingleState(from->getID(), to->getID(), c, lower_problem);
+    _igraph->addEdgeSingleState(from->getID(), to->getID(), (int32)c, lower_problem);
 }
 //------------------------------------------------------------------------------
 
@@ -444,7 +444,7 @@
     } else if ( non_inf_bound.isConst() ) {
         MemoryManager& mm = _igraph->getMemoryManager();
         IOpndProxy* c_opnd = new (mm) 
-            IOpndProxy(non_inf_bound.getConst(), _const_id_counter++);
+            IOpndProxy((int32)non_inf_bound.getConst(), _const_id_counter++);
         _igraph->addOpnd(c_opnd);
         addDistanceSingleProblem(c_opnd /* to */, dst, 0, lower_problem);
     }
@@ -642,7 +642,7 @@
         }
     }
 
-    uint32 checks_total = _redundantChecks.size();
+    size_t checks_total = _redundantChecks.size();
     if ( _dump_abcd_stats && checks_total > 0 ) {
         std::ofstream checks_log;
         checks_log.open("bounds_checks.log", std::fstream::out | std::fstream::app);

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/loop_unroll.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/loop_unroll.cpp?rev=568941&r1=568940&r2=568941&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/loop_unroll.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/loop_unroll.cpp Thu Aug 23 04:47:52
2007
@@ -144,7 +144,7 @@
 typedef StlVector<Inst*> InstStack;
 typedef StlVector<LoopUnrollInfo*> UnrollInfos;
 
-static void log_ident(int n)  {for (int i=0;i<n;++i) Log::out()<<"  "; }
+static void log_ident(size_t n)  {for (size_t i=0;i<n;++i) Log::out()<<"  "; }
 static int signof(int v) { return (v == 0) ? 0 : ( v < 0 ? -1 : 1); }
 
 
@@ -237,7 +237,7 @@
 
         //check config settings
         bool failed = false;
-        int nodesInLoop = loopHeader->getNodesInLoop().size();
+        size_t nodesInLoop = loopHeader->getNodesInLoop().size();
         const char* reason = "unknown";
         if (nodesInLoop > flags.largeLoopSize) {
             reason = "loop is too large";



Mime
View raw message