<!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>[166345] 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/166345">166345</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-03-26 22:05:55 -0700 (Wed, 26 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Parse stackmaps liveOuts
https://bugs.webkit.org/show_bug.cgi?id=130801
Reviewed by Geoffrey Garen.
This just adds the code to parse them but doesn't do anything with them, yet.
* ftl/FTLLocation.cpp:
(JSC::FTL::Location::forStackmaps):
* ftl/FTLLocation.h:
(JSC::FTL::Location::forRegister):
(JSC::FTL::Location::forIndirect):
* ftl/FTLStackMaps.cpp:
(JSC::FTL::StackMaps::Location::parse):
(JSC::FTL::StackMaps::Location::dump):
(JSC::FTL::StackMaps::LiveOut::parse):
(JSC::FTL::StackMaps::LiveOut::dump):
(JSC::FTL::StackMaps::Record::parse):
(JSC::FTL::StackMaps::Record::dump):
* ftl/FTLStackMaps.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLocationcpp">trunk/Source/JavaScriptCore/ftl/FTLLocation.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLocationh">trunk/Source/JavaScriptCore/ftl/FTLLocation.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLStackMapscpp">trunk/Source/JavaScriptCore/ftl/FTLStackMaps.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLStackMapsh">trunk/Source/JavaScriptCore/ftl/FTLStackMaps.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (166344 => 166345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-03-27 04:42:50 UTC (rev 166344)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-03-27 05:05:55 UTC (rev 166345)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-03-26 Filip Pizlo <fpizlo@apple.com>
+
+ Parse stackmaps liveOuts
+ https://bugs.webkit.org/show_bug.cgi?id=130801
+
+ Reviewed by Geoffrey Garen.
+
+ This just adds the code to parse them but doesn't do anything with them, yet.
+
+ * ftl/FTLLocation.cpp:
+ (JSC::FTL::Location::forStackmaps):
+ * ftl/FTLLocation.h:
+ (JSC::FTL::Location::forRegister):
+ (JSC::FTL::Location::forIndirect):
+ * ftl/FTLStackMaps.cpp:
+ (JSC::FTL::StackMaps::Location::parse):
+ (JSC::FTL::StackMaps::Location::dump):
+ (JSC::FTL::StackMaps::LiveOut::parse):
+ (JSC::FTL::StackMaps::LiveOut::dump):
+ (JSC::FTL::StackMaps::Record::parse):
+ (JSC::FTL::StackMaps::Record::dump):
+ * ftl/FTLStackMaps.h:
+
</ins><span class="cx"> 2014-03-26 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Build fix after r166307.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLocationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLocation.cpp (166344 => 166345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLocation.cpp 2014-03-27 04:42:50 UTC (rev 166344)
+++ trunk/Source/JavaScriptCore/ftl/FTLLocation.cpp 2014-03-27 05:05:55 UTC (rev 166345)
</span><span class="lines">@@ -45,10 +45,10 @@
</span><span class="cx">
</span><span class="cx"> case StackMaps::Location::Register:
</span><span class="cx"> case StackMaps::Location::Direct:
</span><del>- return forRegister(location.dwarfRegNum, location.offset);
</del><ins>+ return forRegister(location.dwarfReg, location.offset);
</ins><span class="cx">
</span><span class="cx"> case StackMaps::Location::Indirect:
</span><del>- return forIndirect(location.dwarfRegNum, location.offset);
</del><ins>+ return forIndirect(location.dwarfReg, location.offset);
</ins><span class="cx">
</span><span class="cx"> case StackMaps::Location::Constant:
</span><span class="cx"> return forConstant(location.offset);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLocationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLocation.h (166344 => 166345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLocation.h 2014-03-27 04:42:50 UTC (rev 166344)
+++ trunk/Source/JavaScriptCore/ftl/FTLLocation.h 2014-03-27 05:05:55 UTC (rev 166345)
</span><span class="lines">@@ -57,20 +57,20 @@
</span><span class="cx"> u.constant = 1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static Location forRegister(int16_t dwarfRegNum, int32_t addend)
</del><ins>+ static Location forRegister(DWARFRegister dwarfReg, int32_t addend)
</ins><span class="cx"> {
</span><span class="cx"> Location result;
</span><span class="cx"> result.m_kind = Register;
</span><del>- result.u.variable.dwarfRegNum = dwarfRegNum;
</del><ins>+ result.u.variable.dwarfRegNum = dwarfReg.dwarfRegNum();
</ins><span class="cx"> result.u.variable.offset = addend;
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static Location forIndirect(int16_t dwarfRegNum, int32_t offset)
</del><ins>+ static Location forIndirect(DWARFRegister dwarfReg, int32_t offset)
</ins><span class="cx"> {
</span><span class="cx"> Location result;
</span><span class="cx"> result.m_kind = Indirect;
</span><del>- result.u.variable.dwarfRegNum = dwarfRegNum;
</del><ins>+ result.u.variable.dwarfRegNum = dwarfReg.dwarfRegNum();
</ins><span class="cx"> result.u.variable.offset = offset;
</span><span class="cx"> return result;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLStackMapscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLStackMaps.cpp (166344 => 166345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLStackMaps.cpp 2014-03-27 04:42:50 UTC (rev 166344)
+++ trunk/Source/JavaScriptCore/ftl/FTLStackMaps.cpp 2014-03-27 05:05:55 UTC (rev 166345)
</span><span class="lines">@@ -77,13 +77,13 @@
</span><span class="cx"> {
</span><span class="cx"> kind = static_cast<Kind>(context.view->read<uint8_t>(context.offset, true));
</span><span class="cx"> size = context.view->read<uint8_t>(context.offset, true);
</span><del>- dwarfRegNum = context.view->read<uint16_t>(context.offset, true);
</del><ins>+ dwarfReg = DWARFRegister(context.view->read<uint16_t>(context.offset, true));
</ins><span class="cx"> this->offset = context.view->read<int32_t>(context.offset, true);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StackMaps::Location::dump(PrintStream& out) const
</span><span class="cx"> {
</span><del>- out.print("(", kind, ", reg", dwarfRegNum, ", off:", offset, ", size:", size, ")");
</del><ins>+ out.print("(", kind, ", ", dwarfReg, ", off:", offset, ", size:", size, ")");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GPRReg StackMaps::Location::directGPR() const
</span><span class="lines">@@ -97,6 +97,18 @@
</span><span class="cx"> FTL::Location::forStackmaps(&stackmaps, *this).restoreInto(jit, savedRegisters, result);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void StackMaps::LiveOut::parse(StackMaps::ParseContext& context)
+{
+ dwarfReg = DWARFRegister(context.view->read<uint16_t>(context.offset, true)); // regnum
+ context.view->read<uint8_t>(context.offset, true); // reserved
+ size = context.view->read<uint8_t>(context.offset, true); // size in bytes
+}
+
+void StackMaps::LiveOut::dump(PrintStream& out) const
+{
+ out.print("(", dwarfReg, ", ", size, ")");
+}
+
</ins><span class="cx"> bool StackMaps::Record::parse(StackMaps::ParseContext& context)
</span><span class="cx"> {
</span><span class="cx"> int64_t id = context.view->read<int64_t>(context.offset, true);
</span><span class="lines">@@ -114,12 +126,11 @@
</span><span class="cx">
</span><span class="cx"> if (context.version >= 1)
</span><span class="cx"> context.view->read<uint16_t>(context.offset, true); // padding
</span><ins>+
</ins><span class="cx"> unsigned numLiveOuts = context.view->read<uint16_t>(context.offset, true);
</span><del>- while (numLiveOuts--) {
- context.view->read<uint16_t>(context.offset, true); // regnum
- context.view->read<uint8_t>(context.offset, true); // reserved
- context.view->read<uint8_t>(context.offset, true); // size in bytes
- }
</del><ins>+ while (numLiveOuts--)
+ liveOuts.append(readObject<LiveOut>(context));
+
</ins><span class="cx"> if (context.version >= 1) {
</span><span class="cx"> if (context.offset & 7) {
</span><span class="cx"> ASSERT(!(context.offset & 3));
</span><span class="lines">@@ -134,7 +145,8 @@
</span><span class="cx"> {
</span><span class="cx"> out.print(
</span><span class="cx"> "(#", patchpointID, ", offset = ", instructionOffset, ", flags = ", flags,
</span><del>- ", [", listDump(locations), "])");
</del><ins>+ ", locations = [", listDump(locations), "]), liveOuts = [",
+ listDump(liveOuts), "]");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool StackMaps::parse(DataView* view)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLStackMapsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLStackMaps.h (166344 => 166345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLStackMaps.h 2014-03-27 04:42:50 UTC (rev 166344)
+++ trunk/Source/JavaScriptCore/ftl/FTLStackMaps.h 2014-03-27 05:05:55 UTC (rev 166345)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #if ENABLE(FTL_JIT)
</span><span class="cx">
</span><span class="cx"> #include "DataView.h"
</span><ins>+#include "FTLDWARFRegister.h"
</ins><span class="cx"> #include "GPRInfo.h"
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx">
</span><span class="lines">@@ -70,8 +71,8 @@
</span><span class="cx"> ConstantIndex
</span><span class="cx"> };
</span><span class="cx">
</span><del>- uint16_t dwarfRegNum; // Represented as a 12-bit int in the section.
- int8_t size;
</del><ins>+ DWARFRegister dwarfReg;
+ uint8_t size;
</ins><span class="cx"> Kind kind;
</span><span class="cx"> int32_t offset;
</span><span class="cx">
</span><span class="lines">@@ -82,12 +83,26 @@
</span><span class="cx"> void restoreInto(MacroAssembler&, StackMaps&, char* savedRegisters, GPRReg result) const;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+ // FIXME: Investigate how much memory this takes and possibly prune it from the
+ // format we keep around in FTL::JITCode. I suspect that it would be most awesome to
+ // have a CompactStackMaps struct that lossily stores only that subset of StackMaps
+ // and Record that we actually need for OSR exit.
+ // https://bugs.webkit.org/show_bug.cgi?id=130802
+ struct LiveOut {
+ DWARFRegister dwarfReg;
+ uint8_t size;
+
+ void parse(ParseContext&);
+ void dump(PrintStream& out) const;
+ };
+
</ins><span class="cx"> struct Record {
</span><span class="cx"> uint32_t patchpointID;
</span><span class="cx"> uint32_t instructionOffset;
</span><span class="cx"> uint16_t flags;
</span><span class="cx">
</span><span class="cx"> Vector<Location> locations;
</span><ins>+ Vector<LiveOut> liveOuts;
</ins><span class="cx">
</span><span class="cx"> bool parse(ParseContext&);
</span><span class="cx"> void dump(PrintStream&) const;
</span></span></pre>
</div>
</div>
</body>
</html>