<!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>[160815] 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/160815">160815</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2013-12-18 18:21:33 -0800 (Wed, 18 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>CStack Branch: Stop threading callFrameRegister through LLIntSlowCalls
https://bugs.webkit.org/show_bug.cgi?id=125964
Reviewed by Geoffrey Garen.
Removed the general restoring of the call frame registers (cfr) after the return
from a LLInt slow calls. In most cases, the "exec" value of the LLInt slow
path return pair is set to 0. For llint_slow_path_call/construct and
llint_slow_path_size_and_alloc_frame_for_varargs the execCallee is returned in
the "exec" value. When an exception happens in a slow path handler we return 0,
because the llint_throw_from_slow_path_trampoline path will properly unwind by
making a slow call that will invoke genericUnwind() to do the real unwinding.
* llint/LLIntSlowPaths.cpp:
(JSC::LLInt::LLINT_SLOW_PATH_DECL):
* llint/LowLevelInterpreter.asm:
* llint/LowLevelInterpreter64.asm:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesjsCStackSourceJavaScriptCoreChangeLog">branches/jsCStack/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCorellintLLIntSlowPathscpp">branches/jsCStack/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCorellintLowLevelInterpreterasm">branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter.asm</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCorellintLowLevelInterpreter64asm">branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesjsCStackSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/ChangeLog (160814 => 160815)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ChangeLog 2013-12-19 01:55:46 UTC (rev 160814)
+++ branches/jsCStack/Source/JavaScriptCore/ChangeLog 2013-12-19 02:21:33 UTC (rev 160815)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2013-12-18 Michael Saboff <msaboff@apple.com>
+
+ CStack Branch: Stop threading callFrameRegister through LLIntSlowCalls
+ https://bugs.webkit.org/show_bug.cgi?id=125964
+
+ Reviewed by Geoffrey Garen.
+
+ Removed the general restoring of the call frame registers (cfr) after the return
+ from a LLInt slow calls. In most cases, the "exec" value of the LLInt slow
+ path return pair is set to 0. For llint_slow_path_call/construct and
+ llint_slow_path_size_and_alloc_frame_for_varargs the execCallee is returned in
+ the "exec" value. When an exception happens in a slow path handler we return 0,
+ because the llint_throw_from_slow_path_trampoline path will properly unwind by
+ making a slow call that will invoke genericUnwind() to do the real unwinding.
+
+ * llint/LLIntSlowPaths.cpp:
+ (JSC::LLInt::LLINT_SLOW_PATH_DECL):
+ * llint/LowLevelInterpreter.asm:
+ * llint/LowLevelInterpreter64.asm:
+
</ins><span class="cx"> 2013-12-18 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> CStack: Fix LLINT to baseline JIT OSR.
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorellintLLIntSlowPathscpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp (160814 => 160815)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2013-12-19 01:55:46 UTC (rev 160814)
+++ branches/jsCStack/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2013-12-19 02:21:33 UTC (rev 160815)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> return encodeResult(first, second); \
</span><span class="cx"> } while (false)
</span><span class="cx">
</span><del>-#define LLINT_END_IMPL() LLINT_RETURN_TWO(pc, exec)
</del><ins>+#define LLINT_END_IMPL() LLINT_RETURN_TWO(pc, 0)
</ins><span class="cx">
</span><span class="cx"> #define LLINT_THROW(exceptionToThrow) do { \
</span><span class="cx"> vm.throwException(exec, exceptionToThrow); \
</span><span class="lines">@@ -145,22 +145,28 @@
</span><span class="cx"> #define LLINT_CALL_THROW(exec, exceptionToThrow) do { \
</span><span class="cx"> ExecState* __ct_exec = (exec); \
</span><span class="cx"> vm.throwException(__ct_exec, exceptionToThrow); \
</span><del>- LLINT_CALL_END_IMPL(__ct_exec, callToThrow(__ct_exec)); \
</del><ins>+ LLINT_CALL_END_IMPL(0, callToThrow(__ct_exec)); \
</ins><span class="cx"> } while (false)
</span><span class="cx">
</span><span class="cx"> #define LLINT_CALL_CHECK_EXCEPTION(exec) do { \
</span><span class="cx"> ExecState* __cce_exec = (exec); \
</span><span class="cx"> if (UNLIKELY(vm.exception())) \
</span><del>- LLINT_CALL_END_IMPL(__cce_exec, callToThrow(__cce_exec)); \
</del><ins>+ LLINT_CALL_END_IMPL(0, callToThrow(__cce_exec)); \
</ins><span class="cx"> } while (false)
</span><span class="cx">
</span><span class="cx"> #define LLINT_CALL_RETURN(exec, callTarget) do { \
</span><span class="cx"> ExecState* __cr_exec = (exec); \
</span><span class="cx"> void* __cr_callTarget = (callTarget); \
</span><del>- LLINT_CALL_CHECK_EXCEPTION(__cr_exec); \
</del><ins>+ LLINT_CALL_CHECK_EXCEPTION(__cr_exec); \
</ins><span class="cx"> LLINT_CALL_END_IMPL(__cr_exec, __cr_callTarget); \
</span><span class="cx"> } while (false)
</span><span class="cx">
</span><ins>+#define LLINT_RETURN_CALLEE_FRAME(execCallee) do { \
+ ExecState* __rcf_exec = (execCallee); \
+ LLINT_RETURN_TWO(pc, __rcf_exec); \
+ } while (false)
+
+
</ins><span class="cx"> extern "C" SlowPathReturnType llint_trace_operand(ExecState* exec, Instruction* pc, int fromWhere, int operand)
</span><span class="cx"> {
</span><span class="cx"> LLINT_BEGIN();
</span><span class="lines">@@ -1117,7 +1123,7 @@
</span><span class="cx">
</span><span class="cx"> vm.newCallFrameReturnValue = execCallee;
</span><span class="cx">
</span><del>- LLINT_END();
</del><ins>+ LLINT_RETURN_CALLEE_FRAME(execCallee);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LLINT_SLOW_PATH_DECL(slow_path_call_varargs)
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorellintLowLevelInterpreterasm"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter.asm (160814 => 160815)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2013-12-19 01:55:46 UTC (rev 160814)
+++ branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2013-12-19 02:21:33 UTC (rev 160815)
</span><span class="lines">@@ -290,7 +290,9 @@
</span><span class="cx"> if C_LOOP
</span><span class="cx"> cloopCallJSFunction callee
</span><span class="cx"> else
</span><ins>+ btpz t1, .dontUpdateSP
</ins><span class="cx"> addp CallerFrameAndPCSize, t1, sp
</span><ins>+ .dontUpdateSP:
</ins><span class="cx"> call callee
</span><span class="cx"> restoreStackPointerAfterCall()
</span><span class="cx"> dispatchAfterCall()
</span><span class="lines">@@ -798,10 +800,8 @@
</span><span class="cx"> traceExecution()
</span><span class="cx"> callSlowPath(_llint_slow_path_size_and_alloc_frame_for_varargs)
</span><span class="cx"> branchIfException(_llint_throw_from_slow_path_trampoline)
</span><del>- loadp CodeBlock[cfr], t0
- loadp CodeBlock::m_vm[t0], t0
- loadp VM::newCallFrameReturnValue[t0], t0
- move t0, sp
</del><ins>+ # calleeFrame in t1
+ move t1, sp
</ins><span class="cx"> slowPathForCall(_llint_slow_path_call_varargs)
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorellintLowLevelInterpreter64asm"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm (160814 => 160815)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2013-12-19 01:55:46 UTC (rev 160814)
+++ branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2013-12-19 02:21:33 UTC (rev 160815)
</span><span class="lines">@@ -300,7 +300,6 @@
</span><span class="cx">
</span><span class="cx"> macro restoreStateAfterCCall()
</span><span class="cx"> move t0, PC
</span><del>- move t1, cfr
</del><span class="cx"> move t3, PB
</span><span class="cx"> subp PB, PC
</span><span class="cx"> rshiftp 3, PC
</span><span class="lines">@@ -336,7 +335,6 @@
</span><span class="cx"> storei PC, ArgumentCount + TagOffset[cfr]
</span><span class="cx"> prepareStateForCCall()
</span><span class="cx"> cCall2(_llint_slow_path_handle_watchdog_timer, cfr, PC)
</span><del>- move t1, cfr
</del><span class="cx"> btpnz t0, throwHandler
</span><span class="cx"> move t3, PB
</span><span class="cx"> loadi ArgumentCount + TagOffset[cfr], PC
</span></span></pre>
</div>
</div>
</body>
</html>