<!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>[209852] 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/209852">209852</a></dd>
<dt>Author</dt> <dd>keith_miller@apple.com</dd>
<dt>Date</dt> <dd>2016-12-14 20:36:08 -0800 (Wed, 14 Dec 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Wasm should decode constants correctly
https://bugs.webkit.org/show_bug.cgi?id=165886

Reviewed by Saam Barati.

JSTests:

* wasm/Builder.js:
(const._isValidValue):
* wasm/Builder_WebAssemblyBinary.js:
(const.putOp):
* wasm/LowLevelBinary.js:
(export.default.LowLevelBinary.prototype.float):
(export.default.LowLevelBinary.prototype.double):
* wasm/function-tests/f32-const.js: Added.
* wasm/function-tests/f64-const.js: Added.
* wasm/function-tests/i32-const.js: Added.
* wasm/wasm.json:

Source/JavaScriptCore:

This patch fixes how we decode the constant part of i32, i64, f32,
and f64.const opcodes.

* wasm/WasmFunctionParser.h:
(JSC::Wasm::FunctionParser&lt;Context&gt;::parseExpression):
* wasm/wasm.json:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<li><a href="#trunkJSTestswasmBuilderjs">trunk/JSTests/wasm/Builder.js</a></li>
<li><a href="#trunkJSTestswasmBuilder_WebAssemblyBinaryjs">trunk/JSTests/wasm/Builder_WebAssemblyBinary.js</a></li>
<li><a href="#trunkJSTestswasmLowLevelBinaryjs">trunk/JSTests/wasm/LowLevelBinary.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="#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="#trunkJSTestswasmfunctiontestsf32constjs">trunk/JSTests/wasm/function-tests/f32-const.js</a></li>
<li><a href="#trunkJSTestswasmfunctiontestsf64constjs">trunk/JSTests/wasm/function-tests/f64-const.js</a></li>
<li><a href="#trunkJSTestswasmfunctiontestsi32constjs">trunk/JSTests/wasm/function-tests/i32-const.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (209851 => 209852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog        2016-12-15 03:48:49 UTC (rev 209851)
+++ trunk/JSTests/ChangeLog        2016-12-15 04:36:08 UTC (rev 209852)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-12-14  Keith Miller  &lt;keith_miller@apple.com&gt;
+
+        Wasm should decode constants correctly
+        https://bugs.webkit.org/show_bug.cgi?id=165886
+
+        Reviewed by Saam Barati.
+
+        * wasm/Builder.js:
+        (const._isValidValue):
+        * wasm/Builder_WebAssemblyBinary.js:
+        (const.putOp):
+        * wasm/LowLevelBinary.js:
+        (export.default.LowLevelBinary.prototype.float):
+        (export.default.LowLevelBinary.prototype.double):
+        * wasm/function-tests/f32-const.js: Added.
+        * wasm/function-tests/f64-const.js: Added.
+        * wasm/function-tests/i32-const.js: Added.
+        * wasm/wasm.json:
+
</ins><span class="cx"> 2016-12-14  Saam Barati  &lt;sbarati@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         WebAssembly: Add various low hanging fruit that will allow us to run the LLVM torture tests in Wasm
</span></span></pre></div>
<a id="trunkJSTestswasmBuilderjs"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/wasm/Builder.js (209851 => 209852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/wasm/Builder.js        2016-12-15 03:48:49 UTC (rev 209851)
+++ trunk/JSTests/wasm/Builder.js        2016-12-15 04:36:08 UTC (rev 209852)
</span><span class="lines">@@ -35,7 +35,8 @@
</span><span class="cx"> 
</span><span class="cx"> const _isValidValue = (value, type) =&gt; {
</span><span class="cx">     switch (type) {
</span><del>-    case &quot;i32&quot;: return ((value &amp; 0xFFFFFFFF) &gt;&gt;&gt; 0) === value;
</del><ins>+    // We allow both signed and unsigned numbers.
+    case &quot;i32&quot;: return -(2 ** 31) &lt;= value &amp;&amp; value &lt; 2 ** 32;
</ins><span class="cx">     case &quot;i64&quot;: throw new Error(`Unimplemented: value check for ${type}`); // FIXME https://bugs.webkit.org/show_bug.cgi?id=163420 64-bit values
</span><span class="cx">     case &quot;f32&quot;: return typeof(value) === &quot;number&quot; &amp;&amp; isFinite(value);
</span><span class="cx">     case &quot;f64&quot;: return typeof(value) === &quot;number&quot; &amp;&amp; isFinite(value);
</span></span></pre></div>
<a id="trunkJSTestswasmBuilder_WebAssemblyBinaryjs"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/wasm/Builder_WebAssemblyBinary.js (209851 => 209852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/wasm/Builder_WebAssemblyBinary.js        2016-12-15 03:48:49 UTC (rev 209851)
+++ trunk/JSTests/wasm/Builder_WebAssemblyBinary.js        2016-12-15 04:36:08 UTC (rev 209852)
</span><span class="lines">@@ -72,6 +72,15 @@
</span><span class="cx">             put(bin, type, op.immediates[i]);
</span><span class="cx">         }
</span><span class="cx">         break;
</span><ins>+    case &quot;i32.const&quot;: {
+        assert.eq(op.immediates.length, 1);
+        let imm = op.immediates[0];
+        // Do a static cast to make large int32s signed.
+        if (imm &gt;= 2 ** 31)
+            imm = imm - (2 ** 32);
+        put(bin, &quot;varint32&quot;, imm);
+        break;
+    }
</ins><span class="cx">     case &quot;br_table&quot;:
</span><span class="cx">         put(bin, &quot;varuint32&quot;, op.immediates.length - 1);
</span><span class="cx">         for (let imm of op.immediates)
</span></span></pre></div>
<a id="trunkJSTestswasmLowLevelBinaryjs"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/wasm/LowLevelBinary.js (209851 => 209852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/wasm/LowLevelBinary.js        2016-12-15 03:48:49 UTC (rev 209851)
+++ trunk/JSTests/wasm/LowLevelBinary.js        2016-12-15 04:36:08 UTC (rev 209852)
</span><span class="lines">@@ -122,6 +122,30 @@
</span><span class="cx">         this._push8(v &gt;&gt;&gt; 16);
</span><span class="cx">         this._push8(v &gt;&gt;&gt; 24);
</span><span class="cx">     }
</span><ins>+    float(v) {
+        if (isNaN(v))
+            throw new RangeError(&quot;unimplemented, NaNs&quot;);
+        // Unfortunately, we cannot just view the actual buffer as a Float32Array since it needs to be 4 byte aligned
+        let buffer = new ArrayBuffer(4);
+        let floatView = new Float32Array(buffer);
+        let int8View = new Uint8Array(buffer);
+        floatView[0] = v;
+        for (let byte of int8View)
+            this._push8(byte);
+    }
+
+    double(v) {
+        if (isNaN(v))
+            throw new RangeError(&quot;unimplemented, NaNs&quot;);
+        // Unfortunately, we cannot just view the actual buffer as a Float64Array since it needs to be 4 byte aligned
+        let buffer = new ArrayBuffer(8);
+        let floatView = new Float64Array(buffer);
+        let int8View = new Uint8Array(buffer);
+        floatView[0] = v;
+        for (let byte of int8View)
+            this._push8(byte);
+    }
+
</ins><span class="cx">     varuint32(v) {
</span><span class="cx">         assert.isNumber(v);
</span><span class="cx">         if (v &lt; varuint32Min || varuint32Max &lt; v)
</span></span></pre></div>
<a id="trunkJSTestswasmfunctiontestsf32constjs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/wasm/function-tests/f32-const.js (0 => 209852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/wasm/function-tests/f32-const.js                                (rev 0)
+++ trunk/JSTests/wasm/function-tests/f32-const.js        2016-12-15 04:36:08 UTC (rev 209852)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+import * as assert from '../assert.js';
+import Builder from '../Builder.js';
+
+const builder = (new Builder())
+      .Type().End()
+      .Function().End()
+      .Export()
+          .Function(&quot;answer&quot;)
+          .Function(&quot;minInt&quot;)
+      .End()
+      .Code()
+          .Function(&quot;answer&quot;, { params: [], ret: &quot;f32&quot; })
+              .F32Const(.5)
+          .End()
+
+          .Function(&quot;minInt&quot;, { params: [], ret: &quot;f32&quot; })
+             .F32Const(-1)
+          .End()
+
+      .End();
+
+const bin = builder.WebAssembly().get();
+const module = new WebAssembly.Module(bin);
+const instance = new WebAssembly.Instance(module);
+assert.eq(instance.exports.answer(), .5);
+assert.eq(instance.exports.minInt(), -1);
</ins></span></pre></div>
<a id="trunkJSTestswasmfunctiontestsf64constjs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/wasm/function-tests/f64-const.js (0 => 209852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/wasm/function-tests/f64-const.js                                (rev 0)
+++ trunk/JSTests/wasm/function-tests/f64-const.js        2016-12-15 04:36:08 UTC (rev 209852)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+import * as assert from '../assert.js';
+import Builder from '../Builder.js';
+
+const builder = (new Builder())
+      .Type().End()
+      .Function().End()
+      .Export()
+          .Function(&quot;answer&quot;)
+          .Function(&quot;minInt&quot;)
+      .End()
+      .Code()
+          .Function(&quot;answer&quot;, { params: [], ret: &quot;f64&quot; })
+              .F64Const(42.424242)
+          .End()
+
+          .Function(&quot;minInt&quot;, { params: [], ret: &quot;f64&quot; })
+             .F64Const(-1)
+          .End()
+
+      .End();
+
+const bin = builder.WebAssembly().get();
+const module = new WebAssembly.Module(bin);
+const instance = new WebAssembly.Instance(module);
+assert.eq(instance.exports.answer(), 42.424242);
+assert.eq(instance.exports.minInt(), -1);
</ins></span></pre></div>
<a id="trunkJSTestswasmfunctiontestsi32constjs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/wasm/function-tests/i32-const.js (0 => 209852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/wasm/function-tests/i32-const.js                                (rev 0)
+++ trunk/JSTests/wasm/function-tests/i32-const.js        2016-12-15 04:36:08 UTC (rev 209852)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+import * as assert from '../assert.js';
+import Builder from '../Builder.js';
+
+
+const builder = (new Builder())
+      .Type().End()
+      .Function().End()
+      .Export()
+          .Function(&quot;answer&quot;)
+          .Function(&quot;minInt&quot;)
+      .End()
+      .Code()
+          .Function(&quot;answer&quot;, { params: [], ret: &quot;i32&quot; })
+              .I32Const(42)
+          .End()
+
+          .Function(&quot;minInt&quot;, { params: [], ret: &quot;i32&quot; })
+             .I32Const(-1)
+          .End()
+
+          .Function(&quot;minInt&quot;, { params: [], ret: &quot;i32&quot; })
+             .I32Const(0xffffffff)
+          .End()
+      .End();
+
+const bin = builder.WebAssembly().get();
+const module = new WebAssembly.Module(bin);
+const instance = new WebAssembly.Instance(module);
+assert.eq(instance.exports.answer(), 42);
+assert.eq(instance.exports.minInt(), -1);
+assert.eq(instance.exports.minInt(), -1);
</ins></span></pre></div>
<a id="trunkJSTestswasmwasmjson"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/wasm/wasm.json (209851 => 209852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/wasm/wasm.json        2016-12-15 03:48:49 UTC (rev 209851)
+++ trunk/JSTests/wasm/wasm.json        2016-12-15 04:36:08 UTC (rev 209852)
</span><span class="lines">@@ -56,8 +56,8 @@
</span><span class="cx">         &quot;end&quot;:                 { &quot;category&quot;: &quot;control&quot;,    &quot;value&quot;:  11, &quot;return&quot;: [],           &quot;parameter&quot;: [],                       &quot;immediate&quot;: [],                                                                                         &quot;description&quot;: &quot;end a block, loop, or if&quot; },
</span><span class="cx">         &quot;i32.const&quot;:           { &quot;category&quot;: &quot;special&quot;,    &quot;value&quot;:  65, &quot;return&quot;: [&quot;i32&quot;],      &quot;parameter&quot;: [],                       &quot;immediate&quot;: [{&quot;name&quot;: &quot;value&quot;,          &quot;type&quot;: &quot;varint32&quot;}],                                           &quot;description&quot;: &quot;a constant value interpreted as i32&quot; },
</span><span class="cx">         &quot;i64.const&quot;:           { &quot;category&quot;: &quot;special&quot;,    &quot;value&quot;:  66, &quot;return&quot;: [&quot;i64&quot;],      &quot;parameter&quot;: [],                       &quot;immediate&quot;: [{&quot;name&quot;: &quot;value&quot;,          &quot;type&quot;: &quot;varint64&quot;}],                                           &quot;description&quot;: &quot;a constant value interpreted as i64&quot; },
</span><del>-        &quot;f64.const&quot;:           { &quot;category&quot;: &quot;special&quot;,    &quot;value&quot;:  68, &quot;return&quot;: [&quot;f64&quot;],      &quot;parameter&quot;: [],                       &quot;immediate&quot;: [{&quot;name&quot;: &quot;value&quot;,          &quot;type&quot;: &quot;uint64&quot;}],                                             &quot;description&quot;: &quot;a constant value interpreted as f64&quot; },
-        &quot;f32.const&quot;:           { &quot;category&quot;: &quot;special&quot;,    &quot;value&quot;:  67, &quot;return&quot;: [&quot;f32&quot;],      &quot;parameter&quot;: [],                       &quot;immediate&quot;: [{&quot;name&quot;: &quot;value&quot;,          &quot;type&quot;: &quot;uint32&quot;}],                                             &quot;description&quot;: &quot;a constant value interpreted as f32&quot; },
</del><ins>+        &quot;f64.const&quot;:           { &quot;category&quot;: &quot;special&quot;,    &quot;value&quot;:  68, &quot;return&quot;: [&quot;f64&quot;],      &quot;parameter&quot;: [],                       &quot;immediate&quot;: [{&quot;name&quot;: &quot;value&quot;,          &quot;type&quot;: &quot;double&quot;}],                                             &quot;description&quot;: &quot;a constant value interpreted as f64&quot; },
+        &quot;f32.const&quot;:           { &quot;category&quot;: &quot;special&quot;,    &quot;value&quot;:  67, &quot;return&quot;: [&quot;f32&quot;],      &quot;parameter&quot;: [],                       &quot;immediate&quot;: [{&quot;name&quot;: &quot;value&quot;,          &quot;type&quot;: &quot;float&quot;}],                                             &quot;description&quot;: &quot;a constant value interpreted as f32&quot; },
</ins><span class="cx">         &quot;get_local&quot;:           { &quot;category&quot;: &quot;special&quot;,    &quot;value&quot;:  32, &quot;return&quot;: [&quot;any&quot;],    &quot;parameter&quot;: [],                       &quot;immediate&quot;: [{&quot;name&quot;: &quot;local_index&quot;,    &quot;type&quot;: &quot;varuint32&quot;}],                                          &quot;description&quot;: &quot;read a local variable or parameter&quot; },
</span><span class="cx">         &quot;set_local&quot;:           { &quot;category&quot;: &quot;special&quot;,    &quot;value&quot;:  33, &quot;return&quot;: [],           &quot;parameter&quot;: [&quot;any&quot;],                &quot;immediate&quot;: [{&quot;name&quot;: &quot;local_index&quot;,    &quot;type&quot;: &quot;varuint32&quot;}],                                          &quot;description&quot;: &quot;write a local variable or parameter&quot; },
</span><span class="cx">         &quot;tee_local&quot;:           { &quot;category&quot;: &quot;special&quot;,    &quot;value&quot;:  34, &quot;return&quot;: [&quot;any&quot;],     &quot;parameter&quot;: [&quot;any&quot;],                  &quot;immediate&quot;: [{&quot;name&quot;: &quot;local_index&quot;,    &quot;type&quot;: &quot;varuint32&quot;}],                                          &quot;description&quot;: &quot;write a local variable or parameter and return the same value&quot; },
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (209851 => 209852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2016-12-15 03:48:49 UTC (rev 209851)
+++ trunk/Source/JavaScriptCore/ChangeLog        2016-12-15 04:36:08 UTC (rev 209852)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-12-14  Keith Miller  &lt;keith_miller@apple.com&gt;
+
+        Wasm should decode constants correctly
+        https://bugs.webkit.org/show_bug.cgi?id=165886
+
+        Reviewed by Saam Barati.
+
+        This patch fixes how we decode the constant part of i32, i64, f32,
+        and f64.const opcodes.
+
+        * wasm/WasmFunctionParser.h:
+        (JSC::Wasm::FunctionParser&lt;Context&gt;::parseExpression):
+        * wasm/wasm.json:
+
</ins><span class="cx"> 2016-12-14  Saam Barati  &lt;sbarati@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         WebAssembly: Add various low hanging fruit that will allow us to run the LLVM torture tests in Wasm
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmFunctionParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WasmFunctionParser.h (209851 => 209852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmFunctionParser.h        2016-12-15 03:48:49 UTC (rev 209851)
+++ trunk/Source/JavaScriptCore/wasm/WasmFunctionParser.h        2016-12-15 04:36:08 UTC (rev 209852)
</span><span class="lines">@@ -302,20 +302,34 @@
</span><span class="cx">     }
</span><span class="cx"> #undef CREATE_CASE
</span><span class="cx"> 
</span><del>-    case OpType::F32Const:
-    case OpType::I32Const: {
</del><ins>+    case OpType::F32Const: {
</ins><span class="cx">         uint32_t constant;
</span><del>-        if (!parseVarUInt32(constant))
</del><ins>+        if (!parseUInt32(constant))
</ins><span class="cx">             return false;
</span><ins>+        m_expressionStack.append(m_context.addConstant(F32, constant));
+        return true;
+    }
+
+    case OpType::I32Const: {
+        int32_t constant;
+        if (!parseVarInt32(constant))
+            return false;
</ins><span class="cx">         m_expressionStack.append(m_context.addConstant(I32, constant));
</span><span class="cx">         return true;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    case OpType::F64Const:
-    case OpType::I64Const: {
</del><ins>+    case OpType::F64Const: {
</ins><span class="cx">         uint64_t constant;
</span><del>-        if (!parseVarUInt64(constant))
</del><ins>+        if (!parseUInt64(constant))
</ins><span class="cx">             return false;
</span><ins>+        m_expressionStack.append(m_context.addConstant(F64, constant));
+        return true;
+    }
+
+    case OpType::I64Const: {
+        int64_t constant;
+        if (!parseVarInt64(constant))
+            return false;
</ins><span class="cx">         m_expressionStack.append(m_context.addConstant(I64, constant));
</span><span class="cx">         return true;
</span><span class="cx">     }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmwasmjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/wasm.json (209851 => 209852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/wasm.json        2016-12-15 03:48:49 UTC (rev 209851)
+++ trunk/Source/JavaScriptCore/wasm/wasm.json        2016-12-15 04:36:08 UTC (rev 209852)
</span><span class="lines">@@ -56,13 +56,13 @@
</span><span class="cx">         &quot;end&quot;:                 { &quot;category&quot;: &quot;control&quot;,    &quot;value&quot;:  11, &quot;return&quot;: [],           &quot;parameter&quot;: [],                       &quot;immediate&quot;: [],                                                                                         &quot;description&quot;: &quot;end a block, loop, or if&quot; },
</span><span class="cx">         &quot;i32.const&quot;:           { &quot;category&quot;: &quot;special&quot;,    &quot;value&quot;:  65, &quot;return&quot;: [&quot;i32&quot;],      &quot;parameter&quot;: [],                       &quot;immediate&quot;: [{&quot;name&quot;: &quot;value&quot;,          &quot;type&quot;: &quot;varint32&quot;}],                                           &quot;description&quot;: &quot;a constant value interpreted as i32&quot; },
</span><span class="cx">         &quot;i64.const&quot;:           { &quot;category&quot;: &quot;special&quot;,    &quot;value&quot;:  66, &quot;return&quot;: [&quot;i64&quot;],      &quot;parameter&quot;: [],                       &quot;immediate&quot;: [{&quot;name&quot;: &quot;value&quot;,          &quot;type&quot;: &quot;varint64&quot;}],                                           &quot;description&quot;: &quot;a constant value interpreted as i64&quot; },
</span><del>-        &quot;f64.const&quot;:           { &quot;category&quot;: &quot;special&quot;,    &quot;value&quot;:  68, &quot;return&quot;: [&quot;f64&quot;],      &quot;parameter&quot;: [],                       &quot;immediate&quot;: [{&quot;name&quot;: &quot;value&quot;,          &quot;type&quot;: &quot;uint64&quot;}],                                             &quot;description&quot;: &quot;a constant value interpreted as f64&quot; },
-        &quot;f32.const&quot;:           { &quot;category&quot;: &quot;special&quot;,    &quot;value&quot;:  67, &quot;return&quot;: [&quot;f32&quot;],      &quot;parameter&quot;: [],                       &quot;immediate&quot;: [{&quot;name&quot;: &quot;value&quot;,          &quot;type&quot;: &quot;uint32&quot;}],                                             &quot;description&quot;: &quot;a constant value interpreted as f32&quot; },
-        &quot;get_local&quot;:           { &quot;category&quot;: &quot;special&quot;,    &quot;value&quot;:  32, &quot;return&quot;: [&quot;local&quot;],    &quot;parameter&quot;: [],                       &quot;immediate&quot;: [{&quot;name&quot;: &quot;local_index&quot;,    &quot;type&quot;: &quot;varuint32&quot;}],                                          &quot;description&quot;: &quot;read a local variable or parameter&quot; },
-        &quot;set_local&quot;:           { &quot;category&quot;: &quot;special&quot;,    &quot;value&quot;:  33, &quot;return&quot;: [],           &quot;parameter&quot;: [&quot;local&quot;],                &quot;immediate&quot;: [{&quot;name&quot;: &quot;local_index&quot;,    &quot;type&quot;: &quot;varuint32&quot;}],                                          &quot;description&quot;: &quot;write a local variable or parameter&quot; },
-        &quot;tee_local&quot;:           { &quot;category&quot;: &quot;special&quot;,    &quot;value&quot;:  34, &quot;return&quot;: [&quot;prev&quot;],     &quot;parameter&quot;: [&quot;any&quot;],                  &quot;immediate&quot;: [{&quot;name&quot;: &quot;local_index&quot;,    &quot;type&quot;: &quot;varuint32&quot;}],                                          &quot;description&quot;: &quot;write a local variable or parameter and return the same value&quot; },
-        &quot;get_global&quot;:          { &quot;category&quot;: &quot;special&quot;,    &quot;value&quot;:  35, &quot;return&quot;: [&quot;global&quot;],   &quot;parameter&quot;: [],                       &quot;immediate&quot;: [{&quot;name&quot;: &quot;global_index&quot;,   &quot;type&quot;: &quot;varuint32&quot;}],                                          &quot;description&quot;: &quot;read a global variable&quot; },
-        &quot;set_global&quot;:          { &quot;category&quot;: &quot;special&quot;,    &quot;value&quot;:  36, &quot;return&quot;: [&quot;&quot;],         &quot;parameter&quot;: [&quot;global&quot;],               &quot;immediate&quot;: [{&quot;name&quot;: &quot;global_index&quot;,   &quot;type&quot;: &quot;varuint32&quot;}],                                          &quot;description&quot;: &quot;write a global variable&quot; },
</del><ins>+        &quot;f64.const&quot;:           { &quot;category&quot;: &quot;special&quot;,    &quot;value&quot;:  68, &quot;return&quot;: [&quot;f64&quot;],      &quot;parameter&quot;: [],                       &quot;immediate&quot;: [{&quot;name&quot;: &quot;value&quot;,          &quot;type&quot;: &quot;double&quot;}],                                             &quot;description&quot;: &quot;a constant value interpreted as f64&quot; },
+        &quot;f32.const&quot;:           { &quot;category&quot;: &quot;special&quot;,    &quot;value&quot;:  67, &quot;return&quot;: [&quot;f32&quot;],      &quot;parameter&quot;: [],                       &quot;immediate&quot;: [{&quot;name&quot;: &quot;value&quot;,          &quot;type&quot;: &quot;float&quot;}],                                             &quot;description&quot;: &quot;a constant value interpreted as f32&quot; },
+        &quot;get_local&quot;:           { &quot;category&quot;: &quot;special&quot;,    &quot;value&quot;:  32, &quot;return&quot;: [&quot;any&quot;],    &quot;parameter&quot;: [],                       &quot;immediate&quot;: [{&quot;name&quot;: &quot;local_index&quot;,    &quot;type&quot;: &quot;varuint32&quot;}],                                          &quot;description&quot;: &quot;read a local variable or parameter&quot; },
+        &quot;set_local&quot;:           { &quot;category&quot;: &quot;special&quot;,    &quot;value&quot;:  33, &quot;return&quot;: [],           &quot;parameter&quot;: [&quot;any&quot;],                &quot;immediate&quot;: [{&quot;name&quot;: &quot;local_index&quot;,    &quot;type&quot;: &quot;varuint32&quot;}],                                          &quot;description&quot;: &quot;write a local variable or parameter&quot; },
+        &quot;tee_local&quot;:           { &quot;category&quot;: &quot;special&quot;,    &quot;value&quot;:  34, &quot;return&quot;: [&quot;any&quot;],     &quot;parameter&quot;: [&quot;any&quot;],                  &quot;immediate&quot;: [{&quot;name&quot;: &quot;local_index&quot;,    &quot;type&quot;: &quot;varuint32&quot;}],                                          &quot;description&quot;: &quot;write a local variable or parameter and return the same value&quot; },
+        &quot;get_global&quot;:          { &quot;category&quot;: &quot;special&quot;,    &quot;value&quot;:  35, &quot;return&quot;: [&quot;any&quot;],   &quot;parameter&quot;: [],                       &quot;immediate&quot;: [{&quot;name&quot;: &quot;global_index&quot;,   &quot;type&quot;: &quot;varuint32&quot;}],                                          &quot;description&quot;: &quot;read a global variable&quot; },
+        &quot;set_global&quot;:          { &quot;category&quot;: &quot;special&quot;,    &quot;value&quot;:  36, &quot;return&quot;: [],         &quot;parameter&quot;: [&quot;any&quot;],               &quot;immediate&quot;: [{&quot;name&quot;: &quot;global_index&quot;,   &quot;type&quot;: &quot;varuint32&quot;}],                                          &quot;description&quot;: &quot;write a global variable&quot; },
</ins><span class="cx">         &quot;call&quot;:                { &quot;category&quot;: &quot;call&quot;,       &quot;value&quot;:  16, &quot;return&quot;: [&quot;call&quot;],     &quot;parameter&quot;: [&quot;call&quot;],                 &quot;immediate&quot;: [{&quot;name&quot;: &quot;function_index&quot;, &quot;type&quot;: &quot;varuint32&quot;}],                                          &quot;description&quot;: &quot;call a function by its index&quot; },
</span><span class="cx">         &quot;call_indirect&quot;:       { &quot;category&quot;: &quot;call&quot;,       &quot;value&quot;:  17, &quot;return&quot;: [&quot;call&quot;],     &quot;parameter&quot;: [&quot;call&quot;],                 &quot;immediate&quot;: [{&quot;name&quot;: &quot;type_index&quot;,     &quot;type&quot;: &quot;varuint32&quot;}, {&quot;name&quot;: &quot;reserved&quot;,     &quot;type&quot;: &quot;varuint1&quot;}], &quot;description&quot;: &quot;call a function indirect with an expected signature&quot; },
</span><span class="cx">         &quot;i32.load8_s&quot;:         { &quot;category&quot;: &quot;memory&quot;,     &quot;value&quot;:  44, &quot;return&quot;: [&quot;i32&quot;],      &quot;parameter&quot;: [&quot;addr&quot;],                 &quot;immediate&quot;: [{&quot;name&quot;: &quot;flags&quot;,          &quot;type&quot;: &quot;varuint32&quot;}, {&quot;name&quot;: &quot;offset&quot;, &quot;type&quot;: &quot;varuint32&quot;}], &quot;description&quot;: &quot;load from memory&quot; },
</span></span></pre>
</div>
</div>

</body>
</html>