<!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>[209204] 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/209204">209204</a></dd>
<dt>Author</dt> <dd>keith_miller@apple.com</dd>
<dt>Date</dt> <dd>2016-12-01 14:00:23 -0800 (Thu, 01 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add wasm int to floating point opcodes
https://bugs.webkit.org/show_bug.cgi?id=165252
Reviewed by Geoffrey Garen.
JSTests:
Add tests for Wasm integral to floating point conversion opcodes.
* wasm/function-tests/int-to-floating-point.js: Added.
* wasm/wasm.json:
Source/JavaScriptCore:
This patch adds support for the Wasm integral type => floating point
type conversion opcodes. Most of these were already supported by B3
however there was no support for uint64 to float/double. Unfortunately,
AFAIK x86_64 does not have a single instruction that performs this
conversion. Since there is a signed conversion instruction on x86 we
use that for all uint64s that don't have the top bit set. If they do have
the top bit set we need to divide by 2 (rounding up) then convert the number
with the signed conversion then double the result.
* assembler/MacroAssemblerX86_64.h:
(JSC::MacroAssemblerX86_64::convertUInt64ToDouble):
(JSC::MacroAssemblerX86_64::convertUInt64ToFloat):
* jsc.cpp:
(valueWithTypeOfWasmValue):
(box):
(functionTestWasmModuleFunctions):
* wasm/WasmB3IRGenerator.cpp:
(JSC::Wasm::B3IRGenerator::addOp<F64ConvertUI64>):
(JSC::Wasm::B3IRGenerator::addOp<OpType::F32ConvertUI64>):
* wasm/WasmFunctionParser.h:
(JSC::Wasm::FunctionParser<Context>::parseExpression):
* wasm/wasm.json:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</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="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerX86_64h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejsccpp">trunk/Source/JavaScriptCore/jsc.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWasmB3IRGeneratorcpp">trunk/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWasmFunctionParserh">trunk/Source/JavaScriptCore/wasm/WasmFunctionParser.h</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmwasmjson">trunk/Source/JavaScriptCore/wasm/wasm.json</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkJSTestswasmfunctiontestsinttofloatingpointjs">trunk/JSTests/wasm/function-tests/int-to-floating-point.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (209203 => 209204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog 2016-12-01 21:58:30 UTC (rev 209203)
+++ trunk/JSTests/ChangeLog 2016-12-01 22:00:23 UTC (rev 209204)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-12-01 Keith Miller <keith_miller@apple.com>
+
+ Add wasm int to floating point opcodes
+ https://bugs.webkit.org/show_bug.cgi?id=165252
+
+ Reviewed by Geoffrey Garen.
+
+ Add tests for Wasm integral to floating point conversion opcodes.
+
+ * wasm/function-tests/int-to-floating-point.js: Added.
+ * wasm/wasm.json:
+
</ins><span class="cx"> 2016-12-01 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><span class="cx"> Land a test case for <rdar://problem/27889416>
</span></span></pre></div>
<a id="trunkJSTestswasmfunctiontestsinttofloatingpointjs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/wasm/function-tests/int-to-floating-point.js (0 => 209204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/wasm/function-tests/int-to-floating-point.js (rev 0)
+++ trunk/JSTests/wasm/function-tests/int-to-floating-point.js 2016-12-01 22:00:23 UTC (rev 209204)
</span><span class="lines">@@ -0,0 +1,135 @@
</span><ins>+import Builder from '../Builder.js'
+
+const b = new Builder();
+b.setChecked(false);
+b.Type().End()
+ .Function().End()
+ .Code()
+
+ .Function({ params: ["i64"], ret: "f32" }, [])
+ .GetLocal(0)
+ .F32ConvertUI64()
+ .End()
+
+ .Function({ params: ["i64"], ret: "f32" }, [])
+ .GetLocal(0)
+ .F32ConvertSI64()
+ .End()
+
+ .Function({ params: ["i32"], ret: "f32" }, [])
+ .GetLocal(0)
+ .F32ConvertUI32()
+ .End()
+
+ .Function({ params: ["i32"], ret: "f32" }, [])
+ .GetLocal(0)
+ .F32ConvertSI32()
+ .End()
+
+ .Function({ params: ["i64"], ret: "f64" }, [])
+ .GetLocal(0)
+ .F64ConvertUI64()
+ .End()
+
+ .Function({ params: ["i64"], ret: "f64" }, [])
+ .GetLocal(0)
+ .F64ConvertSI64()
+ .End()
+
+ .Function({ params: ["i32"], ret: "f64" }, [])
+ .GetLocal(0)
+ .F64ConvertUI32()
+ .End()
+
+ .Function({ params: ["i32"], ret: "f64" }, [])
+ .GetLocal(0)
+ .F64ConvertSI32()
+ .End()
+
+const bin = b.WebAssembly()
+bin.trim();
+testWasmModuleFunctions(bin.get(), 8,
+ [[{ type: "f32", value: 1.0 }, [{ type: "i64", value: "1" }]],
+ [{ type: "f32", value: 0.0 }, [{ type: "i64", value: "0" }]],
+ [{ type: "f32", value: 9223372036854775807 }, [{type: "i64", value: "9223372036854775807" }]],
+ [{ type: "f32", value: 9223372036854775808 }, [{type: "i64", value: "-9223372036854775808" }]],
+ [{ type: "f32", value: 18446744073709551616.0 }, [{ type: "i64", value: "0xffffffffffffffff" }]],
+ // Test rounding directions.
+ [{ type: "f32", value: 16777216.0 }, [{ type: "i64", value: "16777217" }]],
+ [{ type: "f32", value: 16777220.0 }, [{ type: "i64", value: "16777219" }]]
+ ],
+
+ [[{ type: "f32", value: 1.0 }, [{ type: "i64", value: "1" }]],
+ [{ type: "f32", value: -1.0}, [{ type: "i64", value: "-1" }]],
+ [{ type: "f32", value: 0.0}, [{ type: "i64", value: "0" }]],
+ [{ type: "f32", value: 9223372036854775807}, [{ type: "i64", value: "9223372036854775807" }]],
+ [{ type: "f32", value: -9223372036854775808}, [{ type: "i64", value: "-9223372036854775808" }]],
+ [{ type: "f32", value: 314159275180032.0}, [{ type: "i64", value: "314159265358979" }]],
+ // Test rounding directions.
+ [{ type: "f32", value: 16777216.0}, [{ type: "i64", value: "16777217" }]],
+ [{ type: "f32", value: -16777216.0}, [{ type: "i64", value: "-16777217" }]],
+ [{ type: "f32", value: 16777220.0}, [{ type: "i64", value: "16777219" }]],
+ [{ type: "f32", value: -16777220.0}, [{ type: "i64", value: "-16777219" }]]
+ ],
+
+ [[{ type: "f32", value: 1.0 }, [{ type: "i32", value: 1 }]],
+ [{ type: "f32", value: 0.0 }, [{ type: "i32", value: 0 }]],
+ [{ type: "f32", value: 2147483648 }, [{ type: "i32", value: 2147483647 }]],
+ [{ type: "f32", value: 2147483648 }, [{ type: "i32", value: -2147483648 }]],
+ [{ type: "f32", value: 305419904.0 }, [{ type: "i32", value: 0x12345678 }]],
+ [{ type: "f32", value: 4294967296.0 }, [{ type: "i32", value: -1 }]],
+ // Test rounding directions.
+ [{ type: "f32", value: 16777220.0 }, [{ type: "i32", value: 16777219 }]]
+ ],
+
+ [[{ type: "f32", value: 1.0 }, [{ type: "i32", value: 1 }]],
+ [{ type: "f32", value: -1.0 }, [{ type: "i32", value: -1 }]],
+ [{ type: "f32", value: 0.0 }, [{ type: "i32", value: 0 }]],
+ [{ type: "f32", value: 2147483648 }, [{ type: "i32", value: 2147483647 }]],
+ [{ type: "f32", value: -2147483648 }, [{ type: "i32", value: -2147483648 }]],
+ [{ type: "f32", value: 1234567936.0 }, [{ type: "i32", value: 1234567890 }]],
+ // Test rounding directions.
+ [{ type: "f32", value: 16777216.0 }, [{ type: "i32", value: 16777217 }]],
+ [{ type: "f32", value: -16777216.0 }, [{ type: "i32", value: -16777217 }]],
+ [{ type: "f32", value: 16777220.0 }, [{ type: "i32", value: 16777219 }]],
+ [{ type: "f32", value: -16777220.0 }, [{ type: "i32", value: -16777219 }]]
+ ],
+
+ [[{ type: "f64", value: 1.0 }, [{ type: "i64", value: "1" }]],
+ [{ type: "f64", value: 0.0 }, [{ type: "i64", value: "0" }]],
+ [{ type: "f64", value: 9223372036854775807 }, [{ type: "i64", value: "9223372036854775807" }]],
+ [{ type: "f64", value: 9223372036854775808 }, [{ type: "i64", value: "-9223372036854775808" }]],
+ [{ type: "f64", value: 18446744073709551616.0 }, [{ type: "i64", value: "0xffffffffffffffff" }]],
+ // Test rounding directions.
+ [{ type: "f64", value: 9007199254740992 }, [{ type: "i64", value: "9007199254740993" }]],
+ [{ type: "f64", value: 9007199254740996 }, [{ type: "i64", value: "9007199254740995" }]]
+ ],
+
+ [[{ type: "f64", value: 1.0 }, [{ type: "i64", value: "1" }]],
+ [{ type: "f64", value: -1.0 }, [{ type: "i64", value: "-1" }]],
+ [{ type: "f64", value: 0.0 }, [{ type: "i64", value: "0" }]],
+ [{ type: "f64", value: 9223372036854775807 }, [{ type: "i64", value: "9223372036854775807" }]],
+ [{ type: "f64", value: -9223372036854775808 }, [{ type: "i64", value: "-9223372036854775808" }]],
+ [{ type: "f64", value: 4669201609102990 }, [{ type: "i64", value: "4669201609102990" }]],
+ // Test rounding directions.
+ [{ type: "f64", value: 9007199254740992 }, [{ type: "i64", value: "9007199254740993" }]],
+ [{ type: "f64", value: -9007199254740992 }, [{ type: "i64", value: "-9007199254740993" }]],
+ [{ type: "f64", value: 9007199254740996 }, [{ type: "i64", value: "9007199254740995" }]],
+ [{ type: "f64", value: -9007199254740996 }, [{ type: "i64", value: "-9007199254740995" }]]
+ ],
+
+ [[{ type: "f64", value: 1.0 }, [{ type: "i32", value: 1 }]],
+ [{ type: "f64", value: 0.0 }, [{ type: "i32", value: 0 }]],
+ [{ type: "f64", value: 2147483647 }, [{ type: "i32", value: 2147483647 }]],
+ [{ type: "f64", value: 2147483648 }, [{ type: "i32", value: -2147483648 }]],
+ [{ type: "f64", value: 4294967295.0 }, [{ type: "i32", value: -1 }]]
+ ],
+
+ [[{ type: "f64", value: 1.0 }, [{ type: "i32", value: 1 }]],
+ [{ type: "f64", value: -1.0 }, [{ type: "i32", value: -1 }]],
+ [{ type: "f64", value: 0.0 }, [{ type: "i32", value: 0 }]],
+ [{ type: "f64", value: 2147483647 }, [{ type: "i32", value: 2147483647 }]],
+ [{ type: "f64", value: -2147483648 }, [{ type: "i32", value: -2147483648 }]],
+ [{ type: "f64", value: 987654321 }, [{ type: "i32", value: 987654321 }]]
+ ]
+ );
</ins></span></pre></div>
<a id="trunkJSTestswasmwasmjson"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/wasm/wasm.json (209203 => 209204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/wasm/wasm.json 2016-12-01 21:58:30 UTC (rev 209203)
+++ trunk/JSTests/wasm/wasm.json 2016-12-01 22:00:23 UTC (rev 209204)
</span><span class="lines">@@ -199,15 +199,15 @@
</span><span class="cx"> "i64.trunc_u/f64": { "category": "conversion", "value": 177, "return": ["i64"], "parameter": ["f64"], "immediate": [] },
</span><span class="cx"> "i64.extend_s/i32": { "category": "conversion", "value": 172, "return": ["i64"], "parameter": ["i32"], "immediate": [], "b3op": "SExt32" },
</span><span class="cx"> "i64.extend_u/i32": { "category": "conversion", "value": 173, "return": ["i64"], "parameter": ["i32"], "immediate": [], "b3op": "ZExt32" },
</span><del>- "f32.convert_s/i32": { "category": "conversion", "value": 178, "return": ["f32"], "parameter": ["i32"], "immediate": [] },
- "f32.convert_u/i32": { "category": "conversion", "value": 179, "return": ["f32"], "parameter": ["i32"], "immediate": [] },
- "f32.convert_s/i64": { "category": "conversion", "value": 180, "return": ["f32"], "parameter": ["i64"], "immediate": [] },
</del><ins>+ "f32.convert_s/i32": { "category": "conversion", "value": 178, "return": ["f32"], "parameter": ["i32"], "immediate": [], "b3op": "IToF" },
+ "f32.convert_u/i32": { "category": "conversion", "value": 179, "return": ["f32"], "parameter": ["i32"], "immediate": [], "b3op": "IToF(ZExt32(@0))" },
+ "f32.convert_s/i64": { "category": "conversion", "value": 180, "return": ["f32"], "parameter": ["i64"], "immediate": [], "b3op": "IToF" },
</ins><span class="cx"> "f32.convert_u/i64": { "category": "conversion", "value": 181, "return": ["f32"], "parameter": ["i64"], "immediate": [] },
</span><span class="cx"> "f32.demote/f64": { "category": "conversion", "value": 182, "return": ["f32"], "parameter": ["f64"], "immediate": [], "b3op": "DoubleToFloat"},
</span><span class="cx"> "f32.reinterpret/i32": { "category": "conversion", "value": 190, "return": ["f32"], "parameter": ["i32"], "immediate": [], "b3op": "BitwiseCast" },
</span><del>- "f64.convert_s/i32": { "category": "conversion", "value": 183, "return": ["f64"], "parameter": ["i32"], "immediate": [] },
- "f64.convert_u/i32": { "category": "conversion", "value": 184, "return": ["f64"], "parameter": ["i32"], "immediate": [] },
- "f64.convert_s/i64": { "category": "conversion", "value": 185, "return": ["f64"], "parameter": ["i64"], "immediate": [] },
</del><ins>+ "f64.convert_s/i32": { "category": "conversion", "value": 183, "return": ["f64"], "parameter": ["i32"], "immediate": [], "b3op": "IToD" },
+ "f64.convert_u/i32": { "category": "conversion", "value": 184, "return": ["f64"], "parameter": ["i32"], "immediate": [], "b3op": "IToD(ZExt32(@0))" },
+ "f64.convert_s/i64": { "category": "conversion", "value": 185, "return": ["f64"], "parameter": ["i64"], "immediate": [], "b3op": "IToD" },
</ins><span class="cx"> "f64.convert_u/i64": { "category": "conversion", "value": 186, "return": ["f64"], "parameter": ["i64"], "immediate": [] },
</span><span class="cx"> "f64.promote/f32": { "category": "conversion", "value": 187, "return": ["f64"], "parameter": ["f32"], "immediate": [], "b3op": "FloatToDouble"},
</span><span class="cx"> "f64.reinterpret/i64": { "category": "conversion", "value": 191, "return": ["f64"], "parameter": ["i64"], "immediate": [], "b3op": "BitwiseCast" },
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (209203 => 209204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-12-01 21:58:30 UTC (rev 209203)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-12-01 22:00:23 UTC (rev 209204)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2016-12-01 Keith Miller <keith_miller@apple.com>
+
+ Add wasm int to floating point opcodes
+ https://bugs.webkit.org/show_bug.cgi?id=165252
+
+ Reviewed by Geoffrey Garen.
+
+ This patch adds support for the Wasm integral type => floating point
+ type conversion opcodes. Most of these were already supported by B3
+ however there was no support for uint64 to float/double. Unfortunately,
+ AFAIK x86_64 does not have a single instruction that performs this
+ conversion. Since there is a signed conversion instruction on x86 we
+ use that for all uint64s that don't have the top bit set. If they do have
+ the top bit set we need to divide by 2 (rounding up) then convert the number
+ with the signed conversion then double the result.
+
+ * assembler/MacroAssemblerX86_64.h:
+ (JSC::MacroAssemblerX86_64::convertUInt64ToDouble):
+ (JSC::MacroAssemblerX86_64::convertUInt64ToFloat):
+ * jsc.cpp:
+ (valueWithTypeOfWasmValue):
+ (box):
+ (functionTestWasmModuleFunctions):
+ * wasm/WasmB3IRGenerator.cpp:
+ (JSC::Wasm::B3IRGenerator::addOp<F64ConvertUI64>):
+ (JSC::Wasm::B3IRGenerator::addOp<OpType::F32ConvertUI64>):
+ * wasm/WasmFunctionParser.h:
+ (JSC::Wasm::FunctionParser<Context>::parseExpression):
+ * wasm/wasm.json:
+
</ins><span class="cx"> 2016-12-01 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><span class="cx"> Renamed EvalCodeCache => DirectEvalCodeCache
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h (209203 => 209204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h 2016-12-01 21:58:30 UTC (rev 209203)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h 2016-12-01 22:00:23 UTC (rev 209204)
</span><span class="lines">@@ -1682,7 +1682,17 @@
</span><span class="cx"> {
</span><span class="cx"> m_assembler.scvtf<32, 64>(dest, src);
</span><span class="cx"> }
</span><del>-
</del><ins>+
+ void convertUInt64ToDouble(RegisterID src, FPRegisterID dest)
+ {
+ m_assembler.ucvtf<64, 64>(dest, src);
+ }
+
+ void convertUInt64ToFloat(RegisterID src, FPRegisterID dest)
+ {
+ m_assembler.ucvtf<32, 64>(dest, src);
+ }
+
</ins><span class="cx"> void divDouble(FPRegisterID src, FPRegisterID dest)
</span><span class="cx"> {
</span><span class="cx"> divDouble(dest, src, dest);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerX86_64h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h (209203 => 209204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h 2016-12-01 21:58:30 UTC (rev 209203)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h 2016-12-01 22:00:23 UTC (rev 209204)
</span><span class="lines">@@ -1305,6 +1305,47 @@
</span><span class="cx"> m_assembler.cvtsi2ssq_mr(src.offset, src.base, dest);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // One of scratch or scratch2 may be the same as src
+ void convertUInt64ToDouble(RegisterID src, FPRegisterID dest, RegisterID scratch)
+ {
+ RegisterID scratch2 = scratchRegister();
+
+ m_assembler.testq_rr(src, src);
+ AssemblerLabel signBitSet = m_assembler.jCC(x86Condition(Signed));
+ m_assembler.cvtsi2sdq_rr(src, dest);
+ AssemblerLabel done = m_assembler.jmp();
+ m_assembler.linkJump(signBitSet, m_assembler.label());
+ if (scratch != src)
+ m_assembler.movq_rr(src, scratch);
+ m_assembler.movq_rr(src, scratch2);
+ m_assembler.shrq_i8r(1, scratch);
+ m_assembler.andq_ir(1, scratch2);
+ m_assembler.orq_rr(scratch, scratch2);
+ m_assembler.cvtsi2sdq_rr(scratch2, dest);
+ m_assembler.addsd_rr(dest, dest);
+ m_assembler.linkJump(done, m_assembler.label());
+ }
+
+ // One of scratch or scratch2 may be the same as src
+ void convertUInt64ToFloat(RegisterID src, FPRegisterID dest, RegisterID scratch)
+ {
+ RegisterID scratch2 = scratchRegister();
+ m_assembler.testq_rr(src, src);
+ AssemblerLabel signBitSet = m_assembler.jCC(x86Condition(Signed));
+ m_assembler.cvtsi2ssq_rr(src, dest);
+ AssemblerLabel done = m_assembler.jmp();
+ m_assembler.linkJump(signBitSet, m_assembler.label());
+ if (scratch != src)
+ m_assembler.movq_rr(src, scratch);
+ m_assembler.movq_rr(src, scratch2);
+ m_assembler.shrq_i8r(1, scratch);
+ m_assembler.andq_ir(1, scratch2);
+ m_assembler.orq_rr(scratch, scratch2);
+ m_assembler.cvtsi2ssq_rr(scratch2, dest);
+ m_assembler.addss_rr(dest, dest);
+ m_assembler.linkJump(done, m_assembler.label());
+ }
+
</ins><span class="cx"> static bool supportsFloatingPoint() { return true; }
</span><span class="cx"> static bool supportsFloatingPointTruncate() { return true; }
</span><span class="cx"> static bool supportsFloatingPointSqrt() { return true; }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejsccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jsc.cpp (209203 => 209204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jsc.cpp 2016-12-01 21:58:30 UTC (rev 209203)
+++ trunk/Source/JavaScriptCore/jsc.cpp 2016-12-01 22:00:23 UTC (rev 209204)
</span><span class="lines">@@ -75,6 +75,7 @@
</span><span class="cx"> #include <string.h>
</span><span class="cx"> #include <thread>
</span><span class="cx"> #include <type_traits>
</span><ins>+#include <wtf/CommaPrinter.h>
</ins><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="lines">@@ -2495,6 +2496,18 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEBASSEMBLY)
</span><span class="cx">
</span><ins>+static CString valueWithTypeOfWasmValue(ExecState* exec, VM& vm, JSValue value, JSValue wasmValue)
+{
+ JSString* type = jsCast<JSString*>(wasmValue.get(exec, makeIdentifier(vm, "type")));
+
+ const String& typeString = type->value(exec);
+ if (typeString == "i64" || typeString == "i32")
+ return toCString(typeString, " ", RawPointer(bitwise_cast<void*>(value)));
+ if (typeString == "f32")
+ return toCString(typeString, " hex: ", RawPointer(bitwise_cast<void*>(value)), ", float: ", bitwise_cast<float>(static_cast<uint32_t>(JSValue::encode(value))));
+ return toCString(typeString, " hex: ", RawPointer(bitwise_cast<void*>(value)), ", double: ", bitwise_cast<double>(value));
+}
+
</ins><span class="cx"> static JSValue box(ExecState* exec, VM& vm, JSValue wasmValue)
</span><span class="cx"> {
</span><span class="cx"> JSString* type = jsCast<JSString*>(wasmValue.get(exec, makeIdentifier(vm, "type")));
</span><span class="lines">@@ -2502,9 +2515,14 @@
</span><span class="cx">
</span><span class="cx"> const String& typeString = type->value(exec);
</span><span class="cx"> if (typeString == "i64") {
</span><del>- RELEASE_ASSERT(value.isString());
</del><span class="cx"> int64_t result;
</span><del>- RELEASE_ASSERT(sscanf(bitwise_cast<const char*>(jsCast<JSString*>(value)->value(exec).characters8()), "%lld", &result) != EOF);
</del><ins>+ const char* str = toCString(jsCast<JSString*>(value)->value(exec)).data();
+ int scanResult;
+ if (std::strlen(str) > 2 && str[0] == '0' && str[1] == 'x')
+ scanResult = sscanf(str, "%llx", &result);
+ else
+ scanResult = sscanf(str, "%lld", &result);
+ RELEASE_ASSERT(scanResult != EOF);
</ins><span class="cx"> return JSValue::decode(result);
</span><span class="cx"> }
</span><span class="cx"> RELEASE_ASSERT(value.isNumber());
</span><span class="lines">@@ -2582,7 +2600,13 @@
</span><span class="cx"> JSValue callResult = callWasmFunction(&vm, *plan.compiledFunction(i)->jsEntryPoint, boxedArgs);
</span><span class="cx"> JSValue expected = box(exec, vm, result);
</span><span class="cx"> if (callResult != expected) {
</span><del>- WTFReportAssertionFailure(__FILE__, __LINE__, WTF_PRETTY_FUNCTION, toCString(" (callResult == ", RawPointer(bitwise_cast<void*>(callResult)), ", expected == ", RawPointer(bitwise_cast<void*>(expected)), ")").data());
</del><ins>+ dataLog("Arguments: ");
+ CommaPrinter comma(", ");
+ for (unsigned argIndex = 0; argIndex < arguments->length(); ++argIndex)
+ dataLog(comma, valueWithTypeOfWasmValue(exec, vm, boxedArgs[argIndex], arguments->getIndexQuickly(argIndex)));
+ dataLogLn();
+
+ WTFReportAssertionFailure(__FILE__, __LINE__, WTF_PRETTY_FUNCTION, toCString(" (callResult == ", valueWithTypeOfWasmValue(exec, vm, callResult, result), ", expected == ", valueWithTypeOfWasmValue(exec, vm, expected, result), ")").data());
</ins><span class="cx"> CRASH();
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmB3IRGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp (209203 => 209204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp 2016-12-01 21:58:30 UTC (rev 209203)
+++ trunk/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp 2016-12-01 22:00:23 UTC (rev 209204)
</span><span class="lines">@@ -760,6 +760,48 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// Custom wasm ops. These are the ones too messy to do in wasm.json.
+
+template<>
+bool B3IRGenerator::addOp<F64ConvertUI64>(ExpressionType arg, ExpressionType& result)
+{
+ PatchpointValue* patchpoint = m_currentBlock->appendNew<PatchpointValue>(m_proc, Float, Origin());
+ if (isX86())
+ patchpoint->numGPScratchRegisters = 1;
+ patchpoint->append(ConstrainedValue(arg, ValueRep::WarmAny));
+ patchpoint->setGenerator([=] (CCallHelpers& jit, const StackmapGenerationParams& params) {
+ AllowMacroScratchRegisterUsage allowScratch(jit);
+#if CPU(X86_64)
+ jit.convertUInt64ToDouble(params[1].gpr(), params[0].fpr(), params.gpScratch(0));
+#else
+ jit.convertUInt64ToDouble(params[1].gpr(), params[0].fpr());
+#endif
+ });
+ patchpoint->effects = Effects::none();
+ result = patchpoint;
+ return true;
+}
+
+template<>
+bool B3IRGenerator::addOp<OpType::F32ConvertUI64>(ExpressionType arg, ExpressionType& result)
+{
+ PatchpointValue* patchpoint = m_currentBlock->appendNew<PatchpointValue>(m_proc, Float, Origin());
+ if (isX86())
+ patchpoint->numGPScratchRegisters = 1;
+ patchpoint->append(ConstrainedValue(arg, ValueRep::WarmAny));
+ patchpoint->setGenerator([=] (CCallHelpers& jit, const StackmapGenerationParams& params) {
+ AllowMacroScratchRegisterUsage allowScratch(jit);
+#if CPU(X86_64)
+ jit.convertUInt64ToFloat(params[1].gpr(), params[0].fpr(), params.gpScratch(0));
+#else
+ jit.convertUInt64ToFloat(params[1].gpr(), params[0].fpr());
+#endif
+ });
+ patchpoint->effects = Effects::none();
+ result = patchpoint;
+ return true;
+}
+
</ins><span class="cx"> } } // namespace JSC::Wasm
</span><span class="cx">
</span><span class="cx"> #include "WasmB3IRGeneratorInlines.h"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmFunctionParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WasmFunctionParser.h (209203 => 209204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmFunctionParser.h 2016-12-01 21:58:30 UTC (rev 209203)
+++ trunk/Source/JavaScriptCore/wasm/WasmFunctionParser.h 2016-12-01 22:00:23 UTC (rev 209204)
</span><span class="lines">@@ -211,6 +211,8 @@
</span><span class="cx"> FOR_EACH_WASM_SIMPLE_BINARY_OP(CREATE_CASE)
</span><span class="cx"> #undef CREATE_CASE
</span><span class="cx">
</span><ins>+ case OpType::F32ConvertUI64: return unaryCase<OpType::F32ConvertUI64>();
+ case OpType::F64ConvertUI64: return unaryCase<OpType::F64ConvertUI64>();
</ins><span class="cx"> #define CREATE_CASE(name, id, b3op, inc) case OpType::name: return unaryCase<OpType::name>();
</span><span class="cx"> FOR_EACH_WASM_SIMPLE_UNARY_OP(CREATE_CASE)
</span><span class="cx"> #undef CREATE_CASE
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmwasmjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/wasm.json (209203 => 209204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/wasm.json 2016-12-01 21:58:30 UTC (rev 209203)
+++ trunk/Source/JavaScriptCore/wasm/wasm.json 2016-12-01 22:00:23 UTC (rev 209204)
</span><span class="lines">@@ -199,15 +199,15 @@
</span><span class="cx"> "i64.trunc_u/f64": { "category": "conversion", "value": 177, "return": ["i64"], "parameter": ["f64"], "immediate": [] },
</span><span class="cx"> "i64.extend_s/i32": { "category": "conversion", "value": 172, "return": ["i64"], "parameter": ["i32"], "immediate": [], "b3op": "SExt32" },
</span><span class="cx"> "i64.extend_u/i32": { "category": "conversion", "value": 173, "return": ["i64"], "parameter": ["i32"], "immediate": [], "b3op": "ZExt32" },
</span><del>- "f32.convert_s/i32": { "category": "conversion", "value": 178, "return": ["f32"], "parameter": ["i32"], "immediate": [] },
- "f32.convert_u/i32": { "category": "conversion", "value": 179, "return": ["f32"], "parameter": ["i32"], "immediate": [] },
- "f32.convert_s/i64": { "category": "conversion", "value": 180, "return": ["f32"], "parameter": ["i64"], "immediate": [] },
</del><ins>+ "f32.convert_s/i32": { "category": "conversion", "value": 178, "return": ["f32"], "parameter": ["i32"], "immediate": [], "b3op": "IToF" },
+ "f32.convert_u/i32": { "category": "conversion", "value": 179, "return": ["f32"], "parameter": ["i32"], "immediate": [], "b3op": "IToF(ZExt32(@0))" },
+ "f32.convert_s/i64": { "category": "conversion", "value": 180, "return": ["f32"], "parameter": ["i64"], "immediate": [], "b3op": "IToF" },
</ins><span class="cx"> "f32.convert_u/i64": { "category": "conversion", "value": 181, "return": ["f32"], "parameter": ["i64"], "immediate": [] },
</span><span class="cx"> "f32.demote/f64": { "category": "conversion", "value": 182, "return": ["f32"], "parameter": ["f64"], "immediate": [], "b3op": "DoubleToFloat"},
</span><span class="cx"> "f32.reinterpret/i32": { "category": "conversion", "value": 190, "return": ["f32"], "parameter": ["i32"], "immediate": [], "b3op": "BitwiseCast" },
</span><del>- "f64.convert_s/i32": { "category": "conversion", "value": 183, "return": ["f64"], "parameter": ["i32"], "immediate": [] },
- "f64.convert_u/i32": { "category": "conversion", "value": 184, "return": ["f64"], "parameter": ["i32"], "immediate": [] },
- "f64.convert_s/i64": { "category": "conversion", "value": 185, "return": ["f64"], "parameter": ["i64"], "immediate": [] },
</del><ins>+ "f64.convert_s/i32": { "category": "conversion", "value": 183, "return": ["f64"], "parameter": ["i32"], "immediate": [], "b3op": "IToD" },
+ "f64.convert_u/i32": { "category": "conversion", "value": 184, "return": ["f64"], "parameter": ["i32"], "immediate": [], "b3op": "IToD(ZExt32(@0))" },
+ "f64.convert_s/i64": { "category": "conversion", "value": 185, "return": ["f64"], "parameter": ["i64"], "immediate": [], "b3op": "IToD" },
</ins><span class="cx"> "f64.convert_u/i64": { "category": "conversion", "value": 186, "return": ["f64"], "parameter": ["i64"], "immediate": [] },
</span><span class="cx"> "f64.promote/f32": { "category": "conversion", "value": 187, "return": ["f64"], "parameter": ["f32"], "immediate": [], "b3op": "FloatToDouble"},
</span><span class="cx"> "f64.reinterpret/i64": { "category": "conversion", "value": 191, "return": ["f64"], "parameter": ["i64"], "immediate": [], "b3op": "BitwiseCast" },
</span></span></pre>
</div>
</div>
</body>
</html>