<!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>[160506] 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/160506">160506</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2013-12-12 14:54:00 -0800 (Thu, 12 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>CStack Branch: Eliminate unnecessary add/sub 16 to stack pointer
https://bugs.webkit.org/show_bug.cgi?id=125653
Not yet reviewed.
Changed the DFG stack frame to include outgoing space for at least the two
pointers for returnPC and callerFrame. Changed the setting of the stack
pointer to not include the space for the outgoing returnPC and callerFrame.
Eliminated the add/sub 16 around calls in the DFG.
Adjusted the LLInt and baseline JIT calculation of the stack pointer for calls.
In both cases, the frame is set up with temp that points to the base of the callee
frame. The space for the outgoing returnPC and callerFrame is added to the temp
to create the stack pointer for the call.
* dfg/DFGGraph.cpp:
(JSC::DFG::Graph::frameRegisterCount):
* dfg/DFGSpeculativeJIT64.cpp:
(JSC::DFG::SpeculativeJIT::emitCall):
* interpreter/JSStack.h:
* jit/JITCall.cpp:
(JSC::JIT::compileOpCall):
* 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="#branchesjsCStackSourceJavaScriptCoredfgDFGGraphcpp">branches/jsCStack/Source/JavaScriptCore/dfg/DFGGraph.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp">branches/jsCStack/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreinterpreterJSStackh">branches/jsCStack/Source/JavaScriptCore/interpreter/JSStack.h</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCorejitJITCallcpp">branches/jsCStack/Source/JavaScriptCore/jit/JITCall.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 (160505 => 160506)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ChangeLog 2013-12-12 21:25:34 UTC (rev 160505)
+++ branches/jsCStack/Source/JavaScriptCore/ChangeLog 2013-12-12 22:54:00 UTC (rev 160506)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2013-12-12 Michael Saboff <msaboff@apple.com>
+
+ CStack Branch: Eliminate unnecessary add/sub 16 to stack pointer
+ https://bugs.webkit.org/show_bug.cgi?id=125653
+
+ Not yet reviewed.
+
+ Changed the DFG stack frame to include outgoing space for at least the two
+ pointers for returnPC and callerFrame. Changed the setting of the stack
+ pointer to not include the space for the outgoing returnPC and callerFrame.
+ Eliminated the add/sub 16 around calls in the DFG.
+
+ Adjusted the LLInt and baseline JIT calculation of the stack pointer for calls.
+ In both cases, the frame is set up with temp that points to the base of the callee
+ frame. The space for the outgoing returnPC and callerFrame is added to the temp
+ to create the stack pointer for the call.
+
+ * dfg/DFGGraph.cpp:
+ (JSC::DFG::Graph::frameRegisterCount):
+ * dfg/DFGSpeculativeJIT64.cpp:
+ (JSC::DFG::SpeculativeJIT::emitCall):
+ * interpreter/JSStack.h:
+ * jit/JITCall.cpp:
+ (JSC::JIT::compileOpCall):
+ * llint/LowLevelInterpreter.asm:
+ * llint/LowLevelInterpreter64.asm:
+
</ins><span class="cx"> 2013-12-12 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix handling of uncaught exceptions.
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoredfgDFGGraphcpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/dfg/DFGGraph.cpp (160505 => 160506)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/dfg/DFGGraph.cpp 2013-12-12 21:25:34 UTC (rev 160505)
+++ branches/jsCStack/Source/JavaScriptCore/dfg/DFGGraph.cpp 2013-12-12 22:54:00 UTC (rev 160506)
</span><span class="lines">@@ -703,7 +703,7 @@
</span><span class="cx">
</span><span class="cx"> unsigned Graph::frameRegisterCount()
</span><span class="cx"> {
</span><del>- unsigned result = m_nextMachineLocal + m_parameterSlots;
</del><ins>+ unsigned result = m_nextMachineLocal + std::max(m_parameterSlots, (unsigned)JSStack::CallerFrameAndPCSize);
</ins><span class="cx"> result += result & 1; // Align the register count
</span><span class="cx"> return result;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp (160505 => 160506)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2013-12-12 21:25:34 UTC (rev 160505)
+++ branches/jsCStack/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2013-12-12 22:54:00 UTC (rev 160506)
</span><span class="lines">@@ -714,24 +714,17 @@
</span><span class="cx"> m_jit.loadPtr(MacroAssembler::Address(calleeGPR, OBJECT_OFFSETOF(JSFunction, m_scope)), resultGPR);
</span><span class="cx"> m_jit.store64(resultGPR, calleeFrameSlot(JSStack::ScopeChain));
</span><span class="cx">
</span><del>- // FIXME: CStack - remove the add/sub 16 before and after call.
- m_jit.addPtr(TrustedImm32(16), MacroAssembler::stackPointerRegister);
-
</del><span class="cx"> JITCompiler::Call fastCall = m_jit.nearCall();
</span><span class="cx">
</span><span class="cx"> JITCompiler::Jump done = m_jit.jump();
</span><span class="cx">
</span><span class="cx"> slowPath.link(&m_jit);
</span><span class="cx">
</span><del>- m_jit.addPtr(TrustedImm32(16), MacroAssembler::stackPointerRegister);
-
</del><span class="cx"> m_jit.move(calleeGPR, GPRInfo::regT0); // Callee needs to be in regT0
</span><span class="cx"> JITCompiler::Call slowCall = m_jit.nearCall();
</span><span class="cx">
</span><span class="cx"> done.link(&m_jit);
</span><span class="cx">
</span><del>- m_jit.addPtr(TrustedImm32(-16), MacroAssembler::stackPointerRegister);
-
</del><span class="cx"> m_jit.move(GPRInfo::returnValueGPR, resultGPR);
</span><span class="cx">
</span><span class="cx"> jsValueResult(resultGPR, m_currentNode, DataFormatJS, UseChildrenCalledExplicitly);
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreinterpreterJSStackh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/interpreter/JSStack.h (160505 => 160506)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/interpreter/JSStack.h 2013-12-12 21:25:34 UTC (rev 160505)
+++ branches/jsCStack/Source/JavaScriptCore/interpreter/JSStack.h 2013-12-12 22:54:00 UTC (rev 160506)
</span><span class="lines">@@ -61,8 +61,8 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(JSStack);
</span><span class="cx"> public:
</span><span class="cx"> enum CallFrameHeaderEntry {
</span><del>- CallerFrameAndPCSize = 0,
- CodeBlock = sizeof(CallerFrameAndPC) / sizeof(Register),
</del><ins>+ CallerFrameAndPCSize = sizeof(CallerFrameAndPC) / sizeof(Register),
+ CodeBlock = CallerFrameAndPCSize,
</ins><span class="cx"> ScopeChain,
</span><span class="cx"> Callee,
</span><span class="cx"> ArgumentCount,
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorejitJITCallcpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/jit/JITCall.cpp (160505 => 160506)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/jit/JITCall.cpp 2013-12-12 21:25:34 UTC (rev 160505)
+++ branches/jsCStack/Source/JavaScriptCore/jit/JITCall.cpp 2013-12-12 22:54:00 UTC (rev 160506)
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx">
</span><span class="cx"> loadPtr(Address(regT0, OBJECT_OFFSETOF(JSFunction, m_scope)), regT2);
</span><span class="cx"> store64(regT2, Address(regT1, JSStack::ScopeChain * sizeof(Register)));
</span><del>- addPtr(TrustedImm32(16), regT1, stackPointerRegister);
</del><ins>+ addPtr(TrustedImm32(JSStack::CallerFrameAndPCSize * static_cast<int>(sizeof(Register))), regT1, stackPointerRegister);
</ins><span class="cx">
</span><span class="cx"> m_callStructureStubCompilationInfo[callLinkInfoIndex].hotPathOther = emitNakedCall();
</span><span class="cx">
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorellintLowLevelInterpreterasm"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter.asm (160505 => 160506)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2013-12-12 21:25:34 UTC (rev 160505)
+++ branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2013-12-12 22:54:00 UTC (rev 160506)
</span><span class="lines">@@ -41,6 +41,8 @@
</span><span class="cx"> end
</span><span class="cx"> const SlotSize = 8
</span><span class="cx">
</span><ins>+const CallerFrameAndPCSize = 2 * PtrSize
+
</ins><span class="cx"> const CallerFrame = 0
</span><span class="cx"> const ReturnPC = CallerFrame + PtrSize
</span><span class="cx"> const CodeBlock = ReturnPC + PtrSize
</span><span class="lines">@@ -264,7 +266,7 @@
</span><span class="cx"> if C_LOOP
</span><span class="cx"> cloopCallJSFunction LLIntCallLinkInfo::machineCodeTarget[callLinkInfo]
</span><span class="cx"> else
</span><del>- prepareStackPointerForJSCall(calleeFramePtr)
</del><ins>+ move calleeFramePtr, sp
</ins><span class="cx"> call LLIntCallLinkInfo::machineCodeTarget[callLinkInfo]
</span><span class="cx"> restoreStackPointerAfterJSCall()
</span><span class="cx"> dispatchAfterCall()
</span><span class="lines">@@ -278,7 +280,7 @@
</span><span class="cx"> if C_LOOP
</span><span class="cx"> cloopCallJSFunction callee
</span><span class="cx"> else
</span><del>- prepareStackPointerForJSCall(t1) # The slow patch leaves the calle ExecState* in t1
</del><ins>+ addp CallerFrameAndPCSize, t1, sp
</ins><span class="cx"> call callee
</span><span class="cx"> restoreStackPointerAfterJSCall()
</span><span class="cx"> dispatchAfterCall()
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorellintLowLevelInterpreter64asm"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm (160505 => 160506)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2013-12-12 21:25:34 UTC (rev 160505)
+++ branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2013-12-12 22:54:00 UTC (rev 160506)
</span><span class="lines">@@ -152,10 +152,6 @@
</span><span class="cx"> subp cfr, t1, sp
</span><span class="cx"> end
</span><span class="cx">
</span><del>-macro prepareStackPointerForJSCall(calleeFramePtr)
- addp 16, calleeFramePtr, sp
-end
-
</del><span class="cx"> macro restoreStackPointerAfterJSCall()
</span><span class="cx"> loadp CodeBlock[cfr], t1
</span><span class="cx"> loadi CodeBlock::m_numCalleeRegisters[t1], t1
</span><span class="lines">@@ -1748,6 +1744,7 @@
</span><span class="cx"> loadisFromInstruction(3, t2)
</span><span class="cx"> storei PC, ArgumentCount + TagOffset[cfr]
</span><span class="cx"> storei t2, ArgumentCount + PayloadOffset[t3]
</span><ins>+ addp CallerFrameAndPCSize, t3
</ins><span class="cx"> callTargetFunction(t1,t3)
</span><span class="cx">
</span><span class="cx"> .opCallSlow:
</span></span></pre>
</div>
</div>
</body>
</html>