Title: [154075] trunk/Source/_javascript_Core
Revision
154075
Author
[email protected]
Date
2013-08-14 14:49:45 -0700 (Wed, 14 Aug 2013)

Log Message

Fixed jit on Win64.
https://bugs.webkit.org/show_bug.cgi?id=119601

Reviewed by Oliver Hunt.

* jit/JITStubsMSVC64.asm: Added ctiVMThrowTrampolineSlowpath implementation.
* jit/JSInterfaceJIT.h: Added thirdArgumentRegister.
* jit/SlowPathCall.h:
(JSC::JITSlowPathCall::call): Added correct calling convention for Win64.

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (154074 => 154075)


--- trunk/Source/_javascript_Core/ChangeLog	2013-08-14 21:44:55 UTC (rev 154074)
+++ trunk/Source/_javascript_Core/ChangeLog	2013-08-14 21:49:45 UTC (rev 154075)
@@ -1,3 +1,15 @@
+2013-08-14  Michael Saboff  <[email protected]>
+
+        Fixed jit on Win64.
+        https://bugs.webkit.org/show_bug.cgi?id=119601
+
+        Reviewed by Oliver Hunt.
+
+        * jit/JITStubsMSVC64.asm: Added ctiVMThrowTrampolineSlowpath implementation.
+        * jit/JSInterfaceJIT.h: Added thirdArgumentRegister.
+        * jit/SlowPathCall.h:
+        (JSC::JITSlowPathCall::call): Added correct calling convention for Win64.
+
 2013-08-14  Alex Christensen  <[email protected]>
 
         Compile fix for Win64 with jit disabled.

Modified: trunk/Source/_javascript_Core/jit/JITStubsMSVC64.asm (154074 => 154075)


--- trunk/Source/_javascript_Core/jit/JITStubsMSVC64.asm	2013-08-14 21:44:55 UTC (rev 154074)
+++ trunk/Source/_javascript_Core/jit/JITStubsMSVC64.asm	2013-08-14 21:49:45 UTC (rev 154075)
@@ -24,6 +24,7 @@
 ;*/
 
 EXTERN cti_vm_throw : near
+EXTERN cti_vm_throw_slowpath : near
 PUBLIC ctiTrampoline
 PUBLIC ctiVMThrowTrampoline
 PUBLIC ctiOpThrowNotCaught
@@ -68,6 +69,18 @@
     int 3
 ctiVMThrowTrampoline ENDP
 
+ctiVMThrowTrampolineSlowpath PROC
+	sub rsp, 16
+    mov rcx, rsp
+	mov rdx, r13
+	call cti_vm_throw_slowpath
+    ; When cti_vm_throw_slowpath returns, rax points to the memory we allocated on stack
+	; It contains the callFrame and handler address
+	pop rax		; callFrame
+	pop rdx		; handler
+    jmp rdx
+ctiVMThrowTrampolineSlowpath ENDP
+ 
 ctiOpThrowNotCaught PROC
     add rsp, 58h
     pop rbx

Modified: trunk/Source/_javascript_Core/jit/JSInterfaceJIT.h (154074 => 154075)


--- trunk/Source/_javascript_Core/jit/JSInterfaceJIT.h	2013-08-14 21:44:55 UTC (rev 154074)
+++ trunk/Source/_javascript_Core/jit/JSInterfaceJIT.h	2013-08-14 21:49:45 UTC (rev 154075)
@@ -62,6 +62,7 @@
 #else
         static const RegisterID firstArgumentRegister = X86Registers::ecx;
         static const RegisterID secondArgumentRegister = X86Registers::edx;
+        static const RegisterID thirdArgumentRegister = X86Registers::r8;
 #endif
 
         static const RegisterID callFrameRegister = X86Registers::r13;

Modified: trunk/Source/_javascript_Core/jit/SlowPathCall.h (154074 => 154075)


--- trunk/Source/_javascript_Core/jit/SlowPathCall.h	2013-08-14 21:44:55 UTC (rev 154074)
+++ trunk/Source/_javascript_Core/jit/SlowPathCall.h	2013-08-14 21:49:45 UTC (rev 154075)
@@ -53,6 +53,11 @@
         m_jit->addPtr(MacroAssembler::TrustedImm32(-8), MacroAssembler::stackPointerRegister);
         m_jit->push(JIT::TrustedImm32(JIT::TrustedImmPtr(m_pc)));
         m_jit->push(JIT::callFrameRegister);
+#elif CPU(X86_64) && OS(WINDOWS)
+        m_jit->addPtr(MacroAssembler::TrustedImm32(-16), MacroAssembler::stackPointerRegister);
+        m_jit->move(MacroAssembler::stackPointerRegister, JIT::firstArgumentRegister);
+        m_jit->move(JIT::callFrameRegister, JIT::secondArgumentRegister);
+        m_jit->move(JIT::TrustedImmPtr(m_pc), JIT::thirdArgumentRegister);
 #else
         m_jit->move(JIT::callFrameRegister, JIT::firstArgumentRegister);
         m_jit->move(JIT::TrustedImmPtr(m_pc), JIT::secondArgumentRegister);
@@ -62,6 +67,9 @@
 
 #if CPU(X86) && USE(JSVALUE32_64)
         m_jit->addPtr(MacroAssembler::TrustedImm32(16), MacroAssembler::stackPointerRegister);
+#elif CPU(X86_64) && OS(WINDOWS)
+        m_jit->pop(JIT::regT0); // vPC
+        m_jit->pop(JIT::regT1); // callFrame register
 #endif
 
 #if ENABLE(OPCODE_SAMPLING)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to