<!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>[189382] 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/189382">189382</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-04 14:00:56 -0700 (Fri, 04 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Implement the GetLocal and SetLocal instructions in WebAssembly
https://bugs.webkit.org/show_bug.cgi?id=148793
Patch by Sukolsak Sakshuwong <sukolsak@gmail.com> on 2015-09-04
Reviewed by Saam Barati.
This patch implements the GetLocal and SetLocal instructions for locals
of type int32 in WebAssembly. A "local" in this context is either an
argument or a local variable.
* tests/stress/wasm-locals.js: Added.
(shouldBe):
* tests/stress/wasm-locals.wasm: Added.
* wasm/WASMFunctionCompiler.h:
(JSC::WASMFunctionCompiler::buildSetLocal):
(JSC::WASMFunctionCompiler::buildGetLocal):
* wasm/WASMFunctionParser.cpp:
(JSC::WASMFunctionParser::parseSetLocalStatement):
(JSC::WASMFunctionParser::parseExpressionI32):
(JSC::WASMFunctionParser::parseGetLocalExpressionI32):
* wasm/WASMFunctionParser.h:
* wasm/WASMFunctionSyntaxChecker.h:
(JSC::WASMFunctionSyntaxChecker::buildSetLocal):
(JSC::WASMFunctionSyntaxChecker::buildGetLocal):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</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>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstresswasmlocalsjs">trunk/Source/JavaScriptCore/tests/stress/wasm-locals.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstresswasmlocalswasm">trunk/Source/JavaScriptCore/tests/stress/wasm-locals.wasm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (189381 => 189382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-09-04 20:59:12 UTC (rev 189381)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-09-04 21:00:56 UTC (rev 189382)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-09-04 Sukolsak Sakshuwong <sukolsak@gmail.com>
+
+ Implement the GetLocal and SetLocal instructions in WebAssembly
+ https://bugs.webkit.org/show_bug.cgi?id=148793
+
+ Reviewed by Saam Barati.
+
+ This patch implements the GetLocal and SetLocal instructions for locals
+ of type int32 in WebAssembly. A "local" in this context is either an
+ argument or a local variable.
+
+ * tests/stress/wasm-locals.js: Added.
+ (shouldBe):
+ * tests/stress/wasm-locals.wasm: Added.
+ * wasm/WASMFunctionCompiler.h:
+ (JSC::WASMFunctionCompiler::buildSetLocal):
+ (JSC::WASMFunctionCompiler::buildGetLocal):
+ * wasm/WASMFunctionParser.cpp:
+ (JSC::WASMFunctionParser::parseSetLocalStatement):
+ (JSC::WASMFunctionParser::parseExpressionI32):
+ (JSC::WASMFunctionParser::parseGetLocalExpressionI32):
+ * wasm/WASMFunctionParser.h:
+ * wasm/WASMFunctionSyntaxChecker.h:
+ (JSC::WASMFunctionSyntaxChecker::buildSetLocal):
+ (JSC::WASMFunctionSyntaxChecker::buildGetLocal):
+
</ins><span class="cx"> 2015-09-04 Basile Clement <basile_clement@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, add missing copyright to file from r189336
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstresswasmlocalsjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/wasm-locals.js (0 => 189382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/wasm-locals.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/wasm-locals.js 2015-09-04 21:00:56 UTC (rev 189382)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+//@ skip
+
+function shouldBe(actual, expected) {
+ if (actual !== expected)
+ throw new Error('bad value: ' + actual);
+}
+
+/*
+wasm-locals.wasm is generated by pack-asmjs <https://github.com/WebAssembly/polyfill-prototype-1> from the following script:
+
+function asmModule(global, env, buffer) {
+ "use asm";
+
+ function sum(x, y) {
+ x = x | 0;
+ y = y | 0;
+ var result = 0;
+ result = (x + y) | 0;
+ return result;
+ }
+
+ function add1(x) {
+ x = x | 0;
+ return (x + 1) | 0;
+ }
+
+ return {
+ sum: sum,
+ add1: add1,
+ };
+}
+*/
+
+var module = loadWebAssembly("wasm-locals.wasm");
+
+shouldBe(module.sum(12, 30), 42);
+
+shouldBe(module.add1(42), 43);
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstresswasmlocalswasm"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/wasm-locals.wasm (0 => 189382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/wasm-locals.wasm (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/wasm-locals.wasm 2015-09-04 21:00:56 UTC (rev 189382)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+wasmB\x81\x82 \xC0\xC1 \xC0\xA1sumadd1
</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 (189381 => 189382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMFunctionCompiler.h 2015-09-04 20:59:12 UTC (rev 189381)
+++ trunk/Source/JavaScriptCore/wasm/WASMFunctionCompiler.h 2015-09-04 21:00:56 UTC (rev 189382)
</span><span class="lines">@@ -127,6 +127,19 @@
</span><span class="cx"> m_codeBlock->capabilityLevel();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void buildSetLocal(uint32_t localIndex, int, WASMType type)
+ {
+ switch (type) {
+ case WASMType::I32:
+ load32(temporaryAddress(m_tempStackTop - 1), GPRInfo::regT0);
+ m_tempStackTop--;
+ store32(GPRInfo::regT0, localAddress(localIndex));
+ break;
+ default:
+ ASSERT_NOT_REACHED();
+ }
+ }
+
</ins><span class="cx"> void buildReturn(int, WASMExpressionType returnType)
</span><span class="cx"> {
</span><span class="cx"> switch (returnType) {
</span><span class="lines">@@ -151,6 +164,20 @@
</span><span class="cx"> return UNUSED;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ int buildGetLocal(uint32_t localIndex, WASMType type)
+ {
+ switch (type) {
+ case WASMType::I32:
+ load32(localAddress(localIndex), GPRInfo::regT0);
+ m_tempStackTop++;
+ store32(GPRInfo::regT0, temporaryAddress(m_tempStackTop - 1));
+ break;
+ default:
+ ASSERT_NOT_REACHED();
+ }
+ 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></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMFunctionParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.cpp (189381 => 189382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.cpp 2015-09-04 20:59:12 UTC (rev 189381)
+++ trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.cpp 2015-09-04 21:00:56 UTC (rev 189382)
</span><span class="lines">@@ -210,8 +210,9 @@
</span><span class="cx"> {
</span><span class="cx"> FAIL_IF_FALSE(localIndex < m_localTypes.size(), "The local variable index is incorrect.");
</span><span class="cx"> WASMType type = m_localTypes[localIndex];
</span><del>- parseExpression(context, WASMExpressionType(type));
- // FIXME: Implement this instruction.
</del><ins>+ ContextExpression expression = parseExpression(context, WASMExpressionType(type));
+ PROPAGATE_ERROR();
+ context.buildSetLocal(localIndex, expression, type);
</ins><span class="cx"> return UNUSED;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -425,11 +426,12 @@
</span><span class="cx"> switch (op) {
</span><span class="cx"> case WASMOpExpressionI32::Immediate:
</span><span class="cx"> return parseImmediateExpressionI32(context);
</span><ins>+ case WASMOpExpressionI32::GetLocal:
+ return parseGetLocalExpressionI32(context);
</ins><span class="cx"> case WASMOpExpressionI32::Add:
</span><span class="cx"> case WASMOpExpressionI32::Sub:
</span><span class="cx"> return parseBinaryExpressionI32(context, op);
</span><span class="cx"> case WASMOpExpressionI32::ConstantPoolIndex:
</span><del>- case WASMOpExpressionI32::GetLocal:
</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">@@ -507,8 +509,9 @@
</span><span class="cx"> switch (opWithImmediate) {
</span><span class="cx"> case WASMOpExpressionI32WithImmediate::Immediate:
</span><span class="cx"> return parseImmediateExpressionI32(context, immediate);
</span><ins>+ case WASMOpExpressionI32WithImmediate::GetLocal:
+ return parseGetLocalExpressionI32(context, immediate);
</ins><span class="cx"> case WASMOpExpressionI32WithImmediate::ConstantPoolIndex:
</span><del>- case WASMOpExpressionI32WithImmediate::GetLocal:
</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">@@ -533,6 +536,22 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <class Context>
</span><ins>+ContextExpression WASMFunctionParser::parseGetLocalExpressionI32(Context& context, uint32_t localIndex)
+{
+ FAIL_IF_FALSE(localIndex < m_localTypes.size(), "The local index is incorrect.");
+ FAIL_IF_FALSE(m_localTypes[localIndex] == WASMType::I32, "Expected a local of type int32.");
+ return context.buildGetLocal(localIndex, WASMType::I32);
+}
+
+template <class Context>
+ContextExpression WASMFunctionParser::parseGetLocalExpressionI32(Context& context)
+{
+ uint32_t localIndex;
+ READ_COMPACT_UINT32_OR_FAIL(localIndex, "Cannot read the local index.");
+ return parseGetLocalExpressionI32(context, localIndex);
+}
+
+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 (189381 => 189382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.h 2015-09-04 20:59:12 UTC (rev 189381)
+++ trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.h 2015-09-04 21:00:56 UTC (rev 189382)
</span><span class="lines">@@ -80,6 +80,8 @@
</span><span class="cx"> template <class Context> ContextExpression parseExpressionI32(Context&);
</span><span class="cx"> template <class Context> ContextExpression parseImmediateExpressionI32(Context&, uint32_t immediate);
</span><span class="cx"> template <class Context> ContextExpression parseImmediateExpressionI32(Context&);
</span><ins>+ template <class Context> ContextExpression parseGetLocalExpressionI32(Context&, uint32_t localIndex);
+ template <class Context> ContextExpression parseGetLocalExpressionI32(Context&);
</ins><span class="cx"> template <class Context> ContextExpression parseBinaryExpressionI32(Context&, WASMOpExpressionI32);
</span><span class="cx">
</span><span class="cx"> JSWASMModule* m_module;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMFunctionSyntaxCheckerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMFunctionSyntaxChecker.h (189381 => 189382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMFunctionSyntaxChecker.h 2015-09-04 20:59:12 UTC (rev 189381)
+++ trunk/Source/JavaScriptCore/wasm/WASMFunctionSyntaxChecker.h 2015-09-04 21:00:56 UTC (rev 189382)
</span><span class="lines">@@ -47,6 +47,11 @@
</span><span class="cx"> ASSERT(!m_tempStackTop);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void buildSetLocal(uint32_t, int, WASMType)
+ {
+ m_tempStackTop--;
+ }
+
</ins><span class="cx"> void buildReturn(int, WASMExpressionType returnType)
</span><span class="cx"> {
</span><span class="cx"> if (returnType != WASMExpressionType::Void)
</span><span class="lines">@@ -60,6 +65,13 @@
</span><span class="cx"> return UNUSED;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ int buildGetLocal(uint32_t, WASMType)
+ {
+ m_tempStackTop++;
+ updateTempStackHeight();
+ 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>