<!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>[209295] 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/209295">209295</a></dd>
<dt>Author</dt> <dd>keith_miller@apple.com</dd>
<dt>Date</dt> <dd>2016-12-02 22:40:37 -0800 (Fri, 02 Dec 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>[JSC] add additional bit to JSTokenType bitfield
https://bugs.webkit.org/show_bug.cgi?id=165091

Patch by Caitlin Potter &lt;caitp@igalia.com&gt; on 2016-12-02
Reviewed by Geoffrey Garen.

JSTests:

* stress/bug-165091.js: Added.
(shouldThrowSyntaxError):

Source/JavaScriptCore:

Avoid overflow which causes keyword tokens to be treated as unary
tokens now that &quot;async&quot; is tokenized as a keyword, by granting an
additional 64 bits to be occupied by token IDs.

* parser/ParserTokens.h:</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="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerX86Commonh">trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWasmB3IRGeneratorcpp">trunk/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkJSTestswasmfunctiontestsnearestjs">trunk/JSTests/wasm/function-tests/nearest.js</a></li>
<li><a href="#trunkJSTestswasmfunctionteststruncjs">trunk/JSTests/wasm/function-tests/trunc.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (209294 => 209295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog        2016-12-03 03:58:56 UTC (rev 209294)
+++ trunk/JSTests/ChangeLog        2016-12-03 06:40:37 UTC (rev 209295)
</span><span class="lines">@@ -29,6 +29,16 @@
</span><span class="cx">         Add Wasm floating point nearest and trunc
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=165339
</span><span class="cx"> 
</span><ins>+        Reviewed by Saam Barati.
+
+        * wasm/function-tests/nearest.js: Added.
+        * wasm/function-tests/trunc.js: Added.
+
+2016-12-02  Keith Miller  &lt;keith_miller@apple.com&gt;
+
+        Add Wasm floating point nearest and trunc
+        https://bugs.webkit.org/show_bug.cgi?id=165339
+
</ins><span class="cx">         Reviewed by Filip Pizlo.
</span><span class="cx"> 
</span><span class="cx">         * wasm/function-tests/nearest.js: Added.
</span></span></pre></div>
<a id="trunkJSTestswasmfunctiontestsnearestjs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/wasm/function-tests/nearest.js (0 => 209295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/wasm/function-tests/nearest.js                                (rev 0)
+++ trunk/JSTests/wasm/function-tests/nearest.js        2016-12-03 06:40:37 UTC (rev 209295)
</span><span class="lines">@@ -0,0 +1,55 @@
</span><ins>+import Builder from '../Builder.js'
+
+const b = new Builder();
+b.Type().End()
+    .Function().End()
+    .Code()
+    .Function({ params: [&quot;f32&quot;], ret: &quot;f32&quot; }, [])
+    .GetLocal(0)
+    .F32Nearest()
+    .End()
+
+    .Function({ params: [&quot;f64&quot;], ret: &quot;f64&quot; }, [])
+    .GetLocal(0)
+    .F64Nearest()
+    .End()
+
+const bin = b.WebAssembly()
+bin.trim();
+testWasmModuleFunctions(bin.get(), 2,
+                        [[{ type: &quot;f32&quot;, value: &quot;-0x0p+0&quot; }, [{ type: &quot;f32&quot;, value: &quot;-0x0p+0&quot; }]],
+                         [{ type: &quot;f32&quot;, value: &quot;0x0p+0&quot; }, [{ type: &quot;f32&quot;, value: &quot;0x0p+0&quot; }]],
+                         [{ type: &quot;f32&quot;, value: &quot;-0x0p+0&quot; }, [{ type: &quot;f32&quot;, value: &quot;-0x1p-149&quot; }]],
+                         [{ type: &quot;f32&quot;, value: &quot;0x0p+0&quot; }, [{ type: &quot;f32&quot;, value: &quot;0x1p-149&quot; }]],
+                         [{ type: &quot;f32&quot;, value: &quot;-0x0p+0&quot; }, [{ type: &quot;f32&quot;, value: &quot;-0x1p-126&quot; }]],
+                         [{ type: &quot;f32&quot;, value: &quot;0x0p+0&quot; }, [{ type: &quot;f32&quot;, value: &quot;0x1p-126&quot; }]],
+                         [{ type: &quot;f32&quot;, value: &quot;-0x0p+0&quot; }, [{ type: &quot;f32&quot;, value: &quot;-0x1p-1&quot; }]],
+                         [{ type: &quot;f32&quot;, value: &quot;0x0p+0&quot; }, [{ type: &quot;f32&quot;, value: &quot;0x1p-1&quot; }]],
+                         [{ type: &quot;f32&quot;, value: &quot;-0x1p+0&quot; }, [{ type: &quot;f32&quot;, value: &quot;-0x1p+0&quot; }]],
+                         [{ type: &quot;f32&quot;, value: &quot;0x1p+0&quot; }, [{ type: &quot;f32&quot;, value: &quot;0x1p+0&quot; }]],
+                         [{ type: &quot;f32&quot;, value: &quot;-0x1.8p+2&quot; }, [{ type: &quot;f32&quot;, value: &quot;-0x1.921fb6p+2&quot; }]],
+                         [{ type: &quot;f32&quot;, value: &quot;0x1.8p+2&quot; }, [{ type: &quot;f32&quot;, value: &quot;0x1.921fb6p+2&quot; }]],
+                         [{ type: &quot;f32&quot;, value: &quot;-0x1.fffffep+127&quot; }, [{ type: &quot;f32&quot;, value: &quot;-0x1.fffffep+127&quot; }]],
+                         [{ type: &quot;f32&quot;, value: &quot;0x1.fffffep+127&quot; }, [{ type: &quot;f32&quot;, value: &quot;0x1.fffffep+127&quot; }]],
+                         [{ type: &quot;f32&quot;, value: &quot;-infinity&quot; }, [{ type: &quot;f32&quot;, value: &quot;-infinity&quot; }]],
+                         [{ type: &quot;f32&quot;, value: &quot;infinity&quot; }, [{ type: &quot;f32&quot;, value: &quot;infinity&quot; }]],
+                        ],
+
+                        [[{ type: &quot;f64&quot;, value: &quot;-0x0p+0&quot; }, [{ type: &quot;f64&quot;, value: &quot;-0x0p+0&quot; }]],
+                         [{ type: &quot;f64&quot;, value: &quot;0x0p+0&quot; }, [{ type: &quot;f64&quot;, value: &quot;0x0p+0&quot; }]],
+                         [{ type: &quot;f64&quot;, value: &quot;-0x0p+0&quot; }, [{ type: &quot;f64&quot;, value: &quot;-0x0.0000000000001p-1022&quot; }]],
+                         [{ type: &quot;f64&quot;, value: &quot;0x0p+0&quot; }, [{ type: &quot;f64&quot;, value: &quot;0x0.0000000000001p-1022&quot; }]],
+                         [{ type: &quot;f64&quot;, value: &quot;-0x0p+0&quot; }, [{ type: &quot;f64&quot;, value: &quot;-0x1p-1022&quot; }]],
+                         [{ type: &quot;f64&quot;, value: &quot;0x0p+0&quot; }, [{ type: &quot;f64&quot;, value: &quot;0x1p-1022&quot; }]],
+                         [{ type: &quot;f64&quot;, value: &quot;-0x0p+0&quot; }, [{ type: &quot;f64&quot;, value: &quot;-0x1p-1&quot; }]],
+                         [{ type: &quot;f64&quot;, value: &quot;0x0p+0&quot; }, [{ type: &quot;f64&quot;, value: &quot;0x1p-1&quot; }]],
+                         [{ type: &quot;f64&quot;, value: &quot;-0x1p+0&quot; }, [{ type: &quot;f64&quot;, value: &quot;-0x1p+0&quot; }]],
+                         [{ type: &quot;f64&quot;, value: &quot;0x1p+0&quot; }, [{ type: &quot;f64&quot;, value: &quot;0x1p+0&quot; }]],
+                         [{ type: &quot;f64&quot;, value: &quot;-0x1.8p+2&quot; }, [{ type: &quot;f64&quot;, value: &quot;-0x1.921fb54442d18p+2&quot; }]],
+                         [{ type: &quot;f64&quot;, value: &quot;0x1.8p+2&quot; }, [{ type: &quot;f64&quot;, value: &quot;0x1.921fb54442d18p+2&quot; }]],
+                         [{ type: &quot;f64&quot;, value: &quot;-0x1.fffffffffffffp+1023&quot; }, [{ type: &quot;f64&quot;, value: &quot;-0x1.fffffffffffffp+1023&quot; }]],
+                         [{ type: &quot;f64&quot;, value: &quot;0x1.fffffffffffffp+1023&quot; }, [{ type: &quot;f64&quot;, value: &quot;0x1.fffffffffffffp+1023&quot; }]],
+                         [{ type: &quot;f64&quot;, value: &quot;-infinity&quot; }, [{ type: &quot;f64&quot;, value: &quot;-infinity&quot; }]],
+                         [{ type: &quot;f64&quot;, value: &quot;infinity&quot; }, [{ type: &quot;f64&quot;, value: &quot;infinity&quot; }]],
+                        ],
+                       );
</ins></span></pre></div>
<a id="trunkJSTestswasmfunctionteststruncjs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/wasm/function-tests/trunc.js (0 => 209295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/wasm/function-tests/trunc.js                                (rev 0)
+++ trunk/JSTests/wasm/function-tests/trunc.js        2016-12-03 06:40:37 UTC (rev 209295)
</span><span class="lines">@@ -0,0 +1,55 @@
</span><ins>+import Builder from '../Builder.js'
+
+const b = new Builder();
+b.Type().End()
+    .Function().End()
+    .Code()
+    .Function({ params: [&quot;f32&quot;], ret: &quot;f32&quot; }, [])
+    .GetLocal(0)
+    .F32Trunc()
+    .End()
+
+    .Function({ params: [&quot;f64&quot;], ret: &quot;f64&quot; }, [])
+    .GetLocal(0)
+    .F64Trunc()
+    .End()
+
+const bin = b.WebAssembly()
+bin.trim();
+testWasmModuleFunctions(bin.get(), 2,
+                        [[{ type: &quot;f32&quot;, value: &quot;-0x0p+0&quot; }, [{ type: &quot;f32&quot;, value: &quot;-0x0p+0&quot; }]],
+                         [{ type: &quot;f32&quot;, value: &quot;0x0p+0&quot; }, [{ type: &quot;f32&quot;, value: &quot;0x0p+0&quot; }]],
+                         [{ type: &quot;f32&quot;, value: &quot;-0x0p+0&quot; }, [{ type: &quot;f32&quot;, value: &quot;-0x1p-149&quot; }]],
+                         [{ type: &quot;f32&quot;, value: &quot;0x0p+0&quot; }, [{ type: &quot;f32&quot;, value: &quot;0x1p-149&quot; }]],
+                         [{ type: &quot;f32&quot;, value: &quot;-0x0p+0&quot; }, [{ type: &quot;f32&quot;, value: &quot;-0x1p-126&quot; }]],
+                         [{ type: &quot;f32&quot;, value: &quot;0x0p+0&quot; }, [{ type: &quot;f32&quot;, value: &quot;0x1p-126&quot; }]],
+                         [{ type: &quot;f32&quot;, value: &quot;-0x0p+0&quot; }, [{ type: &quot;f32&quot;, value: &quot;-0x1p-1&quot; }]],
+                         [{ type: &quot;f32&quot;, value: &quot;0x0p+0&quot; }, [{ type: &quot;f32&quot;, value: &quot;0x1p-1&quot; }]],
+                         [{ type: &quot;f32&quot;, value: &quot;-0x1p+0&quot; }, [{ type: &quot;f32&quot;, value: &quot;-0x1p+0&quot; }]],
+                         [{ type: &quot;f32&quot;, value: &quot;0x1p+0&quot; }, [{ type: &quot;f32&quot;, value: &quot;0x1p+0&quot; }]],
+                         [{ type: &quot;f32&quot;, value: &quot;-0x1.8p+2&quot; }, [{ type: &quot;f32&quot;, value: &quot;-0x1.921fb6p+2&quot; }]],
+                         [{ type: &quot;f32&quot;, value: &quot;0x1.8p+2&quot; }, [{ type: &quot;f32&quot;, value: &quot;0x1.921fb6p+2&quot; }]],
+                         [{ type: &quot;f32&quot;, value: &quot;-0x1.fffffep+127&quot; }, [{ type: &quot;f32&quot;, value: &quot;-0x1.fffffep+127&quot; }]],
+                         [{ type: &quot;f32&quot;, value: &quot;0x1.fffffep+127&quot; }, [{ type: &quot;f32&quot;, value: &quot;0x1.fffffep+127&quot; }]],
+                         [{ type: &quot;f32&quot;, value: &quot;-infinity&quot; }, [{ type: &quot;f32&quot;, value: &quot;-infinity&quot; }]],
+                         [{ type: &quot;f32&quot;, value: &quot;infinity&quot; }, [{ type: &quot;f32&quot;, value: &quot;infinity&quot; }]],
+                        ],
+
+                        [[{ type: &quot;f64&quot;, value: &quot;-0x0p+0&quot; }, [{ type: &quot;f64&quot;, value: &quot;-0x0p+0&quot; }]],
+                         [{ type: &quot;f64&quot;, value: &quot;0x0p+0&quot; }, [{ type: &quot;f64&quot;, value: &quot;0x0p+0&quot; }]],
+                         [{ type: &quot;f64&quot;, value: &quot;-0x0p+0&quot; }, [{ type: &quot;f64&quot;, value: &quot;-0x0.0000000000001p-1022&quot; }]],
+                         [{ type: &quot;f64&quot;, value: &quot;0x0p+0&quot; }, [{ type: &quot;f64&quot;, value: &quot;0x0.0000000000001p-1022&quot; }]],
+                         [{ type: &quot;f64&quot;, value: &quot;-0x0p+0&quot; }, [{ type: &quot;f64&quot;, value: &quot;-0x1p-1022&quot; }]],
+                         [{ type: &quot;f64&quot;, value: &quot;0x0p+0&quot; }, [{ type: &quot;f64&quot;, value: &quot;0x1p-1022&quot; }]],
+                         [{ type: &quot;f64&quot;, value: &quot;-0x0p+0&quot; }, [{ type: &quot;f64&quot;, value: &quot;-0x1p-1&quot; }]],
+                         [{ type: &quot;f64&quot;, value: &quot;0x0p+0&quot; }, [{ type: &quot;f64&quot;, value: &quot;0x1p-1&quot; }]],
+                         [{ type: &quot;f64&quot;, value: &quot;-0x1p+0&quot; }, [{ type: &quot;f64&quot;, value: &quot;-0x1p+0&quot; }]],
+                         [{ type: &quot;f64&quot;, value: &quot;0x1p+0&quot; }, [{ type: &quot;f64&quot;, value: &quot;0x1p+0&quot; }]],
+                         [{ type: &quot;f64&quot;, value: &quot;-0x1.8p+2&quot; }, [{ type: &quot;f64&quot;, value: &quot;-0x1.921fb54442d18p+2&quot; }]],
+                         [{ type: &quot;f64&quot;, value: &quot;0x1.8p+2&quot; }, [{ type: &quot;f64&quot;, value: &quot;0x1.921fb54442d18p+2&quot; }]],
+                         [{ type: &quot;f64&quot;, value: &quot;-0x1.fffffffffffffp+1023&quot; }, [{ type: &quot;f64&quot;, value: &quot;-0x1.fffffffffffffp+1023&quot; }]],
+                         [{ type: &quot;f64&quot;, value: &quot;0x1.fffffffffffffp+1023&quot; }, [{ type: &quot;f64&quot;, value: &quot;0x1.fffffffffffffp+1023&quot; }]],
+                         [{ type: &quot;f64&quot;, value: &quot;-infinity&quot; }, [{ type: &quot;f64&quot;, value: &quot;-infinity&quot; }]],
+                         [{ type: &quot;f64&quot;, value: &quot;infinity&quot; }, [{ type: &quot;f64&quot;, value: &quot;infinity&quot; }]],
+                        ],
+                       );
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (209294 => 209295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2016-12-03 03:58:56 UTC (rev 209294)
+++ trunk/Source/JavaScriptCore/ChangeLog        2016-12-03 06:40:37 UTC (rev 209295)
</span><span class="lines">@@ -50,6 +50,36 @@
</span><span class="cx"> 
</span><span class="cx"> 2016-12-02  Keith Miller  &lt;keith_miller@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Add Wasm floating point nearest and trunc
+        https://bugs.webkit.org/show_bug.cgi?id=165339
+
+        Reviewed by Saam Barati.
+
+        This patch also allows any wasm primitive type to be passed as a
+        string.
+
+        * assembler/MacroAssemblerARM64.h:
+        (JSC::MacroAssemblerARM64::nearestIntDouble):
+        (JSC::MacroAssemblerARM64::nearestIntFloat):
+        (JSC::MacroAssemblerARM64::truncDouble):
+        (JSC::MacroAssemblerARM64::truncFloat):
+        * assembler/MacroAssemblerX86Common.h:
+        (JSC::MacroAssemblerX86Common::nearestIntDouble):
+        (JSC::MacroAssemblerX86Common::nearestIntFloat):
+        * jsc.cpp:
+        (box):
+        * wasm/WasmB3IRGenerator.cpp:
+        (JSC::Wasm::B3IRGenerator::addOp&lt;F64ConvertUI64&gt;):
+        (JSC::Wasm::B3IRGenerator::addOp&lt;OpType::F32ConvertUI64&gt;):
+        (JSC::Wasm::B3IRGenerator::addOp&lt;OpType::F64Nearest&gt;):
+        (JSC::Wasm::B3IRGenerator::addOp&lt;OpType::F32Nearest&gt;):
+        (JSC::Wasm::B3IRGenerator::addOp&lt;OpType::F64Trunc&gt;):
+        (JSC::Wasm::B3IRGenerator::addOp&lt;OpType::F32Trunc&gt;):
+        * wasm/WasmFunctionParser.h:
+        (JSC::Wasm::FunctionParser&lt;Context&gt;::parseExpression):
+
+2016-12-02  Keith Miller  &lt;keith_miller@apple.com&gt;
+
</ins><span class="cx">         Unreviewed, forgot to change instruction after renaming.
</span><span class="cx"> 
</span><span class="cx">         * assembler/MacroAssemblerARM64.h:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h (209294 => 209295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h        2016-12-03 03:58:56 UTC (rev 209294)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h        2016-12-03 06:40:37 UTC (rev 209295)
</span><span class="lines">@@ -1560,6 +1560,16 @@
</span><span class="cx">         m_assembler.frintm&lt;32&gt;(dest, src);
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    void roundTowardNearestIntDouble(FPRegisterID src, FPRegisterID dest)
+    {
+        m_assembler.frintn&lt;64&gt;(dest, src);
+    }
+
+    void roundTowardNearestIntFloat(FPRegisterID src, FPRegisterID dest)
+    {
+        m_assembler.frintn&lt;32&gt;(dest, src);
+    }
+
</ins><span class="cx">     void roundTowardZeroDouble(FPRegisterID src, FPRegisterID dest)
</span><span class="cx">     {
</span><span class="cx">         m_assembler.frintz&lt;64&gt;(dest, src);
</span><span class="lines">@@ -1570,6 +1580,7 @@
</span><span class="cx">         m_assembler.frintz&lt;32&gt;(dest, src);
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+
</ins><span class="cx">     // Convert 'src' to an integer, and places the resulting 'dest'.
</span><span class="cx">     // If the result is not representable as a 32 bit value, branch.
</span><span class="cx">     // May also branch for some values that are representable in 32 bits
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerX86Commonh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h (209294 => 209295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h        2016-12-03 03:58:56 UTC (rev 209294)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h        2016-12-03 06:40:37 UTC (rev 209295)
</span><span class="lines">@@ -797,6 +797,16 @@
</span><span class="cx">         m_assembler.roundss_mr(src.offset, src.base, dst, X86Assembler::RoundingType::TowardNegativeInfiniti);
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    void roundTowardNearestIntDouble(FPRegisterID src, FPRegisterID dst)
+    {
+        m_assembler.roundsd_rr(src, dst, X86Assembler::RoundingType::ToNearestWithTiesToEven);
+    }
+
+    void roundTowardNearestIntFloat(FPRegisterID src, FPRegisterID dst)
+    {
+        m_assembler.roundss_rr(src, dst, X86Assembler::RoundingType::ToNearestWithTiesToEven);
+    }
+
</ins><span class="cx">     void roundTowardZeroDouble(FPRegisterID src, FPRegisterID dst)
</span><span class="cx">     {
</span><span class="cx">         m_assembler.roundsd_rr(src, dst, X86Assembler::RoundingType::TowardZero);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmB3IRGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp (209294 => 209295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp        2016-12-03 03:58:56 UTC (rev 209294)
+++ trunk/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp        2016-12-03 06:40:37 UTC (rev 209295)
</span><span class="lines">@@ -783,6 +783,58 @@
</span><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+template&lt;&gt;
+bool B3IRGenerator::addOp&lt;OpType::F64Nearest&gt;(ExpressionType arg, ExpressionType&amp; result)
+{
+    PatchpointValue* patchpoint = m_currentBlock-&gt;appendNew&lt;PatchpointValue&gt;(m_proc, Double, Origin());
+    patchpoint-&gt;append(arg, ValueRep::SomeRegister);
+    patchpoint-&gt;setGenerator([=] (CCallHelpers&amp; jit, const StackmapGenerationParams&amp; params) {
+        jit.roundTowardNearestIntDouble(params[1].fpr(), params[0].fpr());
+    });
+    patchpoint-&gt;effects = Effects::none();
+    result = patchpoint;
+    return true;
+}
+
+template&lt;&gt;
+bool B3IRGenerator::addOp&lt;OpType::F32Nearest&gt;(ExpressionType arg, ExpressionType&amp; result)
+{
+    PatchpointValue* patchpoint = m_currentBlock-&gt;appendNew&lt;PatchpointValue&gt;(m_proc, Float, Origin());
+    patchpoint-&gt;append(arg, ValueRep::SomeRegister);
+    patchpoint-&gt;setGenerator([=] (CCallHelpers&amp; jit, const StackmapGenerationParams&amp; params) {
+        jit.roundTowardNearestIntFloat(params[1].fpr(), params[0].fpr());
+    });
+    patchpoint-&gt;effects = Effects::none();
+    result = patchpoint;
+    return true;
+}
+
+template&lt;&gt;
+bool B3IRGenerator::addOp&lt;OpType::F64Trunc&gt;(ExpressionType arg, ExpressionType&amp; result)
+{
+    PatchpointValue* patchpoint = m_currentBlock-&gt;appendNew&lt;PatchpointValue&gt;(m_proc, Double, Origin());
+    patchpoint-&gt;append(arg, ValueRep::SomeRegister);
+    patchpoint-&gt;setGenerator([=] (CCallHelpers&amp; jit, const StackmapGenerationParams&amp; params) {
+        jit.roundTowardZeroDouble(params[1].fpr(), params[0].fpr());
+    });
+    patchpoint-&gt;effects = Effects::none();
+    result = patchpoint;
+    return true;
+}
+
+template&lt;&gt;
+bool B3IRGenerator::addOp&lt;OpType::F32Trunc&gt;(ExpressionType arg, ExpressionType&amp; result)
+{
+    PatchpointValue* patchpoint = m_currentBlock-&gt;appendNew&lt;PatchpointValue&gt;(m_proc, Float, Origin());
+    patchpoint-&gt;append(arg, ValueRep::SomeRegister);
+    patchpoint-&gt;setGenerator([=] (CCallHelpers&amp; jit, const StackmapGenerationParams&amp; params) {
+        jit.roundTowardZeroFloat(params[1].fpr(), params[0].fpr());
+    });
+    patchpoint-&gt;effects = Effects::none();
+    result = patchpoint;
+    return true;
+}
+
</ins><span class="cx"> } } // namespace JSC::Wasm
</span><span class="cx"> 
</span><span class="cx"> #include &quot;WasmB3IRGeneratorInlines.h&quot;
</span></span></pre>
</div>
</div>

</body>
</html>