harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r496300 - /harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RCE.cpp
Date Mon, 15 Jan 2007 12:41:52 GMT
Author: varlax
Date: Mon Jan 15 04:41:52 2007
New Revision: 496300

URL: http://svn.apache.org/viewvc?view=rev&rev=496300
Log:
Applied HARMONY-2967 [drlvm][jit] assertion fires when running dacapo eclipse with -Xem:server
Tested on SUSE9

Modified:
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RCE.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RCE.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RCE.cpp?view=diff&rev=496300&r1=496299&r2=496300
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RCE.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RCE.cpp Mon Jan 15
04:41:52 2007
@@ -144,11 +144,12 @@
                                 BranchInst* br = (BranchInst*)condInst;
                                 newCondInst = irManager->newBranchInst(mnem,br->getTrueTarget(),
br->getFalseTarget(), condInst->getOpnd(0));
                             } else {
+                                Mnemonic condMnem = getBaseConditionMnemonic(condInst->getMnemonic());
                                 Inst::Opnds defs(condInst,Inst::OpndRole_Def|Inst::OpndRole_Explicit);
-                                if (baseMnem == Mnemonic_CMOVcc) {
+                                if (condMnem == Mnemonic_CMOVcc) {
                                     Inst::Opnds uses(condInst,Inst::OpndRole_Use|Inst::OpndRole_Explicit);
                                     newCondInst = irManager->newInst(mnem, condInst->getOpnd(defs.begin()),
inst->getOpnd(uses.begin()));
-                                } else if (baseMnem == Mnemonic_SETcc) {
+                                } else if (condMnem == Mnemonic_SETcc) {
                                     newCondInst = irManager->newInst(mnem, condInst->getOpnd(defs.begin()));
                                 } else {
                                     assert(0);



Mime
View raw message