Changeset 159521 in webkit

Timestamp:

Nov 19, 2013 1:59:40 PM (10 years ago)

Author:

msaboff@apple.com

Message:

REGRESSION (r159395): Error compiling for ARMv7
​https://bugs.webkit.org/show_bug.cgi?id=124552

Reviewed by Geoffrey Garen.

Fixed the implementation of branch8(RelationalCondition cond, AbsoluteAddress address, TrustedImm32 right)
to materialize and use address similar to other ARMv7 branchXX() functions.

• assembler/MacroAssemblerARMv7.h:

(JSC::MacroAssemblerARMv7::branch8):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• assembler/MacroAssemblerARMv7.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-11-18  Michael Saboff  <msaboff@apple.com>
+
+        REGRESSION (r159395): Error compiling for ARMv7
+        https://bugs.webkit.org/show_bug.cgi?id=124552
+
+        Reviewed by Geoffrey Garen.
+
+        Fixed the implementation of branch8(RelationalCondition cond, AbsoluteAddress address, TrustedImm32 right)
+        to materialize and use address similar to other ARMv7 branchXX() functions.
+
+        * assembler/MacroAssemblerARMv7.h:
+        (JSC::MacroAssemblerARMv7::branch8):
+
 2013-11-19  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h

@@ -1378 +1378 @@
     }
     
-    Jump branch8(RelationalCondition cond, AbsoluteAddress left, TrustedImm32 right)
-    {
-        load8(left, addressTempRegister);
+    Jump branch8(RelationalCondition cond, AbsoluteAddress address, TrustedImm32 right)
+    {
+        // Use addressTempRegister instead of dataTempRegister, since branch32 uses dataTempRegister.
+        move(TrustedImmPtr(address.m_ptr), addressTempRegister);
+        load8(Address(addressTempRegister), addressTempRegister);
         return branch32(cond, addressTempRegister, right);
     }