[webkit-changes] [122594] trunk/Source/JavaScriptCore

[paroga]

Title: [122594] trunk/Source/_javascript_Core

Revision

122594

Author

par...@webkit.org

Date

2012-07-13 09:35:46 -0700 (Fri, 13 Jul 2012)

Log Message

Fix ARM_TRADITIONAL JIT for COMPILER(MSVC) and COMPILER(RVCT) after r121885
https://bugs.webkit.org/show_bug.cgi?id=91238

Reviewed by Zoltan Herczeg.

r121885 changed the assembler instruction only for COMPILER(GCC).
Use the same instructions for the other compilers too.

* jit/JITStubs.cpp:
(JSC::ctiTrampoline):
(JSC::ctiTrampolineEnd):
(JSC::ctiVMThrowTrampoline):

Modified Paths

• trunk/Source/_javascript_Core/ChangeLog
• trunk/Source/_javascript_Core/jit/JITStubs.cpp

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (122593 => 122594)

--- trunk/Source/_javascript_Core/ChangeLog	2012-07-13 16:22:33 UTC (rev 122593)
+++ trunk/Source/_javascript_Core/ChangeLog	2012-07-13 16:35:46 UTC (rev 122594)
@@ -1,3 +1,18 @@
+2012-07-13  Patrick Gansterer  <par...@webkit.org>
+
+        Fix ARM_TRADITIONAL JIT for COMPILER(MSVC) and COMPILER(RVCT) after r121885
+        https://bugs.webkit.org/show_bug.cgi?id=91238
+
+        Reviewed by Zoltan Herczeg.
+
+        r121885 changed the assembler instruction only for COMPILER(GCC).
+        Use the same instructions for the other compilers too.
+
+        * jit/JITStubs.cpp:
+        (JSC::ctiTrampoline):
+        (JSC::ctiTrampolineEnd):
+        (JSC::ctiVMThrowTrampoline):
+
 2012-07-12  Filip Pizlo  <fpi...@apple.com>
 
         DFG property access stubs should use structure transition watchpoints

Modified: trunk/Source/_javascript_Core/jit/JITStubs.cpp (122593 => 122594)

--- trunk/Source/_javascript_Core/jit/JITStubs.cpp	2012-07-13 16:22:33 UTC (rev 122593)
+++ trunk/Source/_javascript_Core/jit/JITStubs.cpp	2012-07-13 16:35:46 UTC (rev 122594)
@@ -740,17 +740,20 @@
 {
     ARM
     stmdb sp!, {r1-r3}
-    stmdb sp!, {r4-r8, lr}
+    stmdb sp!, {r4-r6, r8-r11, lr}
     sub sp, sp, # PRESERVEDR4_OFFSET
-    mov r4, r2
-    mov r5, #512
+    mov r5, r2
+    mov r6, #512
     mov lr, pc
     bx r0
     add sp, sp, # PRESERVEDR4_OFFSET
-    ldmia sp!, {r4-r8, lr}
+    ldmia sp!, {r4-r6, r8-r11, lr}
     add sp, sp, #12
     bx lr
 }
+__asm void ctiTrampolineEnd()
+{
+}
 
 __asm void ctiVMThrowTrampoline()
 {
@@ -759,7 +762,7 @@
     mov r0, sp
     bl cti_vm_throw
     add sp, sp, # PRESERVEDR4_OFFSET
-    ldmia sp!, {r4-r8, lr}
+    ldmia sp!, {r4-r6, r8-r11, lr}
     add sp, sp, #12
     bx lr
 }
@@ -1212,31 +1215,32 @@
 MSVC_BEGIN(    AREA Trampoline, CODE)
 MSVC_BEGIN()
 MSVC_BEGIN(    EXPORT ctiTrampoline)
+MSVC_BEGIN(    EXPORT ctiTrampolineEnd)
 MSVC_BEGIN(    EXPORT ctiVMThrowTrampoline)
 MSVC_BEGIN(    EXPORT ctiOpThrowNotCaught)
 MSVC_BEGIN()
 MSVC_BEGIN(ctiTrampoline PROC)
 MSVC_BEGIN(    stmdb sp!, {r1-r3})
-MSVC_BEGIN(    stmdb sp!, {r4-r8, lr})
+MSVC_BEGIN(    stmdb sp!, {r4-r6, r8-r11, lr})
 MSVC_BEGIN(    sub sp, sp, #68 ; sync with PRESERVEDR4_OFFSET)
-MSVC_BEGIN(    mov r4, r2)
-MSVC_BEGIN(    mov r5, #512)
+MSVC_BEGIN(    mov r5, r2)
+MSVC_BEGIN(    mov r6, #512)
 MSVC_BEGIN(    ; r0 contains the code)
 MSVC_BEGIN(    mov lr, pc)
 MSVC_BEGIN(    bx r0)
 MSVC_BEGIN(    add sp, sp, #68 ; sync with PRESERVEDR4_OFFSET)
-MSVC_BEGIN(    ldmia sp!, {r4-r8, lr})
+MSVC_BEGIN(    ldmia sp!, {r4-r6, r8-r11, lr})
 MSVC_BEGIN(    add sp, sp, #12)
 MSVC_BEGIN(    bx lr)
+MSVC_BEGIN(ctiTrampolineEnd)
 MSVC_BEGIN(ctiTrampoline ENDP)
 MSVC_BEGIN()
 MSVC_BEGIN(ctiVMThrowTrampoline PROC)
 MSVC_BEGIN(    mov r0, sp)
-MSVC_BEGIN(    mov lr, pc)
 MSVC_BEGIN(    bl cti_vm_throw)
 MSVC_BEGIN(ctiOpThrowNotCaught)
 MSVC_BEGIN(    add sp, sp, #68 ; sync with PRESERVEDR4_OFFSET)
-MSVC_BEGIN(    ldmia sp!, {r4-r8, lr})
+MSVC_BEGIN(    ldmia sp!, {r4-r6, r8-r11, lr})
 MSVC_BEGIN(    add sp, sp, #12)
 MSVC_BEGIN(    bx lr)
 MSVC_BEGIN(ctiVMThrowTrampoline ENDP)

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes