<!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>[189624] trunk/Source/JavaScriptCore</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/189624">189624</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-11 11:40:53 -0700 (Fri, 11 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add initial support for floats in WebAsssembly
https://bugs.webkit.org/show_bug.cgi?id=149062
Patch by Sukolsak Sakshuwong <sukolsak@gmail.com> on 2015-09-11
Reviewed by Geoffrey Garen.
Implement the ConstantPoolIndex, Immediate, GetLocal, and GetGlobal
instructions for floats (float32) in WebAssembly.
* tests/stress/wasm-arithmetic-float32.js: Added.
(shouldBe):
* tests/stress/wasm-globals.js:
* tests/stress/wasm-type-conversion.js:
* tests/stress/wasm/arithmetic-float32.wasm: Added.
* tests/stress/wasm/globals.wasm:
* tests/stress/wasm/type-conversion.wasm:
* wasm/WASMConstants.h:
* wasm/WASMFunctionCompiler.h:
(JSC::WASMFunctionCompiler::buildSetLocal):
(JSC::WASMFunctionCompiler::buildReturn):
(JSC::WASMFunctionCompiler::buildImmediateF32):
(JSC::WASMFunctionCompiler::buildGetLocal):
* wasm/WASMFunctionParser.cpp:
(JSC::WASMFunctionParser::parseExpression):
(JSC::WASMFunctionParser::parseExpressionF32):
(JSC::WASMFunctionParser::parseConstantPoolIndexExpressionF32):
(JSC::WASMFunctionParser::parseImmediateExpressionF32):
(JSC::WASMFunctionParser::parseGetLocalExpressionF32):
(JSC::WASMFunctionParser::parseGetGlobalExpressionF32):
* wasm/WASMFunctionParser.h:
* wasm/WASMFunctionSyntaxChecker.h:
(JSC::WASMFunctionSyntaxChecker::buildImmediateF32):
* wasm/WASMReader.cpp:
(JSC::WASMReader::readOpExpressionF32):
* wasm/WASMReader.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstresswasmglobalswasm">trunk/Source/JavaScriptCore/tests/stress/wasm/globals.wasm</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstresswasmtypeconversionwasm">trunk/Source/JavaScriptCore/tests/stress/wasm/type-conversion.wasm</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstresswasmglobalsjs">trunk/Source/JavaScriptCore/tests/stress/wasm-globals.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstresswasmtypeconversionjs">trunk/Source/JavaScriptCore/tests/stress/wasm-type-conversion.js</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWASMConstantsh">trunk/Source/JavaScriptCore/wasm/WASMConstants.h</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWASMFunctionCompilerh">trunk/Source/JavaScriptCore/wasm/WASMFunctionCompiler.h</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWASMFunctionParsercpp">trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWASMFunctionParserh">trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.h</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWASMFunctionSyntaxCheckerh">trunk/Source/JavaScriptCore/wasm/WASMFunctionSyntaxChecker.h</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWASMReadercpp">trunk/Source/JavaScriptCore/wasm/WASMReader.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWASMReaderh">trunk/Source/JavaScriptCore/wasm/WASMReader.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstresswasmarithmeticfloat32wasm">trunk/Source/JavaScriptCore/tests/stress/wasm/arithmetic-float32.wasm</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstresswasmarithmeticfloat32js">trunk/Source/JavaScriptCore/tests/stress/wasm-arithmetic-float32.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (189623 => 189624)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-09-11 17:35:59 UTC (rev 189623)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-09-11 18:40:53 UTC (rev 189624)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2015-09-11 Sukolsak Sakshuwong <sukolsak@gmail.com>
+
+ Add initial support for floats in WebAsssembly
+ https://bugs.webkit.org/show_bug.cgi?id=149062
+
+ Reviewed by Geoffrey Garen.
+
+ Implement the ConstantPoolIndex, Immediate, GetLocal, and GetGlobal
+ instructions for floats (float32) in WebAssembly.
+
+ * tests/stress/wasm-arithmetic-float32.js: Added.
+ (shouldBe):
+ * tests/stress/wasm-globals.js:
+ * tests/stress/wasm-type-conversion.js:
+ * tests/stress/wasm/arithmetic-float32.wasm: Added.
+ * tests/stress/wasm/globals.wasm:
+ * tests/stress/wasm/type-conversion.wasm:
+ * wasm/WASMConstants.h:
+ * wasm/WASMFunctionCompiler.h:
+ (JSC::WASMFunctionCompiler::buildSetLocal):
+ (JSC::WASMFunctionCompiler::buildReturn):
+ (JSC::WASMFunctionCompiler::buildImmediateF32):
+ (JSC::WASMFunctionCompiler::buildGetLocal):
+ * wasm/WASMFunctionParser.cpp:
+ (JSC::WASMFunctionParser::parseExpression):
+ (JSC::WASMFunctionParser::parseExpressionF32):
+ (JSC::WASMFunctionParser::parseConstantPoolIndexExpressionF32):
+ (JSC::WASMFunctionParser::parseImmediateExpressionF32):
+ (JSC::WASMFunctionParser::parseGetLocalExpressionF32):
+ (JSC::WASMFunctionParser::parseGetGlobalExpressionF32):
+ * wasm/WASMFunctionParser.h:
+ * wasm/WASMFunctionSyntaxChecker.h:
+ (JSC::WASMFunctionSyntaxChecker::buildImmediateF32):
+ * wasm/WASMReader.cpp:
+ (JSC::WASMReader::readOpExpressionF32):
+ * wasm/WASMReader.h:
+
</ins><span class="cx"> 2015-09-11 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><span class="cx"> Try to fix the CLOOP build.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstresswasmarithmeticfloat32wasm"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/wasm/arithmetic-float32.wasm (0 => 189624)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/wasm/arithmetic-float32.wasm (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/wasm/arithmetic-float32.wasm 2015-09-11 18:40:53 UTC (rev 189624)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+wasm\xF7\x80?number
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstresswasmglobalswasm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/stress/wasm/globals.wasm (189623 => 189624)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/wasm/globals.wasm 2015-09-11 17:35:59 UTC (rev 189623)
+++ trunk/Source/JavaScriptCore/tests/stress/wasm/globals.wasm 2015-09-11 18:40:53 UTC (rev 189624)
</span><span class="lines">@@ -1 +1 @@
</span><del>-wasmy\x80\x80\x80\xA0\xC0\x80\xA1\xA0getXgetYsetXsetY
</del><span class="cx">\ No newline at end of file
</span><ins>+wasm\xD2\x80\x80\x80\x80\xA0\xC0\x80\xA1\xA0\x80\xA2\xA0getXgetYgetZsetXsetYsetZ
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstresswasmtypeconversionwasm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/stress/wasm/type-conversion.wasm (189623 => 189624)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/wasm/type-conversion.wasm 2015-09-11 17:35:59 UTC (rev 189623)
+++ trunk/Source/JavaScriptCore/tests/stress/wasm/type-conversion.wasm 2015-09-11 18:40:53 UTC (rev 189624)
</span><span class="lines">@@ -1 +1 @@
</span><del>-wasmA\x80\xC0\x80\xA0takeAndReturnInt32takeAndReturnDouble
</del><span class="cx">\ No newline at end of file
</span><ins>+wasm{\x80\xC0\x80\xA0\x80\xA0takeAndReturnInt32takeAndReturnFloattakeAndReturnDouble
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstresswasmarithmeticfloat32js"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/wasm-arithmetic-float32.js (0 => 189624)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/wasm-arithmetic-float32.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/wasm-arithmetic-float32.js 2015-09-11 18:40:53 UTC (rev 189624)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+//@ skip
+
+function shouldBe(actual, expected) {
+ if (actual !== expected)
+ throw new Error('bad value: ' + actual);
+}
+
+/*
+wasm/arithmetic-float32.wasm is generated by pack-asmjs <https://github.com/WebAssembly/polyfill-prototype-1> from the following script:
+
+function asmModule(global, env, buffer) {
+ "use asm";
+
+ var fround = global.Math.fround;
+
+ function number() {
+ return fround(0.5);
+ }
+
+ return {
+ number: number,
+ };
+}
+*/
+
+var module = loadWebAssembly("wasm/arithmetic-float32.wasm");
+
+shouldBe(module.number(), 0.5);
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstresswasmglobalsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/stress/wasm-globals.js (189623 => 189624)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/wasm-globals.js 2015-09-11 17:35:59 UTC (rev 189623)
+++ trunk/Source/JavaScriptCore/tests/stress/wasm-globals.js 2015-09-11 18:40:53 UTC (rev 189624)
</span><span class="lines">@@ -11,8 +11,10 @@
</span><span class="cx"> function asmModule(global, env, buffer) {
</span><span class="cx"> "use asm";
</span><span class="cx">
</span><ins>+ var fround = global.Math.fround;
</ins><span class="cx"> var x = 0;
</span><del>- var y = 0.0;
</del><ins>+ var y = fround(0);
+ var z = 0.0;
</ins><span class="cx">
</span><span class="cx"> function getX() {
</span><span class="cx"> return x;
</span><span class="lines">@@ -22,21 +24,32 @@
</span><span class="cx"> return y;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function getZ() {
+ return z;
+ }
+
</ins><span class="cx"> function setX(newX) {
</span><span class="cx"> newX = newX | 0;
</span><span class="cx"> x = newX;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function setY(newY) {
</span><del>- newY = +newY;
</del><ins>+ newY = fround(newY);
</ins><span class="cx"> y = newY;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function setZ(newZ) {
+ newZ = +newZ;
+ z = newZ;
+ }
+
</ins><span class="cx"> return {
</span><span class="cx"> getX: getX,
</span><span class="cx"> getY: getY,
</span><ins>+ getZ: getZ,
</ins><span class="cx"> setX: setX,
</span><span class="cx"> setY: setY,
</span><ins>+ setZ: setZ,
</ins><span class="cx"> };
</span><span class="cx"> }
</span><span class="cx"> */
</span><span class="lines">@@ -45,13 +58,22 @@
</span><span class="cx">
</span><span class="cx"> shouldBe(module.getX(), 0);
</span><span class="cx"> shouldBe(module.getY(), 0);
</span><ins>+shouldBe(module.getZ(), 0);
</ins><span class="cx">
</span><span class="cx"> module.setX(1);
</span><span class="cx">
</span><span class="cx"> shouldBe(module.getX(), 1);
</span><span class="cx"> shouldBe(module.getY(), 0);
</span><ins>+shouldBe(module.getZ(), 0);
</ins><span class="cx">
</span><del>-module.setY(0.5);
</del><ins>+module.setY(0.1);
</ins><span class="cx">
</span><span class="cx"> shouldBe(module.getX(), 1);
</span><del>-shouldBe(module.getY(), 0.5);
</del><ins>+shouldBe(module.getY(), 0.10000000149011612);
+shouldBe(module.getZ(), 0);
+
+module.setZ(0.1);
+
+shouldBe(module.getX(), 1);
+shouldBe(module.getY(), 0.10000000149011612);
+shouldBe(module.getZ(), 0.1);
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstresswasmtypeconversionjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/stress/wasm-type-conversion.js (189623 => 189624)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/wasm-type-conversion.js 2015-09-11 17:35:59 UTC (rev 189623)
+++ trunk/Source/JavaScriptCore/tests/stress/wasm-type-conversion.js 2015-09-11 18:40:53 UTC (rev 189624)
</span><span class="lines">@@ -11,11 +11,18 @@
</span><span class="cx"> function asmModule(global, env, buffer) {
</span><span class="cx"> "use asm";
</span><span class="cx">
</span><ins>+ var fround = global.Math.fround;
+
</ins><span class="cx"> function takeAndReturnInt32(x) {
</span><span class="cx"> x = x | 0;
</span><span class="cx"> return x;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function takeAndReturnFloat(x) {
+ x = fround(x);
+ return x;
+ }
+
</ins><span class="cx"> function takeAndReturnDouble(x) {
</span><span class="cx"> x = +x;
</span><span class="cx"> return x;
</span><span class="lines">@@ -44,6 +51,16 @@
</span><span class="cx"> shouldBe(module.takeAndReturnInt32([2.5]), 2);
</span><span class="cx"> shouldBe(module.takeAndReturnInt32(two), 2);
</span><span class="cx">
</span><ins>+shouldBe(module.takeAndReturnFloat(0.1), 0.10000000149011612);
+shouldBe(module.takeAndReturnFloat("0.1"), 0.10000000149011612);
+shouldBe(module.takeAndReturnFloat(1), 1);
+shouldBe(module.takeAndReturnFloat(true), 1);
+shouldBe(module.takeAndReturnFloat(false), 0);
+shouldBe(isNaN(module.takeAndReturnFloat("one")), true);
+shouldBe(isNaN(module.takeAndReturnFloat({ })), true);
+shouldBe(module.takeAndReturnFloat([2.5]), 2.5);
+shouldBe(module.takeAndReturnFloat(two), 2);
+
</ins><span class="cx"> shouldBe(module.takeAndReturnDouble(1.5), 1.5);
</span><span class="cx"> shouldBe(module.takeAndReturnDouble("1.5"), 1.5);
</span><span class="cx"> shouldBe(module.takeAndReturnDouble(1), 1);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMConstantsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMConstants.h (189623 => 189624)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMConstants.h 2015-09-11 17:35:59 UTC (rev 189623)
+++ trunk/Source/JavaScriptCore/wasm/WASMConstants.h 2015-09-11 18:40:53 UTC (rev 189624)
</span><span class="lines">@@ -170,6 +170,42 @@
</span><span class="cx"> NumberOfWASMOpExpressionI32WithImmediates
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+enum class WASMOpExpressionF32 : uint8_t {
+ ConstantPoolIndex,
+ Immediate,
+ GetLocal,
+ GetGlobal,
+ SetLocal,
+ SetGlobal,
+ Load,
+ LoadWithOffset,
+ Store,
+ StoreWithOffset,
+ CallInternal,
+ CallIndirect,
+ Conditional,
+ Comma,
+ FromS32,
+ FromU32,
+ FromF64,
+ Negate,
+ Add,
+ Sub,
+ Mul,
+ Div,
+ Abs,
+ Ceil,
+ Floor,
+ Sqrt,
+ NumberOfWASMOpExpressionF32s
+};
+
+enum class WASMOpExpressionF32WithImmediate : uint8_t {
+ ConstantPoolIndex,
+ GetLocal,
+ NumberOfWASMOpExpressionF32WithImmediates
+};
+
</ins><span class="cx"> enum class WASMOpExpressionF64 : uint8_t {
</span><span class="cx"> ConstantPoolIndex,
</span><span class="cx"> Immediate,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMFunctionCompilerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMFunctionCompiler.h (189623 => 189624)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMFunctionCompiler.h 2015-09-11 17:35:59 UTC (rev 189623)
+++ trunk/Source/JavaScriptCore/wasm/WASMFunctionCompiler.h 2015-09-11 18:40:53 UTC (rev 189624)
</span><span class="lines">@@ -210,6 +210,7 @@
</span><span class="cx"> {
</span><span class="cx"> switch (type) {
</span><span class="cx"> case WASMType::I32:
</span><ins>+ case WASMType::F32:
</ins><span class="cx"> load32(temporaryAddress(m_tempStackTop - 1), GPRInfo::regT0);
</span><span class="cx"> m_tempStackTop--;
</span><span class="cx"> store32(GPRInfo::regT0, localAddress(localIndex));
</span><span class="lines">@@ -255,8 +256,11 @@
</span><span class="cx"> #endif
</span><span class="cx"> m_tempStackTop--;
</span><span class="cx"> break;
</span><ins>+ case WASMExpressionType::F32:
</ins><span class="cx"> case WASMExpressionType::F64:
</span><span class="cx"> loadDouble(temporaryAddress(m_tempStackTop - 1), FPRInfo::fpRegT0);
</span><ins>+ if (returnType == WASMExpressionType::F32)
+ convertFloatToDouble(FPRInfo::fpRegT0, FPRInfo::fpRegT0);
</ins><span class="cx"> #if USE(JSVALUE64)
</span><span class="cx"> boxDouble(FPRInfo::fpRegT0, GPRInfo::returnValueGPR);
</span><span class="cx"> #else
</span><span class="lines">@@ -280,6 +284,12 @@
</span><span class="cx"> return UNUSED;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ int buildImmediateF32(float immediate)
+ {
+ store32(Imm32(bitwise_cast<int32_t>(immediate)), temporaryAddress(m_tempStackTop++));
+ return UNUSED;
+ }
+
</ins><span class="cx"> int buildImmediateF64(double immediate)
</span><span class="cx"> {
</span><span class="cx"> #if USE(JSVALUE64)
</span><span class="lines">@@ -300,6 +310,7 @@
</span><span class="cx"> {
</span><span class="cx"> switch (type) {
</span><span class="cx"> case WASMType::I32:
</span><ins>+ case WASMType::F32:
</ins><span class="cx"> load32(localAddress(localIndex), GPRInfo::regT0);
</span><span class="cx"> store32(GPRInfo::regT0, temporaryAddress(m_tempStackTop++));
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMFunctionParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.cpp (189623 => 189624)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.cpp 2015-09-11 17:35:59 UTC (rev 189623)
+++ trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.cpp 2015-09-11 18:40:53 UTC (rev 189624)
</span><span class="lines">@@ -35,11 +35,13 @@
</span><span class="cx">
</span><span class="cx"> #define PROPAGATE_ERROR() do { if (!m_errorMessage.isNull()) return 0; } while (0)
</span><span class="cx"> #define FAIL_WITH_MESSAGE(errorMessage) do { m_errorMessage = errorMessage; return 0; } while (0)
</span><ins>+#define READ_FLOAT_OR_FAIL(result, errorMessage) do { if (!m_reader.readFloat(result)) FAIL_WITH_MESSAGE(errorMessage); } while (0)
</ins><span class="cx"> #define READ_DOUBLE_OR_FAIL(result, errorMessage) do { if (!m_reader.readDouble(result)) FAIL_WITH_MESSAGE(errorMessage); } while (0)
</span><span class="cx"> #define READ_COMPACT_INT32_OR_FAIL(result, errorMessage) do { if (!m_reader.readCompactInt32(result)) FAIL_WITH_MESSAGE(errorMessage); } while (0)
</span><span class="cx"> #define READ_COMPACT_UINT32_OR_FAIL(result, errorMessage) do { if (!m_reader.readCompactUInt32(result)) FAIL_WITH_MESSAGE(errorMessage); } while (0)
</span><span class="cx"> #define READ_OP_STATEMENT_OR_FAIL(hasImmediate, op, opWithImmediate, immediate, errorMessage) do { if (!m_reader.readOpStatement(hasImmediate, op, opWithImmediate, immediate)) FAIL_WITH_MESSAGE(errorMessage); } while (0)
</span><span class="cx"> #define READ_OP_EXPRESSION_I32_OR_FAIL(hasImmediate, op, opWithImmediate, immediate, errorMessage) do { if (!m_reader.readOpExpressionI32(hasImmediate, op, opWithImmediate, immediate)) FAIL_WITH_MESSAGE(errorMessage); } while (0)
</span><ins>+#define READ_OP_EXPRESSION_F32_OR_FAIL(hasImmediate, op, opWithImmediate, immediate, errorMessage) do { if (!m_reader.readOpExpressionF32(hasImmediate, op, opWithImmediate, immediate)) FAIL_WITH_MESSAGE(errorMessage); } while (0)
</ins><span class="cx"> #define READ_OP_EXPRESSION_F64_OR_FAIL(hasImmediate, op, opWithImmediate, immediate, errorMessage) do { if (!m_reader.readOpExpressionF64(hasImmediate, op, opWithImmediate, immediate)) FAIL_WITH_MESSAGE(errorMessage); } while (0)
</span><span class="cx"> #define READ_VARIABLE_TYPES_OR_FAIL(hasImmediate, variableTypes, variableTypesWithImmediate, immediate, errorMessage) do { if (!m_reader.readVariableTypes(hasImmediate, variableTypes, variableTypesWithImmediate, immediate)) FAIL_WITH_MESSAGE(errorMessage); } while (0)
</span><span class="cx"> #define READ_SWITCH_CASE_OR_FAIL(result, errorMessage) do { if (!m_reader.readSwitchCase(result)) FAIL_WITH_MESSAGE(errorMessage); } while (0)
</span><span class="lines">@@ -495,9 +497,10 @@
</span><span class="cx"> switch (expressionType) {
</span><span class="cx"> case WASMExpressionType::I32:
</span><span class="cx"> return parseExpressionI32(context);
</span><ins>+ case WASMExpressionType::F32:
+ return parseExpressionF32(context);
</ins><span class="cx"> case WASMExpressionType::F64:
</span><span class="cx"> return parseExpressionF64(context);
</span><del>- case WASMExpressionType::F32:
</del><span class="cx"> case WASMExpressionType::Void:
</span><span class="cx"> // FIXME: Implement these instructions.
</span><span class="cx"> FAIL_WITH_MESSAGE("Unsupported instruction.");
</span><span class="lines">@@ -719,6 +722,113 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <class Context>
</span><ins>+ContextExpression WASMFunctionParser::parseExpressionF32(Context& context)
+{
+ bool hasImmediate;
+ WASMOpExpressionF32 op;
+ WASMOpExpressionF32WithImmediate opWithImmediate;
+ uint8_t immediate;
+ READ_OP_EXPRESSION_F32_OR_FAIL(hasImmediate, op, opWithImmediate, immediate, "Cannot read the float32 expression opcode.");
+ if (!hasImmediate) {
+ switch (op) {
+ case WASMOpExpressionF32::ConstantPoolIndex:
+ return parseConstantPoolIndexExpressionF32(context);
+ case WASMOpExpressionF32::Immediate:
+ return parseImmediateExpressionF32(context);
+ case WASMOpExpressionF32::GetLocal:
+ return parseGetLocalExpressionF32(context);
+ case WASMOpExpressionF32::GetGlobal:
+ return parseGetGlobalExpressionF32(context);
+ case WASMOpExpressionF32::SetLocal:
+ case WASMOpExpressionF32::SetGlobal:
+ case WASMOpExpressionF32::Load:
+ case WASMOpExpressionF32::LoadWithOffset:
+ case WASMOpExpressionF32::Store:
+ case WASMOpExpressionF32::StoreWithOffset:
+ case WASMOpExpressionF32::CallInternal:
+ case WASMOpExpressionF32::CallIndirect:
+ case WASMOpExpressionF32::Conditional:
+ case WASMOpExpressionF32::Comma:
+ case WASMOpExpressionF32::FromS32:
+ case WASMOpExpressionF32::FromU32:
+ case WASMOpExpressionF32::FromF64:
+ case WASMOpExpressionF32::Negate:
+ case WASMOpExpressionF32::Add:
+ case WASMOpExpressionF32::Sub:
+ case WASMOpExpressionF32::Mul:
+ case WASMOpExpressionF32::Div:
+ case WASMOpExpressionF32::Abs:
+ case WASMOpExpressionF32::Ceil:
+ case WASMOpExpressionF32::Floor:
+ case WASMOpExpressionF32::Sqrt:
+ // FIXME: Implement these instructions.
+ FAIL_WITH_MESSAGE("Unsupported instruction.");
+ default:
+ ASSERT_NOT_REACHED();
+ }
+ } else {
+ switch (opWithImmediate) {
+ case WASMOpExpressionF32WithImmediate::ConstantPoolIndex:
+ return parseConstantPoolIndexExpressionF32(context, immediate);
+ case WASMOpExpressionF32WithImmediate::GetLocal:
+ return parseGetLocalExpressionF32(context, immediate);
+ default:
+ ASSERT_NOT_REACHED();
+ }
+ }
+ return 0;
+}
+
+template <class Context>
+ContextExpression WASMFunctionParser::parseConstantPoolIndexExpressionF32(Context& context, uint32_t constantIndex)
+{
+ FAIL_IF_FALSE(constantIndex < m_module->f32Constants().size(), "The constant pool index is incorrect.");
+ return context.buildImmediateF32(m_module->f32Constants()[constantIndex]);
+}
+
+template <class Context>
+ContextExpression WASMFunctionParser::parseConstantPoolIndexExpressionF32(Context& context)
+{
+ uint32_t constantIndex;
+ READ_COMPACT_UINT32_OR_FAIL(constantIndex, "Cannot read the constant pool index.");
+ return parseConstantPoolIndexExpressionF32(context, constantIndex);
+}
+
+template <class Context>
+ContextExpression WASMFunctionParser::parseImmediateExpressionF32(Context& context)
+{
+ float immediate;
+ READ_FLOAT_OR_FAIL(immediate, "Cannot read the immediate.");
+ return context.buildImmediateF32(immediate);
+}
+
+template <class Context>
+ContextExpression WASMFunctionParser::parseGetLocalExpressionF32(Context& context, uint32_t localIndex)
+{
+ FAIL_IF_FALSE(localIndex < m_localTypes.size(), "The local index is incorrect.");
+ FAIL_IF_FALSE(m_localTypes[localIndex] == WASMType::F32, "Expected a local of type float32.");
+ return context.buildGetLocal(localIndex, WASMType::F32);
+}
+
+template <class Context>
+ContextExpression WASMFunctionParser::parseGetLocalExpressionF32(Context& context)
+{
+ uint32_t localIndex;
+ READ_COMPACT_UINT32_OR_FAIL(localIndex, "Cannot read the local index.");
+ return parseGetLocalExpressionF32(context, localIndex);
+}
+
+template <class Context>
+ContextExpression WASMFunctionParser::parseGetGlobalExpressionF32(Context& context)
+{
+ uint32_t globalIndex;
+ READ_COMPACT_UINT32_OR_FAIL(globalIndex, "Cannot read the global index.");
+ FAIL_IF_FALSE(globalIndex < m_module->globalVariableTypes().size(), "The global index is incorrect.");
+ FAIL_IF_FALSE(m_module->globalVariableTypes()[globalIndex] == WASMType::F32, "Expected a global variable of type float32.");
+ return context.buildGetGlobal(globalIndex, WASMType::F32);
+}
+
+template <class Context>
</ins><span class="cx"> ContextExpression WASMFunctionParser::parseExpressionF64(Context& context)
</span><span class="cx"> {
</span><span class="cx"> bool hasImmediate;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMFunctionParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.h (189623 => 189624)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.h 2015-09-11 17:35:59 UTC (rev 189623)
+++ trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.h 2015-09-11 18:40:53 UTC (rev 189624)
</span><span class="lines">@@ -95,6 +95,14 @@
</span><span class="cx"> template <class Context> ContextExpression parseRelationalI32ExpressionI32(Context&, WASMOpExpressionI32);
</span><span class="cx"> template <class Context> ContextExpression parseRelationalF64ExpressionI32(Context&, WASMOpExpressionI32);
</span><span class="cx">
</span><ins>+ template <class Context> ContextExpression parseExpressionF32(Context&);
+ template <class Context> ContextExpression parseConstantPoolIndexExpressionF32(Context&, uint32_t constantIndex);
+ template <class Context> ContextExpression parseConstantPoolIndexExpressionF32(Context&);
+ template <class Context> ContextExpression parseImmediateExpressionF32(Context&);
+ template <class Context> ContextExpression parseGetLocalExpressionF32(Context&, uint32_t localIndex);
+ template <class Context> ContextExpression parseGetLocalExpressionF32(Context&);
+ template <class Context> ContextExpression parseGetGlobalExpressionF32(Context&);
+
</ins><span class="cx"> template <class Context> ContextExpression parseExpressionF64(Context&);
</span><span class="cx"> template <class Context> ContextExpression parseConstantPoolIndexExpressionF64(Context&, uint32_t constantIndex);
</span><span class="cx"> template <class Context> ContextExpression parseConstantPoolIndexExpressionF64(Context&);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMFunctionSyntaxCheckerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMFunctionSyntaxChecker.h (189623 => 189624)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMFunctionSyntaxChecker.h 2015-09-11 17:35:59 UTC (rev 189623)
+++ trunk/Source/JavaScriptCore/wasm/WASMFunctionSyntaxChecker.h 2015-09-11 18:40:53 UTC (rev 189624)
</span><span class="lines">@@ -73,6 +73,13 @@
</span><span class="cx"> return UNUSED;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ int buildImmediateF32(uint32_t)
+ {
+ m_tempStackTop++;
+ updateTempStackHeight();
+ return UNUSED;
+ }
+
</ins><span class="cx"> int buildImmediateF64(uint32_t)
</span><span class="cx"> {
</span><span class="cx"> m_tempStackTop++;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMReadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMReader.cpp (189623 => 189624)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMReader.cpp 2015-09-11 17:35:59 UTC (rev 189623)
+++ trunk/Source/JavaScriptCore/wasm/WASMReader.cpp 2015-09-11 18:40:53 UTC (rev 189624)
</span><span class="lines">@@ -189,6 +189,13 @@
</span><span class="cx"> static_cast<uint8_t>(WASMOpExpressionI32WithImmediate::NumberOfWASMOpExpressionI32WithImmediates));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool WASMReader::readOpExpressionF32(bool& hasImmediate, WASMOpExpressionF32& op, WASMOpExpressionF32WithImmediate& opWithImmediate, uint8_t& immediate)
+{
+ return readOp(hasImmediate, op, opWithImmediate, immediate,
+ static_cast<uint8_t>(WASMOpExpressionF32::NumberOfWASMOpExpressionF32s),
+ static_cast<uint8_t>(WASMOpExpressionF32WithImmediate::NumberOfWASMOpExpressionF32WithImmediates));
+}
+
</ins><span class="cx"> bool WASMReader::readOpExpressionF64(bool& hasImmediate, WASMOpExpressionF64& op, WASMOpExpressionF64WithImmediate& opWithImmediate, uint8_t& immediate)
</span><span class="cx"> {
</span><span class="cx"> return readOp(hasImmediate, op, opWithImmediate, immediate,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMReaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMReader.h (189623 => 189624)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMReader.h 2015-09-11 17:35:59 UTC (rev 189623)
+++ trunk/Source/JavaScriptCore/wasm/WASMReader.h 2015-09-11 18:40:53 UTC (rev 189624)
</span><span class="lines">@@ -56,6 +56,7 @@
</span><span class="cx"> bool readExportFormat(WASMExportFormat& result);
</span><span class="cx"> bool readOpStatement(bool& hasImmediate, WASMOpStatement&, WASMOpStatementWithImmediate&, uint8_t& immediate);
</span><span class="cx"> bool readOpExpressionI32(bool& hasImmediate, WASMOpExpressionI32&, WASMOpExpressionI32WithImmediate&, uint8_t& immediate);
</span><ins>+ bool readOpExpressionF32(bool& hasImmediate, WASMOpExpressionF32&, WASMOpExpressionF32WithImmediate&, uint8_t& immediate);
</ins><span class="cx"> bool readOpExpressionF64(bool& hasImmediate, WASMOpExpressionF64&, WASMOpExpressionF64WithImmediate&, uint8_t& immediate);
</span><span class="cx"> bool readVariableTypes(bool& hasImmediate, WASMVariableTypes&, WASMVariableTypesWithImmediate&, uint8_t& immediate);
</span><span class="cx"> bool readSwitchCase(WASMSwitchCase& result);
</span></span></pre>
</div>
</div>
</body>
</html>