Changeset 154075 in webkit for trunk/Source/JavaScriptCore/jit/SlowPathCall.h

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.

File:

• trunk/Source/JavaScriptCore/jit/SlowPathCall.h (modified) (2 diffs)

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