Changeset 60401 in webkit

Timestamp:

May 29, 2010 12:46:31 AM (14 years ago)

Author:

ggaren@apple.com

Message:

Fixed Windows crash seen on buildbot.

• jit/JITOpcodes32_64.cpp:

(JSC::JIT::privateCompileCTINativeCall): fastcall puts the first
argument in ecx.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jit/JITOpcodes32_64.cpp (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-05-29  Geoffrey Garen  <ggaren@apple.com>
+
+        Fixed Windows crash seen on buildbot.
+
+        * jit/JITOpcodes32_64.cpp:
+        (JSC::JIT::privateCompileCTINativeCall): __fastcall puts the first
+        argument in ecx.
+
 2010-05-28  Geoffrey Garen  <ggaren@apple.com>
 

trunk/JavaScriptCore/jit/JITOpcodes32_64.cpp

@@ -192 +192 @@
 
 #if CPU(X86)
-#if COMPILER(MSVC) || OS(LINUX)
-    // Calling convention:      f(edx, ...);
-    // Host function signature: f(ExecState*);
-    move(callFrameRegister, X86Registers::edx);
-
-#else
     // Calling convention:      f(ecx, edx, ...);
     // Host function signature: f(ExecState*);
     move(callFrameRegister, X86Registers::ecx);
-
-#endif // COMPILER(MSVC) || OS(LINUX)
 
     subPtr(Imm32(16 - sizeof(void*)), stackPointerRegister); // Align stack after call.
@@ -252 +244 @@
     emitPutToCallFrameHeader(regT1, RegisterFile::ReturnPC);
 
-#if COMPILER(MSVC) || OS(LINUX)
-    // Calling convention:      f(edx, ...);
-    // Host function signature: f(ExecState*);
-    move(callFrameRegister, X86Registers::edx);
-
-#else
     // Calling convention:      f(ecx, edx, ...);
     // Host function signature: f(ExecState*);
     move(callFrameRegister, X86Registers::ecx);
-
-#endif // COMPILER(MSVC) || OS(LINUX)
 
     subPtr(Imm32(16 - sizeof(void*)), stackPointerRegister); // Align stack after call.