<!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>[189499] 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/189499">189499</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-08 11:34:22 -0700 (Tue, 08 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Implement all the arithmetic and logical instructions in WebAssembly
https://bugs.webkit.org/show_bug.cgi?id=148882
Patch by Sukolsak Sakshuwong <sukolsak@gmail.com> on 2015-09-08
Reviewed by Mark Lam.
This patch implements all the arithmetic and logical instructions for
32-bit integers in WebAssembly.
* tests/stress/wasm-arithmetic.js:
* tests/stress/wasm/arithmetic.wasm:
* wasm/WASMFunctionCompiler.h:
(JSC::WASMFunctionCompiler::buildUnaryI32):
(JSC::WASMFunctionCompiler::buildBinaryI32):
* wasm/WASMFunctionParser.cpp:
(JSC::WASMFunctionParser::parseExpressionI32):
(JSC::WASMFunctionParser::parseUnaryExpressionI32):
* wasm/WASMFunctionParser.h:
* wasm/WASMFunctionSyntaxChecker.h:
(JSC::WASMFunctionSyntaxChecker::buildUnaryI32):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstresswasmarithmeticwasm">trunk/Source/JavaScriptCore/tests/stress/wasm/arithmetic.wasm</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstresswasmarithmeticjs">trunk/Source/JavaScriptCore/tests/stress/wasm-arithmetic.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 (189498 => 189499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-09-08 18:23:23 UTC (rev 189498)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-09-08 18:34:22 UTC (rev 189499)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-09-08 Sukolsak Sakshuwong <sukolsak@gmail.com>
+
+ Implement all the arithmetic and logical instructions in WebAssembly
+ https://bugs.webkit.org/show_bug.cgi?id=148882
+
+ Reviewed by Mark Lam.
+
+ This patch implements all the arithmetic and logical instructions for
+ 32-bit integers in WebAssembly.
+
+ * tests/stress/wasm-arithmetic.js:
+ * tests/stress/wasm/arithmetic.wasm:
+ * wasm/WASMFunctionCompiler.h:
+ (JSC::WASMFunctionCompiler::buildUnaryI32):
+ (JSC::WASMFunctionCompiler::buildBinaryI32):
+ * wasm/WASMFunctionParser.cpp:
+ (JSC::WASMFunctionParser::parseExpressionI32):
+ (JSC::WASMFunctionParser::parseUnaryExpressionI32):
+ * wasm/WASMFunctionParser.h:
+ * wasm/WASMFunctionSyntaxChecker.h:
+ (JSC::WASMFunctionSyntaxChecker::buildUnaryI32):
+
</ins><span class="cx"> 2015-09-08 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, fix debug by removing an assertion that is not correct anymore.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstresswasmarithmeticwasm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/stress/wasm/arithmetic.wasm (189498 => 189499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/wasm/arithmetic.wasm 2015-09-08 18:23:23 UTC (rev 189498)
+++ trunk/Source/JavaScriptCore/tests/stress/wasm/arithmetic.wasm 2015-09-08 18:34:22 UTC (rev 189499)
</span><span class="lines">@@ -1,4 +1,3 @@
</span><del>-wasm\x9E\xFF\xFF\xFF\xFF\x80\x80\x80\x80*-\x80 \xAA(\xA8\x80 \xFF\xFF\xFF\xFF\xA1\x80!\x82\xA5\x80!\xA1\xA0\x80!\x81\x80\x80"\x80\xA2\x80"\x80\xA0\x80#\x82\xA5\x80#\xD6\xFF\xFF\xFF\xA5\x80#\xA1\xA0\x80#\x81\x80\x80$\x80\xA0\x8D\x80$\x80\xA0-addSubtractaddOverflowdividedivideByZerodivideOverflowunsignedDivideunsignedDivideByZeromodulomoduloNegativemoduloZero moduloOverflow
-unsignedModulo unsignedModuloZero
</del><span class="cx">\ No newline at end of file
</span><ins>+wasm\xD2\xFF\xFF\xFF\xFF*\x80\x80\x80\x80\xD6\xFF\xFF\xFF( \x81\x80\x81 \xC0\x80 \xAA\x84\xA8\x80 \xFF\xFF\xFF\xFF\xA1\x80 \xA6\xA7\x80 \x82\x80\x80!\x81\xA5\x80!\xA1\xA0\x80!\x82\x80\x80"\x80\xA2\x80"\x80\xA0\x80#\x81\xA5\x80#\x83\xA5\x80#\xA1\xA0\x80#\x82\x80\x80$\x80\xA0\x8D\x80$\x80\xA0\x80%\xD5\xFF\xFF\xFF\x80&\xAA\x84\x80'/:\x80(\xB5?\x80)\xB5\xA1\x80*\x80\xBC\x80+\x80\xBC\x80,\x81\x80,\xA0\x80-\x81\x80-\xA0\x80H\x83\x80H\x81 negateaddSubtractaddOverflowmultiplymultiplyOverflowdividedivideByZerodivideOverflowunsignedDivideunsignedDivideByZero modulo
+moduloNegative moduloZero moduloOverflow+unsignedModulounsignedModuloZerobitNotbitOrbitAndbitXorleftShiftarithmeticRightShiftlogicalRightShiftcountLeadingZeroscountLeadingZerosOfZerologicalNotNonZerologicalNotZeroabsoluteNegativeabsolutePositive
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstresswasmarithmeticjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/stress/wasm-arithmetic.js (189498 => 189499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/wasm-arithmetic.js 2015-09-08 18:23:23 UTC (rev 189498)
+++ trunk/Source/JavaScriptCore/tests/stress/wasm-arithmetic.js 2015-09-08 18:34:22 UTC (rev 189499)
</span><span class="lines">@@ -24,6 +24,15 @@
</span><span class="cx"> function asmModule(global, env, buffer) {
</span><span class="cx"> "use asm";
</span><span class="cx">
</span><ins>+ var clz32 = global.Math.clz32;
+ var abs = global.Math.abs;
+
+ function negate() {
+ var x = 0;
+ x = 42;
+ return -x;
+ }
+
</ins><span class="cx"> function addSubtract() {
</span><span class="cx"> return ((10 + 40) - 8) | 0;
</span><span class="cx"> }
</span><span class="lines">@@ -32,6 +41,14 @@
</span><span class="cx"> return (2147483647 + 1) | 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function multiply() {
+ return (6 * 7) | 0;
+ }
+
+ function multiplyOverflow() {
+ return (-2147483648 * -1) | 0;
+ }
+
</ins><span class="cx"> function divide() {
</span><span class="cx"> return (42 / 5) | 0;
</span><span class="cx"> }
</span><span class="lines">@@ -76,9 +93,64 @@
</span><span class="cx"> return ((-1 >>> 0) % 0) | 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function bitNot() {
+ return ~1;
+ }
+
+ function bitOr() {
+ return 3 | 5;
+ }
+
+ function bitAnd() {
+ return 3 & 5;
+ }
+
+ function bitXor() {
+ return 3 ^ 5;
+ }
+
+ function leftShift() {
+ return 1 << 16;
+ }
+
+ function arithmeticRightShift() {
+ return (-1) >> 16;
+ }
+
+ function logicalRightShift() {
+ return (-1) >>> 16;
+ }
+
+ function countLeadingZeros() {
+ return clz32(42);
+ }
+
+ function countLeadingZerosOfZero() {
+ return clz32(0);
+ }
+
+ function logicalNotNonZero() {
+ return (!42) | 0;
+ }
+
+ function logicalNotZero() {
+ return (!0) | 0;
+ }
+
+ function absoluteNegative() {
+ return abs(-42);
+ }
+
+ function absolutePositive() {
+ return abs(42);
+ }
+
</ins><span class="cx"> return {
</span><ins>+ negate: negate,
</ins><span class="cx"> addSubtract: addSubtract,
</span><span class="cx"> addOverflow: addOverflow,
</span><ins>+ multiply: multiply,
+ multiplyOverflow: multiplyOverflow,
</ins><span class="cx"> divide: divide,
</span><span class="cx"> divideByZero: divideByZero,
</span><span class="cx"> divideOverflow: divideOverflow,
</span><span class="lines">@@ -90,16 +162,35 @@
</span><span class="cx"> moduloOverflow: moduloOverflow,
</span><span class="cx"> unsignedModulo: unsignedModulo,
</span><span class="cx"> unsignedModuloZero: unsignedModuloZero,
</span><ins>+ bitNot: bitNot,
+ bitOr: bitOr,
+ bitAnd: bitAnd,
+ bitXor: bitXor,
+ leftShift: leftShift,
+ arithmeticRightShift: arithmeticRightShift,
+ logicalRightShift: logicalRightShift,
+ countLeadingZeros: countLeadingZeros,
+ countLeadingZerosOfZero: countLeadingZerosOfZero,
+ logicalNotNonZero: logicalNotNonZero,
+ logicalNotZero: logicalNotZero,
+ absoluteNegative: absoluteNegative,
+ absolutePositive: absolutePositive,
</ins><span class="cx"> };
</span><span class="cx"> }
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> var module = loadWebAssembly("wasm/arithmetic.wasm");
</span><span class="cx">
</span><ins>+shouldBe(module.negate(), -42);
+
</ins><span class="cx"> shouldBe(module.addSubtract(), 42);
</span><span class="cx">
</span><span class="cx"> shouldBe(module.addOverflow(), -2147483648);
</span><span class="cx">
</span><ins>+shouldBe(module.multiply(), 42);
+
+shouldBe(module.multiplyOverflow(), -2147483648);
+
</ins><span class="cx"> shouldBe(module.divide(), 8);
</span><span class="cx">
</span><span class="cx"> shouldThrow(() => {
</span><span class="lines">@@ -133,3 +224,29 @@
</span><span class="cx"> shouldThrow(() => {
</span><span class="cx"> module.unsignedModuloZero();
</span><span class="cx"> }, "Error: Division by zero or division overflow.");
</span><ins>+
+shouldBe(module.bitNot(), -2);
+
+shouldBe(module.bitOr(), 7);
+
+shouldBe(module.bitAnd(), 1);
+
+shouldBe(module.bitXor(), 6);
+
+shouldBe(module.leftShift(), 65536);
+
+shouldBe(module.arithmeticRightShift(), -1);
+
+shouldBe(module.logicalRightShift(), 65535);
+
+shouldBe(module.countLeadingZeros(), 26);
+
+shouldBe(module.countLeadingZerosOfZero(), 32);
+
+shouldBe(module.logicalNotNonZero(), 0);
+
+shouldBe(module.logicalNotZero(), 1);
+
+shouldBe(module.absoluteNegative(), 42);
+
+shouldBe(module.absolutePositive(), 42);
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMFunctionCompilerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMFunctionCompiler.h (189498 => 189499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMFunctionCompiler.h 2015-09-08 18:23:23 UTC (rev 189498)
+++ trunk/Source/JavaScriptCore/wasm/WASMFunctionCompiler.h 2015-09-08 18:34:22 UTC (rev 189499)
</span><span class="lines">@@ -263,6 +263,43 @@
</span><span class="cx"> return UNUSED;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ int buildUnaryI32(int, WASMOpExpressionI32 op)
+ {
+ load32(temporaryAddress(m_tempStackTop - 1), GPRInfo::regT0);
+ switch (op) {
+ case WASMOpExpressionI32::Negate:
+ neg32(GPRInfo::regT0);
+ break;
+ case WASMOpExpressionI32::BitNot:
+ xor32(TrustedImm32(-1), GPRInfo::regT0);
+ break;
+ case WASMOpExpressionI32::CountLeadingZeros:
+ countLeadingZeros32(GPRInfo::regT0, GPRInfo::regT0);
+ break;
+ case WASMOpExpressionI32::LogicalNot: {
+ // FIXME: Don't use branches.
+ Jump zero = branchTest32(Zero, GPRInfo::regT0);
+ move(TrustedImm32(0), GPRInfo::regT0);
+ Jump end = jump();
+ zero.link(this);
+ move(TrustedImm32(1), GPRInfo::regT0);
+ end.link(this);
+ break;
+ }
+ case WASMOpExpressionI32::Abs: {
+ // FIXME: Don't use branches.
+ Jump end = branchTest32(PositiveOrZero, GPRInfo::regT0);
+ neg32(GPRInfo::regT0);
+ end.link(this);
+ break;
+ }
+ default:
+ ASSERT_NOT_REACHED();
+ }
+ store32(GPRInfo::regT0, 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">@@ -274,6 +311,9 @@
</span><span class="cx"> case WASMOpExpressionI32::Sub:
</span><span class="cx"> sub32(GPRInfo::regT1, GPRInfo::regT0);
</span><span class="cx"> break;
</span><ins>+ case WASMOpExpressionI32::Mul:
+ mul32(GPRInfo::regT1, GPRInfo::regT0);
+ break;
</ins><span class="cx"> case WASMOpExpressionI32::SDiv:
</span><span class="cx"> case WASMOpExpressionI32::UDiv:
</span><span class="cx"> case WASMOpExpressionI32::SMod:
</span><span class="lines">@@ -322,6 +362,24 @@
</span><span class="cx"> #endif
</span><span class="cx"> break;
</span><span class="cx"> }
</span><ins>+ case WASMOpExpressionI32::BitOr:
+ or32(GPRInfo::regT1, GPRInfo::regT0);
+ break;
+ case WASMOpExpressionI32::BitAnd:
+ and32(GPRInfo::regT1, GPRInfo::regT0);
+ break;
+ case WASMOpExpressionI32::BitXor:
+ xor32(GPRInfo::regT1, GPRInfo::regT0);
+ break;
+ case WASMOpExpressionI32::LeftShift:
+ lshift32(GPRInfo::regT1, GPRInfo::regT0);
+ break;
+ case WASMOpExpressionI32::ArithmeticRightShift:
+ rshift32(GPRInfo::regT1, GPRInfo::regT0);
+ break;
+ case WASMOpExpressionI32::LogicalRightShift:
+ urshift32(GPRInfo::regT1, GPRInfo::regT0);
+ break;
</ins><span class="cx"> default:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMFunctionParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.cpp (189498 => 189499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.cpp 2015-09-08 18:23:23 UTC (rev 189498)
+++ trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.cpp 2015-09-08 18:34:22 UTC (rev 189499)
</span><span class="lines">@@ -433,12 +433,25 @@
</span><span class="cx"> return parseImmediateExpressionI32(context);
</span><span class="cx"> case WASMOpExpressionI32::GetLocal:
</span><span class="cx"> return parseGetLocalExpressionI32(context);
</span><ins>+ case WASMOpExpressionI32::Negate:
+ case WASMOpExpressionI32::BitNot:
+ case WASMOpExpressionI32::CountLeadingZeros:
+ case WASMOpExpressionI32::LogicalNot:
+ case WASMOpExpressionI32::Abs:
+ return parseUnaryExpressionI32(context, op);
</ins><span class="cx"> case WASMOpExpressionI32::Add:
</span><span class="cx"> case WASMOpExpressionI32::Sub:
</span><ins>+ case WASMOpExpressionI32::Mul:
</ins><span class="cx"> case WASMOpExpressionI32::SDiv:
</span><span class="cx"> case WASMOpExpressionI32::UDiv:
</span><span class="cx"> case WASMOpExpressionI32::SMod:
</span><span class="cx"> case WASMOpExpressionI32::UMod:
</span><ins>+ case WASMOpExpressionI32::BitOr:
+ case WASMOpExpressionI32::BitAnd:
+ case WASMOpExpressionI32::BitXor:
+ case WASMOpExpressionI32::LeftShift:
+ case WASMOpExpressionI32::ArithmeticRightShift:
+ case WASMOpExpressionI32::LogicalRightShift:
</ins><span class="cx"> return parseBinaryExpressionI32(context, op);
</span><span class="cx"> case WASMOpExpressionI32::EqualI32:
</span><span class="cx"> case WASMOpExpressionI32::NotEqualI32:
</span><span class="lines">@@ -477,17 +490,6 @@
</span><span class="cx"> case WASMOpExpressionI32::Comma:
</span><span class="cx"> case WASMOpExpressionI32::FromF32:
</span><span class="cx"> case WASMOpExpressionI32::FromF64:
</span><del>- case WASMOpExpressionI32::Negate:
- case WASMOpExpressionI32::Mul:
- case WASMOpExpressionI32::BitNot:
- case WASMOpExpressionI32::BitOr:
- case WASMOpExpressionI32::BitAnd:
- case WASMOpExpressionI32::BitXor:
- case WASMOpExpressionI32::LeftShift:
- case WASMOpExpressionI32::ArithmeticRightShift:
- case WASMOpExpressionI32::LogicalRightShift:
- case WASMOpExpressionI32::CountLeadingZeros:
- case WASMOpExpressionI32::LogicalNot:
</del><span class="cx"> case WASMOpExpressionI32::EqualF32:
</span><span class="cx"> case WASMOpExpressionI32::EqualF64:
</span><span class="cx"> case WASMOpExpressionI32::NotEqualF32:
</span><span class="lines">@@ -504,7 +506,6 @@
</span><span class="cx"> case WASMOpExpressionI32::UMin:
</span><span class="cx"> case WASMOpExpressionI32::SMax:
</span><span class="cx"> case WASMOpExpressionI32::UMax:
</span><del>- case WASMOpExpressionI32::Abs:
</del><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">@@ -571,6 +572,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <class Context>
</span><ins>+ContextExpression WASMFunctionParser::parseUnaryExpressionI32(Context& context, WASMOpExpressionI32 op)
+{
+ ContextExpression expression = parseExpressionI32(context);
+ PROPAGATE_ERROR();
+ return context.buildUnaryI32(expression, op);
+}
+
+template <class Context>
</ins><span class="cx"> ContextExpression WASMFunctionParser::parseBinaryExpressionI32(Context& context, WASMOpExpressionI32 op)
</span><span class="cx"> {
</span><span class="cx"> ContextExpression left = parseExpressionI32(context);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMFunctionParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.h (189498 => 189499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.h 2015-09-08 18:23:23 UTC (rev 189498)
+++ trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.h 2015-09-08 18:34:22 UTC (rev 189499)
</span><span class="lines">@@ -84,6 +84,7 @@
</span><span class="cx"> template <class Context> ContextExpression parseImmediateExpressionI32(Context&);
</span><span class="cx"> template <class Context> ContextExpression parseGetLocalExpressionI32(Context&, uint32_t localIndex);
</span><span class="cx"> template <class Context> ContextExpression parseGetLocalExpressionI32(Context&);
</span><ins>+ template <class Context> ContextExpression parseUnaryExpressionI32(Context&, WASMOpExpressionI32);
</ins><span class="cx"> template <class Context> ContextExpression parseBinaryExpressionI32(Context&, WASMOpExpressionI32);
</span><span class="cx"> template <class Context> ContextExpression parseRelationalI32ExpressionI32(Context&, WASMOpExpressionI32);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMFunctionSyntaxCheckerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMFunctionSyntaxChecker.h (189498 => 189499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMFunctionSyntaxChecker.h 2015-09-08 18:23:23 UTC (rev 189498)
+++ trunk/Source/JavaScriptCore/wasm/WASMFunctionSyntaxChecker.h 2015-09-08 18:34:22 UTC (rev 189499)
</span><span class="lines">@@ -79,6 +79,11 @@
</span><span class="cx"> return UNUSED;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ int buildUnaryI32(int, WASMOpExpressionI32)
+ {
+ return UNUSED;
+ }
+
</ins><span class="cx"> int buildBinaryI32(int, int, WASMOpExpressionI32)
</span><span class="cx"> {
</span><span class="cx"> m_tempStackTop--;
</span></span></pre>
</div>
</div>
</body>
</html>