<!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>[160562] 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/160562">160562</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2013-12-13 13:36:55 -0800 (Fri, 13 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>jsCStack:REGRESSION: "print(“My object: “ + { });” crashes LLINT in op_call
https://bugs.webkit.org/show_bug.cgi?id=125694
Reviewed by Filip Pizlo.
We were clobbering the rbx value saved on the stack at the top of callToJavaScript
and callToNativeFunction. This is due to a difference between the JSStack's notion
of top of stack being the first usable location and the stack pointer register
pointing to the last used location. I changed the allocation of the sentinel frame
accordingly.
In the process I cleaned up the rounding of paddedArgsCount in ProtoCallFrame::init
to use WTF::roundUpToMultipleOf<> since the rounding had to change to keep the stack
pointer aligned.
* interpreter/ProtoCallFrame.cpp:
(JSC::ProtoCallFrame::init):
* 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="#branchesjsCStackSourceJavaScriptCoreinterpreterProtoCallFramecpp">branches/jsCStack/Source/JavaScriptCore/interpreter/ProtoCallFrame.cpp</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 (160561 => 160562)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ChangeLog 2013-12-13 21:36:39 UTC (rev 160561)
+++ branches/jsCStack/Source/JavaScriptCore/ChangeLog 2013-12-13 21:36:55 UTC (rev 160562)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2013-12-13 Michael Saboff <msaboff@apple.com>
+
+ jsCStack:REGRESSION: "print(“My object: “ + { });” crashes LLINT in op_call
+ https://bugs.webkit.org/show_bug.cgi?id=125694
+
+ Reviewed by Filip Pizlo.
+
+ We were clobbering the rbx value saved on the stack at the top of callToJavaScript
+ and callToNativeFunction. This is due to a difference between the JSStack's notion
+ of top of stack being the first usable location and the stack pointer register
+ pointing to the last used location. I changed the allocation of the sentinel frame
+ accordingly.
+
+ In the process I cleaned up the rounding of paddedArgsCount in ProtoCallFrame::init
+ to use WTF::roundUpToMultipleOf<> since the rounding had to change to keep the stack
+ pointer aligned.
+
+ * interpreter/ProtoCallFrame.cpp:
+ (JSC::ProtoCallFrame::init):
+ * llint/LowLevelInterpreter64.asm:
+
</ins><span class="cx"> 2013-12-12 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> CStack Branch: Use proper values for stack checks
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoredfgDFGGraphcpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/dfg/DFGGraph.cpp (160561 => 160562)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/dfg/DFGGraph.cpp 2013-12-13 21:36:39 UTC (rev 160561)
+++ branches/jsCStack/Source/JavaScriptCore/dfg/DFGGraph.cpp 2013-12-13 21:36:55 UTC (rev 160562)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> #include "JSActivation.h"
</span><span class="cx"> #include "OperandsInlines.h"
</span><span class="cx"> #include "Operations.h"
</span><ins>+#include "StackAlignment.h"
</ins><span class="cx"> #include <wtf/CommaPrinter.h>
</span><span class="cx"> #include <wtf/ListDump.h>
</span><span class="cx">
</span><span class="lines">@@ -704,7 +705,7 @@
</span><span class="cx"> unsigned Graph::frameRegisterCount()
</span><span class="cx"> {
</span><span class="cx"> unsigned result = m_nextMachineLocal + std::max(m_parameterSlots, static_cast<unsigned>(JSStack::CallerFrameAndPCSize));
</span><del>- result = WTF::roundUpToMultipleOf<2>(result);
</del><ins>+ result = WTF::roundUpToMultipleOf(stackAlignmentRegisters(), result);
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreinterpreterProtoCallFramecpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/interpreter/ProtoCallFrame.cpp (160561 => 160562)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/interpreter/ProtoCallFrame.cpp 2013-12-13 21:36:39 UTC (rev 160561)
+++ branches/jsCStack/Source/JavaScriptCore/interpreter/ProtoCallFrame.cpp 2013-12-13 21:36:55 UTC (rev 160562)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "ProtoCallFrame.h"
</span><span class="cx">
</span><span class="cx"> #include "CodeBlock.h"
</span><ins>+#include "StackAlignment.h"
</ins><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="lines">@@ -43,10 +44,8 @@
</span><span class="cx"> if (paddedArgsCount < numParameters)
</span><span class="cx"> paddedArgsCount = numParameters;
</span><span class="cx"> }
</span><del>- // FIXME: CStack - Align the combination of sentinel frame + callee frame
- // Maybe this should be in callToJavaScript.
- if (!(paddedArgsCount & 1))
- paddedArgsCount++;
</del><ins>+ // Round up paddedArgsCount to keep the stack frame size aligned.
+ paddedArgsCount = WTF::roundUpToMultipleOf(stackAlignmentRegisters(), paddedArgsCount);
</ins><span class="cx"> this->setPaddedArgsCount(paddedArgsCount);
</span><span class="cx"> this->clearCurrentVPC();
</span><span class="cx"> this->setThisValue(thisValue);
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorellintLowLevelInterpreter64asm"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm (160561 => 160562)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2013-12-13 21:36:39 UTC (rev 160561)
+++ branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2013-12-13 21:36:55 UTC (rev 160562)
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> macro callToJavaScriptEpilogue()
</span><del>- addp (CallFrameHeaderSlots-1)*8, cfr, sp
</del><ins>+ addp CallFrameHeaderSlots*8, cfr, sp
</ins><span class="cx"> loadp CallerFrame[cfr], cfr
</span><span class="cx">
</span><span class="cx"> popCalleeSaves
</span><span class="lines">@@ -183,7 +183,7 @@
</span><span class="cx">
</span><span class="cx"> # Allocate and initialize the sentinel frame.
</span><span class="cx"> move sp, cfr
</span><del>- subp (CallFrameHeaderSlots-1)*8, cfr
</del><ins>+ subp CallFrameHeaderSlots*8, cfr
</ins><span class="cx"> storep 0, ArgumentCount[cfr]
</span><span class="cx"> storep vmTopCallFrame, Callee[cfr]
</span><span class="cx"> loadp [vmTopCallFrame], temp2
</span></span></pre>
</div>
</div>
</body>
</html>