commit a4aaf68a8bafa44433ceff2bb957a481381aa9a8
author Ben Cheng <bccheng@google.com> Wed Sep 30 22:53:44 2009 -0700
committer Ben Cheng <bccheng@google.com> Wed Sep 30 22:55:36 2009 -0700
tree 1f3eda8cf6d73d0f4197d58feb9c7a400ff96610
parent 76a477ed7e878fb1193de51ce7caec46b2d1f515

Fix a memory disambiguation and a SFP/DFP assembling bug in the JIT.

vm/compiler/codegen/arm/LocalOptimizations.c

diff --git a/vm/compiler/codegen/arm/LocalOptimizations.c b/vm/compiler/codegen/arm/LocalOptimizations.c
index 71fc014..86f692f 100644
--- a/vm/compiler/codegen/arm/LocalOptimizations.c
+++ b/vm/compiler/codegen/arm/LocalOptimizations.c
@@ -33,15 +33,14 @@
     return (lir->defMask != ~0ULL) && (lir->defMask & ENCODE_DALVIK_REG);
 }
 
-static inline bool isDalvikRegisterPartiallyClobbered(ArmLIR *lir1,
-                                                      ArmLIR *lir2)
+static inline bool isDalvikRegisterClobbered(ArmLIR *lir1, ArmLIR *lir2)
 {
   int reg1Lo = DECODE_ALIAS_INFO_REG(lir1->aliasInfo);
   int reg1Hi = reg1Lo + DECODE_ALIAS_INFO_WIDE(lir1->aliasInfo);
   int reg2Lo = DECODE_ALIAS_INFO_REG(lir2->aliasInfo);
   int reg2Hi = reg2Lo + DECODE_ALIAS_INFO_WIDE(lir2->aliasInfo);
 
-  return (reg1Lo == reg2Hi) || (reg1Hi == reg2Lo);
+  return (reg1Lo == reg2Lo) || (reg1Lo == reg2Hi) || (reg1Hi == reg2Lo);
 }
 
 static void dumpDependentInsnPair(ArmLIR *thisLIR, ArmLIR *checkLIR,
@@ -129,8 +128,7 @@
                     if (stopHere == false &&
                         ((checkLIR->useMask | checkLIR->defMask) &
                          ENCODE_DALVIK_REG)) {
-                        stopHere = isDalvikRegisterPartiallyClobbered(thisLIR,
-                                                                      checkLIR);
+                        stopHere = isDalvikRegisterClobbered(thisLIR, checkLIR);
                     }
 
                     /* Found a new place to put the store - move it here */
@@ -227,7 +225,7 @@
 
                 /* Store data partially clobbers the Dalvik register */
                 if (isDalvikStore(checkLIR) &&
-                    isDalvikRegisterPartiallyClobbered(thisLIR, checkLIR)) {
+                    isDalvikRegisterClobbered(thisLIR, checkLIR)) {
                     break;
                 }
             }
@@ -279,8 +277,7 @@
                     /* Store data partially clobbers the Dalvik register */
                     if (stopHere == false &&
                         (checkLIR->defMask & ENCODE_DALVIK_REG)) {
-                        stopHere = isDalvikRegisterPartiallyClobbered(thisLIR,
-                                                                      checkLIR);
+                        stopHere = isDalvikRegisterClobbered(thisLIR, checkLIR);
                     }
 
                     /*