Title: [158922] trunk/Source/_javascript_Core
Revision
158922
Author
[email protected]
Date
2013-11-08 09:12:27 -0800 (Fri, 08 Nov 2013)

Log Message

[Win] _javascript_ crash in getHostCallReturnValue.
https://bugs.webkit.org/show_bug.cgi?id=124040

Patch by [email protected] <[email protected]> on 2013-11-08
Reviewed by Geoffrey Garen.

* jit/JITOperations.cpp: Update MSVC assembler code in getHostCallReturnValue according to gcc x86 version.

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (158921 => 158922)


--- trunk/Source/_javascript_Core/ChangeLog	2013-11-08 15:27:09 UTC (rev 158921)
+++ trunk/Source/_javascript_Core/ChangeLog	2013-11-08 17:12:27 UTC (rev 158922)
@@ -1,3 +1,12 @@
+2013-11-08  [email protected]  <[email protected]>
+
+        [Win] _javascript_ crash in getHostCallReturnValue.
+        https://bugs.webkit.org/show_bug.cgi?id=124040
+
+        Reviewed by Geoffrey Garen.
+
+        * jit/JITOperations.cpp: Update MSVC assembler code in getHostCallReturnValue according to gcc x86 version.
+
 2013-11-08  Julien Brianceau  <[email protected]>
 
         [mips] Fix typo (introduced in r158751).

Modified: trunk/Source/_javascript_Core/jit/JITOperations.cpp (158921 => 158922)


--- trunk/Source/_javascript_Core/jit/JITOperations.cpp	2013-11-08 15:27:09 UTC (rev 158921)
+++ trunk/Source/_javascript_Core/jit/JITOperations.cpp	2013-11-08 17:12:27 UTC (rev 158922)
@@ -1802,11 +1802,9 @@
 extern "C" {
     __declspec(naked) EncodedJSValue HOST_CALL_RETURN_VALUE_OPTION getHostCallReturnValue()
     {
-        __asm {
-            mov edi, [edi + 0]; // CallerFrameAndPC::callerFrame
-            mov [esp + 4], edi;
-            jmp getHostCallReturnValueWithExecState
-        }
+        __asm mov ebp, [ebp + 0]; // CallerFrameAndPC::callerFrame
+        __asm mov [esp + 4], ebp;
+        __asm jmp getHostCallReturnValueWithExecState
     }
 }
 #endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to