<!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>[166266] trunk/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/166266">166266</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-03-25 16:28:48 -0700 (Tue, 25 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix 32-bit getter call alignment.
Reviewed by Mark Hahnenberg.
* jit/Repatch.cpp:
(JSC::generateGetByIdStub):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorejitRepatchcpp">trunk/Source/JavaScriptCore/jit/Repatch.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (166265 => 166266)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-03-25 23:20:14 UTC (rev 166265)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-03-25 23:28:48 UTC (rev 166266)
</span><span class="lines">@@ -1,5 +1,14 @@
</span><span class="cx"> 2014-03-25 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><ins>+ Fix 32-bit getter call alignment.
+
+ Reviewed by Mark Hahnenberg.
+
+ * jit/Repatch.cpp:
+ (JSC::generateGetByIdStub):
+
+2014-03-25 Filip Pizlo <fpizlo@apple.com>
+
</ins><span class="cx"> Repatch should plant calls to getters directly rather than through a C helper
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=129589
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitRepatchcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/Repatch.cpp (166265 => 166266)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/Repatch.cpp 2014-03-25 23:20:14 UTC (rev 166265)
+++ trunk/Source/JavaScriptCore/jit/Repatch.cpp 2014-03-25 23:28:48 UTC (rev 166266)
</span><span class="lines">@@ -340,8 +340,8 @@
</span><span class="cx"> // - Any byte between FP (exclusive) and SP (inclusive) could be live in the calling
</span><span class="cx"> // code.
</span><span class="cx"> //
</span><del>- // Therefore, we temporary grow the stack for the purpose of the call and then
- // degrow it after.
</del><ins>+ // Therefore, we temporarily grow the stack for the purpose of the call and then
+ // shrink it after.
</ins><span class="cx">
</span><span class="cx"> callLinkInfo = std::make_unique<CallLinkInfo>();
</span><span class="cx"> callLinkInfo->callType = CallLinkInfo::Call;
</span><span class="lines">@@ -363,15 +363,14 @@
</span><span class="cx"> unsigned numberOfRegsForCall =
</span><span class="cx"> JSStack::CallFrameHeaderSize + numberOfParameters;
</span><span class="cx">
</span><del>- unsigned alignedNumberOfNeededRegs =
- WTF::roundUpToMultipleOf(stackAlignmentRegisters(), numberOfRegsForCall);
</del><ins>+ unsigned numberOfBytesForCall =
+ numberOfRegsForCall * sizeof(Register) - sizeof(CallerFrameAndPC);
</ins><span class="cx">
</span><del>- unsigned alignedNumberOfNeededBytes =
- alignedNumberOfNeededRegs * sizeof(Register);
</del><ins>+ unsigned alignedNumberOfBytesForCall =
+ WTF::roundUpToMultipleOf(stackAlignmentBytes(), numberOfBytesForCall);
</ins><span class="cx">
</span><span class="cx"> stubJit.subPtr(
</span><del>- MacroAssembler::TrustedImm32(
- alignedNumberOfNeededBytes - sizeof(CallerFrameAndPC)),
</del><ins>+ MacroAssembler::TrustedImm32(alignedNumberOfBytesForCall),
</ins><span class="cx"> MacroAssembler::stackPointerRegister);
</span><span class="cx">
</span><span class="cx"> MacroAssembler::Address calleeFrame = MacroAssembler::Address(
</span><span class="lines">@@ -404,8 +403,7 @@
</span><span class="cx"> fastPathCall = stubJit.nearCall();
</span><span class="cx">
</span><span class="cx"> stubJit.addPtr(
</span><del>- MacroAssembler::TrustedImm32(
- alignedNumberOfNeededBytes - sizeof(CallerFrameAndPC)),
</del><ins>+ MacroAssembler::TrustedImm32(alignedNumberOfBytesForCall),
</ins><span class="cx"> MacroAssembler::stackPointerRegister);
</span><span class="cx">
</span><span class="cx"> done.append(stubJit.jump());
</span><span class="lines">@@ -419,8 +417,7 @@
</span><span class="cx"> slowPathCall = stubJit.nearCall();
</span><span class="cx">
</span><span class="cx"> stubJit.addPtr(
</span><del>- MacroAssembler::TrustedImm32(
- alignedNumberOfNeededBytes - sizeof(CallerFrameAndPC)),
</del><ins>+ MacroAssembler::TrustedImm32(alignedNumberOfBytesForCall),
</ins><span class="cx"> MacroAssembler::stackPointerRegister);
</span><span class="cx">
</span><span class="cx"> done.append(stubJit.jump());
</span></span></pre>
</div>
</div>
</body>
</html>