Changeset 96419 in webkit

Timestamp:

Sep 30, 2011 1:36:08 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Fix bug in getHostCallReturnValue of DFG JIT on X86
​https://bugs.webkit.org/show_bug.cgi?id=69133

Patch by Yuqiang Xian <​yuqiang.xian@intel.com> on 2011-09-30
Reviewed by Gavin Barraclough.

We need to insert the additional argument in the stack slot before
return address instead of simply pushing it afterwards.
Also getHostCallReturnValue* should be attributed as stdcall
to make the stack cleaned up by the callee.

• dfg/DFGOperations.cpp:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• dfg/DFGOperations.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-09-30  Yuqiang Xian  <yuqiang.xian@intel.com>
+
+        Fix bug in getHostCallReturnValue of DFG JIT on X86
+        https://bugs.webkit.org/show_bug.cgi?id=69133
+
+        Reviewed by Gavin Barraclough.
+
+        We need to insert the additional argument in the stack slot before
+        return address instead of simply pushing it afterwards.
+        Also getHostCallReturnValue* should be attributed as stdcall
+        to make the stack cleaned up by the callee.
+
+        * dfg/DFGOperations.cpp:
+
 2011-09-30  Pierre Rossi  <pierre.rossi@gmail.com>
 

trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp

@@ -533 +533 @@
 }
 
-EncodedJSValue getHostCallReturnValue();
-EncodedJSValue getHostCallReturnValueWithExecState(ExecState*);
+EncodedJSValue DFG_OPERATION getHostCallReturnValue();
+EncodedJSValue DFG_OPERATION getHostCallReturnValueWithExecState(ExecState*);
 
 #if CPU(X86_64)
@@ -549 +549 @@
 SYMBOL_STRING(getHostCallReturnValue) ":" "\n"
     "mov -40(%edi), %edi\n"
-    "push %edi\n"
+    "mov (%esp), %ecx\n"
+    "mov %edi, (%esp)\n"
+    "lea -4(%esp), %esp\n"
+    "mov %ecx, (%esp)\n"
     "jmp " SYMBOL_STRING(getHostCallReturnValueWithExecState) "\n"
 );
 #endif
 
-EncodedJSValue getHostCallReturnValueWithExecState(ExecState* exec)
+EncodedJSValue DFG_OPERATION getHostCallReturnValueWithExecState(ExecState* exec)
 {
     return JSValue::encode(exec->globalData().hostCallReturnValue);