<!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>[160956] 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/160956">160956</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2013-12-20 18:48:50 -0800 (Fri, 20 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Arity check stack restoration should preserve the ArgumentCount in case there is a register restoration thunk below it
https://bugs.webkit.org/show_bug.cgi?id=126106
Not yet reviewed.
* assembler/MacroAssemblerCodeRef.h:
(JSC::ReturnAddressPtr::dump):
* jit/ArityCheckFailReturnThunks.cpp:
(JSC::ArityCheckFailReturnThunks::returnPCsFor):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesjsCStackSourceJavaScriptCoreChangeLog">branches/jsCStack/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreassemblerMacroAssemblerCodeRefh">branches/jsCStack/Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCorejitArityCheckFailReturnThunkscpp">branches/jsCStack/Source/JavaScriptCore/jit/ArityCheckFailReturnThunks.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 (160955 => 160956)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ChangeLog 2013-12-21 02:47:10 UTC (rev 160955)
+++ branches/jsCStack/Source/JavaScriptCore/ChangeLog 2013-12-21 02:48:50 UTC (rev 160956)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2013-12-20 Filip Pizlo <fpizlo@apple.com>
+
+ Arity check stack restoration should preserve the ArgumentCount in case there is a register restoration thunk below it
+ https://bugs.webkit.org/show_bug.cgi?id=126106
+
+ Not yet reviewed.
+
+ * assembler/MacroAssemblerCodeRef.h:
+ (JSC::ReturnAddressPtr::dump):
+ * jit/ArityCheckFailReturnThunks.cpp:
+ (JSC::ArityCheckFailReturnThunks::returnPCsFor):
+
</ins><span class="cx"> 2013-12-20 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> CStack: callToJavaScript should do stack check for incoming args.
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreassemblerMacroAssemblerCodeRefh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h (160955 => 160956)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h 2013-12-21 02:47:10 UTC (rev 160955)
+++ branches/jsCStack/Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h 2013-12-21 02:48:50 UTC (rev 160956)
</span><span class="lines">@@ -254,6 +254,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void* value() const { return m_value; }
</span><ins>+
+ void dump(PrintStream& out) const
+ {
+ out.print(RawPointer(m_value));
+ }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void* m_value;
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorejitArityCheckFailReturnThunkscpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/jit/ArityCheckFailReturnThunks.cpp (160955 => 160956)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/jit/ArityCheckFailReturnThunks.cpp 2013-12-21 02:47:10 UTC (rev 160955)
+++ branches/jsCStack/Source/JavaScriptCore/jit/ArityCheckFailReturnThunks.cpp 2013-12-21 02:48:50 UTC (rev 160956)
</span><span class="lines">@@ -68,8 +68,6 @@
</span><span class="cx"> for (unsigned size = m_nextSize; size <= numExpectedArgumentsIncludingThis; size += stackAlignmentRegisters()) {
</span><span class="cx"> labels.append(jit.label());
</span><span class="cx">
</span><del>- jit.nearCall();
- jit.pop(GPRInfo::regT2);
</del><span class="cx"> jit.load32(
</span><span class="cx"> AssemblyHelpers::Address(
</span><span class="cx"> AssemblyHelpers::stackPointerRegister,
</span><span class="lines">@@ -79,16 +77,25 @@
</span><span class="cx"> jit.add32(
</span><span class="cx"> AssemblyHelpers::TrustedImm32(
</span><span class="cx"> JSStack::CallFrameHeaderSize - JSStack::CallerFrameAndPCSize + size - 1),
</span><del>- GPRInfo::regT1);
- jit.lshift32(AssemblyHelpers::TrustedImm32(3), GPRInfo::regT1);
- jit.addPtr(AssemblyHelpers::stackPointerRegister, GPRInfo::regT1);
- jit.loadPtr(GPRInfo::regT1, GPRInfo::regT1);
</del><ins>+ GPRInfo::regT1, GPRInfo::regT2);
+ jit.lshift32(AssemblyHelpers::TrustedImm32(3), GPRInfo::regT2);
+ jit.addPtr(AssemblyHelpers::stackPointerRegister, GPRInfo::regT2);
+ jit.loadPtr(GPRInfo::regT2, GPRInfo::regT2);
</ins><span class="cx">
</span><span class="cx"> jit.addPtr(
</span><span class="cx"> AssemblyHelpers::TrustedImm32(size * sizeof(Register)),
</span><span class="cx"> AssemblyHelpers::stackPointerRegister);
</span><span class="cx">
</span><del>- jit.jump(GPRInfo::regT1);
</del><ins>+ // Thunks like ours want to use the return PC to figure out where things
+ // were saved. So, we pay it forward.
+ jit.store32(
+ GPRInfo::regT1,
+ AssemblyHelpers::Address(
+ AssemblyHelpers::stackPointerRegister,
+ (JSStack::ArgumentCount - JSStack::CallerFrameAndPCSize) * sizeof(Register) +
+ PayloadOffset));
+
+ jit.jump(GPRInfo::regT2);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LinkBuffer linkBuffer(vm, &jit, GLOBAL_THUNK_ID);
</span></span></pre>
</div>
</div>
</body>
</html>