Changeset 159298 in webkit

Timestamp:

Nov 14, 2013 11:43:08 AM (10 years ago)

Author:

msaboff@apple.com

Message:

REGRESSION (r159276): Fix lots of crashes for arm_traditional architecture.
​https://bugs.webkit.org/show_bug.cgi?id=124365

Reviewed by Oliver Hunt.

Crashes were caused by a mixup between regular registers and temporary registers in ARM_EXTRA_GPRS.

• llint/LowLevelInterpreter32_64.asm: Warning, t3 != a3. It's safer to use an implementation using aX

registers like the MIPS one for cCallX macros.

• offlineasm/arm.rb: Rearrange ARM_EXTRA_GPRS according to the new register distribution in LLINT.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• llint/LowLevelInterpreter32_64.asm (modified) (3 diffs)
• offlineasm/arm.rb (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-11-14  Michael Saboff  <msaboff@apple.com>
+
+        REGRESSION (r159276): Fix lots of crashes for arm_traditional architecture.
+        https://bugs.webkit.org/show_bug.cgi?id=124365
+
+        Reviewed by Oliver Hunt.
+
+        Crashes were caused by a mixup between regular registers and temporary registers in ARM_EXTRA_GPRS.
+
+        * llint/LowLevelInterpreter32_64.asm: Warning, t3 != a3. It's safer to use an implementation using aX
+        registers like the MIPS one for cCallX macros.
+        * offlineasm/arm.rb: Rearrange ARM_EXTRA_GPRS according to the new register distribution in LLINT.
+
 2013-11-14  Michael Saboff  <msaboff@apple.com>
 

trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm

@@ -98 +98 @@
 
 macro cCall2(function, arg1, arg2)
-    if ARM or ARMv7 or ARMv7_TRADITIONAL
-        move arg1, t0
-        move arg2, t1
+    if ARM or ARMv7 or ARMv7_TRADITIONAL or MIPS
+        move arg1, a0
+        move arg2, a1
         call function
     elsif X86
         poke arg1, 0
         poke arg2, 1
-        call function
-    elsif MIPS
-        move arg1, a0
-        move arg2, a1
         call function
     elsif SH4
@@ -122 +118 @@
 # This barely works. arg3 and arg4 should probably be immediates.
 macro cCall4(function, arg1, arg2, arg3, arg4)
-    if ARM or ARMv7 or ARMv7_TRADITIONAL
-        move arg1, t0
-        move arg2, t1
-        move arg3, t2
-        move arg4, t3
+    if ARM or ARMv7 or ARMv7_TRADITIONAL or MIPS
+        move arg1, a0
+        move arg2, a1
+        move arg3, a2
+        move arg4, a3
         call function
     elsif X86
@@ -133 +129 @@
         poke arg3, 2
         poke arg4, 3
-        call function
-    elsif MIPS
-        move arg1, a0
-        move arg2, a1
-        move arg3, a2
-        move arg4, a3
         call function
     elsif SH4

trunk/Source/JavaScriptCore/offlineasm/arm.rb

@@ -64 +64 @@
 end
 
-ARM_EXTRA_GPRS = [SpecialRegister.new("r9"), SpecialRegister.new("r8"), SpecialRegister.new("r3")]
+ARM_EXTRA_GPRS = [SpecialRegister.new("r10"), SpecialRegister.new("r12")]
 ARM_EXTRA_FPRS = [SpecialRegister.new("d7")]
 ARM_SCRATCH_FPR = SpecialRegister.new("d6")
@@ -224 +224 @@
         result = riscLowerMisplacedAddresses(result)
         result = riscLowerRegisterReuse(result)
-        result = assignRegistersToTemporaries(result, :gpr, ARM_EXTRA_GPRS)
+        if isARMv7
+            result = assignRegistersToTemporaries(result, :gpr, ARM_EXTRA_GPRS.concat([SpecialRegister.new("r11")]))
+        else
+            result = assignRegistersToTemporaries(result, :gpr, ARM_EXTRA_GPRS.concat([SpecialRegister.new("r7")]))
+        end
         result = assignRegistersToTemporaries(result, :fpr, ARM_EXTRA_FPRS)
         return result