<!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>[207824] 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/207824">207824</a></dd>
<dt>Author</dt> <dd>keith_miller@apple.com</dd>
<dt>Date</dt> <dd>2016-10-25 10:12:20 -0700 (Tue, 25 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add trivial Wasm conversion opcodes
https://bugs.webkit.org/show_bug.cgi?id=163950
Reviewed by Filip Pizlo.
This patch differentiates between Wasm opcodes that are trivially mapped to a B3 opcode and
those that are not. Some of the Wasm opcodes that are currently a non-simple opcode will
become simple as we add B3 opcodes for Wasm operations. The remaining opcodes will need to
be added via patchpoints in a later patch.
JSTests:
* wasm/generate-wasmops-header.js:
(const.template.pragma.once.ENABLE.WEBASSEMBLY.include.cstdint.namespace.JSC.namespace.Wasm.inline.bool.isSimple):
* wasm/wasm.json:
Source/JavaScriptCore:
* wasm/WasmB3IRGenerator.cpp:
* wasm/WasmOps.h:
(JSC::Wasm::isSimple):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<li><a href="#trunkJSTestswasmgeneratewasmopsheaderjs">trunk/JSTests/wasm/generate-wasmops-header.js</a></li>
<li><a href="#trunkJSTestswasmwasmjson">trunk/JSTests/wasm/wasm.json</a></li>
<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="#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 (207823 => 207824)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog 2016-10-25 16:34:32 UTC (rev 207823)
+++ trunk/JSTests/ChangeLog 2016-10-25 17:12:20 UTC (rev 207824)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-10-25 Keith Miller <keith_miller@apple.com>
+
+ Add trivial Wasm conversion opcodes
+ https://bugs.webkit.org/show_bug.cgi?id=163950
+
+ Reviewed by Filip Pizlo.
+
+ This patch differentiates between Wasm opcodes that are trivially mapped to a B3 opcode and
+ those that are not. Some of the Wasm opcodes that are currently a non-simple opcode will
+ become simple as we add B3 opcodes for Wasm operations. The remaining opcodes will need to
+ be added via patchpoints in a later patch.
+
+ * wasm/generate-wasmops-header.js:
+ (const.template.pragma.once.ENABLE.WEBASSEMBLY.include.cstdint.namespace.JSC.namespace.Wasm.inline.bool.isSimple):
+ * wasm/wasm.json:
+
</ins><span class="cx"> 2016-10-24 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> Arrow functions with concise bodies cannot return regular expressions
</span></span></pre></div>
<a id="trunkJSTestswasmgeneratewasmopsheaderjs"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/wasm/generate-wasmops-header.js (207823 => 207824)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/wasm/generate-wasmops-header.js 2016-10-25 16:34:32 UTC (rev 207823)
+++ trunk/JSTests/wasm/generate-wasmops-header.js 2016-10-25 17:12:20 UTC (rev 207824)
</span><span class="lines">@@ -27,15 +27,23 @@
</span><span class="cx"> yield cppMacro(op.name, op.opcode.value, op.opcode.b3op || "Oops");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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;
+
</ins><span class="cx"> const defines = [
</span><span class="cx"> "#define FOR_EACH_WASM_SPECIAL_OP(macro)",
</span><span class="cx"> ...opcodeMacroizer(op => op.category === "special" || op.category === "call"),
</span><span class="cx"> "\n\n#define FOR_EACH_WASM_CONTROL_FLOW_OP(macro)",
</span><span class="cx"> ...opcodeMacroizer(op => op.category === "control"),
</span><del>- "\n\n#define FOR_EACH_WASM_UNARY_OP(macro)",
- ...opcodeMacroizer(op => op.category === "arithmetic" && op.parameter.length === 1),
- "\n\n#define FOR_EACH_WASM_BINARY_OP(macro)",
- ...opcodeMacroizer(op => (op.category === "arithmetic" || op.category === "comparison") && op.parameter.length === 2),
</del><ins>+ "\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),
</ins><span class="cx"> "\n\n#define FOR_EACH_WASM_MEMORY_LOAD_OP(macro)",
</span><span class="cx"> ...opcodeMacroizer(op => (op.category === "memory" && op.return.length === 1)),
</span><span class="cx"> "\n\n#define FOR_EACH_WASM_MEMORY_STORE_OP(macro)",
</span><span class="lines">@@ -147,6 +155,32 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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;
+}
+
</ins><span class="cx"> } } // namespace JSC::Wasm
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(WEBASSEMBLY)
</span></span></pre></div>
<a id="trunkJSTestswasmwasmjson"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/wasm/wasm.json (207823 => 207824)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/wasm/wasm.json 2016-10-25 16:34:32 UTC (rev 207823)
+++ trunk/JSTests/wasm/wasm.json 2016-10-25 17:12:20 UTC (rev 207824)
</span><span class="lines">@@ -199,21 +199,21 @@
</span><span class="cx"> "i64.trunc_s/f64": { "category": "conversion", "value": 163, "return": ["i64"], "parameter": ["f64"], "immediate": [] },
</span><span class="cx"> "i64.trunc_u/f32": { "category": "conversion", "value": 164, "return": ["i64"], "parameter": ["f32"], "immediate": [] },
</span><span class="cx"> "i64.trunc_u/f64": { "category": "conversion", "value": 165, "return": ["i64"], "parameter": ["f64"], "immediate": [] },
</span><del>- "i64.extend_s/i32": { "category": "conversion", "value": 166, "return": ["i64"], "parameter": ["i32"], "immediate": [] },
- "i64.extend_u/i32": { "category": "conversion", "value": 167, "return": ["i64"], "parameter": ["i32"], "immediate": [] },
</del><ins>+ "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" },
</ins><span class="cx"> "f32.convert_s/i32": { "category": "conversion", "value": 168, "return": ["f32"], "parameter": ["i32"], "immediate": [] },
</span><span class="cx"> "f32.convert_u/i32": { "category": "conversion", "value": 169, "return": ["f32"], "parameter": ["i32"], "immediate": [] },
</span><span class="cx"> "f32.convert_s/i64": { "category": "conversion", "value": 170, "return": ["f32"], "parameter": ["i64"], "immediate": [] },
</span><span class="cx"> "f32.convert_u/i64": { "category": "conversion", "value": 171, "return": ["f32"], "parameter": ["i64"], "immediate": [] },
</span><del>- "f32.demote/f64": { "category": "conversion", "value": 172, "return": ["f32"], "parameter": ["f64"], "immediate": [] },
- "f32.reinterpret/i32": { "category": "conversion", "value": 173, "return": ["f32"], "parameter": ["i32"], "immediate": [] },
</del><ins>+ "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" },
</ins><span class="cx"> "f64.convert_s/i32": { "category": "conversion", "value": 174, "return": ["f64"], "parameter": ["i32"], "immediate": [] },
</span><span class="cx"> "f64.convert_u/i32": { "category": "conversion", "value": 175, "return": ["f64"], "parameter": ["i32"], "immediate": [] },
</span><span class="cx"> "f64.convert_s/i64": { "category": "conversion", "value": 176, "return": ["f64"], "parameter": ["i64"], "immediate": [] },
</span><span class="cx"> "f64.convert_u/i64": { "category": "conversion", "value": 177, "return": ["f64"], "parameter": ["i64"], "immediate": [] },
</span><del>- "f64.promote/f32": { "category": "conversion", "value": 178, "return": ["f64"], "parameter": ["f32"], "immediate": [] },
- "f64.reinterpret/i64": { "category": "conversion", "value": 179, "return": ["f64"], "parameter": ["i64"], "immediate": [] },
- "i32.reinterpret/f32": { "category": "conversion", "value": 180, "return": ["i32"], "parameter": ["f32"], "immediate": [] },
- "i64.reinterpret/f64": { "category": "conversion", "value": 181, "return": ["i64"], "parameter": ["f64"], "immediate": [] }
</del><ins>+ "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 class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (207823 => 207824)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-10-25 16:34:32 UTC (rev 207823)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-10-25 17:12:20 UTC (rev 207824)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-10-25 Keith Miller <keith_miller@apple.com>
+
+ Add trivial Wasm conversion opcodes
+ https://bugs.webkit.org/show_bug.cgi?id=163950
+
+ Reviewed by Filip Pizlo.
+
+ This patch differentiates between Wasm opcodes that are trivially mapped to a B3 opcode and
+ those that are not. Some of the Wasm opcodes that are currently a non-simple opcode will
+ become simple as we add B3 opcodes for Wasm operations. The remaining opcodes will need to
+ be added via patchpoints in a later patch.
+
+ * wasm/WasmB3IRGenerator.cpp:
+ * wasm/WasmOps.h:
+ (JSC::Wasm::isSimple):
+
</ins><span class="cx"> 2016-10-24 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> Arrow functions with concise bodies cannot return regular expressions
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmB3IRGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp (207823 => 207824)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp 2016-10-25 16:34:32 UTC (rev 207823)
+++ trunk/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp 2016-10-25 17:12:20 UTC (rev 207824)
</span><span class="lines">@@ -448,6 +448,8 @@
</span><span class="cx">
</span><span class="cx"> bool B3IRGenerator::unaryOp(UnaryOpType op, ExpressionType arg, ExpressionType& result)
</span><span class="cx"> {
</span><ins>+ if (!isSimple(op))
+ return false;
</ins><span class="cx"> result = m_currentBlock->appendNew<Value>(m_proc, toB3Op(op), Origin(), arg);
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -454,6 +456,8 @@
</span><span class="cx">
</span><span class="cx"> bool B3IRGenerator::binaryOp(BinaryOpType op, ExpressionType left, ExpressionType right, ExpressionType& result)
</span><span class="cx"> {
</span><ins>+ if (!isSimple(op))
+ return false;
</ins><span class="cx"> result = m_currentBlock->appendNew<Value>(m_proc, toB3Op(op), Origin(), left, right);
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmOpsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WasmOps.h (207823 => 207824)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmOps.h 2016-10-25 16:34:32 UTC (rev 207823)
+++ trunk/Source/JavaScriptCore/wasm/WasmOps.h 2016-10-25 17:12:20 UTC (rev 207824)
</span><span class="lines">@@ -61,38 +61,66 @@
</span><span class="cx"> macro(Nop, 0xa, Oops) \
</span><span class="cx"> macro(End, 0xf, Oops)
</span><span class="cx">
</span><ins>+#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)
+
</ins><span class="cx"> #define FOR_EACH_WASM_UNARY_OP(macro) \
</span><del>- macro(I32Clz, 0x57, Clz) \
</del><ins>+ FOR_EACH_WASM_SIMPLE_UNARY_OP(macro) \
</ins><span class="cx"> macro(I32Ctz, 0x58, Oops) \
</span><span class="cx"> macro(I32Popcnt, 0x59, Oops) \
</span><del>- macro(I64Clz, 0x72, Clz) \
</del><ins>+ macro(I32Eqz, 0x5a, Oops) \
</ins><span class="cx"> macro(I64Ctz, 0x73, Oops) \
</span><span class="cx"> macro(I64Popcnt, 0x74, Oops) \
</span><del>- macro(F32Abs, 0x7b, Abs) \
</del><ins>+ macro(I64Eqz, 0xba, Oops) \
</ins><span class="cx"> macro(F32Neg, 0x7c, Oops) \
</span><span class="cx"> macro(F32Copysign, 0x7d, Oops) \
</span><del>- macro(F32Ceil, 0x7e, Ceil) \
- macro(F32Floor, 0x7f, Floor) \
</del><span class="cx"> macro(F32Trunc, 0x80, Oops) \
</span><span class="cx"> macro(F32Nearest, 0x81, Oops) \
</span><span class="cx"> macro(F32Sqrt, 0x82, Oops) \
</span><del>- macro(F64Abs, 0x8f, Abs) \
</del><span class="cx"> macro(F64Neg, 0x90, Oops) \
</span><span class="cx"> macro(F64Copysign, 0x91, Oops) \
</span><del>- macro(F64Ceil, 0x92, Ceil) \
- macro(F64Floor, 0x93, Floor) \
</del><span class="cx"> macro(F64Trunc, 0x94, Oops) \
</span><span class="cx"> macro(F64Nearest, 0x95, Oops) \
</span><del>- macro(F64Sqrt, 0x96, Oops)
</del><ins>+ 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)
</ins><span class="cx">
</span><del>-#define FOR_EACH_WASM_BINARY_OP(macro) \
</del><ins>+#define FOR_EACH_WASM_SIMPLE_BINARY_OP(macro) \
</ins><span class="cx"> macro(I32Add, 0x40, Add) \
</span><span class="cx"> macro(I32Sub, 0x41, Sub) \
</span><span class="cx"> macro(I32Mul, 0x42, Mul) \
</span><span class="cx"> macro(I32DivS, 0x43, Div) \
</span><del>- macro(I32DivU, 0x44, Oops) \
</del><span class="cx"> macro(I32RemS, 0x45, Mod) \
</span><del>- macro(I32RemU, 0x46, Oops) \
</del><span class="cx"> macro(I32And, 0x47, BitAnd) \
</span><span class="cx"> macro(I32Or, 0x48, BitOr) \
</span><span class="cx"> macro(I32Xor, 0x49, BitXor) \
</span><span class="lines">@@ -99,8 +127,6 @@
</span><span class="cx"> macro(I32Shl, 0x4a, Shl) \
</span><span class="cx"> macro(I32ShrU, 0x4b, SShr) \
</span><span class="cx"> macro(I32ShrS, 0x4c, ZShr) \
</span><del>- macro(I32Rotr, 0xb6, Oops) \
- macro(I32Rotl, 0xb7, Oops) \
</del><span class="cx"> macro(I32Eq, 0x4d, Equal) \
</span><span class="cx"> macro(I32Ne, 0x4e, NotEqual) \
</span><span class="cx"> macro(I32LtS, 0x4f, LessThan) \
</span><span class="lines">@@ -115,9 +141,7 @@
</span><span class="cx"> macro(I64Sub, 0x5c, Sub) \
</span><span class="cx"> macro(I64Mul, 0x5d, Mul) \
</span><span class="cx"> macro(I64DivS, 0x5e, Div) \
</span><del>- macro(I64DivU, 0x5f, Oops) \
</del><span class="cx"> macro(I64RemS, 0x60, Mod) \
</span><del>- macro(I64RemU, 0x61, Oops) \
</del><span class="cx"> macro(I64And, 0x62, BitAnd) \
</span><span class="cx"> macro(I64Or, 0x63, BitOr) \
</span><span class="cx"> macro(I64Xor, 0x64, BitXor) \
</span><span class="lines">@@ -124,8 +148,6 @@
</span><span class="cx"> macro(I64Shl, 0x65, Shl) \
</span><span class="cx"> macro(I64ShrU, 0x66, SShr) \
</span><span class="cx"> macro(I64ShrS, 0x67, ZShr) \
</span><del>- macro(I64Rotr, 0xb8, Oops) \
- macro(I64Rotl, 0xb9, Oops) \
</del><span class="cx"> macro(I64Eq, 0x68, Equal) \
</span><span class="cx"> macro(I64Ne, 0x69, NotEqual) \
</span><span class="cx"> macro(I64LtS, 0x6a, LessThan) \
</span><span class="lines">@@ -140,8 +162,6 @@
</span><span class="cx"> macro(F32Sub, 0x76, Sub) \
</span><span class="cx"> macro(F32Mul, 0x77, Mul) \
</span><span class="cx"> macro(F32Div, 0x78, Div) \
</span><del>- macro(F32Min, 0x79, Oops) \
- macro(F32Max, 0x7a, Oops) \
</del><span class="cx"> macro(F32Eq, 0x83, Equal) \
</span><span class="cx"> macro(F32Ne, 0x84, NotEqual) \
</span><span class="cx"> macro(F32Lt, 0x85, LessThan) \
</span><span class="lines">@@ -152,8 +172,6 @@
</span><span class="cx"> macro(F64Sub, 0x8a, Sub) \
</span><span class="cx"> macro(F64Mul, 0x8b, Mul) \
</span><span class="cx"> macro(F64Div, 0x8c, Div) \
</span><del>- macro(F64Min, 0x8d, Oops) \
- macro(F64Max, 0x8e, Oops) \
</del><span class="cx"> macro(F64Eq, 0x97, Equal) \
</span><span class="cx"> macro(F64Ne, 0x98, NotEqual) \
</span><span class="cx"> macro(F64Lt, 0x99, LessThan) \
</span><span class="lines">@@ -161,6 +179,21 @@
</span><span class="cx"> macro(F64Gt, 0x9b, GreaterThan) \
</span><span class="cx"> macro(F64Ge, 0x9c, GreaterEqual)
</span><span class="cx">
</span><ins>+#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)
+
</ins><span class="cx"> #define FOR_EACH_WASM_MEMORY_LOAD_OP(macro) \
</span><span class="cx"> macro(I32Load8S, 0x20, Oops) \
</span><span class="cx"> macro(I32Load8U, 0x21, Oops) \
</span><span class="lines">@@ -243,6 +276,32 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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;
+}
+
</ins><span class="cx"> } } // namespace JSC::Wasm
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(WEBASSEMBLY)
</span></span></pre>
</div>
</div>
</body>
</html>