Changeset 154075 in webkit for trunk/Source/JavaScriptCore

Timestamp:

Aug 14, 2013, 2:49:45 PM (12 years ago)

Author:

[email protected]

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.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jit/JITStubsMSVC64.asm (modified) (2 diffs)
• jit/JSInterfaceJIT.h (modified) (1 diff)
• jit/SlowPathCall.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+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]>
 

trunk/Source/JavaScriptCore/jit/JITStubsMSVC64.asm

@@ -25 +25 @@
 
 EXTERN cti_vm_throw : near
+EXTERN cti_vm_throw_slowpath : near
 PUBLIC ctiTrampoline
 PUBLIC ctiVMThrowTrampoline
@@ -69 +70 @@
 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

trunk/Source/JavaScriptCore/jit/JSInterfaceJIT.h

@@ -63 +63 @@
         static const RegisterID firstArgumentRegister = X86Registers::ecx;
         static const RegisterID secondArgumentRegister = X86Registers::edx;
+        static const RegisterID thirdArgumentRegister = X86Registers::r8;
 #endif
 

trunk/Source/JavaScriptCore/jit/SlowPathCall.h

@@ -54 +54 @@
         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);
@@ -63 +68 @@
 #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