<!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>[190002] 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/190002">190002</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-18 17:31:04 -0700 (Fri, 18 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Implement the arithmetic instructions for doubles in WebAssembly
https://bugs.webkit.org/show_bug.cgi?id=148945
Patch by Sukolsak Sakshuwong <sukolsak@gmail.com> on 2015-09-18
Reviewed by Geoffrey Garen.
This patch implements the arithmetic instructions for doubles (float64)
in WebAssembly.
* tests/stress/wasm-arithmetic-float64.js:
* tests/stress/wasm/arithmetic-float64.wasm:
* wasm/WASMFunctionCompiler.h:
(JSC::WASMFunctionCompiler::buildUnaryF64):
(JSC::WASMFunctionCompiler::buildBinaryF64):
(JSC::WASMFunctionCompiler::callOperation):
* wasm/WASMFunctionParser.cpp:
(JSC::WASMFunctionParser::parseExpressionF64):
(JSC::WASMFunctionParser::parseUnaryExpressionF64):
(JSC::WASMFunctionParser::parseBinaryExpressionF64):
* wasm/WASMFunctionParser.h:
* wasm/WASMFunctionSyntaxChecker.h:
(JSC::WASMFunctionSyntaxChecker::buildUnaryF64):
(JSC::WASMFunctionSyntaxChecker::buildBinaryF32):
(JSC::WASMFunctionSyntaxChecker::buildBinaryF64):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstresswasmarithmeticfloat64wasm">trunk/Source/JavaScriptCore/tests/stress/wasm/arithmetic-float64.wasm</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstresswasmarithmeticfloat64js">trunk/Source/JavaScriptCore/tests/stress/wasm-arithmetic-float64.js</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (190001 => 190002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-09-18 23:57:44 UTC (rev 190001)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-09-19 00:31:04 UTC (rev 190002)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-09-18 Sukolsak Sakshuwong <sukolsak@gmail.com>
+
+ Implement the arithmetic instructions for doubles in WebAssembly
+ https://bugs.webkit.org/show_bug.cgi?id=148945
+
+ Reviewed by Geoffrey Garen.
+
+ This patch implements the arithmetic instructions for doubles (float64)
+ in WebAssembly.
+
+ * tests/stress/wasm-arithmetic-float64.js:
+ * tests/stress/wasm/arithmetic-float64.wasm:
+ * wasm/WASMFunctionCompiler.h:
+ (JSC::WASMFunctionCompiler::buildUnaryF64):
+ (JSC::WASMFunctionCompiler::buildBinaryF64):
+ (JSC::WASMFunctionCompiler::callOperation):
+ * wasm/WASMFunctionParser.cpp:
+ (JSC::WASMFunctionParser::parseExpressionF64):
+ (JSC::WASMFunctionParser::parseUnaryExpressionF64):
+ (JSC::WASMFunctionParser::parseBinaryExpressionF64):
+ * wasm/WASMFunctionParser.h:
+ * wasm/WASMFunctionSyntaxChecker.h:
+ (JSC::WASMFunctionSyntaxChecker::buildUnaryF64):
+ (JSC::WASMFunctionSyntaxChecker::buildBinaryF32):
+ (JSC::WASMFunctionSyntaxChecker::buildBinaryF64):
+
</ins><span class="cx"> 2015-09-18 Basile Clement <basile_clement@apple.com>
</span><span class="cx">
</span><span class="cx"> [ES6] Tail call fast path should efficiently reuse the frame's stack space
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstresswasmarithmeticfloat64wasm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/stress/wasm/arithmetic-float64.wasm (190001 => 190002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/wasm/arithmetic-float64.wasm 2015-09-18 23:57:44 UTC (rev 190001)
+++ trunk/Source/JavaScriptCore/tests/stress/wasm/arithmetic-float64.wasm 2015-09-19 00:31:04 UTC (rev 190002)
</span><span class="lines">@@ -1 +1,3 @@
</span><del>-wasm\xF4\x80\xCD\xCC\xCC\xCC\xCC\xCC@number
</del><span class="cx">\ No newline at end of file
</span><ins>+wasm\xFF\x80\xCD\xCC\xCC\xCC\xCC\xCC@\x80\xA0\x80\xA0\xA1\x80\xA0\xA1\x80\xA0\xA1\x80\xA0\xA1\x80\xA0\xA1\x80\xA0\x80\xA0\x80 \xA0\x80 \xA0\x80 \xA0\x80 \xA0\x80 \xA0\x80!\xA0\x80"\xA0\x80#\xA0\x80$\xA0\xA1\x80%\xA0\x80&\xA0\x80'\xA0\xA1numbernegateaddsubtractmultiplydividemoduloabsoluteceilNumberfloorNumber squareRoot
+cosine sine tangent+arccosinearcsinearctangentarctangent2exponentiallogarithmpower
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstresswasmarithmeticfloat64js"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/stress/wasm-arithmetic-float64.js (190001 => 190002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/wasm-arithmetic-float64.js 2015-09-18 23:57:44 UTC (rev 190001)
+++ trunk/Source/JavaScriptCore/tests/stress/wasm-arithmetic-float64.js 2015-09-19 00:31:04 UTC (rev 190002)
</span><span class="lines">@@ -11,12 +11,154 @@
</span><span class="cx"> function asmModule(global, env, buffer) {
</span><span class="cx"> "use asm";
</span><span class="cx">
</span><ins>+ var abs = global.Math.abs;
+ var ceil = global.Math.ceil;
+ var floor = global.Math.floor;
+ var sqrt = global.Math.sqrt;
+ var cos = global.Math.cos;
+ var sin = global.Math.sin;
+ var tan = global.Math.tan;
+ var acos = global.Math.acos;
+ var asin = global.Math.asin;
+ var atan = global.Math.atan;
+ var atan2 = global.Math.atan2;
+ var exp = global.Math.exp;
+ var log = global.Math.log;
+ var pow = global.Math.pow;
+
</ins><span class="cx"> function number() {
</span><span class="cx"> return 4.2;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function negate(x) {
+ x = +x;
+ return -x;
+ }
+
+ function add(x, y) {
+ x = +x;
+ y = +y;
+ return x + y;
+ }
+
+ function subtract(x, y) {
+ x = +x;
+ y = +y;
+ return x - y;
+ }
+
+ function multiply(x, y) {
+ x = +x;
+ y = +y;
+ return x * y;
+ }
+
+ function divide(x, y) {
+ x = +x;
+ y = +y;
+ return x / y;
+ }
+
+ function modulo(x, y) {
+ x = +x;
+ y = +y;
+ return x % y;
+ }
+
+ function absolute(x) {
+ x = +x;
+ return abs(x);
+ }
+
+ function ceilNumber(x) {
+ x = +x;
+ return ceil(x);
+ }
+
+ function floorNumber(x) {
+ x = +x;
+ return floor(x);
+ }
+
+ function squareRoot(x) {
+ x = +x;
+ return sqrt(x);
+ }
+
+ function cosine(x) {
+ x = +x;
+ return cos(x);
+ }
+
+ function sine(x) {
+ x = +x;
+ return sin(x);
+ }
+
+ function tangent(x) {
+ x = +x;
+ return tan(x);
+ }
+
+ function arccosine(x) {
+ x = +x;
+ return acos(x);
+ }
+
+ function arcsine(x) {
+ x = +x;
+ return asin(x);
+ }
+
+ function arctangent(x) {
+ x = +x;
+ return atan(x);
+ }
+
+ function arctangent2(x, y) {
+ x = +x;
+ y = +y;
+ return atan2(x, y);
+ }
+
+ function exponential(x) {
+ x = +x;
+ return exp(x);
+ }
+
+ function logarithm(x) {
+ x = +x;
+ return log(x);
+ }
+
+ function power(x, y) {
+ x = +x;
+ y = +y;
+ return pow(x, y);
+ }
+
</ins><span class="cx"> return {
</span><span class="cx"> number: number,
</span><ins>+ negate: negate,
+ add: add,
+ subtract: subtract,
+ multiply: multiply,
+ divide: divide,
+ modulo: modulo,
+ absolute: absolute,
+ ceilNumber: ceilNumber,
+ floorNumber: floorNumber,
+ squareRoot: squareRoot,
+ cosine: cosine,
+ sine: sine,
+ tangent: tangent,
+ arccosine: arccosine,
+ arcsine: arcsine,
+ arctangent: arctangent,
+ arctangent2: arctangent2,
+ exponential: exponential,
+ logarithm: logarithm,
+ power: power,
</ins><span class="cx"> };
</span><span class="cx"> }
</span><span class="cx"> */
</span><span class="lines">@@ -24,3 +166,30 @@
</span><span class="cx"> var module = loadWebAssembly("wasm/arithmetic-float64.wasm");
</span><span class="cx">
</span><span class="cx"> shouldBe(module.number(), 4.2);
</span><ins>+shouldBe(module.negate(0.1), -0.1);
+shouldBe(module.add(0.1, 0.5), 0.6);
+shouldBe(isNaN(module.add(0.1, NaN)), true);
+shouldBe(module.add(0.1, Infinity), Infinity);
+shouldBe(isNaN(module.add(Infinity, -Infinity)), true);
+shouldBe(module.subtract(0.1, 0.5), -0.4);
+shouldBe(module.multiply(0.1, 0.5), 0.05);
+shouldBe(module.divide(0.1, 0.5), 0.2);
+shouldBe(module.divide(0.1, 0), Infinity);
+shouldBe(module.divide(0.1, -0), -Infinity);
+shouldBe(module.modulo(0.1, 0.03), 0.010000000000000009);
+shouldBe(isNaN(module.modulo(0.1, 0)), true);
+shouldBe(module.absolute(-4.2), 4.2);
+shouldBe(module.absolute(4.2), 4.2);
+shouldBe(module.ceilNumber(4.2), 5);
+shouldBe(module.floorNumber(4.2), 4);
+shouldBe(module.squareRoot(0.09), 0.3);
+shouldBe(module.cosine(Math.PI), -1);
+shouldBe(module.sine(Math.PI / 2), 1);
+shouldBe(module.tangent(Math.PI / 4), 0.9999999999999999);
+shouldBe(module.arccosine(-1), Math.PI);
+shouldBe(module.arcsine(1), Math.PI / 2);
+shouldBe(module.arctangent(1), Math.PI / 4);
+shouldBe(module.arctangent2(1, 0), Math.PI / 2);
+shouldBe(module.exponential(1), Math.E);
+shouldBe(module.logarithm(Math.E), 1);
+shouldBe(module.power(4, 1.5), 8);
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMFunctionCompilerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMFunctionCompiler.h (190001 => 190002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMFunctionCompiler.h 2015-09-18 23:57:44 UTC (rev 190001)
+++ trunk/Source/JavaScriptCore/wasm/WASMFunctionCompiler.h 2015-09-19 00:31:04 UTC (rev 190002)
</span><span class="lines">@@ -649,6 +649,73 @@
</span><span class="cx"> return UNUSED;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ int buildUnaryF64(int, WASMOpExpressionF64 op)
+ {
+ loadDouble(temporaryAddress(m_tempStackTop - 1), FPRInfo::fpRegT1);
+ switch (op) {
+ case WASMOpExpressionF64::Negate:
+ negateDouble(FPRInfo::fpRegT1, FPRInfo::fpRegT0);
+ break;
+ case WASMOpExpressionF64::Abs:
+ absDouble(FPRInfo::fpRegT1, FPRInfo::fpRegT0);
+ break;
+ case WASMOpExpressionF64::Sqrt:
+ sqrtDouble(FPRInfo::fpRegT1, FPRInfo::fpRegT0);
+ break;
+ case WASMOpExpressionF64::Ceil:
+ case WASMOpExpressionF64::Floor:
+ case WASMOpExpressionF64::Cos:
+ case WASMOpExpressionF64::Sin:
+ case WASMOpExpressionF64::Tan:
+ case WASMOpExpressionF64::ACos:
+ case WASMOpExpressionF64::ASin:
+ case WASMOpExpressionF64::ATan:
+ case WASMOpExpressionF64::Exp:
+ case WASMOpExpressionF64::Ln:
+ D_JITOperation_D operation;
+ switch (op) {
+ case WASMOpExpressionF64::Ceil:
+ operation = ceil;
+ break;
+ case WASMOpExpressionF64::Floor:
+ operation = floor;
+ break;
+ case WASMOpExpressionF64::Cos:
+ operation = cos;
+ break;
+ case WASMOpExpressionF64::Sin:
+ operation = sin;
+ break;
+ case WASMOpExpressionF64::Tan:
+ operation = tan;
+ break;
+ case WASMOpExpressionF64::ACos:
+ operation = acos;
+ break;
+ case WASMOpExpressionF64::ASin:
+ operation = asin;
+ break;
+ case WASMOpExpressionF64::ATan:
+ operation = atan;
+ break;
+ case WASMOpExpressionF64::Exp:
+ operation = exp;
+ break;
+ case WASMOpExpressionF64::Ln:
+ operation = log;
+ break;
+ default:
+ RELEASE_ASSERT_NOT_REACHED();
+ }
+ callOperation(operation, FPRInfo::fpRegT1, FPRInfo::fpRegT0);
+ break;
+ default:
+ ASSERT_NOT_REACHED();
+ }
+ storeDouble(FPRInfo::fpRegT0, temporaryAddress(m_tempStackTop - 1));
+ return UNUSED;
+ }
+
</ins><span class="cx"> int buildBinaryI32(int, int, WASMOpExpressionI32 op)
</span><span class="cx"> {
</span><span class="cx"> load32(temporaryAddress(m_tempStackTop - 2), GPRInfo::regT0);
</span><span class="lines">@@ -761,6 +828,50 @@
</span><span class="cx"> return UNUSED;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ int buildBinaryF64(int, int, WASMOpExpressionF64 op)
+ {
+ loadDouble(temporaryAddress(m_tempStackTop - 2), FPRInfo::fpRegT0);
+ loadDouble(temporaryAddress(m_tempStackTop - 1), FPRInfo::fpRegT1);
+ switch (op) {
+ case WASMOpExpressionF64::Add:
+ addDouble(FPRInfo::fpRegT1, FPRInfo::fpRegT0);
+ break;
+ case WASMOpExpressionF64::Sub:
+ subDouble(FPRInfo::fpRegT1, FPRInfo::fpRegT0);
+ break;
+ case WASMOpExpressionF64::Mul:
+ mulDouble(FPRInfo::fpRegT1, FPRInfo::fpRegT0);
+ break;
+ case WASMOpExpressionF64::Div:
+ divDouble(FPRInfo::fpRegT1, FPRInfo::fpRegT0);
+ break;
+ case WASMOpExpressionF64::Mod:
+ case WASMOpExpressionF64::ATan2:
+ case WASMOpExpressionF64::Pow:
+ D_JITOperation_DD operation;
+ switch (op) {
+ case WASMOpExpressionF64::Mod:
+ operation = fmod;
+ break;
+ case WASMOpExpressionF64::ATan2:
+ operation = atan2;
+ break;
+ case WASMOpExpressionF64::Pow:
+ operation = pow;
+ break;
+ default:
+ RELEASE_ASSERT_NOT_REACHED();
+ }
+ callOperation(operation, FPRInfo::fpRegT0, FPRInfo::fpRegT1, FPRInfo::fpRegT0);
+ break;
+ default:
+ ASSERT_NOT_REACHED();
+ }
+ m_tempStackTop--;
+ storeDouble(FPRInfo::fpRegT0, temporaryAddress(m_tempStackTop - 1));
+ return UNUSED;
+ }
+
</ins><span class="cx"> int buildRelationalI32(int, int, WASMOpExpressionI32 op)
</span><span class="cx"> {
</span><span class="cx"> load32(temporaryAddress(m_tempStackTop - 2), GPRInfo::regT0);
</span><span class="lines">@@ -1129,6 +1240,12 @@
</span><span class="cx"> appendCallSetResult(operation, dst, FloatingPointPrecision::Single);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void callOperation(D_JITOperation_D operation, FPRegisterID src, FPRegisterID dst)
+ {
+ setupArguments(src);
+ appendCallSetResult(operation, dst, FloatingPointPrecision::Double);
+ }
+
</ins><span class="cx"> void callOperation(int32_t JIT_OPERATION (*operation)(int32_t, int32_t), GPRReg src1, GPRReg src2, GPRReg dst)
</span><span class="cx"> {
</span><span class="cx"> setupArguments(src1, src2);
</span><span class="lines">@@ -1141,6 +1258,12 @@
</span><span class="cx"> appendCallSetResult(operation, dst);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void callOperation(D_JITOperation_DD operation, FPRegisterID src1, FPRegisterID src2, FPRegisterID dst)
+ {
+ setupArguments(src1, src2);
+ appendCallSetResult(operation, dst, FloatingPointPrecision::Double);
+ }
+
</ins><span class="cx"> void callOperation(double JIT_OPERATION (*operation)(uint32_t), GPRReg src, FPRegisterID dst)
</span><span class="cx"> {
</span><span class="cx"> setupArguments(src);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMFunctionParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.cpp (190001 => 190002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.cpp 2015-09-18 23:57:44 UTC (rev 190001)
+++ trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.cpp 2015-09-19 00:31:04 UTC (rev 190002)
</span><span class="lines">@@ -928,20 +928,7 @@
</span><span class="cx"> return parseConvertType(context, WASMExpressionType::I32, WASMExpressionType::F64, WASMTypeConversion::ConvertUnsigned);
</span><span class="cx"> case WASMOpExpressionF64::FromF32:
</span><span class="cx"> return parseConvertType(context, WASMExpressionType::F32, WASMExpressionType::F64, WASMTypeConversion::Promote);
</span><del>- case WASMOpExpressionF64::SetLocal:
- case WASMOpExpressionF64::SetGlobal:
- case WASMOpExpressionF64::Store:
- case WASMOpExpressionF64::StoreWithOffset:
- case WASMOpExpressionF64::Conditional:
- case WASMOpExpressionF64::Comma:
</del><span class="cx"> case WASMOpExpressionF64::Negate:
</span><del>- case WASMOpExpressionF64::Add:
- case WASMOpExpressionF64::Sub:
- case WASMOpExpressionF64::Mul:
- case WASMOpExpressionF64::Div:
- case WASMOpExpressionF64::Mod:
- case WASMOpExpressionF64::Min:
- case WASMOpExpressionF64::Max:
</del><span class="cx"> case WASMOpExpressionF64::Abs:
</span><span class="cx"> case WASMOpExpressionF64::Ceil:
</span><span class="cx"> case WASMOpExpressionF64::Floor:
</span><span class="lines">@@ -952,10 +939,25 @@
</span><span class="cx"> case WASMOpExpressionF64::ACos:
</span><span class="cx"> case WASMOpExpressionF64::ASin:
</span><span class="cx"> case WASMOpExpressionF64::ATan:
</span><del>- case WASMOpExpressionF64::ATan2:
</del><span class="cx"> case WASMOpExpressionF64::Exp:
</span><span class="cx"> case WASMOpExpressionF64::Ln:
</span><ins>+ return parseUnaryExpressionF64(context, op);
+ case WASMOpExpressionF64::Add:
+ case WASMOpExpressionF64::Sub:
+ case WASMOpExpressionF64::Mul:
+ case WASMOpExpressionF64::Div:
+ case WASMOpExpressionF64::Mod:
+ case WASMOpExpressionF64::ATan2:
</ins><span class="cx"> case WASMOpExpressionF64::Pow:
</span><ins>+ return parseBinaryExpressionF64(context, op);
+ case WASMOpExpressionF64::SetLocal:
+ case WASMOpExpressionF64::SetGlobal:
+ case WASMOpExpressionF64::Store:
+ case WASMOpExpressionF64::StoreWithOffset:
+ case WASMOpExpressionF64::Conditional:
+ case WASMOpExpressionF64::Comma:
+ case WASMOpExpressionF64::Min:
+ case WASMOpExpressionF64::Max:
</ins><span class="cx"> // FIXME: Implement these instructions.
</span><span class="cx"> FAIL_WITH_MESSAGE("Unsupported instruction.");
</span><span class="cx"> default:
</span><span class="lines">@@ -1024,6 +1026,24 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <class Context>
</span><ins>+ContextExpression WASMFunctionParser::parseUnaryExpressionF64(Context& context, WASMOpExpressionF64 op)
+{
+ ContextExpression expression = parseExpressionF64(context);
+ PROPAGATE_ERROR();
+ return context.buildUnaryF64(expression, op);
+}
+
+template <class Context>
+ContextExpression WASMFunctionParser::parseBinaryExpressionF64(Context& context, WASMOpExpressionF64 op)
+{
+ ContextExpression left = parseExpressionF64(context);
+ PROPAGATE_ERROR();
+ ContextExpression right = parseExpressionF64(context);
+ PROPAGATE_ERROR();
+ return context.buildBinaryF64(left, right, op);
+}
+
+template <class Context>
</ins><span class="cx"> ContextMemoryAddress WASMFunctionParser::parseMemoryAddress(Context& context, MemoryAccessOffsetMode offsetMode)
</span><span class="cx"> {
</span><span class="cx"> uint32_t offset = 0;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMFunctionParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.h (190001 => 190002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.h 2015-09-18 23:57:44 UTC (rev 190001)
+++ trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.h 2015-09-19 00:31:04 UTC (rev 190002)
</span><span class="lines">@@ -113,6 +113,8 @@
</span><span class="cx"> template <class Context> ContextExpression parseGetLocalExpressionF64(Context&, uint32_t localIndex);
</span><span class="cx"> template <class Context> ContextExpression parseGetLocalExpressionF64(Context&);
</span><span class="cx"> template <class Context> ContextExpression parseGetGlobalExpressionF64(Context&);
</span><ins>+ template <class Context> ContextExpression parseUnaryExpressionF64(Context&, WASMOpExpressionF64);
+ template <class Context> ContextExpression parseBinaryExpressionF64(Context&, WASMOpExpressionF64);
</ins><span class="cx">
</span><span class="cx"> template <class Context> ContextMemoryAddress parseMemoryAddress(Context&, MemoryAccessOffsetMode);
</span><span class="cx"> template <class Context> ContextExpression parseLoad(Context&, WASMExpressionType, WASMMemoryType, MemoryAccessOffsetMode, MemoryAccessConversion = MemoryAccessConversion::NoConversion);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMFunctionSyntaxCheckerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMFunctionSyntaxChecker.h (190001 => 190002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMFunctionSyntaxChecker.h 2015-09-18 23:57:44 UTC (rev 190001)
+++ trunk/Source/JavaScriptCore/wasm/WASMFunctionSyntaxChecker.h 2015-09-19 00:31:04 UTC (rev 190002)
</span><span class="lines">@@ -131,6 +131,11 @@
</span><span class="cx"> return UNUSED;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ int buildUnaryF64(int, WASMOpExpressionF64)
+ {
+ return UNUSED;
+ }
+
</ins><span class="cx"> int buildBinaryI32(int, int, WASMOpExpressionI32)
</span><span class="cx"> {
</span><span class="cx"> m_tempStackTop--;
</span><span class="lines">@@ -143,6 +148,12 @@
</span><span class="cx"> return UNUSED;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ int buildBinaryF64(int, int, WASMOpExpressionF64)
+ {
+ m_tempStackTop--;
+ return UNUSED;
+ }
+
</ins><span class="cx"> int buildRelationalI32(int, int, WASMOpExpressionI32)
</span><span class="cx"> {
</span><span class="cx"> m_tempStackTop--;
</span></span></pre>
</div>
</div>
</body>
</html>