harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r512698 [2/2] - in /harmony/enhanced/drlvm/trunk/vm/jitrino/src: codegenerator/ codegenerator/ia32/ dynopt/ jet/ main/ optimizer/ shared/ vm/ vm/drl/
Date Wed, 28 Feb 2007 10:56:23 GMT
Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Inst.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Inst.cpp?view=diff&rev=512698&r1=512697&r2=512698
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Inst.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Inst.cpp Wed Feb 28 02:56:15 2007
@@ -704,8 +704,6 @@
         assert(0);
     }
     newInst->setPersistentInstructionId(inst->getPersistentInstructionId());
-    decMethodId();
-    newInst->setMethodId(inst->getMethodId());
     return newInst;
 }
 
@@ -713,8 +711,6 @@
 InstFactory::makeClone(LabelInst* inst, OpndManager& opndManager, OpndRenameTable&
table) {
     LabelInst *newInst = makeLabel();
     newInst->setPersistentInstructionId(inst->getPersistentInstructionId());
-    decMethodId();
-    newInst->setMethodId(inst->getMethodId());
     return newInst;
 }
 
@@ -731,8 +727,6 @@
     CatchLabelInst *newInst =makeCatchLabelInst(createLabelNumber(), 
                                                 inst->getOrder(), inst->getExceptionType());
     newInst->setPersistentInstructionId(inst->getPersistentInstructionId());
-    decMethodId();
-    newInst->setMethodId(inst->getMethodId());
     return newInst;
 }
 
@@ -743,8 +737,6 @@
     MethodEntryInst *newInst = makeMethodEntryInst(createLabelNumber(),
                                                    inst->methodDesc);
     newInst->setPersistentInstructionId(inst->getPersistentInstructionId());
-    decMethodId();
-    newInst->setMethodId(inst->getMethodId());
     return newInst;
 }
 
@@ -760,8 +752,6 @@
         newInst = makeMethodMarkerInst(inst->kind, inst->methodDesc);
     }
     newInst->setPersistentInstructionId(inst->getPersistentInstructionId());
-    decMethodId();
-    newInst->setMethodId(inst->getMethodId());
     return newInst;
 }
 
@@ -790,8 +780,6 @@
     default: assert(0);
     }
     newInst->setPersistentInstructionId(inst->getPersistentInstructionId());
-    decMethodId();
-    newInst->setMethodId(inst->getMethodId());
     return newInst;
 }
 
@@ -807,8 +795,6 @@
         newTargets[i] = targets[i];
     SwitchInst *newInst = makeSwitchInst(src, newTargets, numTargets, inst->getDefaultTarget());
     newInst->setPersistentInstructionId(inst->getPersistentInstructionId());
-    decMethodId();
-    newInst->setMethodId(inst->getMethodId());
     return newInst;
 }
 
@@ -843,8 +829,6 @@
     default: assert(0);
     }
     newInst->setPersistentInstructionId(inst->getPersistentInstructionId());
-    decMethodId();
-    newInst->setMethodId(inst->getMethodId());
     return newInst;
 }
 
@@ -859,8 +843,6 @@
                                        inst->getToken(),
                                        inst->getEnclosingMethod());
     newInst->setPersistentInstructionId(inst->getPersistentInstructionId());
-    decMethodId();
-    newInst->setMethodId(inst->getMethodId());
     return newInst;
 }
 
@@ -876,8 +858,6 @@
                                        inst->getCPIndex(),
                                        inst->getOperation());
     newInst->setPersistentInstructionId(inst->getPersistentInstructionId());
-    decMethodId();
-    newInst->setMethodId(inst->getMethodId());
     return newInst;
 }
 
@@ -912,8 +892,6 @@
         }
     }
     newInst->setPersistentInstructionId(inst->getPersistentInstructionId());
-    decMethodId();
-    newInst->setMethodId(inst->getMethodId());
     return newInst;
 }
 
@@ -944,8 +922,6 @@
         break;
     }
     newInst->setPersistentInstructionId(inst->getPersistentInstructionId());
-    decMethodId();
-    newInst->setMethodId(inst->getMethodId());
     return newInst;
 }
 
@@ -977,8 +953,6 @@
         break;
     }
     newInst->setPersistentInstructionId(inst->getPersistentInstructionId());
-    decMethodId();
-    newInst->setMethodId(inst->getMethodId());
     return newInst;
 }
 
@@ -1008,8 +982,6 @@
         break;
     }
     newInst->setPersistentInstructionId(inst->getPersistentInstructionId());
-    decMethodId();
-    newInst->setMethodId(inst->getMethodId());
     return newInst;
 }
 
@@ -1030,8 +1002,6 @@
                              newArgs,
                              inst->getMethodDesc());
     newInst->setPersistentInstructionId(inst->getPersistentInstructionId());
-    decMethodId();
-    newInst->setMethodId(inst->getMethodId());
     InlineInfo* ii = newInst->getInlineInfoPtr();
     ii->getInlineChainFrom(*inst->getInlineInfoPtr());
     return newInst;
@@ -1054,8 +1024,6 @@
                         inst->getNumArgs(),
                         newArgs);
     newInst->setPersistentInstructionId(inst->getPersistentInstructionId());
-    decMethodId();
-    newInst->setMethodId(inst->getMethodId());
     InlineInfo* ii = newInst->getInlineInfoPtr();
     ii->getInlineChainFrom(*inst->getInlineInfoPtr());
     return newInst;
@@ -1077,8 +1045,6 @@
                                  newArgs,
                                  inst->getIntrinsicId());
     newInst->setPersistentInstructionId(inst->getPersistentInstructionId());
-    decMethodId();
-    newInst->setMethodId(inst->getMethodId());
     return newInst;
 }
 
@@ -1100,8 +1066,6 @@
                                  newArgs,
                                  inst->getJitHelperId());
     newInst->setPersistentInstructionId(inst->getPersistentInstructionId());
-    decMethodId();
-    newInst->setMethodId(inst->getMethodId());
     return newInst;
 }
 
@@ -1117,8 +1081,6 @@
                        numArgs,
                        newArgs);
     newInst->setPersistentInstructionId(inst->getPersistentInstructionId());
-    decMethodId();
-    newInst->setMethodId(inst->getMethodId());
     return newInst;
 }
 
@@ -1148,8 +1110,6 @@
         break;
     }
     newInst->setPersistentInstructionId(inst->getPersistentInstructionId());
-    decMethodId();
-    newInst->setMethodId(inst->getMethodId());
     return newInst;
 }
 
@@ -1159,7 +1119,6 @@
 InstFactory::InstFactory(MemoryManager& mm, MethodDesc &md) : memManager(mm) {
     maxNumLabels = 0;
     numInsts = 0;
-    numMethodInsts = ((uint64)md.getUniqueId())<<32;
 }
 
 Opnd**
@@ -1229,14 +1188,12 @@
 InstFactory::makeInst(Opcode op, Modifier mod, Type::Tag type, Opnd* dst) {
     Inst* inst = new (memManager) Inst(op, mod, type, dst);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 Inst*
 InstFactory::makeInst(Opcode op, Modifier mod, Type::Tag type, Opnd* dst, Opnd* src) {
     Inst* inst = new (memManager) Inst(op, mod, type, dst, src);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 Inst*
@@ -1248,28 +1205,24 @@
                       Opnd* src2) {
     Inst* inst = new (memManager) Inst(op, mod, type, dst, src1, src2);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 LabelInst*
 InstFactory::makeLabelInst(uint32 labelId) {
     LabelInst* inst = new (memManager) LabelInst(labelId);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 LabelInst*
 InstFactory::makeLabelInst(Opcode opc, uint32 labelId) {
     LabelInst* inst = new (memManager) LabelInst(opc, labelId);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 DispatchLabelInst*
 InstFactory::makeDispatchLabelInst(uint32 labelId) {
     DispatchLabelInst* inst = new (memManager) DispatchLabelInst(labelId);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 
@@ -1279,7 +1232,6 @@
                                    Type *exceptionType) {
     CatchLabelInst* inst = new (memManager) CatchLabelInst(labelId, ord, exceptionType);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 
@@ -1287,7 +1239,6 @@
 InstFactory::makeMethodEntryInst(uint32 labelId, MethodDesc* md)  {
     MethodEntryInst* inst = new (memManager) MethodEntryInst(labelId, md);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 
@@ -1297,7 +1248,6 @@
     assert(obj && !obj->isNull());
     MethodMarkerInst* inst = new (memManager) MethodMarkerInst(k, md, obj, retOpnd);
     inst->id = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 
@@ -1306,7 +1256,6 @@
         Opnd *retOpnd) {
     MethodMarkerInst* inst = new (memManager) MethodMarkerInst(k, md, retOpnd);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 
@@ -1314,7 +1263,6 @@
 InstFactory::makeMethodMarkerInst(MethodMarkerInst::Kind k, MethodDesc* md) {
     MethodMarkerInst* inst = new (memManager) MethodMarkerInst(k, md);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 
@@ -1322,7 +1270,6 @@
 InstFactory::makeBranchInst(Opcode op, LabelInst* target) {
     BranchInst* inst = new (memManager) BranchInst(op, target);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 BranchInst*
@@ -1331,7 +1278,6 @@
                             LabelInst* target) {
     BranchInst* inst = new (memManager) BranchInst(op, src, target);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 BranchInst*
@@ -1342,7 +1288,6 @@
                             LabelInst* target) {
     BranchInst* inst = new (memManager) BranchInst(op, mod, type, src, target);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 BranchInst*
@@ -1354,7 +1299,6 @@
                             LabelInst* target) {
     BranchInst* inst = new (memManager) BranchInst(op, mod, type, src1, src2, target);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 
@@ -1363,56 +1307,48 @@
                             LabelInst* defTarget) {
     SwitchInst* inst = new (memManager) SwitchInst(src, targets, nTargets, defTarget);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 ConstInst*
 InstFactory::makeConstInst(Opnd* dst, int32 i4) {
     ConstInst* inst = new (memManager) ConstInst(dst, i4);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 ConstInst*
 InstFactory::makeConstInst(Opnd* dst, int64 i8)  {
     ConstInst* inst = new (memManager) ConstInst(dst, i8);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 ConstInst*
 InstFactory::makeConstInst(Opnd* dst, float fs) {
     ConstInst* inst = new (memManager) ConstInst(dst, fs);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 ConstInst*
 InstFactory::makeConstInst(Opnd* dst, double fd)  {
     ConstInst* inst = new (memManager) ConstInst(dst, fd);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 ConstInst*
 InstFactory::makeConstInst(Opnd* dst, ConstInst::ConstValue val) {
     ConstInst* inst = new (memManager) ConstInst(dst, val);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 ConstInst*
 InstFactory::makeConstInst(Opnd* dst) {
     ConstInst* inst = new (memManager) ConstInst(dst);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 TokenInst*
 InstFactory::makeTokenInst(Opcode opc, Modifier mod, Type::Tag type, Opnd* dst, uint32 t,
MethodDesc* encMethod) {
     TokenInst* inst = new (memManager) TokenInst(opc, mod, type, dst, t, encMethod);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 LinkingExcInst*
@@ -1421,42 +1357,36 @@
     LinkingExcInst* inst =
         new (memManager) LinkingExcInst(opc, mod, type, dst, encClass, CPIndex, operation);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 VarAccessInst*
 InstFactory::makeVarAccessInst(Opcode op, Type::Tag type, Opnd* dst, VarOpnd* var) {
     VarAccessInst* inst = new (memManager) VarAccessInst(op, type, dst, var);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 VarAccessInst*
 InstFactory::makeVarAccessInst(Opcode op, Type::Tag type, VarOpnd* var, Opnd* src) {
     VarAccessInst* inst = new (memManager) VarAccessInst(op, type, var, src);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 VarAccessInst*
 InstFactory::makeVarAccessInst(Opcode op, Type::Tag type, Opnd* dst, SsaVarOpnd* var) {
     VarAccessInst* inst = new (memManager) VarAccessInst(op, type, dst, var);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 VarAccessInst*
 InstFactory::makeVarAccessInst(Opcode op, Type::Tag type, SsaVarOpnd* var, Opnd* src) {
     VarAccessInst* inst = new (memManager) VarAccessInst(op, type, var, src);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 TypeInst*
 InstFactory::makeTypeInst(Opcode op, Modifier mod, Type::Tag ty, Opnd* dst, Type* td) {
     TypeInst* inst = new (memManager) TypeInst(op, mod, ty, dst, td);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 TypeInst*
@@ -1464,7 +1394,6 @@
     Opnd* src, Type* td) {
     TypeInst* inst = new (memManager) TypeInst(op, mod, ty, dst, src, td);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 TypeInst*
@@ -1472,7 +1401,6 @@
     Opnd* src1, Opnd* src2, Type* td) {
     TypeInst* inst = new (memManager) TypeInst(op, mod, ty, dst, src1, src2, td);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 TypeInst*
@@ -1482,7 +1410,6 @@
     Opnd** srcs = copyOpnds(srcs_local, 3);
     TypeInst* inst = new (memManager) TypeInst(op, mod, ty, dst, 3, srcs, td);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 TypeInst*
@@ -1492,7 +1419,6 @@
     Opnd** srcs = copyOpnds(srcs_local, 4);
     TypeInst* inst = new (memManager) TypeInst(op, mod, ty, dst, 4, srcs, td);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 TypeInst*
@@ -1500,7 +1426,6 @@
     uint32 nArgs, Opnd** args_, Type* td) {
     TypeInst* inst = new (memManager) TypeInst(op, mod, ty, dst, nArgs, args_, td);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 FieldAccessInst*
@@ -1511,7 +1436,6 @@
                 FieldDesc* fd) {
     FieldAccessInst* inst = new (memManager) FieldAccessInst(op, mod, type, dst, fd);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 FieldAccessInst*
@@ -1523,7 +1447,6 @@
                 FieldDesc* fd) {
     FieldAccessInst* inst = new (memManager) FieldAccessInst(op, mod, type, dst, src, fd);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 FieldAccessInst*
@@ -1536,7 +1459,6 @@
                 FieldDesc* fd) {
     FieldAccessInst* inst = new (memManager) FieldAccessInst(op, mod, type, dst, src1, src2,
fd);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 FieldAccessInst*
@@ -1550,21 +1472,18 @@
     srcs = copyOpnds(srcs, numSrcs);
     FieldAccessInst* inst = new (memManager) FieldAccessInst(op, mod, type, dst, numSrcs,
srcs, fd);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 MethodInst*
 InstFactory::makeMethodInst(Opcode op, Modifier mod, Type::Tag type, Opnd* dst, MethodDesc*
md) {
     MethodInst* inst = new (memManager) MethodInst(op, mod, type, dst, md);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 MethodInst*
 InstFactory::makeMethodInst(Opcode op, Modifier mod, Type::Tag type, Opnd* dst, Opnd* base,
MethodDesc* md) {
     MethodInst* inst = new (memManager) MethodInst(op, mod, type, dst, base, md);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 MethodInst*
@@ -1573,7 +1492,6 @@
     assert(tauHasMethod->getType()->tag == Type::Tau);
     MethodInst* inst = new (memManager) MethodInst(op, mod, type, dst, base, tauHasMethod,
md);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 MethodInst*
@@ -1585,7 +1503,6 @@
                             MethodDesc* md) {
     MethodInst* inst = new (memManager) MethodInst(op, mod, type, dst, nArgs, 0, md);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 MethodInst*
@@ -1599,7 +1516,6 @@
     srcs = copyOpnds(srcs, numSrcs);
     MethodInst* inst = new (memManager) MethodInst(op, mod, type, dst, numSrcs, srcs, md);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 MethodCallInst*
@@ -1611,7 +1527,6 @@
                MethodDesc* md) {
     MethodCallInst* inst = new (memManager) MethodCallInst(op, mod, type, dst, numArgs, args,
md, memManager);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 
@@ -1624,7 +1539,6 @@
                           Opnd** args) {
     CallInst* inst = new (memManager) CallInst(op, mod, type, dst, funptr, numArgs, args,
memManager);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 
@@ -1638,7 +1552,6 @@
     IntrinsicCallInst * inst = 
         new (memManager) IntrinsicCallInst(op, mod, type, dst, nArgs, args_, id);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 
@@ -1653,7 +1566,6 @@
     JitHelperCallInst * inst = 
         new (memManager) JitHelperCallInst(op, mod, type, dst, nArgs, args_, id);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 
@@ -1669,7 +1581,6 @@
     VMHelperCallInst * inst = 
         new (memManager) VMHelperCallInst(op, mod, type, dst, nArgs, args_, id);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     inst->inlInfo = inlInfo;
     return inst;
 }
@@ -1683,7 +1594,6 @@
 #endif
     PhiInst* inst = new (memManager) PhiInst(type, dst, nArgs, args_);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 
@@ -1694,7 +1604,6 @@
                           Opnd* dst) {
     MultiSrcInst* inst = new (memManager) MultiSrcInst(opc, mod, ty, dst);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 MultiSrcInst*
@@ -1705,7 +1614,6 @@
                           Opnd* src) {
     MultiSrcInst* inst = new (memManager) MultiSrcInst(opc, mod, ty, dst, src);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 MultiSrcInst*
@@ -1717,7 +1625,6 @@
                           Opnd* src2) {
     MultiSrcInst* inst = new (memManager) MultiSrcInst(opc, mod, ty, dst, src1, src2);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 MultiSrcInst*
@@ -1756,7 +1663,6 @@
                           Opnd** srcs) {
     MultiSrcInst* inst = new (memManager) MultiSrcInst(opc, mod, ty, dst, nSrcs, srcs);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 
@@ -2051,7 +1957,6 @@
     Inst* inst = makeCallInst(Op_IndirectCall, Modifier(Exception_Sometimes), 
                               returnType, dst, funAddr, numArgs+2, newArgs);
     inst->id = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 
@@ -2070,7 +1975,6 @@
     Inst* inst = makeCallInst(Op_IndirectMemoryCall, Modifier(Exception_Sometimes), 
                               returnType, dst, funAddr, numArgs+2, newArgs);
     inst->id = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 
@@ -2128,7 +2032,6 @@
     Type::Tag atype = src->getType()->tag;
     TauPiInst* inst = new (memManager) TauPiInst(atype, dst, src, tauDep, cond);
     inst->id       = numInsts++;
-    inst->methodId = numMethodInsts++;
     return inst;
 }
 

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Inst.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Inst.h?view=diff&rev=512698&r1=512697&r2=512698
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Inst.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Inst.h Wed Feb 28 02:56:15 2007
@@ -137,10 +137,6 @@
 
     uint32 getId() const {return id;}
 
-    uint64 getMethodId() const {return methodId; }
-
-    void   setMethodId(uint64 id) {methodId = id; }
-
     PersistentInstructionId getPersistentInstructionId() const {return pid; }
 
     void   setPersistentInstructionId(PersistentInstructionId id) {pid = id; }
@@ -386,7 +382,6 @@
     uint32  numSrcs;
     Opnd*   srcs[MAX_INST_SRCS];
     Opnd*   dst;
-    uint64  methodId;
     PersistentInstructionId pid;
     uint32  id;
     
@@ -1319,14 +1314,10 @@
     uint32   createLabelNumber()     {return maxNumLabels++; }
     uint32   getMaxNumLabels()       {return maxNumLabels;   }
     uint32   getNumInsts()           {return numInsts;       }
-    uint64   getMethodId()           {return numMethodInsts; }
-    void     setMethodId(uint64 mid) {numMethodInsts = mid;  }
-    void     decMethodId()           {numMethodInsts--;      }
-
+    
 private:
     uint32   maxNumLabels;        // number of labels generated
     uint32   numInsts;            // number of instructions generated
-    uint64   numMethodInsts;      // a combination of <method,instruction id>
     MemoryManager& memManager;
 
     //

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/escanalyzer.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/escanalyzer.cpp?view=diff&rev=512698&r1=512697&r2=512698
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/escanalyzer.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/escanalyzer.cpp Wed Feb 28 02:56:15
2007
@@ -162,7 +162,7 @@
     const char* mn = mh.getName();
     const Nodes& nodes = irManager.getFlowGraph().getNodes();
     ControlFlowGraph& fg = irManager.getFlowGraph();
-    uint32 nodeNum = nodes.size();
+    uint32 nodeNum = (uint32)nodes.size();
     uint32 num2 = fg.getNodeCount();
     uint32 num3 = fg.getMaxNodeId();
     Nodes::const_iterator niter;

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/inliner.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/inliner.cpp?view=diff&rev=512698&r1=512697&r2=512698
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/inliner.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/inliner.cpp Wed Feb 28 02:56:15
2007
@@ -953,11 +953,7 @@
         methodDesc->getSignatureString() << ::std::endl;
     
     // Generate flowgraph for new region
-    oldMethodId = _instFactory.getMethodId();
-    uint32 id = methodDesc->getUniqueId();
-    _instFactory.setMethodId(((uint64)id)<<32);
-    
-    
+   
     InlineNode* inlineNode = createInlineNode(inlineCC, call);
     assert(inlineNode!=NULL);
 

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/inliner.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/inliner.h?view=diff&rev=512698&r1=512697&r2=512698
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/inliner.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/inliner.h Wed Feb 28 02:56:15 2007
@@ -187,8 +187,6 @@
     Method_Table* _inlineSkipMethodTable;
     Method_Table* _inlineBonusMethodTable;
 
-    uint64 oldMethodId;
-
     bool _usesOptimisticBalancedSync;
     bool isBCmapRequired;
     VectorHandler* bc2HIRMapHandler;

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/multiplybyconstant.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/multiplybyconstant.cpp?view=diff&rev=512698&r1=512697&r2=512698
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/multiplybyconstant.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/multiplybyconstant.cpp Wed Feb 28
02:56:15 2007
@@ -496,7 +496,7 @@
         inttype dinv = ~d;
         int numones = nlz<inttype, width>(dinv);
         int shiftby = width - numones;
-        inttype newd = d + (1 << shiftby);
+        inttype newd = d + ((inttype)1 << shiftby);
         if (shiftby <= m.SMALL_SHIFT_MAXBITS) {
             DEBUGPRINT("planMulNeg(" << (int) d << ") case 2a, shiftby=" <<
shiftby);
             res2.append(MulOp::pushy); res2.append(MulOp::neg);
@@ -711,7 +711,7 @@
                 if ((rightzeros <= small_shift_maxbits) &&
                     (rightzeros + bitswidth >= 2 * small_shift_maxbits)) {
                     DEBUGPRINT("case smallshiftadd");
-                    inttype newd = d + (1 << rightzeros);
+                    inttype newd = d + ((inttype)1 << rightzeros);
                     m.append(MulOp::pushy); m.append(MulOp::neg); 
                     planMul<inttype, width>(m, newd, depth+1); 
                     m.append(MulOp::shladd, rightzeros);
@@ -723,12 +723,12 @@
                 }
             } else {
                 DEBUGPRINT("case even, wider");
-                inttype deltasubright = delta - (1 << deltaright);
+                inttype deltasubright = delta - ((inttype)1 << deltaright);
                 int deltasubright_ntz = ntz<inttype, width>(deltasubright);
                 int region2 = deltasubright_ntz - deltaright +1;
                 assert(region2 > 0);
                 if (region2 > 2) {
-                    inttype newd = d + (1 << rightzeros);
+                    inttype newd = d + ((inttype)1 << rightzeros);
                     if (rightzeros <= small_shift_maxbits) {
                         DEBUGPRINT("case wide smalladdshift");
                         m.append(MulOp::pushy); m.append(MulOp::neg);
@@ -758,7 +758,7 @@
                         m.append(MulOp::shladd, small_shift_maxbits);
                     }
                 } else { // region2 == 1
-                    inttype newd = d - (1 << rightzeros);
+                    inttype newd = d - ((inttype)1 << rightzeros);
                     if (rightzeros <= small_shift_maxbits) {
                         DEBUGPRINT("case wide smalladdshift1");
                         m.append(MulOp::pushy);

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/ControlFlowGraph.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/ControlFlowGraph.h?view=diff&rev=512698&r1=512697&r2=512698
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/ControlFlowGraph.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/ControlFlowGraph.h Wed Feb 28 02:56:15
2007
@@ -719,14 +719,14 @@
    *
    * @return The number of outgoing edges of the node.
    */
-    uint32 getOutDegree() const {return getOutEdges().size();}
+    uint32 getOutDegree() const {return (uint32)getOutEdges().size();}
     
   /** 
    * Gets the number of incoming edges to the node. 
    *
    * @return The number of incoming edges to the node.
    */
-    uint32 getInDegree() const {return getInEdges().size();}
+    uint32 getInDegree() const {return (uint32)getInEdges().size();}
 
   /** 
    * Checks whether the node has only one outgoing edge. 

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/InlineInfo.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/InlineInfo.h?view=diff&rev=512698&r1=512697&r2=512698
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/InlineInfo.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/InlineInfo.h Wed Feb 28 02:56:15 2007
@@ -108,7 +108,7 @@
         os << ::std::endl;
     }
 
-    uint32 countLevels() { return inlineChain ? inlineChain->size() : 0; }
+    uint32 countLevels() { return inlineChain ? (uint32)inlineChain->size() : 0; }
 
 protected:
     friend class InlineInfoMap;

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Interval.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Interval.cpp?view=diff&rev=512698&r1=512697&r2=512698
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Interval.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Interval.cpp Wed Feb 28 02:56:15 2007
@@ -79,13 +79,13 @@
 
         while (i != iend && k != kend)
         {
-            if ((d = i->end - k->beg) < 0)
+            if ((d = int(i->end - k->beg)) < 0)
             {
                 if (d == -1)
                     ++adj;
                 ++i;
             }
-            else if ((d = i->beg - k->end) > 0)
+            else if ((d = int(i->beg - k->end)) > 0)
             {
                 if (d == 1)
                     ++adj;

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/LoopTree.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/LoopTree.cpp?view=diff&rev=512698&r1=512697&r2=512698
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/LoopTree.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/LoopTree.cpp Wed Feb 28 02:56:15 2007
@@ -209,7 +209,7 @@
     Node* block = fg->createNode(header->getKind());
     
     if (coalesceCallback!=NULL) {
-        coalesceCallback->coalesce(header, block, edges.size());
+        coalesceCallback->coalesce(header, block, (uint32)edges.size());
     }
     //retarget all edges
     for (Edges::const_iterator ite = edges.begin(), ende = edges.end(); ite!=ende; ++ite)
{

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/PlatformDependant.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/PlatformDependant.h?view=diff&rev=512698&r1=512697&r2=512698
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/PlatformDependant.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/PlatformDependant.h Wed Feb 28 02:56:15
2007
@@ -30,8 +30,12 @@
     #define strnicmp strncasecmp
 #else
     #pragma warning( push, 4 )
-    #pragma warning( disable : 4100 4127 4201 4511 4512 )
+    #pragma warning( disable : 4100 4127 4201 4511 4512)
     #pragma conform( forScope, on )
+
+    #define strdup _strdup
+    #define strcmpi _strcmpi
+    #define stricmp _stricmp
 #endif //_MSC_VER
 
 #undef stdcall__
@@ -70,5 +74,10 @@
     //----
 
 #endif
+
+inline bool fit32(int64 val) {
+    return (INT_MIN <= val) && (val <= INT_MAX);
+}
+
 
 #endif // _PLATFORMDEPENDANT_H_

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.h?view=diff&rev=512698&r1=512697&r2=512698
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.h Wed Feb 28 02:56:15 2007
@@ -182,7 +182,7 @@
     //
     // accessors for DynoptInfo of this method
     // 
-    virtual uint32      getUniqueId() = 0;
+    virtual POINTER_SIZE_INT    getUniqueId() = 0;
     
     virtual void* getHandleMap() = 0;
     virtual void setHandleMap(void* ) = 0;

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/drl/DrlVMInterface.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/drl/DrlVMInterface.cpp?view=diff&rev=512698&r1=512697&r2=512698
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/drl/DrlVMInterface.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/drl/DrlVMInterface.cpp Wed Feb 28 02:56:15
2007
@@ -92,7 +92,8 @@
         hythread_tls_alloc(&key);
         offset = hythread_tls_get_offset(key);
     }
-    return offset;
+    assert(fit32(offset));
+    return (uint32)offset;
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -412,7 +413,7 @@
     return method_get_code_block_size_jit_new(drlMethod,getJitHandle(), id);
 }
 
-uint32
+POINTER_SIZE_INT
 DrlVMMethodDesc::getUniqueId()
 {
 #ifdef _IPF_

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/drl/DrlVMInterface.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/drl/DrlVMInterface.h?view=diff&rev=512698&r1=512697&r2=512698
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/drl/DrlVMInterface.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/drl/DrlVMInterface.h Wed Feb 28 02:56:15
2007
@@ -287,7 +287,7 @@
     virtual uint32   getInfoBlockSize();
     virtual Byte*    getCodeBlockAddress(int32 id);
     virtual uint32   getCodeBlockSize(int32 id);
-    virtual uint32      getUniqueId();
+    virtual POINTER_SIZE_INT    getUniqueId();
     
     //
     // DRL kernel



Mime
View raw message