<!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>[201089] branches/safari-601.1.46-branch/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/201089">201089</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-05-18 12:03:38 -0700 (Wed, 18 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge patch for rdar://problem/26350121.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchSourceJavaScriptCoreChangeLog">branches/safari-601.1.46-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceJavaScriptCorejitThunkGeneratorscpp">branches/safari-601.1.46-branch/Source/JavaScriptCore/jit/ThunkGenerators.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/JavaScriptCore/ChangeLog (201088 => 201089)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/JavaScriptCore/ChangeLog 2016-05-18 18:59:40 UTC (rev 201088)
+++ branches/safari-601.1.46-branch/Source/JavaScriptCore/ChangeLog 2016-05-18 19:03:38 UTC (rev 201089)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-05-18 Babak Shafiei <bshafiei@apple.com>
+
+ Merge patch for rdar://problem/26350121.
+
+ 2016-04-18 Mark Lam <mark.lam@apple.com>
+
+ Baseline getter/setter return thunks should compute their caller's stack top the same way JIT::stackPointerOffsetFor() does.
+ rdar://problem/25753147
+
+ Reviewed by Geoffrey Garen.
+
+ * jit/ThunkGenerators.cpp:
+ (JSC::arityFixupGenerator):
+ (JSC::computeTopOfStack):
+ (JSC::baselineGetterReturnThunkGenerator):
+ (JSC::baselineSetterReturnThunkGenerator):
+ - I swapped regT2 with regT3 because X86 does not like using regT3 ($rcx) for
+ certain operations. The code can be more straightforward and efficient by
+ swapping them.
+
</ins><span class="cx"> 2016-05-13 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r196490. rdar://problem/26270871
</span></span></pre></div>
<a id="branchessafari601146branchSourceJavaScriptCorejitThunkGeneratorscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/JavaScriptCore/jit/ThunkGenerators.cpp (201088 => 201089)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/JavaScriptCore/jit/ThunkGenerators.cpp 2016-05-18 18:59:40 UTC (rev 201088)
+++ branches/safari-601.1.46-branch/Source/JavaScriptCore/jit/ThunkGenerators.cpp 2016-05-18 19:03:38 UTC (rev 201089)
</span><span class="lines">@@ -505,43 +505,61 @@
</span><span class="cx"> return FINALIZE_CODE(patchBuffer, ("fixup arity"));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void computeTopOfStack(JSInterfaceJIT& jit, GPRReg dstReg, GPRReg scratchReg)
+{
+ // The following is an inlined implementation of JIT::stackPointerOffsetFor() applied to
+ // computing the top of stack for the call frame we're returning to.
+
+ // 1. Compute localRegisterCount.
+ jit.emitGetFromCallFrameHeaderPtr(JSStack::CodeBlock, scratchReg);
+ jit.load32(AssemblyHelpers::Address(GPRInfo::regT3, OBJECT_OFFSETOF(CodeBlock, m_numCalleeRegisters)), scratchReg);
+ if (maxFrameExtentForSlowPathCallInRegisters)
+ jit.add32(AssemblyHelpers::TrustedImm32(maxFrameExtentForSlowPathCallInRegisters), scratchReg);
+
+ // 2. Compute roundLocalRegisterCountForFramePointerOffset(localRegisterCount)
+ unsigned alignment = stackAlignmentRegisters();
+ ASSERT(alignment && !(alignment & (alignment - 1)));
+ unsigned remainderMask = alignment - 1;
+ jit.add32(AssemblyHelpers::TrustedImm32(JSStack::CallerFrameAndPCSize + remainderMask), scratchReg);
+ jit.and32(AssemblyHelpers::TrustedImm32(~remainderMask), scratchReg);
+ jit.add32(AssemblyHelpers::TrustedImm32(-JSStack::CallerFrameAndPCSize), scratchReg);
+
+ // 3. Compute sizeof(Register) and offset it from the callFrameRegister.
+ jit.lshift32(AssemblyHelpers::TrustedImm32(3), scratchReg);
+ jit.xor32(dstReg, dstReg);
+ jit.sub32(scratchReg, dstReg);
+#if USE(JSVALUE64)
+ jit.signExtend32ToPtr(dstReg, dstReg);
+#endif
+ jit.addPtr(GPRInfo::callFrameRegister, dstReg);
+}
+
+
</ins><span class="cx"> MacroAssemblerCodeRef baselineGetterReturnThunkGenerator(VM* vm)
</span><span class="cx"> {
</span><span class="cx"> JSInterfaceJIT jit(vm);
</span><ins>+
+ computeTopOfStack(jit, GPRInfo::regT2, GPRInfo::regT3);
</ins><span class="cx">
</span><span class="cx"> #if USE(JSVALUE64)
</span><span class="cx"> jit.move(GPRInfo::returnValueGPR, GPRInfo::regT0);
</span><span class="cx"> #else
</span><span class="cx"> jit.setupResults(GPRInfo::regT0, GPRInfo::regT1);
</span><span class="cx"> #endif
</span><del>-
- unsigned numberOfParameters = 0;
- numberOfParameters++; // The 'this' argument.
- numberOfParameters++; // The true return PC.
-
- unsigned numberOfRegsForCall =
- JSStack::CallFrameHeaderSize + numberOfParameters;
-
- unsigned numberOfBytesForCall =
- numberOfRegsForCall * sizeof(Register) - sizeof(CallerFrameAndPC);
-
- unsigned alignedNumberOfBytesForCall =
- WTF::roundUpToMultipleOf(stackAlignmentBytes(), numberOfBytesForCall);
-
</del><ins>+
</ins><span class="cx"> // The real return address is stored above the arguments. We passed one argument, which is
</span><span class="cx"> // 'this'. So argument at index 1 is the return address.
</span><span class="cx"> jit.loadPtr(
</span><span class="cx"> AssemblyHelpers::Address(
</span><span class="cx"> AssemblyHelpers::stackPointerRegister,
</span><span class="cx"> (virtualRegisterForArgument(1).offset() - JSStack::CallerFrameAndPCSize) * sizeof(Register)),
</span><del>- GPRInfo::regT2);
-
- jit.addPtr(
- AssemblyHelpers::TrustedImm32(alignedNumberOfBytesForCall),
- AssemblyHelpers::stackPointerRegister);
-
- jit.jump(GPRInfo::regT2);
</del><ins>+ GPRInfo::regT3);
</ins><span class="cx">
</span><ins>+ jit.move(GPRInfo::regT2, AssemblyHelpers::stackPointerRegister);
+ jit.checkStackPointerAlignment();
+
+ jit.jump(GPRInfo::regT3);
+
</ins><span class="cx"> LinkBuffer patchBuffer(*vm, jit, GLOBAL_THUNK_ID);
</span><span class="cx"> return FINALIZE_CODE(patchBuffer, ("baseline getter return thunk"));
</span><span class="cx"> }
</span><span class="lines">@@ -550,34 +568,21 @@
</span><span class="cx"> {
</span><span class="cx"> JSInterfaceJIT jit(vm);
</span><span class="cx">
</span><del>- unsigned numberOfParameters = 0;
- numberOfParameters++; // The 'this' argument.
- numberOfParameters++; // The value to set.
- numberOfParameters++; // The true return PC.
</del><ins>+ computeTopOfStack(jit, GPRInfo::regT2, GPRInfo::regT3);
</ins><span class="cx">
</span><del>- unsigned numberOfRegsForCall =
- JSStack::CallFrameHeaderSize + numberOfParameters;
-
- unsigned numberOfBytesForCall =
- numberOfRegsForCall * sizeof(Register) - sizeof(CallerFrameAndPC);
-
- unsigned alignedNumberOfBytesForCall =
- WTF::roundUpToMultipleOf(stackAlignmentBytes(), numberOfBytesForCall);
-
</del><span class="cx"> // The real return address is stored above the arguments. We passed two arguments, so
</span><span class="cx"> // the argument at index 2 is the return address.
</span><span class="cx"> jit.loadPtr(
</span><span class="cx"> AssemblyHelpers::Address(
</span><span class="cx"> AssemblyHelpers::stackPointerRegister,
</span><span class="cx"> (virtualRegisterForArgument(2).offset() - JSStack::CallerFrameAndPCSize) * sizeof(Register)),
</span><del>- GPRInfo::regT2);
-
- jit.addPtr(
- AssemblyHelpers::TrustedImm32(alignedNumberOfBytesForCall),
- AssemblyHelpers::stackPointerRegister);
-
- jit.jump(GPRInfo::regT2);
</del><ins>+ GPRInfo::regT3);
</ins><span class="cx">
</span><ins>+ jit.move(GPRInfo::regT2, AssemblyHelpers::stackPointerRegister);
+ jit.checkStackPointerAlignment();
+
+ jit.jump(GPRInfo::regT3);
+
</ins><span class="cx"> LinkBuffer patchBuffer(*vm, jit, GLOBAL_THUNK_ID);
</span><span class="cx"> return FINALIZE_CODE(patchBuffer, ("baseline setter return thunk"));
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>