<!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>[160963] 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/160963">160963</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2013-12-21 01:49:39 -0800 (Sat, 21 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Register restoration thunk should restore the ArgumentCount after it restores registers
https://bugs.webkit.org/show_bug.cgi?id=126115
Not yet reviewed.
Just getting us further along in V8/crypto...
* ftl/FTLJSCall.cpp:
(JSC::FTL::JSCall::JSCall):
(JSC::FTL::JSCall::link):
* ftl/FTLJSCall.h:
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::LowerDFGToLLVM::compileCallOrConstruct):
* jit/RegisterPreservationWrapperGenerator.cpp:
(JSC::generateRegisterRestoration):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesjsCStackSourceJavaScriptCoreChangeLog">branches/jsCStack/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreftlFTLJSCallcpp">branches/jsCStack/Source/JavaScriptCore/ftl/FTLJSCall.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreftlFTLJSCallh">branches/jsCStack/Source/JavaScriptCore/ftl/FTLJSCall.h</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">branches/jsCStack/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCorejitRegisterPreservationWrapperGeneratorcpp">branches/jsCStack/Source/JavaScriptCore/jit/RegisterPreservationWrapperGenerator.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 (160962 => 160963)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ChangeLog 2013-12-21 08:59:20 UTC (rev 160962)
+++ branches/jsCStack/Source/JavaScriptCore/ChangeLog 2013-12-21 09:49:39 UTC (rev 160963)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2013-12-21 Filip Pizlo <fpizlo@apple.com>
+
+ Register restoration thunk should restore the ArgumentCount after it restores registers
+ https://bugs.webkit.org/show_bug.cgi?id=126115
+
+ Not yet reviewed.
+
+ Just getting us further along in V8/crypto...
+
+ * ftl/FTLJSCall.cpp:
+ (JSC::FTL::JSCall::JSCall):
+ (JSC::FTL::JSCall::link):
+ * ftl/FTLJSCall.h:
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::LowerDFGToLLVM::compileCallOrConstruct):
+ * jit/RegisterPreservationWrapperGenerator.cpp:
+ (JSC::generateRegisterRestoration):
+
</ins><span class="cx"> 2013-12-20 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> CStack: Introduce JSStack::ensureCapacityFor().
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreftlFTLJSCallcpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/ftl/FTLJSCall.cpp (160962 => 160963)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ftl/FTLJSCall.cpp 2013-12-21 08:59:20 UTC (rev 160962)
+++ branches/jsCStack/Source/JavaScriptCore/ftl/FTLJSCall.cpp 2013-12-21 09:49:39 UTC (rev 160963)
</span><span class="lines">@@ -28,12 +28,13 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(FTL_JIT)
</span><span class="cx">
</span><ins>+#include "DFGNode.h"
+
</ins><span class="cx"> namespace JSC { namespace FTL {
</span><span class="cx">
</span><del>-JSCall::JSCall(unsigned stackmapID, CallLinkInfo::CallType callType, CodeOrigin codeOrigin)
</del><ins>+JSCall::JSCall(unsigned stackmapID, DFG::Node* node)
</ins><span class="cx"> : m_stackmapID(stackmapID)
</span><del>- , m_callType(callType)
- , m_codeOrigin(codeOrigin)
</del><ins>+ , m_node(node)
</ins><span class="cx"> , m_instructionOffset(0)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -65,14 +66,14 @@
</span><span class="cx"> void JSCall::link(VM& vm, LinkBuffer& linkBuffer, CallLinkInfo& callInfo)
</span><span class="cx"> {
</span><span class="cx"> ThunkGenerator generator = linkThunkGeneratorFor(
</span><del>- m_callType == CallLinkInfo::Construct ? CodeForConstruct : CodeForCall,
</del><ins>+ m_node->op() == DFG::Construct ? CodeForConstruct : CodeForCall,
</ins><span class="cx"> MustPreserveRegisters);
</span><span class="cx">
</span><span class="cx"> linkBuffer.link(
</span><span class="cx"> m_slowCall, FunctionPtr(vm.getCTIStub(generator).code().executableAddress()));
</span><span class="cx">
</span><del>- callInfo.callType = m_callType;
- callInfo.codeOrigin = m_codeOrigin;
</del><ins>+ callInfo.callType = m_node->op() == DFG::Construct ? CallLinkInfo::Construct : CallLinkInfo::Call;
+ callInfo.codeOrigin = m_node->codeOrigin;
</ins><span class="cx"> callInfo.callReturnLocation = linkBuffer.locationOfNearCall(m_slowCall);
</span><span class="cx"> callInfo.hotPathBegin = linkBuffer.locationOf(m_targetToCheck);
</span><span class="cx"> callInfo.hotPathOther = linkBuffer.locationOfNearCall(m_fastCall);
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreftlFTLJSCallh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/ftl/FTLJSCall.h (160962 => 160963)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ftl/FTLJSCall.h 2013-12-21 08:59:20 UTC (rev 160962)
+++ branches/jsCStack/Source/JavaScriptCore/ftl/FTLJSCall.h 2013-12-21 09:49:39 UTC (rev 160963)
</span><span class="lines">@@ -33,11 +33,17 @@
</span><span class="cx"> #include "CodeOrigin.h"
</span><span class="cx"> #include "LinkBuffer.h"
</span><span class="cx">
</span><del>-namespace JSC { namespace FTL {
</del><ins>+namespace JSC {
</ins><span class="cx">
</span><ins>+namespace DFG {
+struct Node;
+}
+
+namespace FTL {
+
</ins><span class="cx"> class JSCall {
</span><span class="cx"> public:
</span><del>- JSCall(unsigned stackmapID, CallLinkInfo::CallType, CodeOrigin);
</del><ins>+ JSCall(unsigned stackmapID, DFG::Node*);
</ins><span class="cx">
</span><span class="cx"> void emit(CCallHelpers&);
</span><span class="cx"> void link(VM&, LinkBuffer&, CallLinkInfo&);
</span><span class="lines">@@ -51,8 +57,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> unsigned m_stackmapID;
</span><del>- CallLinkInfo::CallType m_callType;
- CodeOrigin m_codeOrigin;
</del><ins>+ DFG::Node* m_node;
</ins><span class="cx"> CCallHelpers::DataLabelPtr m_targetToCheck;
</span><span class="cx"> CCallHelpers::Call m_fastCall;
</span><span class="cx"> CCallHelpers::Call m_slowCall;
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (160962 => 160963)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2013-12-21 08:59:20 UTC (rev 160962)
+++ branches/jsCStack/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2013-12-21 09:49:39 UTC (rev 160963)
</span><span class="lines">@@ -2465,10 +2465,7 @@
</span><span class="cx"> LValue call = m_out.call(m_out.patchpointInt64Intrinsic(), arguments);
</span><span class="cx"> setInstructionCallingConvention(call, LLVMWebKitJSCallConv);
</span><span class="cx">
</span><del>- m_ftlState.jsCalls.append(JSCall(
- stackmapID,
- m_node->op() == Call ? CallLinkInfo::Call : CallLinkInfo::Construct,
- m_node->codeOrigin));
</del><ins>+ m_ftlState.jsCalls.append(JSCall(stackmapID, m_node));
</ins><span class="cx">
</span><span class="cx"> setJSValue(call);
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorejitRegisterPreservationWrapperGeneratorcpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/jit/RegisterPreservationWrapperGenerator.cpp (160962 => 160963)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/jit/RegisterPreservationWrapperGenerator.cpp 2013-12-21 08:59:20 UTC (rev 160962)
+++ branches/jsCStack/Source/JavaScriptCore/jit/RegisterPreservationWrapperGenerator.cpp 2013-12-21 09:49:39 UTC (rev 160963)
</span><span class="lines">@@ -139,6 +139,8 @@
</span><span class="cx"> RegisterSet toSave = registersToPreserve();
</span><span class="cx"> ptrdiff_t offset = registerPreservationOffset();
</span><span class="cx">
</span><ins>+ ASSERT(!toSave.get(GPRInfo::regT4));
+
</ins><span class="cx"> // We need to place the stack pointer back to where the caller thought they left it.
</span><span class="cx"> // But also, in order to recover the registers, we need to figure out how big the
</span><span class="cx"> // arguments area is.
</span><span class="lines">@@ -147,21 +149,14 @@
</span><span class="cx"> AssemblyHelpers::Address(
</span><span class="cx"> AssemblyHelpers::stackPointerRegister,
</span><span class="cx"> (JSStack::ArgumentCount - JSStack::CallerFrameAndPCSize) * sizeof(Register) + PayloadOffset),
</span><del>- GPRInfo::regT1);
</del><ins>+ GPRInfo::regT4);
</ins><span class="cx">
</span><del>- jit.move(GPRInfo::regT1, GPRInfo::regT2);
</del><ins>+ jit.move(GPRInfo::regT4, GPRInfo::regT2);
</ins><span class="cx"> jit.lshift32(AssemblyHelpers::TrustedImm32(3), GPRInfo::regT2);
</span><span class="cx">
</span><span class="cx"> jit.addPtr(AssemblyHelpers::TrustedImm32(offset), AssemblyHelpers::stackPointerRegister);
</span><span class="cx"> jit.addPtr(AssemblyHelpers::stackPointerRegister, GPRInfo::regT2);
</span><span class="cx">
</span><del>- // Thunks like this rely on the ArgumentCount being intact. Pay it forward.
- jit.store32(
- GPRInfo::regT1,
- AssemblyHelpers::Address(
- AssemblyHelpers::stackPointerRegister,
- (JSStack::ArgumentCount - JSStack::CallerFrameAndPCSize) * sizeof(Register) + PayloadOffset));
-
</del><span class="cx"> // We saved things at:
</span><span class="cx"> //
</span><span class="cx"> // adjSP + (JSStack::CallFrameHeaderSize - JSStack::CallerFrameAndPCSize + NumArgs) * 8
</span><span class="lines">@@ -188,6 +183,13 @@
</span><span class="cx"> jit.load64(AssemblyHelpers::Address(GPRInfo::regT2, currentOffset), gpr);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Thunks like this rely on the ArgumentCount being intact. Pay it forward.
+ jit.store32(
+ GPRInfo::regT4,
+ AssemblyHelpers::Address(
+ AssemblyHelpers::stackPointerRegister,
+ (JSStack::ArgumentCount - JSStack::CallerFrameAndPCSize) * sizeof(Register) + PayloadOffset));
+
</ins><span class="cx"> if (!ASSERT_DISABLED) {
</span><span class="cx"> AssemblyHelpers::Jump ok = jit.branchPtr(
</span><span class="cx"> AssemblyHelpers::Above, GPRInfo::regT1, AssemblyHelpers::TrustedImmPtr(static_cast<size_t>(0x1000)));
</span></span></pre>
</div>
</div>
</body>
</html>