<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[160784] branches/jsCStack/Source/JavaScriptCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/160784">160784</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2013-12-18 11:54:22 -0800 (Wed, 18 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>CStack Branch: getHostCallReturnValue shouldn't pop the callFrame
https://bugs.webkit.org/show_bug.cgi?id=125931
Reviewed by Geoffrey Garen.
Since getHostCallReturnValue() is called after a call to a slow path
function and the return from the slow patch pops the call frame there is
no need for getHostCallReturnValue() to pop the frame.
Removed the popping of the call frame getHostCallReturnValue() for all CPU platforms.
* jit/JITOperations.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesjsCStackSourceJavaScriptCoreChangeLog">branches/jsCStack/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCorejitJITOperationscpp">branches/jsCStack/Source/JavaScriptCore/jit/JITOperations.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesjsCStackSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/ChangeLog (160783 => 160784)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ChangeLog 2013-12-18 19:46:24 UTC (rev 160783)
+++ branches/jsCStack/Source/JavaScriptCore/ChangeLog 2013-12-18 19:54:22 UTC (rev 160784)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2013-12-18 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><ins>+ CStack Branch: getHostCallReturnValue shouldn't pop the callFrame
+ https://bugs.webkit.org/show_bug.cgi?id=125931
+
+ Reviewed by Geoffrey Garen.
+
+ Since getHostCallReturnValue() is called after a call to a slow path
+ function and the return from the slow patch pops the call frame there is
+ no need for getHostCallReturnValue() to pop the frame.
+ Removed the popping of the call frame getHostCallReturnValue() for all CPU platforms.
+
+ * jit/JITOperations.cpp:
+
+2013-12-18 Michael Saboff <msaboff@apple.com>
+
</ins><span class="cx"> CStack Branch: Exceptions in LLIntSlowPaths shouldn't pop call frame
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=125932
</span><span class="cx">
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorejitJITOperationscpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/jit/JITOperations.cpp (160783 => 160784)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/jit/JITOperations.cpp 2013-12-18 19:46:24 UTC (rev 160783)
+++ branches/jsCStack/Source/JavaScriptCore/jit/JITOperations.cpp 2013-12-18 19:54:22 UTC (rev 160784)
</span><span class="lines">@@ -1730,7 +1730,6 @@
</span><span class="cx"> ".globl " SYMBOL_STRING(getHostCallReturnValue) "\n"
</span><span class="cx"> HIDE_SYMBOL(getHostCallReturnValue) "\n"
</span><span class="cx"> SYMBOL_STRING(getHostCallReturnValue) ":" "\n"
</span><del>- "mov 0(%rbp), %rbp\n" // CallerFrameAndPC::callerFrame
</del><span class="cx"> "mov %rbp, %rdi\n"
</span><span class="cx"> "jmp " LOCAL_REFERENCE(getHostCallReturnValueWithExecState) "\n"
</span><span class="cx"> );
</span><span class="lines">@@ -1741,7 +1740,6 @@
</span><span class="cx"> ".globl " SYMBOL_STRING(getHostCallReturnValue) "\n"
</span><span class="cx"> HIDE_SYMBOL(getHostCallReturnValue) "\n"
</span><span class="cx"> SYMBOL_STRING(getHostCallReturnValue) ":" "\n"
</span><del>- "mov 0(%ebp), %ebp\n" // CallerFrameAndPC::callerFrame
</del><span class="cx"> "mov %ebp, 4(%esp)\n"
</span><span class="cx"> "jmp " LOCAL_REFERENCE(getHostCallReturnValueWithExecState) "\n"
</span><span class="cx"> );
</span><span class="lines">@@ -1755,7 +1753,6 @@
</span><span class="cx"> ".thumb" "\n"
</span><span class="cx"> ".thumb_func " THUMB_FUNC_PARAM(getHostCallReturnValue) "\n"
</span><span class="cx"> SYMBOL_STRING(getHostCallReturnValue) ":" "\n"
</span><del>- "ldr r7, [r7, #0]" "\n" // CallerFrameAndPC::callerFrame
</del><span class="cx"> "mov r0, r7" "\n"
</span><span class="cx"> "b " LOCAL_REFERENCE(getHostCallReturnValueWithExecState) "\n"
</span><span class="cx"> );
</span><span class="lines">@@ -1767,7 +1764,6 @@
</span><span class="cx"> HIDE_SYMBOL(getHostCallReturnValue) "\n"
</span><span class="cx"> INLINE_ARM_FUNCTION(getHostCallReturnValue)
</span><span class="cx"> SYMBOL_STRING(getHostCallReturnValue) ":" "\n"
</span><del>- "ldr r11, [r11, #0]" "\n" // CallerFrameAndPC::callerFrame
</del><span class="cx"> "mov r0, r11" "\n"
</span><span class="cx"> "b " LOCAL_REFERENCE(getHostCallReturnValueWithExecState) "\n"
</span><span class="cx"> );
</span><span class="lines">@@ -1779,7 +1775,6 @@
</span><span class="cx"> ".globl " SYMBOL_STRING(getHostCallReturnValue) "\n"
</span><span class="cx"> HIDE_SYMBOL(getHostCallReturnValue) "\n"
</span><span class="cx"> SYMBOL_STRING(getHostCallReturnValue) ":" "\n"
</span><del>- "ldur x29, [x29, #0]" "\n"
</del><span class="cx"> "mov x0, x29" "\n"
</span><span class="cx"> "b " LOCAL_REFERENCE(getHostCallReturnValueWithExecState) "\n"
</span><span class="cx"> );
</span><span class="lines">@@ -1791,7 +1786,6 @@
</span><span class="cx"> HIDE_SYMBOL(getHostCallReturnValue) "\n"
</span><span class="cx"> SYMBOL_STRING(getHostCallReturnValue) ":" "\n"
</span><span class="cx"> LOAD_FUNCTION_TO_T9(getHostCallReturnValueWithExecState)
</span><del>- "lw $fp, 0($fp)" "\n" // CallerFrameAndPC::callerFrame
</del><span class="cx"> "move $a0, $fp" "\n"
</span><span class="cx"> "b " LOCAL_REFERENCE(getHostCallReturnValueWithExecState) "\n"
</span><span class="cx"> );
</span><span class="lines">@@ -1802,7 +1796,6 @@
</span><span class="cx"> ".globl " SYMBOL_STRING(getHostCallReturnValue) "\n"
</span><span class="cx"> HIDE_SYMBOL(getHostCallReturnValue) "\n"
</span><span class="cx"> SYMBOL_STRING(getHostCallReturnValue) ":" "\n"
</span><del>- "mov.l @r14, r14" "\n" // CallerFrameAndPC::callerFrame
</del><span class="cx"> "mov r14, r4" "\n"
</span><span class="cx"> "mov.l 2f, " SH4_SCRATCH_REGISTER "\n"
</span><span class="cx"> "braf " SH4_SCRATCH_REGISTER "\n"
</span><span class="lines">@@ -1815,7 +1808,6 @@
</span><span class="cx"> extern "C" {
</span><span class="cx"> __declspec(naked) EncodedJSValue HOST_CALL_RETURN_VALUE_OPTION getHostCallReturnValue()
</span><span class="cx"> {
</span><del>- __asm mov ebp, [ebp + 0]; // CallerFrameAndPC::callerFrame
</del><span class="cx"> __asm mov [esp + 4], ebp;
</span><span class="cx"> __asm jmp getHostCallReturnValueWithExecState
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>