<!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>[214544] 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/214544">214544</a></dd>
<dt>Author</dt> <dd>keith_miller@apple.com</dd>
<dt>Date</dt> <dd>2017-03-29 10:27:23 -0700 (Wed, 29 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebAssembly: pack OpcodeOrigin to fit in a pointer
https://bugs.webkit.org/show_bug.cgi?id=170244
Reviewed by Michael Saboff.
This patch makes it so we don't have to have allocate the OpcodeOrigin and can just
pack all the data into the pointer B3::Origin already has.
* wasm/WasmB3IRGenerator.cpp:
(JSC::Wasm::parseAndCompile):
* wasm/WasmOpcodeOrigin.cpp:
(JSC::Wasm::OpcodeOrigin::dump):
* wasm/WasmOpcodeOrigin.h:
(JSC::Wasm::OpcodeOrigin::OpcodeOrigin):
(JSC::Wasm::OpcodeOrigin::opcode):
(JSC::Wasm::OpcodeOrigin::location):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWasmB3IRGeneratorcpp">trunk/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWasmOpcodeOrigincpp">trunk/Source/JavaScriptCore/wasm/WasmOpcodeOrigin.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWasmOpcodeOriginh">trunk/Source/JavaScriptCore/wasm/WasmOpcodeOrigin.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (214543 => 214544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2017-03-29 17:22:48 UTC (rev 214543)
+++ trunk/Source/JavaScriptCore/ChangeLog        2017-03-29 17:27:23 UTC (rev 214544)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-03-29 Keith Miller <keith_miller@apple.com>
+
+ WebAssembly: pack OpcodeOrigin to fit in a pointer
+ https://bugs.webkit.org/show_bug.cgi?id=170244
+
+ Reviewed by Michael Saboff.
+
+ This patch makes it so we don't have to have allocate the OpcodeOrigin and can just
+ pack all the data into the pointer B3::Origin already has.
+
+ * wasm/WasmB3IRGenerator.cpp:
+ (JSC::Wasm::parseAndCompile):
+ * wasm/WasmOpcodeOrigin.cpp:
+ (JSC::Wasm::OpcodeOrigin::dump):
+ * wasm/WasmOpcodeOrigin.h:
+ (JSC::Wasm::OpcodeOrigin::OpcodeOrigin):
+ (JSC::Wasm::OpcodeOrigin::opcode):
+ (JSC::Wasm::OpcodeOrigin::location):
+
</ins><span class="cx"> 2017-03-29 JF Bastien <jfbastien@apple.com>
</span><span class="cx">
</span><span class="cx"> WebAssembly: NFC s/goto/lambda/g
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmB3IRGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp (214543 => 214544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp        2017-03-29 17:22:48 UTC (rev 214543)
+++ trunk/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp        2017-03-29 17:27:23 UTC (rev 214544)
</span><span class="lines">@@ -235,7 +235,6 @@
</span><span class="cx"> BasicBlock* m_currentBlock;
</span><span class="cx"> Vector<Variable*> m_locals;
</span><span class="cx"> Vector<UnlinkedWasmToWasmCall>& m_unlinkedWasmToWasmCalls; // List each call site and the function index whose address it should be patched with.
</span><del>- Vector<std::unique_ptr<OpcodeOrigin>> m_origins;
</del><span class="cx"> GPRReg m_memoryBaseGPR;
</span><span class="cx"> GPRReg m_memorySizeGPR;
</span><span class="cx"> GPRReg m_wasmContextGPR;
</span><span class="lines">@@ -1272,10 +1271,7 @@
</span><span class="cx">
</span><span class="cx"> auto B3IRGenerator::origin() -> Origin
</span><span class="cx"> {
</span><del>- if (m_origins.isEmpty() || m_origins.last()->location != m_parser->currentOpcodeStartingOffset())
- m_origins.append(std::make_unique<OpcodeOrigin>(m_parser->currentOpcode(), m_parser->currentOpcodeStartingOffset()));
-
- return Origin(m_origins.last().get());
</del><ins>+ return bitwise_cast<Origin>(OpcodeOrigin(m_parser->currentOpcode(), m_parser->currentOpcodeStartingOffset()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Expected<std::unique_ptr<WasmInternalFunction>, String> parseAndCompile(VM& vm, CompilationContext& compilationContext, const uint8_t* functionStart, size_t functionLength, const Signature* signature, Vector<UnlinkedWasmToWasmCall>& unlinkedWasmToWasmCalls, const ModuleInformation& info, const Vector<SignatureIndex>& moduleSignatureIndicesToUniquedSignatureIndices, MemoryMode mode, unsigned optLevel)
</span><span class="lines">@@ -1289,7 +1285,7 @@
</span><span class="cx">
</span><span class="cx"> procedure.setOriginPrinter([] (PrintStream& out, Origin origin) {
</span><span class="cx"> if (origin.data())
</span><del>- out.print("Wasm: ", *bitwise_cast<OpcodeOrigin*>(origin.data()));
</del><ins>+ out.print("Wasm: ", bitwise_cast<OpcodeOrigin>(origin));
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> B3IRGenerator context(vm, info, procedure, result.get(), unlinkedWasmToWasmCalls, mode);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmOpcodeOrigincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WasmOpcodeOrigin.cpp (214543 => 214544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmOpcodeOrigin.cpp        2017-03-29 17:22:48 UTC (rev 214543)
+++ trunk/Source/JavaScriptCore/wasm/WasmOpcodeOrigin.cpp        2017-03-29 17:27:23 UTC (rev 214544)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> void OpcodeOrigin::dump(PrintStream& out) const
</span><span class="cx"> {
</span><del>- out.print("{opcode: ", makeString(opcode), ", location: ", location, "}");
</del><ins>+ out.print("{opcode: ", makeString(opcode()), ", location: ", location(), "}");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } } // namespace JSC::Wasm
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmOpcodeOriginh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WasmOpcodeOrigin.h (214543 => 214544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmOpcodeOrigin.h        2017-03-29 17:22:48 UTC (rev 214543)
+++ trunk/Source/JavaScriptCore/wasm/WasmOpcodeOrigin.h        2017-03-29 17:27:23 UTC (rev 214544)
</span><span class="lines">@@ -28,22 +28,28 @@
</span><span class="cx"> #include "B3Origin.h"
</span><span class="cx"> #include "WasmFormat.h"
</span><span class="cx">
</span><ins>+#include <wtf/ForbidHeapAllocation.h>
+
</ins><span class="cx"> namespace JSC { namespace Wasm {
</span><span class="cx">
</span><span class="cx"> class OpcodeOrigin {
</span><del>- WTF_MAKE_FAST_ALLOCATED;
- WTF_MAKE_NONCOPYABLE(OpcodeOrigin);
</del><ins>+ WTF_FORBID_HEAP_ALLOCATION;
</ins><span class="cx"> public:
</span><del>- OpcodeOrigin(OpType op, size_t offset)
- : opcode(op)
- , location(offset)
</del><ins>+ OpcodeOrigin() = default;
+ OpcodeOrigin(OpType opcode, size_t offset)
</ins><span class="cx"> {
</span><ins>+ ASSERT(static_cast<uint32_t>(offset) == offset);
+ packedData = (static_cast<uint64_t>(opcode) << 32) | offset;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void dump(PrintStream&) const;
</span><span class="cx">
</span><del>- const OpType opcode;
- const size_t location;
</del><ins>+ OpType opcode() const { return static_cast<OpType>(packedData >> 32); }
+ size_t location() const { return static_cast<uint32_t>(packedData); }
+
+private:
+ static_assert(sizeof(void*) == sizeof(uint64_t), "this packing doesn't work if this isn't the case");
+ uint64_t packedData { 0 };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } } // namespace JSC::Wasm
</span></span></pre>
</div>
</div>
</body>
</html>