Changeset 163179 in webkit

Timestamp:

Jan 31, 2014 10:59:59 AM (10 years ago)

Author:

rgabor@webkit.org

Message:

Fix the ARM Thumb2 build after jsCStack branch merge
​https://bugs.webkit.org/show_bug.cgi?id=127903

Reviewed by Michael Saboff.

SP register cannot be used as a destination register of SUB or ADD on Thumb mode.

• llint/LowLevelInterpreter.asm:
• llint/LowLevelInterpreter32_64.asm:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• llint/LowLevelInterpreter.asm (modified) (4 diffs)
• llint/LowLevelInterpreter32_64.asm (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-01-31  Gabor Rapcsanyi  <rgabor@webkit.org>
+
+        Fix the ARM Thumb2 build after jsCStack branch merge
+        https://bugs.webkit.org/show_bug.cgi?id=127903
+
+        Reviewed by Michael Saboff.
+
+        SP register cannot be used as a destination register of SUB or ADD on Thumb mode.
+
+        * llint/LowLevelInterpreter.asm:
+        * llint/LowLevelInterpreter32_64.asm:
+
 2014-01-31  Julien Brianceau  <jbriance@cisco.com>
 

trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm

@@ -340 +340 @@
 
 macro callToJavaScriptEpilogue()
-    addp CallFrameHeaderSlots * 8, cfr, sp
+    if ARMv7
+        addp CallFrameHeaderSlots * 8, cfr, t4
+        move t4, sp
+    else
+        addp CallFrameHeaderSlots * 8, cfr, sp
+    end
+
     loadp CallerFrame[cfr], cfr
 
@@ -369 +375 @@
     lshiftp 3, scratch
     addp maxFrameExtentForSlowPathCall, scratch
-    subp cfr, scratch, sp
+    if ARMv7
+        subp cfr, scratch, scratch
+        move scratch, sp
+    else
+        subp cfr, scratch, sp
+    end
 end
 
@@ -399 +410 @@
         macro (callee)
             btpz t1, .dontUpdateSP
-            addp CallerFrameAndPCSize, t1, sp
+            if ARMv7
+                addp CallerFrameAndPCSize, t1, t1
+                move t1, sp
+            else
+                addp CallerFrameAndPCSize, t1, sp
+            end
         .dontUpdateSP:
             if C_LOOP
@@ -957 +973 @@
     else
         # The calleeFrame is not stack aligned, move down by CallerFrameAndPCSize to align
-        subp t1, CallerFrameAndPCSize, sp
+        if ARMv7
+            subp t1, CallerFrameAndPCSize, t2
+            move t2, sp
+        else
+            subp t1, CallerFrameAndPCSize, sp
+        end
     end
     slowPathForCall(_llint_slow_path_call_varargs)

trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm

@@ -239 +239 @@
     bpaeq temp1, VM::m_jsStackLimit[vm], .stackHeightOK
 
-    subp cfr, 8, sp
+    if ARMv7
+        subp cfr, 8, temp2
+        move temp2, sp
+    else
+        subp cfr, 8, sp
+    end
 
     if C_LOOP