<!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>[208148] trunk</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/208148">208148</a></dd>
<dt>Author</dt> <dd>keith_miller@apple.com</dd>
<dt>Date</dt> <dd>2016-10-31 09:24:59 -0700 (Mon, 31 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>autogenerated files from wasm.json should be in derived sources.
https://bugs.webkit.org/show_bug.cgi?id=164152
Reviewed by Filip Pizlo.
JSTests:
Delete generation script since it is no longer used.
* wasm/generate-wasmops-header.js: Removed.
Source/JavaScriptCore:
Add two new python scripts to the build. These scripts do what the
old js script in JSTests did. Previously, changes to wasm.json needed
to be manually reflected in WasmOps.h. This patch will auto-build from
the json file. That system was unsustainable, especially as future patches
will likely add more autogenerated files. The generated header files are
identical other than the comment at the top and the order of the opcodes.
I believe ordering difference just has to do with the iteration order for
sets.
* DerivedSources.make:
* wasm/WasmOps.h: Removed.
* wasm/generateWasm.py: Added.
(Wasm):
(Wasm.__init__):
(opcodeIterator):
(toCpp):
(isNormal):
(isUnary):
(isBinary):
* wasm/generateWasmOpsHeader.py: Added.
(cppMacro):
(opcodeMacroizer):
(ceilDiv):
(bitSet):
(BinaryOpType):
(UnaryOpType):
(LoadOpType):
(StoreOpType):
* wasm/wasm.json: Added.
Tools:
Add message to make sure that people keep the wasm.jsons up to date.
* Scripts/webkitpy/common/config/watchlist:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreDerivedSourcesmake">trunk/Source/JavaScriptCore/DerivedSources.make</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonconfigwatchlist">trunk/Tools/Scripts/webkitpy/common/config/watchlist</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCorewasmgenerateWasmpy">trunk/Source/JavaScriptCore/wasm/generateWasm.py</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmgenerateWasmOpsHeaderpy">trunk/Source/JavaScriptCore/wasm/generateWasmOpsHeader.py</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmwasmjson">trunk/Source/JavaScriptCore/wasm/wasm.json</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkJSTestswasmgeneratewasmopsheaderjs">trunk/JSTests/wasm/generate-wasmops-header.js</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWasmOpsh">trunk/Source/JavaScriptCore/wasm/WasmOps.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (208147 => 208148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog 2016-10-31 16:17:48 UTC (rev 208147)
+++ trunk/JSTests/ChangeLog 2016-10-31 16:24:59 UTC (rev 208148)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-10-31 Keith Miller <keith_miller@apple.com>
+
+ autogenerated files from wasm.json should be in derived sources.
+ https://bugs.webkit.org/show_bug.cgi?id=164152
+
+ Reviewed by Filip Pizlo.
+
+ Delete generation script since it is no longer used.
+
+ * wasm/generate-wasmops-header.js: Removed.
+
</ins><span class="cx"> 2016-10-29 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [JSC] JSON.stringify should handle Proxy which is non JSArray but isArray is true
</span></span></pre></div>
<a id="trunkJSTestswasmgeneratewasmopsheaderjs"></a>
<div class="delfile"><h4>Deleted: trunk/JSTests/wasm/generate-wasmops-header.js (208147 => 208148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/wasm/generate-wasmops-header.js 2016-10-31 16:17:48 UTC (rev 208147)
+++ trunk/JSTests/wasm/generate-wasmops-header.js 2016-10-31 16:24:59 UTC (rev 208148)
</span><span class="lines">@@ -1,189 +0,0 @@
</span><del>-// Use the JSON description of WebAssembly to generate the JavaScriptCore's WasmOps.h.
-
-const jsonFile = 'wasm.json';
-const wasm = JSON.parse(read(jsonFile));
-const opcodes = wasm.opcode;
-
-// Iterate through opcodes which match filter, and on each iteration yield ret.
-const opcodeIterator = (filter, ret = op => { return {name: op, opcode: opcodes[op]}; }) => {
- return function*() {
- for (let op in opcodes)
- if (filter(opcodes[op]))
- yield ret(op);
- };
-};
-
-// WebAssembly opcode name to C++ name suitable for JSC.
-const toCpp = name => {
- const camelCase = name.replace(/([^a-z0-9].)/g, c => c[1].toUpperCase());
- const CamelCase = camelCase.charAt(0).toUpperCase() + camelCase.slice(1);
- return CamelCase;
-};
-
-const cppMacro = (wasmOpcode, value, b3Opcode) => " \\\n macro(" + toCpp(wasmOpcode) + ", 0x" + parseInt(value).toString(16) + ", " + b3Opcode + ")";
-
-function* opcodeMacroizer(filter) {
- for (let op of opcodeIterator(filter)())
- yield cppMacro(op.name, op.opcode.value, op.opcode.b3op || "Oops");
-}
-
-const isNormalOp = op => op.category === "arithmetic" || op.category === "conversion" || op.category === "comparison";
-const isUnaryOp = op => isNormalOp(op) && op.parameter.length === 1;
-const isBinaryOp = op => isNormalOp(op) && op.parameter.length === 2;
-
-const defines = [
- "#define FOR_EACH_WASM_SPECIAL_OP(macro)",
- ...opcodeMacroizer(op => op.category === "special" || op.category === "call"),
- "\n\n#define FOR_EACH_WASM_CONTROL_FLOW_OP(macro)",
- ...opcodeMacroizer(op => op.category === "control"),
- "\n\n#define FOR_EACH_WASM_SIMPLE_UNARY_OP(macro)",
- ...opcodeMacroizer(op => isUnaryOp(op) && op.b3op),
- "\n\n#define FOR_EACH_WASM_UNARY_OP(macro) \\\n FOR_EACH_WASM_SIMPLE_UNARY_OP(macro)",
- ...opcodeMacroizer(op => isUnaryOp(op) && !op.b3op),
- "\n\n#define FOR_EACH_WASM_SIMPLE_BINARY_OP(macro)",
- ...opcodeMacroizer(op => isBinaryOp(op) && op.b3op),
- "\n\n#define FOR_EACH_WASM_BINARY_OP(macro) \\\n FOR_EACH_WASM_SIMPLE_BINARY_OP(macro)",
- ...opcodeMacroizer(op => isBinaryOp(op) && !op.b3op),
- "\n\n#define FOR_EACH_WASM_MEMORY_LOAD_OP(macro)",
- ...opcodeMacroizer(op => (op.category === "memory" && op.return.length === 1)),
- "\n\n#define FOR_EACH_WASM_MEMORY_STORE_OP(macro)",
- ...opcodeMacroizer(op => (op.category === "memory" && op.return.length === 0)),
- "\n\n"].join("");
-
-const opValueSet = new Set(opcodeIterator(op => true, op => opcodes[op].value)());
-const maxOpValue = Math.max(...opValueSet);
-const validOps = (() => {
- // Create a bitset of valid ops.
- let v = "";
- for (let i = 0; i < maxOpValue / 8; ++i) {
- let entry = 0;
- for (let j = 0; j < 8; ++j)
- if (opValueSet.has(i * 8 + j))
- entry |= 1 << j;
- v += (i ? ", " : "") + "0x" + entry.toString(16);
- }
- return v;
-})();
-
-const template = `/*
- * Copyright (C) 2016 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. \`\`AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// This file is auto-generated using ${jsonFile}.
-
-#pragma once
-
-#if ENABLE(WEBASSEMBLY)
-
-#include <cstdint>
-
-namespace JSC { namespace Wasm {
-
-${defines}
-
-#define FOR_EACH_WASM_OP(macro) \\
- FOR_EACH_WASM_SPECIAL_OP(macro) \\
- FOR_EACH_WASM_CONTROL_FLOW_OP(macro) \\
- FOR_EACH_WASM_UNARY_OP(macro) \\
- FOR_EACH_WASM_BINARY_OP(macro) \\
- FOR_EACH_WASM_MEMORY_LOAD_OP(macro) \\
- FOR_EACH_WASM_MEMORY_STORE_OP(macro)
-
-#define CREATE_ENUM_VALUE(name, id, b3op) name = id,
-
-enum OpType : uint8_t {
- FOR_EACH_WASM_OP(CREATE_ENUM_VALUE)
-};
-
-template<typename Int>
-inline bool isValidOpType(Int i)
-{
- // Bitset of valid ops.
- static const uint8_t valid[] = { ${validOps} };
- return 0 <= i && i <= ${maxOpValue} && (valid[i / 8] & (1 << (i % 8)));
-}
-
-enum class BinaryOpType : uint8_t {
- FOR_EACH_WASM_BINARY_OP(CREATE_ENUM_VALUE)
-};
-
-enum class UnaryOpType : uint8_t {
- FOR_EACH_WASM_UNARY_OP(CREATE_ENUM_VALUE)
-};
-
-enum class LoadOpType : uint8_t {
- FOR_EACH_WASM_MEMORY_LOAD_OP(CREATE_ENUM_VALUE)
-};
-
-enum class StoreOpType : uint8_t {
- FOR_EACH_WASM_MEMORY_STORE_OP(CREATE_ENUM_VALUE)
-};
-
-#undef CREATE_ENUM_VALUE
-
-inline bool isControlOp(OpType op)
-{
- switch (op) {
-#define CREATE_CASE(name, id, b3op) case OpType::name:
- FOR_EACH_WASM_CONTROL_FLOW_OP(CREATE_CASE)
- return true;
-#undef CREATE_CASE
- default:
- break;
- }
- return false;
-}
-
-inline bool isSimple(UnaryOpType op)
-{
- switch (op) {
-#define CREATE_CASE(name, id, b3op) case UnaryOpType::name:
- FOR_EACH_WASM_SIMPLE_UNARY_OP(CREATE_CASE)
- return true;
-#undef CREATE_CASE
- default:
- break;
- }
- return false;
-}
-
-inline bool isSimple(BinaryOpType op)
-{
- switch (op) {
-#define CREATE_CASE(name, id, b3op) case BinaryOpType::name:
- FOR_EACH_WASM_SIMPLE_BINARY_OP(CREATE_CASE)
- return true;
-#undef CREATE_CASE
- default:
- break;
- }
- return false;
-}
-
-} } // namespace JSC::Wasm
-
-#endif // ENABLE(WEBASSEMBLY)
-`;
-
-print(template);
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (208147 => 208148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-10-31 16:17:48 UTC (rev 208147)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-10-31 16:24:59 UTC (rev 208148)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2016-10-31 Keith Miller <keith_miller@apple.com>
+
+ autogenerated files from wasm.json should be in derived sources.
+ https://bugs.webkit.org/show_bug.cgi?id=164152
+
+ Reviewed by Filip Pizlo.
+
+ Add two new python scripts to the build. These scripts do what the
+ old js script in JSTests did. Previously, changes to wasm.json needed
+ to be manually reflected in WasmOps.h. This patch will auto-build from
+ the json file. That system was unsustainable, especially as future patches
+ will likely add more autogenerated files. The generated header files are
+ identical other than the comment at the top and the order of the opcodes.
+ I believe ordering difference just has to do with the iteration order for
+ sets.
+
+ * DerivedSources.make:
+ * wasm/WasmOps.h: Removed.
+ * wasm/generateWasm.py: Added.
+ (Wasm):
+ (Wasm.__init__):
+ (opcodeIterator):
+ (toCpp):
+ (isNormal):
+ (isUnary):
+ (isBinary):
+ * wasm/generateWasmOpsHeader.py: Added.
+ (cppMacro):
+ (opcodeMacroizer):
+ (ceilDiv):
+ (bitSet):
+ (BinaryOpType):
+ (UnaryOpType):
+ (LoadOpType):
+ (StoreOpType):
+ * wasm/wasm.json: Added.
+
</ins><span class="cx"> 2016-10-29 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [JSC] JSON.stringify should handle Proxy which is non JSArray but isArray is true
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/DerivedSources.make (208147 => 208148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/DerivedSources.make 2016-10-31 16:17:48 UTC (rev 208147)
+++ trunk/Source/JavaScriptCore/DerivedSources.make 2016-10-31 16:24:59 UTC (rev 208148)
</span><span class="lines">@@ -63,6 +63,7 @@
</span><span class="cx"> RegExpJitTables.h \
</span><span class="cx"> AirOpcode.h \
</span><span class="cx"> YarrCanonicalizeUnicode.cpp \
</span><ins>+ WasmOps.h \
</ins><span class="cx"> #
</span><span class="cx">
</span><span class="cx"> # JavaScript builtins.
</span><span class="lines">@@ -297,6 +298,9 @@
</span><span class="cx"> YarrCanonicalizeUnicode.cpp: $(JavaScriptCore)/generateYarrCanonicalizeUnicode $(JavaScriptCore)/ucd/CaseFolding.txt
</span><span class="cx"> $(PYTHON) $(JavaScriptCore)/generateYarrCanonicalizeUnicode $(JavaScriptCore)/ucd/CaseFolding.txt ./YarrCanonicalizeUnicode.cpp
</span><span class="cx">
</span><ins>+WasmOps.h: $(JavaScriptCore)/wasm/generateWasmOpsHeader.py $(JavaScriptCore)/wasm/generateWasm.py $(JavaScriptCore)/wasm/wasm.json
+ $(PYTHON) $(JavaScriptCore)/wasm/generateWasmOpsHeader.py $(JavaScriptCore)/wasm/wasm.json ./WasmOps.h
+
</ins><span class="cx"> # Dynamically-defined targets are listed below. Static targets belong up top.
</span><span class="cx">
</span><span class="cx"> all : \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmOpsh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/wasm/WasmOps.h (208147 => 208148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmOps.h 2016-10-31 16:17:48 UTC (rev 208147)
+++ trunk/Source/JavaScriptCore/wasm/WasmOps.h 2016-10-31 16:24:59 UTC (rev 208148)
</span><span class="lines">@@ -1,308 +0,0 @@
</span><del>-/*
- * Copyright (C) 2016 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// This file is auto-generated using wasm.json.
-
-#pragma once
-
-#if ENABLE(WEBASSEMBLY)
-
-#include <cstdint>
-
-namespace JSC { namespace Wasm {
-
-#define FOR_EACH_WASM_SPECIAL_OP(macro) \
- macro(I32Const, 0x10, Oops) \
- macro(I64Const, 0x11, Oops) \
- macro(F64Const, 0x12, Oops) \
- macro(F32Const, 0x13, Oops) \
- macro(GetLocal, 0x14, Oops) \
- macro(SetLocal, 0x15, Oops) \
- macro(TeeLocal, 0x19, Oops) \
- macro(GetGlobal, 0xbb, Oops) \
- macro(SetGlobal, 0xbc, Oops) \
- macro(Call, 0x16, Oops) \
- macro(CallIndirect, 0x17, Oops)
-
-#define FOR_EACH_WASM_CONTROL_FLOW_OP(macro) \
- macro(Unreachable, 0x0, Oops) \
- macro(Block, 0x1, Oops) \
- macro(Loop, 0x2, Oops) \
- macro(If, 0x3, Oops) \
- macro(Else, 0x4, Oops) \
- macro(Select, 0x5, Oops) \
- macro(Br, 0x6, Oops) \
- macro(BrIf, 0x7, Oops) \
- macro(BrTable, 0x8, Oops) \
- macro(Return, 0x9, Oops) \
- macro(Drop, 0xb, Oops) \
- macro(Nop, 0xa, Oops) \
- macro(End, 0xf, Oops)
-
-#define FOR_EACH_WASM_SIMPLE_UNARY_OP(macro) \
- macro(I32Clz, 0x57, Clz) \
- macro(I64Clz, 0x72, Clz) \
- macro(F32Abs, 0x7b, Abs) \
- macro(F32Ceil, 0x7e, Ceil) \
- macro(F32Floor, 0x7f, Floor) \
- macro(F64Abs, 0x8f, Abs) \
- macro(F64Ceil, 0x92, Ceil) \
- macro(F64Floor, 0x93, Floor) \
- macro(I64ExtendSI32, 0xa6, SExt32) \
- macro(I64ExtendUI32, 0xa7, ZExt32) \
- macro(F32DemoteF64, 0xac, DoubleToFloat) \
- macro(F32ReinterpretI32, 0xad, BitwiseCast) \
- macro(F64PromoteF32, 0xb2, FloatToDouble) \
- macro(F64ReinterpretI64, 0xb3, BitwiseCast) \
- macro(I32ReinterpretF32, 0xb4, BitwiseCast) \
- macro(I64ReinterpretF64, 0xb5, BitwiseCast)
-
-#define FOR_EACH_WASM_UNARY_OP(macro) \
- FOR_EACH_WASM_SIMPLE_UNARY_OP(macro) \
- macro(I32Ctz, 0x58, Oops) \
- macro(I32Popcnt, 0x59, Oops) \
- macro(I32Eqz, 0x5a, Oops) \
- macro(I64Ctz, 0x73, Oops) \
- macro(I64Popcnt, 0x74, Oops) \
- macro(I64Eqz, 0xba, Oops) \
- macro(F32Neg, 0x7c, Oops) \
- macro(F32Copysign, 0x7d, Oops) \
- macro(F32Trunc, 0x80, Oops) \
- macro(F32Nearest, 0x81, Oops) \
- macro(F32Sqrt, 0x82, Oops) \
- macro(F64Neg, 0x90, Oops) \
- macro(F64Copysign, 0x91, Oops) \
- macro(F64Trunc, 0x94, Oops) \
- macro(F64Nearest, 0x95, Oops) \
- macro(F64Sqrt, 0x96, Oops) \
- macro(I32TruncSF32, 0x9d, Oops) \
- macro(I32TruncSF64, 0x9e, Oops) \
- macro(I32TruncUF32, 0x9f, Oops) \
- macro(I32TruncUF64, 0xa0, Oops) \
- macro(I32WrapI64, 0xa1, Oops) \
- macro(I64TruncSF32, 0xa2, Oops) \
- macro(I64TruncSF64, 0xa3, Oops) \
- macro(I64TruncUF32, 0xa4, Oops) \
- macro(I64TruncUF64, 0xa5, Oops) \
- macro(F32ConvertSI32, 0xa8, Oops) \
- macro(F32ConvertUI32, 0xa9, Oops) \
- macro(F32ConvertSI64, 0xaa, Oops) \
- macro(F32ConvertUI64, 0xab, Oops) \
- macro(F64ConvertSI32, 0xae, Oops) \
- macro(F64ConvertUI32, 0xaf, Oops) \
- macro(F64ConvertSI64, 0xb0, Oops) \
- macro(F64ConvertUI64, 0xb1, Oops)
-
-#define FOR_EACH_WASM_SIMPLE_BINARY_OP(macro) \
- macro(I32Add, 0x40, Add) \
- macro(I32Sub, 0x41, Sub) \
- macro(I32Mul, 0x42, Mul) \
- macro(I32DivS, 0x43, Div) \
- macro(I32RemS, 0x45, Mod) \
- macro(I32And, 0x47, BitAnd) \
- macro(I32Or, 0x48, BitOr) \
- macro(I32Xor, 0x49, BitXor) \
- macro(I32Shl, 0x4a, Shl) \
- macro(I32ShrU, 0x4b, SShr) \
- macro(I32ShrS, 0x4c, ZShr) \
- macro(I32Eq, 0x4d, Equal) \
- macro(I32Ne, 0x4e, NotEqual) \
- macro(I32LtS, 0x4f, LessThan) \
- macro(I32LeS, 0x50, LessEqual) \
- macro(I32LtU, 0x51, Below) \
- macro(I32LeU, 0x52, BelowEqual) \
- macro(I32GtS, 0x53, GreaterThan) \
- macro(I32GeS, 0x54, GreaterEqual) \
- macro(I32GtU, 0x55, Above) \
- macro(I32GeU, 0x56, AboveEqual) \
- macro(I64Add, 0x5b, Add) \
- macro(I64Sub, 0x5c, Sub) \
- macro(I64Mul, 0x5d, Mul) \
- macro(I64DivS, 0x5e, Div) \
- macro(I64RemS, 0x60, Mod) \
- macro(I64And, 0x62, BitAnd) \
- macro(I64Or, 0x63, BitOr) \
- macro(I64Xor, 0x64, BitXor) \
- macro(I64Shl, 0x65, Shl) \
- macro(I64ShrU, 0x66, SShr) \
- macro(I64ShrS, 0x67, ZShr) \
- macro(I64Eq, 0x68, Equal) \
- macro(I64Ne, 0x69, NotEqual) \
- macro(I64LtS, 0x6a, LessThan) \
- macro(I64LeS, 0x6b, LessEqual) \
- macro(I64LtU, 0x6c, Below) \
- macro(I64LeU, 0x6d, BelowEqual) \
- macro(I64GtS, 0x6e, GreaterThan) \
- macro(I64GeS, 0x6f, GreaterEqual) \
- macro(I64GtU, 0x70, Above) \
- macro(I64GeU, 0x71, AboveEqual) \
- macro(F32Add, 0x75, Add) \
- macro(F32Sub, 0x76, Sub) \
- macro(F32Mul, 0x77, Mul) \
- macro(F32Div, 0x78, Div) \
- macro(F32Eq, 0x83, Equal) \
- macro(F32Ne, 0x84, NotEqual) \
- macro(F32Lt, 0x85, LessThan) \
- macro(F32Le, 0x86, LessEqual) \
- macro(F32Gt, 0x87, GreaterThan) \
- macro(F32Ge, 0x88, GreaterEqual) \
- macro(F64Add, 0x89, Add) \
- macro(F64Sub, 0x8a, Sub) \
- macro(F64Mul, 0x8b, Mul) \
- macro(F64Div, 0x8c, Div) \
- macro(F64Eq, 0x97, Equal) \
- macro(F64Ne, 0x98, NotEqual) \
- macro(F64Lt, 0x99, LessThan) \
- macro(F64Le, 0x9a, LessEqual) \
- macro(F64Gt, 0x9b, GreaterThan) \
- macro(F64Ge, 0x9c, GreaterEqual)
-
-#define FOR_EACH_WASM_BINARY_OP(macro) \
- FOR_EACH_WASM_SIMPLE_BINARY_OP(macro) \
- macro(I32DivU, 0x44, Oops) \
- macro(I32RemU, 0x46, Oops) \
- macro(I32Rotr, 0xb6, Oops) \
- macro(I32Rotl, 0xb7, Oops) \
- macro(I64DivU, 0x5f, Oops) \
- macro(I64RemU, 0x61, Oops) \
- macro(I64Rotr, 0xb8, Oops) \
- macro(I64Rotl, 0xb9, Oops) \
- macro(F32Min, 0x79, Oops) \
- macro(F32Max, 0x7a, Oops) \
- macro(F64Min, 0x8d, Oops) \
- macro(F64Max, 0x8e, Oops)
-
-#define FOR_EACH_WASM_MEMORY_LOAD_OP(macro) \
- macro(I32Load8S, 0x20, Oops) \
- macro(I32Load8U, 0x21, Oops) \
- macro(I32Load16S, 0x22, Oops) \
- macro(I32Load16U, 0x23, Oops) \
- macro(I64Load8S, 0x24, Oops) \
- macro(I64Load8U, 0x25, Oops) \
- macro(I64Load16S, 0x26, Oops) \
- macro(I64Load16U, 0x27, Oops) \
- macro(I64Load32S, 0x28, Oops) \
- macro(I64Load32U, 0x29, Oops) \
- macro(I32Load, 0x2a, Oops) \
- macro(I64Load, 0x2b, Oops) \
- macro(F32Load, 0x2c, Oops) \
- macro(F64Load, 0x2d, Oops)
-
-#define FOR_EACH_WASM_MEMORY_STORE_OP(macro) \
- macro(I32Store8, 0x2e, Oops) \
- macro(I32Store16, 0x2f, Oops) \
- macro(I64Store8, 0x30, Oops) \
- macro(I64Store16, 0x31, Oops) \
- macro(I64Store32, 0x32, Oops) \
- macro(I32Store, 0x33, Oops) \
- macro(I64Store, 0x34, Oops) \
- macro(F32Store, 0x35, Oops) \
- macro(F64Store, 0x36, Oops)
-
-
-
-#define FOR_EACH_WASM_OP(macro) \
- FOR_EACH_WASM_SPECIAL_OP(macro) \
- FOR_EACH_WASM_CONTROL_FLOW_OP(macro) \
- FOR_EACH_WASM_UNARY_OP(macro) \
- FOR_EACH_WASM_BINARY_OP(macro) \
- FOR_EACH_WASM_MEMORY_LOAD_OP(macro) \
- FOR_EACH_WASM_MEMORY_STORE_OP(macro)
-
-#define CREATE_ENUM_VALUE(name, id, b3op) name = id,
-
-enum OpType : uint8_t {
- FOR_EACH_WASM_OP(CREATE_ENUM_VALUE)
-};
-
-template<typename Int>
-inline bool isValidOpType(Int i)
-{
- // Bitset of valid ops.
- static const uint8_t valid[] = { 0xff, 0x8f, 0xff, 0x2, 0xff, 0xff, 0x7f, 0xa, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f };
- return 0 <= i && i <= 188 && (valid[i / 8] & (1 << (i % 8)));
-}
-
-enum class BinaryOpType : uint8_t {
- FOR_EACH_WASM_BINARY_OP(CREATE_ENUM_VALUE)
-};
-
-enum class UnaryOpType : uint8_t {
- FOR_EACH_WASM_UNARY_OP(CREATE_ENUM_VALUE)
-};
-
-enum class LoadOpType : uint8_t {
- FOR_EACH_WASM_MEMORY_LOAD_OP(CREATE_ENUM_VALUE)
-};
-
-enum class StoreOpType : uint8_t {
- FOR_EACH_WASM_MEMORY_STORE_OP(CREATE_ENUM_VALUE)
-};
-
-#undef CREATE_ENUM_VALUE
-
-inline bool isControlOp(OpType op)
-{
- switch (op) {
-#define CREATE_CASE(name, id, b3op) case OpType::name:
- FOR_EACH_WASM_CONTROL_FLOW_OP(CREATE_CASE)
- return true;
-#undef CREATE_CASE
- default:
- break;
- }
- return false;
-}
-
-inline bool isSimple(UnaryOpType op)
-{
- switch (op) {
-#define CREATE_CASE(name, id, b3op) case UnaryOpType::name:
- FOR_EACH_WASM_SIMPLE_UNARY_OP(CREATE_CASE)
- return true;
-#undef CREATE_CASE
- default:
- break;
- }
- return false;
-}
-
-inline bool isSimple(BinaryOpType op)
-{
- switch (op) {
-#define CREATE_CASE(name, id, b3op) case BinaryOpType::name:
- FOR_EACH_WASM_SIMPLE_BINARY_OP(CREATE_CASE)
- return true;
-#undef CREATE_CASE
- default:
- break;
- }
- return false;
-}
-
-} } // namespace JSC::Wasm
-
-#endif // ENABLE(WEBASSEMBLY)
-
</del></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmgenerateWasmpy"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/wasm/generateWasm.py (0 => 208148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/generateWasm.py (rev 0)
+++ trunk/Source/JavaScriptCore/wasm/generateWasm.py 2016-10-31 16:24:59 UTC (rev 208148)
</span><span class="lines">@@ -0,0 +1,88 @@
</span><ins>+#! /usr/bin/python
+
+# Copyright (C) 2016 Apple Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# This tool has a couple of helpful macros to process Wasm files from the wasm.json.
+
+import json
+import re
+
+
+class Wasm:
+ def __init__(self, scriptName, jsonPath):
+ wasmFile = open(jsonPath, "r")
+ wasm = json.load(open(jsonPath, "r"))
+ wasmFile.close()
+ self.opcodes = wasm["opcode"]
+ self.header = """/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// DO NO EDIT! - This file was generated by """ + scriptName
+
+ def opcodeIterator(self, filter, ret=None):
+ # We need to do this because python is dumb and won't let me use self in the lambda, which is ridiculous.
+ if ret == None:
+ ret = lambda op: {"name": op, "opcode": self.opcodes[op]}
+ for op in self.opcodes.iterkeys():
+ if filter(self.opcodes[op]):
+ yield ret(op)
+
+ def toCpp(self, name):
+ camelCase = re.sub(r'([^a-z0-9].)', lambda c: c.group(0)[1].upper(), name)
+ CamelCase = camelCase[:1].upper() + camelCase[1:]
+ return CamelCase
+
+
+def isNormal(op):
+ return op["category"] == "arithmetic" or op["category"] == "comparison" or op["category"] == "conversion"
+
+
+def isUnary(op):
+ return isNormal(op) and len(op["parameter"]) == 1
+
+
+def isBinary(op):
+ return isNormal(op) and len(op["parameter"]) == 2
</ins><span class="cx">Property changes on: trunk/Source/JavaScriptCore/wasm/generateWasm.py
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<ins>+*
</ins><span class="cx">\ No newline at end of property
</span><a id="trunkSourceJavaScriptCorewasmgenerateWasmOpsHeaderpy"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/wasm/generateWasmOpsHeader.py (0 => 208148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/generateWasmOpsHeader.py (rev 0)
+++ trunk/Source/JavaScriptCore/wasm/generateWasmOpsHeader.py 2016-10-31 16:24:59 UTC (rev 208148)
</span><span class="lines">@@ -0,0 +1,191 @@
</span><ins>+#! /usr/bin/python
+
+# Copyright (C) 2016 Apple Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# This tool has a couple of helpful macros to process Wasm files from the wasm.json.
+
+from generateWasm import *
+import optparse
+import sys
+
+parser = optparse.OptionParser(usage="usage: %prog <wasm.json> <WasmOps.h>")
+(options, args) = parser.parse_args(sys.argv[0:])
+if len(args) != 3:
+ parser.error(parser.usage)
+
+wasm = Wasm(args[0], args[1])
+opcodes = wasm.opcodes
+wasmOpsHFile = open(args[2], "w")
+
+
+def cppMacro(wasmOpcode, value, b3Opcode):
+ return " \\\n macro(" + wasm.toCpp(wasmOpcode) + ", " + hex(int(value)) + ", " + b3Opcode + ")"
+
+
+def opcodeMacroizer(filter):
+ for op in wasm.opcodeIterator(filter):
+ b3op = "Oops"
+ if "b3op" in op["opcode"]:
+ b3op = op["opcode"]["b3op"]
+ yield cppMacro(op["name"], op["opcode"]["value"], b3op)
+
+defines = ["#define FOR_EACH_WASM_SPECIAL_OP(macro)"]
+defines.extend([op for op in opcodeMacroizer(lambda op: op["category"] == "special" or op["category"] == "call")])
+defines.append("\n\n#define FOR_EACH_WASM_CONTROL_FLOW_OP(macro)")
+defines.extend([op for op in opcodeMacroizer(lambda op: op["category"] == "control")])
+defines.append("\n\n#define FOR_EACH_WASM_SIMPLE_UNARY_OP(macro)")
+defines.extend([op for op in opcodeMacroizer(lambda op: isUnary(op) and "b3op" in op)])
+defines.append("\n\n#define FOR_EACH_WASM_UNARY_OP(macro) \\\n FOR_EACH_WASM_SIMPLE_UNARY_OP(macro)")
+defines.extend([op for op in opcodeMacroizer(lambda op: isUnary(op) and not ("b3op" in op))])
+defines.append("\n\n#define FOR_EACH_WASM_SIMPLE_BINARY_OP(macro)")
+defines.extend([op for op in opcodeMacroizer(lambda op: isBinary(op) and "b3op" in op)])
+defines.append("\n\n#define FOR_EACH_WASM_BINARY_OP(macro) \\\n FOR_EACH_WASM_SIMPLE_BINARY_OP(macro)")
+defines.extend([op for op in opcodeMacroizer(lambda op: isBinary(op) and not ("b3op" in op))])
+defines.append("\n\n#define FOR_EACH_WASM_MEMORY_LOAD_OP(macro)")
+defines.extend([op for op in opcodeMacroizer(lambda op: (op["category"] == "memory" and len(op["return"]) == 1))])
+defines.append("\n\n#define FOR_EACH_WASM_MEMORY_STORE_OP(macro)")
+defines.extend([op for op in opcodeMacroizer(lambda op: (op["category"] == "memory" and len(op["return"]) == 0))])
+defines.append("\n\n")
+
+defines = "".join(defines)
+
+opValueSet = set([op for op in wasm.opcodeIterator(lambda op: True, lambda op: opcodes[op]["value"])])
+maxOpValue = max(opValueSet)
+
+
+# Luckily, python does floor division rather than trunc division so this works.
+def ceilDiv(a, b):
+ return -(-a // b)
+
+
+def bitSet():
+ v = ""
+ for i in range(ceilDiv(maxOpValue, 8)):
+ entry = 0
+ for j in range(8):
+ if i * 8 + j in opValueSet:
+ entry |= 1 << j
+ v += (", " if i else "") + hex(entry)
+ return v
+
+validOps = bitSet()
+
+contents = wasm.header + """
+
+#pragma once
+
+#if ENABLE(WEBASSEMBLY)
+
+#include <cstdint>
+
+namespace JSC { namespace Wasm {
+
+""" + defines + """
+#define FOR_EACH_WASM_OP(macro) \\
+ FOR_EACH_WASM_SPECIAL_OP(macro) \\
+ FOR_EACH_WASM_CONTROL_FLOW_OP(macro) \\
+ FOR_EACH_WASM_UNARY_OP(macro) \\
+ FOR_EACH_WASM_BINARY_OP(macro) \\
+ FOR_EACH_WASM_MEMORY_LOAD_OP(macro) \\
+ FOR_EACH_WASM_MEMORY_STORE_OP(macro)
+
+#define CREATE_ENUM_VALUE(name, id, b3op) name = id,
+
+enum OpType : uint8_t {
+ FOR_EACH_WASM_OP(CREATE_ENUM_VALUE)
+};
+
+template<typename Int>
+inline bool isValidOpType(Int i)
+{
+ // Bitset of valid ops.
+ static const uint8_t valid[] = { """ + validOps + """ };
+ return 0 <= i && i <= """ + str(maxOpValue) + """ && (valid[i / 8] & (1 << (i % 8)));
+}
+
+enum class BinaryOpType : uint8_t {
+ FOR_EACH_WASM_BINARY_OP(CREATE_ENUM_VALUE)
+};
+
+enum class UnaryOpType : uint8_t {
+ FOR_EACH_WASM_UNARY_OP(CREATE_ENUM_VALUE)
+};
+
+enum class LoadOpType : uint8_t {
+ FOR_EACH_WASM_MEMORY_LOAD_OP(CREATE_ENUM_VALUE)
+};
+
+enum class StoreOpType : uint8_t {
+ FOR_EACH_WASM_MEMORY_STORE_OP(CREATE_ENUM_VALUE)
+};
+
+#undef CREATE_ENUM_VALUE
+
+inline bool isControlOp(OpType op)
+{
+ switch (op) {
+#define CREATE_CASE(name, id, b3op) case OpType::name:
+ FOR_EACH_WASM_CONTROL_FLOW_OP(CREATE_CASE)
+ return true;
+#undef CREATE_CASE
+ default:
+ break;
+ }
+ return false;
+}
+
+inline bool isSimple(UnaryOpType op)
+{
+ switch (op) {
+#define CREATE_CASE(name, id, b3op) case UnaryOpType::name:
+ FOR_EACH_WASM_SIMPLE_UNARY_OP(CREATE_CASE)
+ return true;
+#undef CREATE_CASE
+ default:
+ break;
+ }
+ return false;
+}
+
+inline bool isSimple(BinaryOpType op)
+{
+ switch (op) {
+#define CREATE_CASE(name, id, b3op) case BinaryOpType::name:
+ FOR_EACH_WASM_SIMPLE_BINARY_OP(CREATE_CASE)
+ return true;
+#undef CREATE_CASE
+ default:
+ break;
+ }
+ return false;
+}
+
+} } // namespace JSC::Wasm
+
+#endif // ENABLE(WEBASSEMBLY)
+
+"""
+
+wasmOpsHFile.write(contents)
+wasmOpsHFile.close()
</ins><span class="cx">Property changes on: trunk/Source/JavaScriptCore/wasm/generateWasmOpsHeader.py
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<ins>+*
</ins><span class="cx">\ No newline at end of property
</span><a id="trunkSourceJavaScriptCorewasmwasmjson"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/wasm/wasm.json (0 => 208148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/wasm.json (rev 0)
+++ trunk/Source/JavaScriptCore/wasm/wasm.json 2016-10-31 16:24:59 UTC (rev 208148)
</span><span class="lines">@@ -0,0 +1,219 @@
</span><ins>+{
+ "comments": ["This file describes the WebAssembly ISA.",
+ "Scripts in this folder auto-generate C++ code for JavaScriptCore as well as the testing DSL which WebKit's WebAssembly tests use.",
+ "When you update this file you need to re-generate the C++ code: jsc ./JSTests/stress/wasm/generate-wasmops-header.js > ./Source/JavaScriptCore/wasm/WASMOps.h"
+ ],
+ "preamble": [
+ { "name": "magic number", "type": "uint32", "value": 1836278016, "description": "NULL character followed by 'asm'" },
+ { "name": "version", "type": "uint32", "value": 12, "description": "Version number, will be reset to 1 for MVP" }
+ ],
+ "value_type" : {
+ "i32": { "type": "uint8", "value": 1 },
+ "i64": { "type": "uint8", "value": 2 },
+ "f32": { "type": "uint8", "value": 3 },
+ "f64": { "type": "uint8", "value": 4 }
+ },
+ "inline_signature_type" : {
+ "void": { "type": "uint8", "value": 0 },
+ "i32": { "type": "uint8", "value": 1 },
+ "i64": { "type": "uint8", "value": 2 },
+ "f32": { "type": "uint8", "value": 3 },
+ "f64": { "type": "uint8", "value": 4 }
+ },
+ "external_kind": {
+ "Function": { "type": "uint8", "value": 0 },
+ "Table": { "type": "uint8", "value": 1 },
+ "Memory": { "type": "uint8", "value": 2 },
+ "Global": { "type": "uint8", "value": 3 }
+ },
+ "section" : {
+ "Type": { "type": "varuint7", "value": 1, "description": "Function signature declarations" },
+ "Import": { "type": "varuint7", "value": 2, "description": "Import declarations" },
+ "Function": { "type": "varuint7", "value": 3, "description": "Function declarations" },
+ "Table": { "type": "varuint7", "value": 4, "description": "Indirect function table and other tables" },
+ "Memory": { "type": "varuint7", "value": 5, "description": "Memory attributes" },
+ "Global": { "type": "varuint7", "value": 6, "description": "Global declarations" },
+ "Export": { "type": "varuint7", "value": 7, "description": "Exports" },
+ "Start": { "type": "varuint7", "value": 8, "description": "Start function declaration" },
+ "Element": { "type": "varuint7", "value": 9, "description": "Elements section" },
+ "Code": { "type": "varuint7", "value": 10, "description": "Function bodies (code)" },
+ "Data": { "type": "varuint7", "value": 11, "description": "Data segments" }
+ },
+ "opcode": {
+ "unreachable": { "category": "control", "value": 0, "return": [], "parameter": [], "immediate": [], "description": "trap immediately" },
+ "block": { "category": "control", "value": 1, "return": ["control"], "parameter": [], "immediate": [{"name": "sig", "type": "inline_signature_type"}], "description": "begin a sequence of expressions, yielding 0 or 1 values" },
+ "loop": { "category": "control", "value": 2, "return": ["control"], "parameter": [], "immediate": [{"name": "sig", "type": "inline_signature_type"}], "description": "begin a block which can also form control flow loops" },
+ "if": { "category": "control", "value": 3, "return": ["control"], "parameter": ["bool"], "immediate": [{"name": "sig", "type": "inline_signature_type"}], "description": "begin if expression" },
+ "else": { "category": "control", "value": 4, "return": ["control"], "parameter": [], "immediate": [], "description": "begin else expression of if" },
+ "select": { "category": "control", "value": 5, "return": ["prev"], "parameter": ["any", "prev", "bool"], "immediate": [], "description": "select one of two values based on condition" },
+ "br": { "category": "control", "value": 6, "return": [], "parameter": [], "immediate": [{"name": "relative_depth", "type": "varuint32"}], "description": "break that targets an outer nested block" },
+ "br_if": { "category": "control", "value": 7, "return": [], "parameter": [], "immediate": [{"name": "relative_depth", "type": "varuint32"}], "description": "conditional break that targets an outer nested block" },
+ "br_table": { "category": "control", "value": 8, "return": [], "parameter": [], "immediate": [{"name": "target_count", "type": "varuint32", "description": "number of entries in the target_table"},
+ {"name": "target_table", "type": "varuint32*", "description": "target entries that indicate an outer block or loop to which to break"},
+ {"name": "default_target", "type": "varuint32", "description": "an outer block or loop to which to break in the default case"}],
+ "description": "branch table control flow construct" },
+ "return": { "category": "control", "value": 9, "return": [], "parameter": [], "immediate": [], "description": "return zero or one value from this function" },
+ "drop": { "category": "control", "value": 11, "return": [], "parameter": ["any"], "immediate": [], "description": "ignore value" },
+ "nop": { "category": "control", "value": 10, "return": [], "parameter": [], "immediate": [], "description": "no operation" },
+ "end": { "category": "control", "value": 15, "return": [], "parameter": [], "immediate": [], "description": "end a block, loop, or if" },
+ "i32.const": { "category": "special", "value": 16, "return": ["i32"], "parameter": [], "immediate": [{"name": "value", "type": "varint32"}], "description": "a constant value interpreted as i32" },
+ "i64.const": { "category": "special", "value": 17, "return": ["i64"], "parameter": [], "immediate": [{"name": "value", "type": "varint64"}], "description": "a constant value interpreted as i64" },
+ "f64.const": { "category": "special", "value": 18, "return": ["f64"], "parameter": [], "immediate": [{"name": "value", "type": "uint64"}], "description": "a constant value interpreted as f64" },
+ "f32.const": { "category": "special", "value": 19, "return": ["f32"], "parameter": [], "immediate": [{"name": "value", "type": "uint32"}], "description": "a constant value interpreted as f32" },
+ "get_local": { "category": "special", "value": 20, "return": ["local"], "parameter": [], "immediate": [{"name": "local_index", "type": "varuint32"}], "description": "read a local variable or parameter" },
+ "set_local": { "category": "special", "value": 21, "return": [], "parameter": ["local"], "immediate": [{"name": "local_index", "type": "varuint32"}], "description": "write a local variable or parameter" },
+ "tee_local": { "category": "special", "value": 25, "return": ["prev"], "parameter": ["any"], "immediate": [{"name": "local_index", "type": "varuint32"}], "description": "write a local variable or parameter and return the same value" },
+ "get_global": { "category": "special", "value": 187, "return": ["global"], "parameter": [], "immediate": [{"name": "global_index", "type": "varuint32"}], "description": "read a global variable" },
+ "set_global": { "category": "special", "value": 188, "return": [""], "parameter": ["global"], "immediate": [{"name": "global_index", "type": "varuint32"}], "description": "write a global variable" },
+ "call": { "category": "call", "value": 22, "return": ["call"], "parameter": ["call"], "immediate": [{"name": "function_index", "type": "varuint32"}], "description": "call a function by its index" },
+ "call_indirect": { "category": "call", "value": 23, "return": ["call"], "parameter": ["call"], "immediate": [{"name": "type_index", "type": "varuint32"}], "description": "call a function indirect with an expected signature" },
+ "i32.load8_s": { "category": "memory", "value": 32, "return": ["i32"], "parameter": ["addr"], "immediate": [{"name": "flags", "type": "varuint32"}, {"name": "offset", "type": "varuint32"}], "description": "load from memory" },
+ "i32.load8_u": { "category": "memory", "value": 33, "return": ["i32"], "parameter": ["addr"], "immediate": [{"name": "flags", "type": "varuint32"}, {"name": "offset", "type": "varuint32"}], "description": "load from memory" },
+ "i32.load16_s": { "category": "memory", "value": 34, "return": ["i32"], "parameter": ["addr"], "immediate": [{"name": "flags", "type": "varuint32"}, {"name": "offset", "type": "varuint32"}], "description": "load from memory" },
+ "i32.load16_u": { "category": "memory", "value": 35, "return": ["i32"], "parameter": ["addr"], "immediate": [{"name": "flags", "type": "varuint32"}, {"name": "offset", "type": "varuint32"}], "description": "load from memory" },
+ "i64.load8_s": { "category": "memory", "value": 36, "return": ["i64"], "parameter": ["addr"], "immediate": [{"name": "flags", "type": "varuint32"}, {"name": "offset", "type": "varuint32"}], "description": "load from memory" },
+ "i64.load8_u": { "category": "memory", "value": 37, "return": ["i64"], "parameter": ["addr"], "immediate": [{"name": "flags", "type": "varuint32"}, {"name": "offset", "type": "varuint32"}], "description": "load from memory" },
+ "i64.load16_s": { "category": "memory", "value": 38, "return": ["i64"], "parameter": ["addr"], "immediate": [{"name": "flags", "type": "varuint32"}, {"name": "offset", "type": "varuint32"}], "description": "load from memory" },
+ "i64.load16_u": { "category": "memory", "value": 39, "return": ["i64"], "parameter": ["addr"], "immediate": [{"name": "flags", "type": "varuint32"}, {"name": "offset", "type": "varuint32"}], "description": "load from memory" },
+ "i64.load32_s": { "category": "memory", "value": 40, "return": ["i64"], "parameter": ["addr"], "immediate": [{"name": "flags", "type": "varuint32"}, {"name": "offset", "type": "varuint32"}], "description": "load from memory" },
+ "i64.load32_u": { "category": "memory", "value": 41, "return": ["i64"], "parameter": ["addr"], "immediate": [{"name": "flags", "type": "varuint32"}, {"name": "offset", "type": "varuint32"}], "description": "load from memory" },
+ "i32.load": { "category": "memory", "value": 42, "return": ["i32"], "parameter": ["addr"], "immediate": [{"name": "flags", "type": "varuint32"}, {"name": "offset", "type": "varuint32"}], "description": "load from memory" },
+ "i64.load": { "category": "memory", "value": 43, "return": ["i64"], "parameter": ["addr"], "immediate": [{"name": "flags", "type": "varuint32"}, {"name": "offset", "type": "varuint32"}], "description": "load from memory" },
+ "f32.load": { "category": "memory", "value": 44, "return": ["f32"], "parameter": ["addr"], "immediate": [{"name": "flags", "type": "varuint32"}, {"name": "offset", "type": "varuint32"}], "description": "load from memory" },
+ "f64.load": { "category": "memory", "value": 45, "return": ["f64"], "parameter": ["addr"], "immediate": [{"name": "flags", "type": "varuint32"}, {"name": "offset", "type": "varuint32"}], "description": "load from memory" },
+ "i32.store8": { "category": "memory", "value": 46, "return": [], "parameter": ["addr", "i32"], "immediate": [{"name": "flags", "type": "varuint32"}, {"name": "offset", "type": "varuint32"}], "description": "store to memory" },
+ "i32.store16": { "category": "memory", "value": 47, "return": [], "parameter": ["addr", "i32"], "immediate": [{"name": "flags", "type": "varuint32"}, {"name": "offset", "type": "varuint32"}], "description": "store to memory" },
+ "i64.store8": { "category": "memory", "value": 48, "return": [], "parameter": ["addr", "i64"], "immediate": [{"name": "flags", "type": "varuint32"}, {"name": "offset", "type": "varuint32"}], "description": "store to memory" },
+ "i64.store16": { "category": "memory", "value": 49, "return": [], "parameter": ["addr", "i64"], "immediate": [{"name": "flags", "type": "varuint32"}, {"name": "offset", "type": "varuint32"}], "description": "store to memory" },
+ "i64.store32": { "category": "memory", "value": 50, "return": [], "parameter": ["addr", "i64"], "immediate": [{"name": "flags", "type": "varuint32"}, {"name": "offset", "type": "varuint32"}], "description": "store to memory" },
+ "i32.store": { "category": "memory", "value": 51, "return": [], "parameter": ["addr", "i32"], "immediate": [{"name": "flags", "type": "varuint32"}, {"name": "offset", "type": "varuint32"}], "description": "store to memory" },
+ "i64.store": { "category": "memory", "value": 52, "return": [], "parameter": ["addr", "i64"], "immediate": [{"name": "flags", "type": "varuint32"}, {"name": "offset", "type": "varuint32"}], "description": "store to memory" },
+ "f32.store": { "category": "memory", "value": 53, "return": [], "parameter": ["addr", "f32"], "immediate": [{"name": "flags", "type": "varuint32"}, {"name": "offset", "type": "varuint32"}], "description": "store to memory" },
+ "f64.store": { "category": "memory", "value": 54, "return": [], "parameter": ["addr", "f64"], "immediate": [{"name": "flags", "type": "varuint32"}, {"name": "offset", "type": "varuint32"}], "description": "store to memory" },
+ "current_memory": { "category": "operation", "value": 59, "return": ["size"], "parameter": [], "immediate": [], "description": "query the size of memory" },
+ "grow_memory": { "category": "operation", "value": 57, "return": ["size"], "parameter": ["size"], "immediate": [], "description": "grow the size of memory" },
+ "i32.add": { "category": "arithmetic", "value": 64, "return": ["i32"], "parameter": ["i32", "i32"], "immediate": [], "b3op": "Add" },
+ "i32.sub": { "category": "arithmetic", "value": 65, "return": ["i32"], "parameter": ["i32", "i32"], "immediate": [], "b3op": "Sub" },
+ "i32.mul": { "category": "arithmetic", "value": 66, "return": ["i32"], "parameter": ["i32", "i32"], "immediate": [], "b3op": "Mul" },
+ "i32.div_s": { "category": "arithmetic", "value": 67, "return": ["i32"], "parameter": ["i32", "i32"], "immediate": [], "b3op": "Div" },
+ "i32.div_u": { "category": "arithmetic", "value": 68, "return": ["i32"], "parameter": ["i32", "i32"], "immediate": [] },
+ "i32.rem_s": { "category": "arithmetic", "value": 69, "return": ["i32"], "parameter": ["i32", "i32"], "immediate": [], "b3op": "Mod" },
+ "i32.rem_u": { "category": "arithmetic", "value": 70, "return": ["i32"], "parameter": ["i32", "i32"], "immediate": [] },
+ "i32.and": { "category": "arithmetic", "value": 71, "return": ["i32"], "parameter": ["i32", "i32"], "immediate": [], "b3op": "BitAnd" },
+ "i32.or": { "category": "arithmetic", "value": 72, "return": ["i32"], "parameter": ["i32", "i32"], "immediate": [], "b3op": "BitOr" },
+ "i32.xor": { "category": "arithmetic", "value": 73, "return": ["i32"], "parameter": ["i32", "i32"], "immediate": [], "b3op": "BitXor" },
+ "i32.shl": { "category": "arithmetic", "value": 74, "return": ["i32"], "parameter": ["i32", "i32"], "immediate": [], "b3op": "Shl" },
+ "i32.shr_u": { "category": "arithmetic", "value": 75, "return": ["i32"], "parameter": ["i32", "i32"], "immediate": [], "b3op": "SShr" },
+ "i32.shr_s": { "category": "arithmetic", "value": 76, "return": ["i32"], "parameter": ["i32", "i32"], "immediate": [], "b3op": "ZShr" },
+ "i32.rotr": { "category": "arithmetic", "value": 182, "return": ["i32"], "parameter": ["i32", "i32"], "immediate": [] },
+ "i32.rotl": { "category": "arithmetic", "value": 183, "return": ["i32"], "parameter": ["i32", "i32"], "immediate": [] },
+ "i32.eq": { "category": "comparison", "value": 77, "return": ["bool"], "parameter": ["i32", "i32"], "immediate": [], "b3op": "Equal" },
+ "i32.ne": { "category": "comparison", "value": 78, "return": ["bool"], "parameter": ["i32", "i32"], "immediate": [], "b3op": "NotEqual" },
+ "i32.lt_s": { "category": "comparison", "value": 79, "return": ["bool"], "parameter": ["i32", "i32"], "immediate": [], "b3op": "LessThan" },
+ "i32.le_s": { "category": "comparison", "value": 80, "return": ["bool"], "parameter": ["i32", "i32"], "immediate": [], "b3op": "LessEqual" },
+ "i32.lt_u": { "category": "comparison", "value": 81, "return": ["bool"], "parameter": ["i32", "i32"], "immediate": [], "b3op": "Below" },
+ "i32.le_u": { "category": "comparison", "value": 82, "return": ["bool"], "parameter": ["i32", "i32"], "immediate": [], "b3op": "BelowEqual" },
+ "i32.gt_s": { "category": "comparison", "value": 83, "return": ["bool"], "parameter": ["i32", "i32"], "immediate": [], "b3op": "GreaterThan" },
+ "i32.ge_s": { "category": "comparison", "value": 84, "return": ["bool"], "parameter": ["i32", "i32"], "immediate": [], "b3op": "GreaterEqual" },
+ "i32.gt_u": { "category": "comparison", "value": 85, "return": ["bool"], "parameter": ["i32", "i32"], "immediate": [], "b3op": "Above" },
+ "i32.ge_u": { "category": "comparison", "value": 86, "return": ["bool"], "parameter": ["i32", "i32"], "immediate": [], "b3op": "AboveEqual" },
+ "i32.clz": { "category": "arithmetic", "value": 87, "return": ["i32"], "parameter": ["i32"], "immediate": [], "b3op": "Clz" },
+ "i32.ctz": { "category": "arithmetic", "value": 88, "return": ["i32"], "parameter": ["i32"], "immediate": [] },
+ "i32.popcnt": { "category": "arithmetic", "value": 89, "return": ["i32"], "parameter": ["i32"], "immediate": [] },
+ "i32.eqz": { "category": "comparison", "value": 90, "return": ["bool"], "parameter": ["i32"], "immediate": [] },
+ "i64.add": { "category": "arithmetic", "value": 91, "return": ["i64"], "parameter": ["i64", "i64"], "immediate": [], "b3op": "Add" },
+ "i64.sub": { "category": "arithmetic", "value": 92, "return": ["i64"], "parameter": ["i64", "i64"], "immediate": [], "b3op": "Sub" },
+ "i64.mul": { "category": "arithmetic", "value": 93, "return": ["i64"], "parameter": ["i64", "i64"], "immediate": [], "b3op": "Mul" },
+ "i64.div_s": { "category": "arithmetic", "value": 94, "return": ["i64"], "parameter": ["i64", "i64"], "immediate": [], "b3op": "Div" },
+ "i64.div_u": { "category": "arithmetic", "value": 95, "return": ["i64"], "parameter": ["i64", "i64"], "immediate": [] },
+ "i64.rem_s": { "category": "arithmetic", "value": 96, "return": ["i64"], "parameter": ["i64", "i64"], "immediate": [], "b3op": "Mod" },
+ "i64.rem_u": { "category": "arithmetic", "value": 97, "return": ["i64"], "parameter": ["i64", "i64"], "immediate": [] },
+ "i64.and": { "category": "arithmetic", "value": 98, "return": ["i64"], "parameter": ["i64", "i64"], "immediate": [], "b3op": "BitAnd" },
+ "i64.or": { "category": "arithmetic", "value": 99, "return": ["i64"], "parameter": ["i64", "i64"], "immediate": [], "b3op": "BitOr" },
+ "i64.xor": { "category": "arithmetic", "value": 100, "return": ["i64"], "parameter": ["i64", "i64"], "immediate": [], "b3op": "BitXor" },
+ "i64.shl": { "category": "arithmetic", "value": 101, "return": ["i64"], "parameter": ["i64", "i64"], "immediate": [], "b3op": "Shl" },
+ "i64.shr_u": { "category": "arithmetic", "value": 102, "return": ["i64"], "parameter": ["i64", "i64"], "immediate": [], "b3op": "SShr" },
+ "i64.shr_s": { "category": "arithmetic", "value": 103, "return": ["i64"], "parameter": ["i64", "i64"], "immediate": [], "b3op": "ZShr" },
+ "i64.rotr": { "category": "arithmetic", "value": 184, "return": ["i64"], "parameter": ["i64", "i64"], "immediate": [] },
+ "i64.rotl": { "category": "arithmetic", "value": 185, "return": ["i64"], "parameter": ["i64", "i64"], "immediate": [] },
+ "i64.eq": { "category": "comparison", "value": 104, "return": ["bool"], "parameter": ["i64", "i64"], "immediate": [], "b3op": "Equal" },
+ "i64.ne": { "category": "comparison", "value": 105, "return": ["bool"], "parameter": ["i64", "i64"], "immediate": [], "b3op": "NotEqual" },
+ "i64.lt_s": { "category": "comparison", "value": 106, "return": ["bool"], "parameter": ["i64", "i64"], "immediate": [], "b3op": "LessThan" },
+ "i64.le_s": { "category": "comparison", "value": 107, "return": ["bool"], "parameter": ["i64", "i64"], "immediate": [], "b3op": "LessEqual" },
+ "i64.lt_u": { "category": "comparison", "value": 108, "return": ["bool"], "parameter": ["i64", "i64"], "immediate": [], "b3op": "Below" },
+ "i64.le_u": { "category": "comparison", "value": 109, "return": ["bool"], "parameter": ["i64", "i64"], "immediate": [], "b3op": "BelowEqual" },
+ "i64.gt_s": { "category": "comparison", "value": 110, "return": ["bool"], "parameter": ["i64", "i64"], "immediate": [], "b3op": "GreaterThan" },
+ "i64.ge_s": { "category": "comparison", "value": 111, "return": ["bool"], "parameter": ["i64", "i64"], "immediate": [], "b3op": "GreaterEqual" },
+ "i64.gt_u": { "category": "comparison", "value": 112, "return": ["bool"], "parameter": ["i64", "i64"], "immediate": [], "b3op": "Above" },
+ "i64.ge_u": { "category": "comparison", "value": 113, "return": ["bool"], "parameter": ["i64", "i64"], "immediate": [], "b3op": "AboveEqual" },
+ "i64.clz": { "category": "arithmetic", "value": 114, "return": ["i64"], "parameter": ["i64"], "immediate": [], "b3op": "Clz" },
+ "i64.ctz": { "category": "arithmetic", "value": 115, "return": ["i64"], "parameter": ["i64"], "immediate": [] },
+ "i64.popcnt": { "category": "arithmetic", "value": 116, "return": ["i64"], "parameter": ["i64"], "immediate": [] },
+ "i64.eqz": { "category": "comparison", "value": 186, "return": ["bool"], "parameter": ["i64"], "immediate": [] },
+ "f32.add": { "category": "arithmetic", "value": 117, "return": ["f32"], "parameter": ["f32", "f32"], "immediate": [], "b3op": "Add" },
+ "f32.sub": { "category": "arithmetic", "value": 118, "return": ["f32"], "parameter": ["f32", "f32"], "immediate": [], "b3op": "Sub" },
+ "f32.mul": { "category": "arithmetic", "value": 119, "return": ["f32"], "parameter": ["f32", "f32"], "immediate": [], "b3op": "Mul" },
+ "f32.div": { "category": "arithmetic", "value": 120, "return": ["f32"], "parameter": ["f32", "f32"], "immediate": [], "b3op": "Div" },
+ "f32.min": { "category": "arithmetic", "value": 121, "return": ["f32"], "parameter": ["f32", "f32"], "immediate": [] },
+ "f32.max": { "category": "arithmetic", "value": 122, "return": ["f32"], "parameter": ["f32", "f32"], "immediate": [] },
+ "f32.abs": { "category": "arithmetic", "value": 123, "return": ["f32"], "parameter": ["f32"], "immediate": [], "b3op": "Abs" },
+ "f32.neg": { "category": "arithmetic", "value": 124, "return": ["f32"], "parameter": ["f32"], "immediate": [] },
+ "f32.copysign": { "category": "arithmetic", "value": 125, "return": ["f32"], "parameter": ["f32"], "immediate": [] },
+ "f32.ceil": { "category": "arithmetic", "value": 126, "return": ["f32"], "parameter": ["f32"], "immediate": [], "b3op": "Ceil" },
+ "f32.floor": { "category": "arithmetic", "value": 127, "return": ["f32"], "parameter": ["f32"], "immediate": [], "b3op": "Floor" },
+ "f32.trunc": { "category": "arithmetic", "value": 128, "return": ["f32"], "parameter": ["f32"], "immediate": [] },
+ "f32.nearest": { "category": "arithmetic", "value": 129, "return": ["f32"], "parameter": ["f32"], "immediate": [] },
+ "f32.sqrt": { "category": "arithmetic", "value": 130, "return": ["f32"], "parameter": ["f32"], "immediate": [] },
+ "f32.eq": { "category": "comparison", "value": 131, "return": ["bool"], "parameter": ["f32", "f32"], "immediate": [], "b3op": "Equal" },
+ "f32.ne": { "category": "comparison", "value": 132, "return": ["bool"], "parameter": ["f32", "f32"], "immediate": [], "b3op": "NotEqual" },
+ "f32.lt": { "category": "comparison", "value": 133, "return": ["bool"], "parameter": ["f32", "f32"], "immediate": [], "b3op": "LessThan" },
+ "f32.le": { "category": "comparison", "value": 134, "return": ["bool"], "parameter": ["f32", "f32"], "immediate": [], "b3op": "LessEqual" },
+ "f32.gt": { "category": "comparison", "value": 135, "return": ["bool"], "parameter": ["f32", "f32"], "immediate": [], "b3op": "GreaterThan" },
+ "f32.ge": { "category": "comparison", "value": 136, "return": ["bool"], "parameter": ["f32", "f32"], "immediate": [], "b3op": "GreaterEqual" },
+ "f64.add": { "category": "arithmetic", "value": 137, "return": ["f64"], "parameter": ["f64", "f64"], "immediate": [], "b3op": "Add" },
+ "f64.sub": { "category": "arithmetic", "value": 138, "return": ["f64"], "parameter": ["f64", "f64"], "immediate": [], "b3op": "Sub" },
+ "f64.mul": { "category": "arithmetic", "value": 139, "return": ["f64"], "parameter": ["f64", "f64"], "immediate": [], "b3op": "Mul" },
+ "f64.div": { "category": "arithmetic", "value": 140, "return": ["f64"], "parameter": ["f64", "f64"], "immediate": [], "b3op": "Div" },
+ "f64.min": { "category": "arithmetic", "value": 141, "return": ["f64"], "parameter": ["f64", "f64"], "immediate": [] },
+ "f64.max": { "category": "arithmetic", "value": 142, "return": ["f64"], "parameter": ["f64", "f64"], "immediate": [] },
+ "f64.abs": { "category": "arithmetic", "value": 143, "return": ["f64"], "parameter": ["f64"], "immediate": [], "b3op": "Abs" },
+ "f64.neg": { "category": "arithmetic", "value": 144, "return": ["f64"], "parameter": ["f64"], "immediate": [] },
+ "f64.copysign": { "category": "arithmetic", "value": 145, "return": ["f64"], "parameter": ["f64"], "immediate": [] },
+ "f64.ceil": { "category": "arithmetic", "value": 146, "return": ["f64"], "parameter": ["f64"], "immediate": [], "b3op": "Ceil" },
+ "f64.floor": { "category": "arithmetic", "value": 147, "return": ["f64"], "parameter": ["f64"], "immediate": [], "b3op": "Floor" },
+ "f64.trunc": { "category": "arithmetic", "value": 148, "return": ["f64"], "parameter": ["f64"], "immediate": [] },
+ "f64.nearest": { "category": "arithmetic", "value": 149, "return": ["f64"], "parameter": ["f64"], "immediate": [] },
+ "f64.sqrt": { "category": "arithmetic", "value": 150, "return": ["f64"], "parameter": ["f64"], "immediate": [] },
+ "f64.eq": { "category": "comparison", "value": 151, "return": ["bool"], "parameter": ["f64", "f64"], "immediate": [], "b3op": "Equal" },
+ "f64.ne": { "category": "comparison", "value": 152, "return": ["bool"], "parameter": ["f64", "f64"], "immediate": [], "b3op": "NotEqual" },
+ "f64.lt": { "category": "comparison", "value": 153, "return": ["bool"], "parameter": ["f64", "f64"], "immediate": [], "b3op": "LessThan" },
+ "f64.le": { "category": "comparison", "value": 154, "return": ["bool"], "parameter": ["f64", "f64"], "immediate": [], "b3op": "LessEqual" },
+ "f64.gt": { "category": "comparison", "value": 155, "return": ["bool"], "parameter": ["f64", "f64"], "immediate": [], "b3op": "GreaterThan" },
+ "f64.ge": { "category": "comparison", "value": 156, "return": ["bool"], "parameter": ["f64", "f64"], "immediate": [], "b3op": "GreaterEqual" },
+ "i32.trunc_s/f32": { "category": "conversion", "value": 157, "return": ["i32"], "parameter": ["f32"], "immediate": [] },
+ "i32.trunc_s/f64": { "category": "conversion", "value": 158, "return": ["i32"], "parameter": ["f64"], "immediate": [] },
+ "i32.trunc_u/f32": { "category": "conversion", "value": 159, "return": ["i32"], "parameter": ["f32"], "immediate": [] },
+ "i32.trunc_u/f64": { "category": "conversion", "value": 160, "return": ["i32"], "parameter": ["f64"], "immediate": [] },
+ "i32.wrap/i64": { "category": "conversion", "value": 161, "return": ["i32"], "parameter": ["i64"], "immediate": [] },
+ "i64.trunc_s/f32": { "category": "conversion", "value": 162, "return": ["i64"], "parameter": ["f32"], "immediate": [] },
+ "i64.trunc_s/f64": { "category": "conversion", "value": 163, "return": ["i64"], "parameter": ["f64"], "immediate": [] },
+ "i64.trunc_u/f32": { "category": "conversion", "value": 164, "return": ["i64"], "parameter": ["f32"], "immediate": [] },
+ "i64.trunc_u/f64": { "category": "conversion", "value": 165, "return": ["i64"], "parameter": ["f64"], "immediate": [] },
+ "i64.extend_s/i32": { "category": "conversion", "value": 166, "return": ["i64"], "parameter": ["i32"], "immediate": [], "b3op": "SExt32" },
+ "i64.extend_u/i32": { "category": "conversion", "value": 167, "return": ["i64"], "parameter": ["i32"], "immediate": [], "b3op": "ZExt32" },
+ "f32.convert_s/i32": { "category": "conversion", "value": 168, "return": ["f32"], "parameter": ["i32"], "immediate": [] },
+ "f32.convert_u/i32": { "category": "conversion", "value": 169, "return": ["f32"], "parameter": ["i32"], "immediate": [] },
+ "f32.convert_s/i64": { "category": "conversion", "value": 170, "return": ["f32"], "parameter": ["i64"], "immediate": [] },
+ "f32.convert_u/i64": { "category": "conversion", "value": 171, "return": ["f32"], "parameter": ["i64"], "immediate": [] },
+ "f32.demote/f64": { "category": "conversion", "value": 172, "return": ["f32"], "parameter": ["f64"], "immediate": [], "b3op": "DoubleToFloat"},
+ "f32.reinterpret/i32": { "category": "conversion", "value": 173, "return": ["f32"], "parameter": ["i32"], "immediate": [], "b3op": "BitwiseCast" },
+ "f64.convert_s/i32": { "category": "conversion", "value": 174, "return": ["f64"], "parameter": ["i32"], "immediate": [] },
+ "f64.convert_u/i32": { "category": "conversion", "value": 175, "return": ["f64"], "parameter": ["i32"], "immediate": [] },
+ "f64.convert_s/i64": { "category": "conversion", "value": 176, "return": ["f64"], "parameter": ["i64"], "immediate": [] },
+ "f64.convert_u/i64": { "category": "conversion", "value": 177, "return": ["f64"], "parameter": ["i64"], "immediate": [] },
+ "f64.promote/f32": { "category": "conversion", "value": 178, "return": ["f64"], "parameter": ["f32"], "immediate": [], "b3op": "FloatToDouble"},
+ "f64.reinterpret/i64": { "category": "conversion", "value": 179, "return": ["f64"], "parameter": ["i64"], "immediate": [], "b3op": "BitwiseCast" },
+ "i32.reinterpret/f32": { "category": "conversion", "value": 180, "return": ["i32"], "parameter": ["f32"], "immediate": [], "b3op": "BitwiseCast" },
+ "i64.reinterpret/f64": { "category": "conversion", "value": 181, "return": ["i64"], "parameter": ["f64"], "immediate": [], "b3op": "BitwiseCast" }
+ }
+}
</ins></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (208147 => 208148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-10-31 16:17:48 UTC (rev 208147)
+++ trunk/Tools/ChangeLog 2016-10-31 16:24:59 UTC (rev 208148)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-10-31 Keith Miller <keith_miller@apple.com>
+
+ autogenerated files from wasm.json should be in derived sources.
+ https://bugs.webkit.org/show_bug.cgi?id=164152
+
+ Reviewed by Filip Pizlo.
+
+ Add message to make sure that people keep the wasm.jsons up to date.
+
+ * Scripts/webkitpy/common/config/watchlist:
+
</ins><span class="cx"> 2016-10-31 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> Holding down a key to choose an accented character should fire "insertReplacementText" input events
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonconfigwatchlist"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/config/watchlist (208147 => 208148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/config/watchlist 2016-10-31 16:17:48 UTC (rev 208147)
+++ trunk/Tools/Scripts/webkitpy/common/config/watchlist 2016-10-31 16:24:59 UTC (rev 208148)
</span><span class="lines">@@ -223,6 +223,10 @@
</span><span class="cx"> "filename": r"Source/JavaScriptCore/Scripts/builtins"
</span><span class="cx"> r"|Source/JavaScriptCore/Scripts/generate-js-builtins\.py",
</span><span class="cx"> },
</span><ins>+ "WasmJSON": {
+ "filename": r"|Source/JavaScriptCore/wasm/wasm\.json"
+ r"|JSTests/wasm/wasm\.json",
+ },
</ins><span class="cx"> "MediaStream": {
</span><span class="cx"> "filename": r"Source/WebCore/Modules/mediastream"
</span><span class="cx"> r"|Source/WebCore/platform/mediastream"
</span><span class="lines">@@ -429,5 +433,6 @@
</span><span class="cx"> "WebInspectorGenerator": [ "This patch modifies the inspector protocol generator. Please ensure that you have rebaselined any generator test results (i.e., by running `Tools/Scripts/run-inspector-generator-tests --reset-results`)" ],
</span><span class="cx"> "WebReplayGenerator": [ "This patch modifies the WEB_REPLAY inputs generator. Please ensure that you have rebaselined any generator test results (i.e., by running `Tools/Scripts/run-input-generator-tests --reset-results`)" ],
</span><span class="cx"> "JSBuiltinsGenerator": [ "This patch modifies the JS builtins code generator. Please ensure that you have rebaselined any generator test results (i.e., by running `Tools/Scripts/run-builtins-generator-tests --reset-results`)" ],
</span><ins>+ "WasmJSON": [ "This patch modifies one of the wasm.json files. Please ensure that any changes in one have been mirrored to the other. You can find the wasm.json files at \"Source/JavaScriptCore/wasm/wasm.json\" and \"JSTests/wasm/wasm.json\"." ],
</ins><span class="cx"> },
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>