<!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>[179967] 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/179967">179967</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2015-02-11 15:02:32 -0800 (Wed, 11 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>The callee frame helpers in DFG::SpeculativeJIT should be available to other JITs
https://bugs.webkit.org/show_bug.cgi?id=141493
Reviewed by Michael Saboff.
* dfg/DFGSpeculativeJIT.h:
(JSC::DFG::SpeculativeJIT::calleeFrameSlot): Deleted.
(JSC::DFG::SpeculativeJIT::calleeArgumentSlot): Deleted.
(JSC::DFG::SpeculativeJIT::calleeFrameTagSlot): Deleted.
(JSC::DFG::SpeculativeJIT::calleeFramePayloadSlot): Deleted.
(JSC::DFG::SpeculativeJIT::calleeArgumentTagSlot): Deleted.
(JSC::DFG::SpeculativeJIT::calleeArgumentPayloadSlot): Deleted.
(JSC::DFG::SpeculativeJIT::calleeFrameCallerFrame): Deleted.
* dfg/DFGSpeculativeJIT32_64.cpp:
(JSC::DFG::SpeculativeJIT::emitCall):
* dfg/DFGSpeculativeJIT64.cpp:
(JSC::DFG::SpeculativeJIT::emitCall):
* jit/AssemblyHelpers.h:
(JSC::AssemblyHelpers::calleeFrameSlot):
(JSC::AssemblyHelpers::calleeArgumentSlot):
(JSC::AssemblyHelpers::calleeFrameTagSlot):
(JSC::AssemblyHelpers::calleeFramePayloadSlot):
(JSC::AssemblyHelpers::calleeArgumentTagSlot):
(JSC::AssemblyHelpers::calleeArgumentPayloadSlot):
(JSC::AssemblyHelpers::calleeFrameCallerFrame):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJITh">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitAssemblyHelpersh">trunk/Source/JavaScriptCore/jit/AssemblyHelpers.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (179966 => 179967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-02-11 23:01:07 UTC (rev 179966)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-02-11 23:02:32 UTC (rev 179967)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2015-02-11 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><ins>+ The callee frame helpers in DFG::SpeculativeJIT should be available to other JITs
+ https://bugs.webkit.org/show_bug.cgi?id=141493
+
+ Reviewed by Michael Saboff.
+
+ * dfg/DFGSpeculativeJIT.h:
+ (JSC::DFG::SpeculativeJIT::calleeFrameSlot): Deleted.
+ (JSC::DFG::SpeculativeJIT::calleeArgumentSlot): Deleted.
+ (JSC::DFG::SpeculativeJIT::calleeFrameTagSlot): Deleted.
+ (JSC::DFG::SpeculativeJIT::calleeFramePayloadSlot): Deleted.
+ (JSC::DFG::SpeculativeJIT::calleeArgumentTagSlot): Deleted.
+ (JSC::DFG::SpeculativeJIT::calleeArgumentPayloadSlot): Deleted.
+ (JSC::DFG::SpeculativeJIT::calleeFrameCallerFrame): Deleted.
+ * dfg/DFGSpeculativeJIT32_64.cpp:
+ (JSC::DFG::SpeculativeJIT::emitCall):
+ * dfg/DFGSpeculativeJIT64.cpp:
+ (JSC::DFG::SpeculativeJIT::emitCall):
+ * jit/AssemblyHelpers.h:
+ (JSC::AssemblyHelpers::calleeFrameSlot):
+ (JSC::AssemblyHelpers::calleeArgumentSlot):
+ (JSC::AssemblyHelpers::calleeFrameTagSlot):
+ (JSC::AssemblyHelpers::calleeFramePayloadSlot):
+ (JSC::AssemblyHelpers::calleeArgumentTagSlot):
+ (JSC::AssemblyHelpers::calleeArgumentPayloadSlot):
+ (JSC::AssemblyHelpers::calleeFrameCallerFrame):
+
+2015-02-11 Filip Pizlo <fpizlo@apple.com>
+
</ins><span class="cx"> SetupVarargsFrame should not assume that an inline stack frame would have identical layout to a normal stack frame
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=141485
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJITh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h (179966 => 179967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h 2015-02-11 23:01:07 UTC (rev 179966)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h 2015-02-11 23:02:32 UTC (rev 179967)
</span><span class="lines">@@ -717,44 +717,6 @@
</span><span class="cx"> void compileInstanceOfForObject(Node*, GPRReg valueReg, GPRReg prototypeReg, GPRReg scratchAndResultReg, GPRReg scratch2Reg);
</span><span class="cx"> void compileInstanceOf(Node*);
</span><span class="cx">
</span><del>- // Access to our fixed callee CallFrame.
- MacroAssembler::Address calleeFrameSlot(int slot)
- {
- ASSERT(slot >= JSStack::CallerFrameAndPCSize);
- return MacroAssembler::Address(MacroAssembler::stackPointerRegister, sizeof(Register) * (slot - JSStack::CallerFrameAndPCSize));
- }
-
- // Access to our fixed callee CallFrame.
- MacroAssembler::Address calleeArgumentSlot(int argument)
- {
- return calleeFrameSlot(virtualRegisterForArgument(argument).offset());
- }
-
- MacroAssembler::Address calleeFrameTagSlot(int slot)
- {
- return calleeFrameSlot(slot).withOffset(OBJECT_OFFSETOF(EncodedValueDescriptor, asBits.tag));
- }
-
- MacroAssembler::Address calleeFramePayloadSlot(int slot)
- {
- return calleeFrameSlot(slot).withOffset(OBJECT_OFFSETOF(EncodedValueDescriptor, asBits.payload));
- }
-
- MacroAssembler::Address calleeArgumentTagSlot(int argument)
- {
- return calleeArgumentSlot(argument).withOffset(OBJECT_OFFSETOF(EncodedValueDescriptor, asBits.tag));
- }
-
- MacroAssembler::Address calleeArgumentPayloadSlot(int argument)
- {
- return calleeArgumentSlot(argument).withOffset(OBJECT_OFFSETOF(EncodedValueDescriptor, asBits.payload));
- }
-
- MacroAssembler::Address calleeFrameCallerFrame()
- {
- return calleeFrameSlot(0).withOffset(CallFrame::callerFrameOffset());
- }
-
</del><span class="cx"> void emitCall(Node*);
</span><span class="cx">
</span><span class="cx"> int32_t framePointerOffsetToGetActivationRegisters()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp (179966 => 179967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2015-02-11 23:01:07 UTC (rev 179966)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2015-02-11 23:02:32 UTC (rev 179967)
</span><span class="lines">@@ -656,7 +656,7 @@
</span><span class="cx">
</span><span class="cx"> int numArgs = numPassedArgs + dummyThisArgument;
</span><span class="cx">
</span><del>- m_jit.store32(MacroAssembler::TrustedImm32(numArgs), calleeFramePayloadSlot(JSStack::ArgumentCount));
</del><ins>+ m_jit.store32(MacroAssembler::TrustedImm32(numArgs), m_jit.calleeFramePayloadSlot(JSStack::ArgumentCount));
</ins><span class="cx">
</span><span class="cx"> for (int i = 0; i < numPassedArgs; i++) {
</span><span class="cx"> Edge argEdge = m_jit.graph().m_varArgChildren[node->firstChild() + 1 + i];
</span><span class="lines">@@ -665,16 +665,16 @@
</span><span class="cx"> GPRReg argPayloadGPR = arg.payloadGPR();
</span><span class="cx"> use(argEdge);
</span><span class="cx">
</span><del>- m_jit.store32(argTagGPR, calleeArgumentTagSlot(i + dummyThisArgument));
- m_jit.store32(argPayloadGPR, calleeArgumentPayloadSlot(i + dummyThisArgument));
</del><ins>+ m_jit.store32(argTagGPR, m_jit.calleeArgumentTagSlot(i + dummyThisArgument));
+ m_jit.store32(argPayloadGPR, m_jit.calleeArgumentPayloadSlot(i + dummyThisArgument));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValueOperand callee(this, calleeEdge);
</span><span class="cx"> GPRReg calleeTagGPR = callee.tagGPR();
</span><span class="cx"> GPRReg calleePayloadGPR = callee.payloadGPR();
</span><span class="cx"> use(calleeEdge);
</span><del>- m_jit.store32(calleePayloadGPR, calleeFramePayloadSlot(JSStack::Callee));
- m_jit.store32(calleeTagGPR, calleeFrameTagSlot(JSStack::Callee));
</del><ins>+ m_jit.store32(calleePayloadGPR, m_jit.calleeFramePayloadSlot(JSStack::Callee));
+ m_jit.store32(calleeTagGPR, m_jit.calleeFrameTagSlot(JSStack::Callee));
</ins><span class="cx">
</span><span class="cx"> flushRegisters();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp (179966 => 179967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2015-02-11 23:01:07 UTC (rev 179966)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2015-02-11 23:02:32 UTC (rev 179967)
</span><span class="lines">@@ -641,7 +641,7 @@
</span><span class="cx">
</span><span class="cx"> int numArgs = numPassedArgs + dummyThisArgument;
</span><span class="cx">
</span><del>- m_jit.store32(MacroAssembler::TrustedImm32(numArgs), calleeFramePayloadSlot(JSStack::ArgumentCount));
</del><ins>+ m_jit.store32(MacroAssembler::TrustedImm32(numArgs), m_jit.calleeFramePayloadSlot(JSStack::ArgumentCount));
</ins><span class="cx">
</span><span class="cx"> for (int i = 0; i < numPassedArgs; i++) {
</span><span class="cx"> Edge argEdge = m_jit.graph().m_varArgChildren[node->firstChild() + 1 + i];
</span><span class="lines">@@ -649,13 +649,13 @@
</span><span class="cx"> GPRReg argGPR = arg.gpr();
</span><span class="cx"> use(argEdge);
</span><span class="cx">
</span><del>- m_jit.store64(argGPR, calleeArgumentSlot(i + dummyThisArgument));
</del><ins>+ m_jit.store64(argGPR, m_jit.calleeArgumentSlot(i + dummyThisArgument));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValueOperand callee(this, calleeEdge);
</span><span class="cx"> GPRReg calleeGPR = callee.gpr();
</span><span class="cx"> use(calleeEdge);
</span><del>- m_jit.store64(calleeGPR, calleeFrameSlot(JSStack::Callee));
</del><ins>+ m_jit.store64(calleeGPR, m_jit.calleeFrameSlot(JSStack::Callee));
</ins><span class="cx">
</span><span class="cx"> flushRegisters();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitAssemblyHelpersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/AssemblyHelpers.h (179966 => 179967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/AssemblyHelpers.h 2015-02-11 23:01:07 UTC (rev 179966)
+++ trunk/Source/JavaScriptCore/jit/AssemblyHelpers.h 2015-02-11 23:02:32 UTC (rev 179967)
</span><span class="lines">@@ -366,6 +366,44 @@
</span><span class="cx"> return payloadFor(static_cast<VirtualRegister>(operand));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Access to our fixed callee CallFrame.
+ Address calleeFrameSlot(int slot)
+ {
+ ASSERT(slot >= JSStack::CallerFrameAndPCSize);
+ return MacroAssembler::Address(MacroAssembler::stackPointerRegister, sizeof(Register) * (slot - JSStack::CallerFrameAndPCSize));
+ }
+
+ // Access to our fixed callee CallFrame.
+ Address calleeArgumentSlot(int argument)
+ {
+ return calleeFrameSlot(virtualRegisterForArgument(argument).offset());
+ }
+
+ Address calleeFrameTagSlot(int slot)
+ {
+ return calleeFrameSlot(slot).withOffset(TagOffset);
+ }
+
+ Address calleeFramePayloadSlot(int slot)
+ {
+ return calleeFrameSlot(slot).withOffset(PayloadOffset);
+ }
+
+ Address calleeArgumentTagSlot(int argument)
+ {
+ return calleeArgumentSlot(argument).withOffset(TagOffset);
+ }
+
+ Address calleeArgumentPayloadSlot(int argument)
+ {
+ return calleeArgumentSlot(argument).withOffset(PayloadOffset);
+ }
+
+ Address calleeFrameCallerFrame()
+ {
+ return calleeFrameSlot(0).withOffset(CallFrame::callerFrameOffset());
+ }
+
</ins><span class="cx"> Jump branchIfCellNotObject(GPRReg cellReg)
</span><span class="cx"> {
</span><span class="cx"> return branch8(Below, Address(cellReg, JSCell::typeInfoTypeOffset()), TrustedImm32(ObjectType));
</span></span></pre>
</div>
</div>
</body>
</html>