<!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>[194598] 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/194598">194598</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2016-01-05 12:39:27 -0800 (Tue, 05 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>FTL B3 should do In
https://bugs.webkit.org/show_bug.cgi?id=152744
Reviewed by Michael Saboff.
This was easy; I just used the same idiom that we already established for ICs in FTL B3.
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::DFG::LowerDFGToLLVM::compileIn):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (194597 => 194598)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-01-05 20:38:46 UTC (rev 194597)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-01-05 20:39:27 UTC (rev 194598)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2016-01-05 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><ins>+ FTL B3 should do In
+ https://bugs.webkit.org/show_bug.cgi?id=152744
+
+ Reviewed by Michael Saboff.
+
+ This was easy; I just used the same idiom that we already established for ICs in FTL B3.
+
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::DFG::LowerDFGToLLVM::compileIn):
+
+2016-01-05 Filip Pizlo <fpizlo@apple.com>
+
</ins><span class="cx"> Implement B3 version of FTL::Output::check()
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=152743
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (194597 => 194598)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2016-01-05 20:38:46 UTC (rev 194597)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2016-01-05 20:39:27 UTC (rev 194598)
</span><span class="lines">@@ -6090,17 +6090,73 @@
</span><span class="cx">
</span><span class="cx"> void compileIn()
</span><span class="cx"> {
</span><del>-#if FTL_USES_B3
- if (verboseCompilationEnabled() || !verboseCompilationEnabled())
- CRASH();
-#else
- Edge base = m_node->child2();
</del><ins>+ Node* node = m_node;
+ Edge base = node->child2();
</ins><span class="cx"> LValue cell = lowCell(base);
</span><del>- speculateObject(base, cell);
- if (JSString* string = m_node->child1()->dynamicCastConstant<JSString*>()) {
</del><ins>+ if (JSString* string = node->child1()->dynamicCastConstant<JSString*>()) {
</ins><span class="cx"> if (string->tryGetValueImpl() && string->tryGetValueImpl()->isAtomic()) {
</span><ins>+ UniquedStringImpl* str = bitwise_cast<UniquedStringImpl*>(string->tryGetValueImpl());
+#if FTL_USES_B3
+ B3::PatchpointValue* patchpoint = m_out.patchpoint(Int64);
+ patchpoint->append(cell, ValueRep::SomeRegister);
+ patchpoint->clobber(RegisterSet::macroScratchRegisters());
</ins><span class="cx">
</span><del>- UniquedStringImpl* str = bitwise_cast<UniquedStringImpl*>(string->tryGetValueImpl());
</del><ins>+ State* state = &m_ftlState;
+ patchpoint->setGenerator(
+ [=] (CCallHelpers& jit, const StackmapGenerationParams& params) {
+ AllowMacroScratchRegisterUsage allowScratch(jit);
+
+ GPRReg baseGPR = params[1].gpr();
+ GPRReg resultGPR = params[0].gpr();
+
+ StructureStubInfo* stubInfo =
+ jit.codeBlock()->addStubInfo(AccessType::In);
+ stubInfo->callSiteIndex =
+ state->jitCode->common.addCodeOrigin(node->origin.semantic);
+ stubInfo->codeOrigin = node->origin.semantic;
+ stubInfo->patch.baseGPR = static_cast<int8_t>(baseGPR);
+ stubInfo->patch.valueGPR = static_cast<int8_t>(resultGPR);
+ stubInfo->patch.usedRegisters = params.unavailableRegisters();
+
+ CCallHelpers::PatchableJump jump = jit.patchableJump();
+ CCallHelpers::Label done = jit.label();
+
+ params.addLatePath(
+ [=] (CCallHelpers& jit) {
+ AllowMacroScratchRegisterUsage allowScratch(jit);
+
+ jump.m_jump.link(&jit);
+ CCallHelpers::Label slowPathBegin = jit.label();
+ CCallHelpers::Call slowPathCall = callOperation(
+ *state, params.unavailableRegisters(), jit,
+ node->origin.semantic, nullptr, operationInOptimize,
+ resultGPR, CCallHelpers::TrustedImmPtr(stubInfo), baseGPR,
+ CCallHelpers::TrustedImmPtr(str)).call();
+ jit.jump().linkTo(done, &jit);
+
+ jit.addLinkTask(
+ [=] (LinkBuffer& linkBuffer) {
+ CodeLocationCall callReturnLocation =
+ linkBuffer.locationOf(slowPathCall);
+ stubInfo->patch.deltaCallToDone =
+ CCallHelpers::differenceBetweenCodePtr(
+ callReturnLocation,
+ linkBuffer.locationOf(done));
+ stubInfo->patch.deltaCallToJump =
+ CCallHelpers::differenceBetweenCodePtr(
+ callReturnLocation,
+ linkBuffer.locationOf(jump));
+ stubInfo->callReturnLocation = callReturnLocation;
+ stubInfo->patch.deltaCallToSlowCase =
+ CCallHelpers::differenceBetweenCodePtr(
+ callReturnLocation,
+ linkBuffer.locationOf(slowPathBegin));
+ });
+ });
+ });
+
+ setJSValue(patchpoint);
+#else // FTL_USES_B3
</ins><span class="cx"> unsigned stackmapID = m_stackmapIDs++;
</span><span class="cx">
</span><span class="cx"> LValue call = m_out.call(
</span><span class="lines">@@ -6110,14 +6166,14 @@
</span><span class="cx">
</span><span class="cx"> setInstructionCallingConvention(call, LLVMAnyRegCallConv);
</span><span class="cx">
</span><del>- m_ftlState.checkIns.append(CheckInDescriptor(stackmapID, m_node->origin.semantic, str));
</del><ins>+ m_ftlState.checkIns.append(CheckInDescriptor(stackmapID, node->origin.semantic, str));
</ins><span class="cx"> setJSValue(call);
</span><ins>+#endif // FTL_USES_B3
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> setJSValue(vmCall(m_out.int64, m_out.operation(operationGenericIn), m_callFrame, cell, lowJSValue(m_node->child1())));
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void compileOverridesHasInstance()
</span></span></pre>
</div>
</div>
</body>
</html>