[webkit-changes] [188072] branches/jsc-tailcall/Source/JavaScriptCore

Thu, 06 Aug 2015 15:45:50 -0700

Title: [188072] branches/jsc-tailcall/Source/_javascript_Core
Revision
188072
Author
msab...@apple.com
Date
2015-08-06 15:45:20 -0700 (Thu, 06 Aug 2015)

Log Message

jsc-tailcall: Stop saving and restoring all callee saves on vmEntry / exit for platforms with per function callee saves handling
https://bugs.webkit.org/show_bug.cgi?id=147747

Reviewed by Basile Clement.

Removed saving of callee save registers and materialization of special tag registers for
64 bit platforms.

* llint/LowLevelInterpreter.asm:
* llint/LowLevelInterpreter64.asm:

Modified Paths

Diff

Modified: branches/jsc-tailcall/Source/_javascript_Core/ChangeLog (188071 => 188072)


--- branches/jsc-tailcall/Source/_javascript_Core/ChangeLog	2015-08-06 22:41:51 UTC (rev 188071)
+++ branches/jsc-tailcall/Source/_javascript_Core/ChangeLog	2015-08-06 22:45:20 UTC (rev 188072)
@@ -1,5 +1,18 @@
 2015-08-06  Michael Saboff  <msab...@apple.com>
 
+        jsc-tailcall: Stop saving and restoring all callee saves on vmEntry / exit for platforms with per function callee saves handling
+        https://bugs.webkit.org/show_bug.cgi?id=147747
+
+        Reviewed by Basile Clement.
+
+        Removed saving of callee save registers and materialization of special tag registers for
+        64 bit platforms.
+
+        * llint/LowLevelInterpreter.asm:
+        * llint/LowLevelInterpreter64.asm:
+
+2015-08-06  Michael Saboff  <msab...@apple.com>
+
         jsc-tailcall: Exceptions should properly restore callee save register contents during unwinding
         https://bugs.webkit.org/show_bug.cgi?id=147639

Modified: branches/jsc-tailcall/Source/_javascript_Core/llint/LowLevelInterpreter.asm (188071 => 188072)


--- branches/jsc-tailcall/Source/_javascript_Core/llint/LowLevelInterpreter.asm	2015-08-06 22:41:51 UTC (rev 188071)
+++ branches/jsc-tailcall/Source/_javascript_Core/llint/LowLevelInterpreter.asm	2015-08-06 22:45:20 UTC (rev 188072)
@@ -397,18 +397,15 @@
     end
 end
 
-if C_LOOP
+# ARM64 and the X86 64 bit platforms properly save and restore callee saves in each function.
+if C_LOOP or ARM64 or X86_64 or X86_64_WIN
     const CalleeSaveRegisterCount = 0
 elsif ARM or ARMv7_TRADITIONAL or ARMv7
     const CalleeSaveRegisterCount = 7
-elsif ARM64
-    const CalleeSaveRegisterCount = 10
-elsif SH4 or X86_64 or MIPS
+elsif SH4 or MIPS
     const CalleeSaveRegisterCount = 5
 elsif X86 or X86_WIN
     const CalleeSaveRegisterCount = 3
-elsif X86_64_WIN
-    const CalleeSaveRegisterCount = 7
 end
 
 const CalleeRegisterSaveSize = CalleeSaveRegisterCount * PtrSize
@@ -418,17 +415,11 @@
 const VMEntryTotalFrameSize = (CalleeRegisterSaveSize + sizeof VMEntryRecord + StackAlignment - 1) & ~StackAlignmentMask
 
 macro pushCalleeSaves()
-    if C_LOOP
+    if C_LOOP or ARM64 or X86_64 or X86_64_WIN
     elsif ARM or ARMv7_TRADITIONAL
         emit "push {r4-r10}"
     elsif ARMv7
         emit "push {r4-r6, r8-r11}"
-    elsif ARM64
-        emit "stp x20, x19, [sp, #-16]!"
-        emit "stp x22, x21, [sp, #-16]!"
-        emit "stp x24, x23, [sp, #-16]!"
-        emit "stp x26, x25, [sp, #-16]!"
-        emit "stp x28, x27, [sp, #-16]!"
     elsif MIPS
         emit "addiu $sp, $sp, -20"
         emit "sw $20, 16($sp)"
@@ -450,35 +441,15 @@
         emit "push esi"
         emit "push edi"
         emit "push ebx"
-    elsif X86_64
-        emit "push %r12"
-        emit "push %r13"
-        emit "push %r14"
-        emit "push %r15"
-        emit "push %rbx"
-    elsif X86_64_WIN
-        emit "push r12"
-        emit "push r13"
-        emit "push r14"
-        emit "push r15"
-        emit "push rbx"
-        emit "push rdi"
-        emit "push rsi"
     end
 end
 
 macro popCalleeSaves()
-    if C_LOOP
+    if C_LOOP or ARM64 or X86_64 or X86_64_WIN
     elsif ARM or ARMv7_TRADITIONAL
         emit "pop {r4-r10}"
     elsif ARMv7
         emit "pop {r4-r6, r8-r11}"
-    elsif ARM64
-        emit "ldp x28, x27, [sp], #16"
-        emit "ldp x26, x25, [sp], #16"
-        emit "ldp x24, x23, [sp], #16"
-        emit "ldp x22, x21, [sp], #16"
-        emit "ldp x20, x19, [sp], #16"
     elsif MIPS
         emit "lw $16, 0($sp)"
         emit "lw $17, 4($sp)"
@@ -500,20 +471,6 @@
         emit "pop ebx"
         emit "pop edi"
         emit "pop esi"
-    elsif X86_64
-        emit "pop %rbx"
-        emit "pop %r15"
-        emit "pop %r14"
-        emit "pop %r13"
-        emit "pop %r12"
-    elsif X86_64_WIN
-        emit "pop rsi"
-        emit "pop rdi"
-        emit "pop rbx"
-        emit "pop r15"
-        emit "pop r14"
-        emit "pop r13"
-        emit "pop r12"
     end
 end
 
@@ -559,10 +516,9 @@
         storep csr3, -16[cfr]
         storep csr0, -24[cfr]
     elsif X86_64_WIN
-        storep t4, -8[cfr]
-        storep csr6, -16[cfr]
-        storep csr5, -24[cfr]
-        storep csr0, -32[cfr]
+        storep csr6, -8[cfr]
+        storep csr5, -16[cfr]
+        storep csr0, -24[cfr]
     end
 end

Modified: branches/jsc-tailcall/Source/_javascript_Core/llint/LowLevelInterpreter64.asm (188071 => 188072)


--- branches/jsc-tailcall/Source/_javascript_Core/llint/LowLevelInterpreter64.asm	2015-08-06 22:41:51 UTC (rev 188071)
+++ branches/jsc-tailcall/Source/_javascript_Core/llint/LowLevelInterpreter64.asm	2015-08-06 22:45:20 UTC (rev 188072)
@@ -215,9 +215,6 @@
     end
     storep cfr, VM::topVMEntryFrame[vm]
 
-    move TagTypeNumber, tagTypeNumber
-    addp TagBitTypeOther, tagTypeNumber, tagMask
-
     checkStackPointerAlignment(extraTempReg, 0xbad0dc02)
 
     makeCall(entry, t3)

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

Reply via email to