<!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>[189405] 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/189405">189405</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-04 17:14:21 -0700 (Fri, 04 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Implement the division and modulo instructions in WebAssembly
https://bugs.webkit.org/show_bug.cgi?id=148791
Patch by Sukolsak Sakshuwong <sukolsak@gmail.com> on 2015-09-04
Reviewed by Geoffrey Garen.
This patch implements the unsigned division, signed modulo, and unsigned
modulo instructions for 32-bit integers in WebAssembly. It also
implements the context pool index instructions, which are needed for
testing. (pack-asmjs puts numbers that are used more than once in the
constant pool.)
* assembler/X86Assembler.h:
(JSC::X86Assembler::divl_r):
* tests/stress/wasm-arithmetic.js:
* tests/stress/wasm-arithmetic.wasm:
* wasm/WASMFunctionCompiler.h:
(JSC::operationMod):
(JSC::operationUnsignedDiv):
(JSC::operationUnsignedMod):
(JSC::WASMFunctionCompiler::buildBinaryI32):
(JSC::WASMFunctionCompiler::callOperation):
* wasm/WASMFunctionParser.cpp:
(JSC::WASMFunctionParser::parseExpressionI32):
(JSC::WASMFunctionParser::parseConstantPoolIndexExpressionI32):
* wasm/WASMFunctionParser.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerX86Assemblerh">trunk/Source/JavaScriptCore/assembler/X86Assembler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstresswasmarithmeticjs">trunk/Source/JavaScriptCore/tests/stress/wasm-arithmetic.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstresswasmarithmeticwasm">trunk/Source/JavaScriptCore/tests/stress/wasm-arithmetic.wasm</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (189404 => 189405)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-09-05 00:12:01 UTC (rev 189404)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-09-05 00:14:21 UTC (rev 189405)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-09-04 Sukolsak Sakshuwong <sukolsak@gmail.com>
+
+ Implement the division and modulo instructions in WebAssembly
+ https://bugs.webkit.org/show_bug.cgi?id=148791
+
+ Reviewed by Geoffrey Garen.
+
+ This patch implements the unsigned division, signed modulo, and unsigned
+ modulo instructions for 32-bit integers in WebAssembly. It also
+ implements the context pool index instructions, which are needed for
+ testing. (pack-asmjs puts numbers that are used more than once in the
+ constant pool.)
+
+ * assembler/X86Assembler.h:
+ (JSC::X86Assembler::divl_r):
+ * tests/stress/wasm-arithmetic.js:
+ * tests/stress/wasm-arithmetic.wasm:
+ * wasm/WASMFunctionCompiler.h:
+ (JSC::operationMod):
+ (JSC::operationUnsignedDiv):
+ (JSC::operationUnsignedMod):
+ (JSC::WASMFunctionCompiler::buildBinaryI32):
+ (JSC::WASMFunctionCompiler::callOperation):
+ * wasm/WASMFunctionParser.cpp:
+ (JSC::WASMFunctionParser::parseExpressionI32):
+ (JSC::WASMFunctionParser::parseConstantPoolIndexExpressionI32):
+ * wasm/WASMFunctionParser.h:
+
</ins><span class="cx"> 2015-09-04 Basile Clement <basile_clement@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix debug output for an eval call
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerX86Assemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/X86Assembler.h (189404 => 189405)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/X86Assembler.h 2015-09-05 00:12:01 UTC (rev 189404)
+++ trunk/Source/JavaScriptCore/assembler/X86Assembler.h 2015-09-05 00:14:21 UTC (rev 189405)
</span><span class="lines">@@ -311,6 +311,7 @@
</span><span class="cx"> GROUP3_OP_TEST = 0,
</span><span class="cx"> GROUP3_OP_NOT = 2,
</span><span class="cx"> GROUP3_OP_NEG = 3,
</span><ins>+ GROUP3_OP_DIV = 6,
</ins><span class="cx"> GROUP3_OP_IDIV = 7,
</span><span class="cx">
</span><span class="cx"> GROUP5_OP_CALLN = 2,
</span><span class="lines">@@ -932,6 +933,11 @@
</span><span class="cx"> m_formatter.immediate32(value);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void divl_r(RegisterID dst)
+ {
+ m_formatter.oneByteOp(OP_GROUP3_Ev, GROUP3_OP_DIV, dst);
+ }
+
</ins><span class="cx"> void idivl_r(RegisterID dst)
</span><span class="cx"> {
</span><span class="cx"> m_formatter.oneByteOp(OP_GROUP3_Ev, GROUP3_OP_IDIV, dst);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstresswasmarithmeticjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/stress/wasm-arithmetic.js (189404 => 189405)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/wasm-arithmetic.js 2015-09-05 00:12:01 UTC (rev 189404)
+++ trunk/Source/JavaScriptCore/tests/stress/wasm-arithmetic.js 2015-09-05 00:14:21 UTC (rev 189405)
</span><span class="lines">@@ -44,12 +44,52 @@
</span><span class="cx"> return (-2147483648 / -1) | 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function unsignedDivide() {
+ return ((-1 >>> 0) / 2) | 0;
+ }
+
+ function unsignedDivideByZero() {
+ return ((-1 >>> 0) / 0) | 0;
+ }
+
+ function modulo() {
+ return (42 % 5) | 0;
+ }
+
+ function moduloNegative() {
+ return (-42 % 5) | 0;
+ }
+
+ function moduloZero() {
+ return (1 % 0) | 0;
+ }
+
+ function moduloOverflow() {
+ return (-2147483648 % -1) | 0;
+ }
+
+ function unsignedModulo() {
+ return ((-1 >>> 0) % 100000) | 0;
+ }
+
+ function unsignedModuloZero() {
+ return ((-1 >>> 0) % 0) | 0;
+ }
+
</ins><span class="cx"> return {
</span><span class="cx"> addSubtract: addSubtract,
</span><span class="cx"> addOverflow: addOverflow,
</span><span class="cx"> divide: divide,
</span><span class="cx"> divideByZero: divideByZero,
</span><span class="cx"> divideOverflow: divideOverflow,
</span><ins>+ unsignedDivide: unsignedDivide,
+ unsignedDivideByZero: unsignedDivideByZero,
+ modulo: modulo,
+ moduloNegative: moduloNegative,
+ moduloZero: moduloZero,
+ moduloOverflow: moduloOverflow,
+ unsignedModulo: unsignedModulo,
+ unsignedModuloZero: unsignedModuloZero,
</ins><span class="cx"> };
</span><span class="cx"> }
</span><span class="cx"> */
</span><span class="lines">@@ -69,3 +109,27 @@
</span><span class="cx"> shouldThrow(() => {
</span><span class="cx"> module.divideOverflow();
</span><span class="cx"> }, "Error: Division by zero or division overflow.");
</span><ins>+
+shouldBe(module.unsignedDivide(), 2147483647);
+
+shouldThrow(() => {
+ module.unsignedDivideByZero();
+}, "Error: Division by zero or division overflow.");
+
+shouldBe(module.modulo(), 2);
+
+shouldBe(module.moduloNegative(), -2);
+
+shouldThrow(() => {
+ module.moduloZero();
+}, "Error: Division by zero or division overflow.");
+
+shouldThrow(() => {
+ module.moduloOverflow();
+}, "Error: Division by zero or division overflow.");
+
+shouldBe(module.unsignedModulo(), 67295);
+
+shouldThrow(() => {
+ module.unsignedModuloZero();
+}, "Error: Division by zero or division overflow.");
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstresswasmarithmeticwasm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/stress/wasm-arithmetic.wasm (189404 => 189405)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/wasm-arithmetic.wasm 2015-09-05 00:12:01 UTC (rev 189404)
+++ trunk/Source/JavaScriptCore/tests/stress/wasm-arithmetic.wasm 2015-09-05 00:14:21 UTC (rev 189405)
</span><span class="lines">@@ -1 +1,4 @@
</span><del>-wasm\xD1\x80 \xAA(\xA8\x80 \xFF\xFF\xFF\xFF\xA1\x80!*\xA5\x80!\xA1\xA0\x80!\x80\x80\x80\x80\xFF\xFF\xFF\xFFaddSubtractaddOverflowdividedivideByZerodivideOverflow
</del><span class="cx">\ No newline at end of file
</span><ins>+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
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMFunctionCompilerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMFunctionCompiler.h (189404 => 189405)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMFunctionCompiler.h 2015-09-05 00:12:01 UTC (rev 189404)
+++ trunk/Source/JavaScriptCore/wasm/WASMFunctionCompiler.h 2015-09-05 00:14:21 UTC (rev 189405)
</span><span class="lines">@@ -42,6 +42,21 @@
</span><span class="cx"> {
</span><span class="cx"> return left / right;
</span><span class="cx"> }
</span><ins>+
+static int32_t JIT_OPERATION operationMod(int32_t left, int32_t right)
+{
+ return left % right;
+}
+
+static uint32_t JIT_OPERATION operationUnsignedDiv(uint32_t left, uint32_t right)
+{
+ return left / right;
+}
+
+static uint32_t JIT_OPERATION operationUnsignedMod(uint32_t left, uint32_t right)
+{
+ return left % right;
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> class WASMFunctionCompiler : private CCallHelpers {
</span><span class="lines">@@ -222,20 +237,49 @@
</span><span class="cx"> case WASMOpExpressionI32::Sub:
</span><span class="cx"> sub32(GPRInfo::regT1, GPRInfo::regT0);
</span><span class="cx"> break;
</span><del>- case WASMOpExpressionI32::SDiv: {
</del><ins>+ case WASMOpExpressionI32::SDiv:
+ case WASMOpExpressionI32::UDiv:
+ case WASMOpExpressionI32::SMod:
+ case WASMOpExpressionI32::UMod: {
</ins><span class="cx"> m_divideErrorJumpList.append(branchTest32(Zero, GPRInfo::regT1));
</span><del>- Jump denominatorNotNeg1 = branch32(NotEqual, GPRInfo::regT1, TrustedImm32(-1));
- m_divideErrorJumpList.append(branch32(Equal, GPRInfo::regT0, TrustedImm32(-2147483647-1)));
- denominatorNotNeg1.link(this);
</del><ins>+ if (op == WASMOpExpressionI32::SDiv || op == WASMOpExpressionI32::SMod) {
+ Jump denominatorNotNeg1 = branch32(NotEqual, GPRInfo::regT1, TrustedImm32(-1));
+ m_divideErrorJumpList.append(branch32(Equal, GPRInfo::regT0, TrustedImm32(-2147483647-1)));
+ denominatorNotNeg1.link(this);
+ }
</ins><span class="cx"> #if CPU(X86) || CPU(X86_64)
</span><span class="cx"> ASSERT(GPRInfo::regT0 == X86Registers::eax);
</span><span class="cx"> move(GPRInfo::regT1, X86Registers::ecx);
</span><del>- m_assembler.cdq();
- m_assembler.idivl_r(X86Registers::ecx);
</del><ins>+ if (op == WASMOpExpressionI32::SDiv || op == WASMOpExpressionI32::SMod) {
+ m_assembler.cdq();
+ m_assembler.idivl_r(X86Registers::ecx);
+ } else {
+ ASSERT(op == WASMOpExpressionI32::UDiv || op == WASMOpExpressionI32::UMod);
+ xor32(X86Registers::edx, X86Registers::edx);
+ m_assembler.divl_r(X86Registers::ecx);
+ }
+ if (op == WASMOpExpressionI32::SMod || op == WASMOpExpressionI32::UMod)
+ move(X86Registers::edx, GPRInfo::regT0);
</ins><span class="cx"> #else
</span><ins>+ // FIXME: We should be able to do an inline div on ARMv7 and ARM64.
</ins><span class="cx"> if (maxFrameExtentForSlowPathCall)
</span><span class="cx"> addPtr(TrustedImm32(-maxFrameExtentForSlowPathCall), stackPointerRegister);
</span><del>- callOperation(operationDiv, GPRInfo::regT0, GPRInfo::regT1, GPRInfo::regT0);
</del><ins>+ switch (op) {
+ case WASMOpExpressionI32::SDiv:
+ callOperation(operationDiv, GPRInfo::regT0, GPRInfo::regT1, GPRInfo::regT0);
+ break;
+ case WASMOpExpressionI32::UDiv:
+ callOperation(operationUnsignedDiv, GPRInfo::regT0, GPRInfo::regT1, GPRInfo::regT0);
+ break;
+ case WASMOpExpressionI32::SMod:
+ callOperation(operationMod, GPRInfo::regT0, GPRInfo::regT1, GPRInfo::regT0);
+ break;
+ case WASMOpExpressionI32::UMod:
+ callOperation(operationUnsignedMod, GPRInfo::regT0, GPRInfo::regT1, GPRInfo::regT0);
+ break;
+ default:
+ ASSERT_NOT_REACHED();
+ }
</ins><span class="cx"> if (maxFrameExtentForSlowPathCall)
</span><span class="cx"> addPtr(TrustedImm32(maxFrameExtentForSlowPathCall), stackPointerRegister);
</span><span class="cx"> #endif
</span><span class="lines">@@ -286,6 +330,13 @@
</span><span class="cx"> move(GPRInfo::returnValueGPR, dst);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void callOperation(uint32_t JIT_OPERATION (*operation)(uint32_t, uint32_t), GPRReg src1, GPRReg src2, GPRReg dst)
+ {
+ setupArguments(src1, src2);
+ appendCall(operation);
+ move(GPRInfo::returnValueGPR, dst);
+ }
+
</ins><span class="cx"> unsigned m_stackHeight;
</span><span class="cx"> unsigned m_numberOfLocals;
</span><span class="cx"> unsigned m_tempStackTop { 0 };
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMFunctionParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.cpp (189404 => 189405)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.cpp 2015-09-05 00:12:01 UTC (rev 189404)
+++ trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.cpp 2015-09-05 00:14:21 UTC (rev 189405)
</span><span class="lines">@@ -424,6 +424,8 @@
</span><span class="cx"> READ_OP_EXPRESSION_I32_OR_FAIL(hasImmediate, op, opWithImmediate, immediate, "Cannot read the int32 expression opcode.");
</span><span class="cx"> if (!hasImmediate) {
</span><span class="cx"> switch (op) {
</span><ins>+ case WASMOpExpressionI32::ConstantPoolIndex:
+ return parseConstantPoolIndexExpressionI32(context);
</ins><span class="cx"> case WASMOpExpressionI32::Immediate:
</span><span class="cx"> return parseImmediateExpressionI32(context);
</span><span class="cx"> case WASMOpExpressionI32::GetLocal:
</span><span class="lines">@@ -431,8 +433,10 @@
</span><span class="cx"> case WASMOpExpressionI32::Add:
</span><span class="cx"> case WASMOpExpressionI32::Sub:
</span><span class="cx"> case WASMOpExpressionI32::SDiv:
</span><ins>+ case WASMOpExpressionI32::UDiv:
+ case WASMOpExpressionI32::SMod:
+ case WASMOpExpressionI32::UMod:
</ins><span class="cx"> return parseBinaryExpressionI32(context, op);
</span><del>- case WASMOpExpressionI32::ConstantPoolIndex:
</del><span class="cx"> case WASMOpExpressionI32::GetGlobal:
</span><span class="cx"> case WASMOpExpressionI32::SetLocal:
</span><span class="cx"> case WASMOpExpressionI32::SetGlobal:
</span><span class="lines">@@ -461,9 +465,6 @@
</span><span class="cx"> case WASMOpExpressionI32::FromF64:
</span><span class="cx"> case WASMOpExpressionI32::Negate:
</span><span class="cx"> case WASMOpExpressionI32::Mul:
</span><del>- case WASMOpExpressionI32::UDiv:
- case WASMOpExpressionI32::SMod:
- case WASMOpExpressionI32::UMod:
</del><span class="cx"> case WASMOpExpressionI32::BitNot:
</span><span class="cx"> case WASMOpExpressionI32::BitOr:
</span><span class="cx"> case WASMOpExpressionI32::BitAnd:
</span><span class="lines">@@ -507,13 +508,12 @@
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> switch (opWithImmediate) {
</span><ins>+ case WASMOpExpressionI32WithImmediate::ConstantPoolIndex:
+ return parseConstantPoolIndexExpressionI32(context, immediate);
</ins><span class="cx"> case WASMOpExpressionI32WithImmediate::Immediate:
</span><span class="cx"> return parseImmediateExpressionI32(context, immediate);
</span><span class="cx"> case WASMOpExpressionI32WithImmediate::GetLocal:
</span><span class="cx"> return parseGetLocalExpressionI32(context, immediate);
</span><del>- case WASMOpExpressionI32WithImmediate::ConstantPoolIndex:
- // FIXME: Implement these instructions.
- FAIL_WITH_MESSAGE("Unsupported instruction.");
</del><span class="cx"> default:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="lines">@@ -522,6 +522,21 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <class Context>
</span><ins>+ContextExpression WASMFunctionParser::parseConstantPoolIndexExpressionI32(Context& context, uint32_t constantPoolIndex)
+{
+ FAIL_IF_FALSE(constantPoolIndex < m_module->i32Constants().size(), "The constant pool index is incorrect.");
+ return context.buildImmediateI32(m_module->i32Constants()[constantPoolIndex]);
+}
+
+template <class Context>
+ContextExpression WASMFunctionParser::parseConstantPoolIndexExpressionI32(Context& context)
+{
+ uint32_t constantPoolIndex;
+ READ_COMPACT_UINT32_OR_FAIL(constantPoolIndex, "Cannot read the constant pool index.");
+ return parseConstantPoolIndexExpressionI32(context, constantPoolIndex);
+}
+
+template <class Context>
</ins><span class="cx"> ContextExpression WASMFunctionParser::parseImmediateExpressionI32(Context& context, uint32_t immediate)
</span><span class="cx"> {
</span><span class="cx"> return context.buildImmediateI32(immediate);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMFunctionParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.h (189404 => 189405)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.h 2015-09-05 00:12:01 UTC (rev 189404)
+++ trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.h 2015-09-05 00:14:21 UTC (rev 189405)
</span><span class="lines">@@ -78,6 +78,8 @@
</span><span class="cx"> template <class Context> ContextExpression parseExpression(Context&, WASMExpressionType);
</span><span class="cx">
</span><span class="cx"> template <class Context> ContextExpression parseExpressionI32(Context&);
</span><ins>+ template <class Context> ContextExpression parseConstantPoolIndexExpressionI32(Context&, uint32_t constantPoolIndex);
+ template <class Context> ContextExpression parseConstantPoolIndexExpressionI32(Context&);
</ins><span class="cx"> template <class Context> ContextExpression parseImmediateExpressionI32(Context&, uint32_t immediate);
</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></pre>
</div>
</div>
</body>
</html>