<!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>[189514] 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/189514">189514</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-08 16:04:44 -0700 (Tue, 08 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Implement control flow statements in WebAssembly
https://bugs.webkit.org/show_bug.cgi?id=148934
Patch by Sukolsak Sakshuwong <sukolsak@gmail.com> on 2015-09-08
Reviewed by Geoffrey Garen.
This patch implements if, while, do, label, break, and continue
statements in WebAssembly. Switches will be implemented in a subsequent
patch.
* tests/stress/wasm-control-flow.js: Added.
(shouldBe):
* tests/stress/wasm/control-flow.wasm: Added.
* wasm/WASMFunctionCompiler.h:
(JSC::WASMFunctionCompiler::linkTarget):
(JSC::WASMFunctionCompiler::jumpToTarget):
(JSC::WASMFunctionCompiler::jumpToTargetIf):
(JSC::WASMFunctionCompiler::startLoop):
(JSC::WASMFunctionCompiler::endLoop):
(JSC::WASMFunctionCompiler::startSwitch):
(JSC::WASMFunctionCompiler::endSwitch):
(JSC::WASMFunctionCompiler::startLabel):
(JSC::WASMFunctionCompiler::endLabel):
(JSC::WASMFunctionCompiler::breakTarget):
(JSC::WASMFunctionCompiler::continueTarget):
(JSC::WASMFunctionCompiler::breakLabelTarget):
(JSC::WASMFunctionCompiler::continueLabelTarget):
* wasm/WASMFunctionParser.cpp:
(JSC::WASMFunctionParser::parseIfStatement):
(JSC::WASMFunctionParser::parseIfElseStatement):
(JSC::WASMFunctionParser::parseWhileStatement):
(JSC::WASMFunctionParser::parseDoStatement):
(JSC::WASMFunctionParser::parseLabelStatement):
(JSC::WASMFunctionParser::parseBreakStatement):
(JSC::WASMFunctionParser::parseBreakLabelStatement):
(JSC::WASMFunctionParser::parseContinueStatement):
(JSC::WASMFunctionParser::parseContinueLabelStatement):
* wasm/WASMFunctionParser.h:
* wasm/WASMFunctionSyntaxChecker.h:
(JSC::WASMFunctionSyntaxChecker::linkTarget):
(JSC::WASMFunctionSyntaxChecker::jumpToTarget):
(JSC::WASMFunctionSyntaxChecker::jumpToTargetIf):
(JSC::WASMFunctionSyntaxChecker::startLoop):
(JSC::WASMFunctionSyntaxChecker::endLoop):
(JSC::WASMFunctionSyntaxChecker::startSwitch):
(JSC::WASMFunctionSyntaxChecker::endSwitch):
(JSC::WASMFunctionSyntaxChecker::startLabel):
(JSC::WASMFunctionSyntaxChecker::endLabel):
(JSC::WASMFunctionSyntaxChecker::breakTarget):
(JSC::WASMFunctionSyntaxChecker::continueTarget):
(JSC::WASMFunctionSyntaxChecker::breakLabelTarget):
(JSC::WASMFunctionSyntaxChecker::continueLabelTarget):</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="#trunkSourceJavaScriptCoretestsstresswasmcontrolflowwasm">trunk/Source/JavaScriptCore/tests/stress/wasm/control-flow.wasm</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstresswasmcontrolflowjs">trunk/Source/JavaScriptCore/tests/stress/wasm-control-flow.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (189513 => 189514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-09-08 23:04:34 UTC (rev 189513)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-09-08 23:04:44 UTC (rev 189514)
</span><span class="lines">@@ -1,3 +1,57 @@
</span><ins>+2015-09-08 Sukolsak Sakshuwong <sukolsak@gmail.com>
+
+ Implement control flow statements in WebAssembly
+ https://bugs.webkit.org/show_bug.cgi?id=148934
+
+ Reviewed by Geoffrey Garen.
+
+ This patch implements if, while, do, label, break, and continue
+ statements in WebAssembly. Switches will be implemented in a subsequent
+ patch.
+
+ * tests/stress/wasm-control-flow.js: Added.
+ (shouldBe):
+ * tests/stress/wasm/control-flow.wasm: Added.
+ * wasm/WASMFunctionCompiler.h:
+ (JSC::WASMFunctionCompiler::linkTarget):
+ (JSC::WASMFunctionCompiler::jumpToTarget):
+ (JSC::WASMFunctionCompiler::jumpToTargetIf):
+ (JSC::WASMFunctionCompiler::startLoop):
+ (JSC::WASMFunctionCompiler::endLoop):
+ (JSC::WASMFunctionCompiler::startSwitch):
+ (JSC::WASMFunctionCompiler::endSwitch):
+ (JSC::WASMFunctionCompiler::startLabel):
+ (JSC::WASMFunctionCompiler::endLabel):
+ (JSC::WASMFunctionCompiler::breakTarget):
+ (JSC::WASMFunctionCompiler::continueTarget):
+ (JSC::WASMFunctionCompiler::breakLabelTarget):
+ (JSC::WASMFunctionCompiler::continueLabelTarget):
+ * wasm/WASMFunctionParser.cpp:
+ (JSC::WASMFunctionParser::parseIfStatement):
+ (JSC::WASMFunctionParser::parseIfElseStatement):
+ (JSC::WASMFunctionParser::parseWhileStatement):
+ (JSC::WASMFunctionParser::parseDoStatement):
+ (JSC::WASMFunctionParser::parseLabelStatement):
+ (JSC::WASMFunctionParser::parseBreakStatement):
+ (JSC::WASMFunctionParser::parseBreakLabelStatement):
+ (JSC::WASMFunctionParser::parseContinueStatement):
+ (JSC::WASMFunctionParser::parseContinueLabelStatement):
+ * wasm/WASMFunctionParser.h:
+ * wasm/WASMFunctionSyntaxChecker.h:
+ (JSC::WASMFunctionSyntaxChecker::linkTarget):
+ (JSC::WASMFunctionSyntaxChecker::jumpToTarget):
+ (JSC::WASMFunctionSyntaxChecker::jumpToTargetIf):
+ (JSC::WASMFunctionSyntaxChecker::startLoop):
+ (JSC::WASMFunctionSyntaxChecker::endLoop):
+ (JSC::WASMFunctionSyntaxChecker::startSwitch):
+ (JSC::WASMFunctionSyntaxChecker::endSwitch):
+ (JSC::WASMFunctionSyntaxChecker::startLabel):
+ (JSC::WASMFunctionSyntaxChecker::endLabel):
+ (JSC::WASMFunctionSyntaxChecker::breakTarget):
+ (JSC::WASMFunctionSyntaxChecker::continueTarget):
+ (JSC::WASMFunctionSyntaxChecker::breakLabelTarget):
+ (JSC::WASMFunctionSyntaxChecker::continueLabelTarget):
+
</ins><span class="cx"> 2015-09-08 Per Arne Vollan <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [Win] Compile errors in inspector code.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstresswasmcontrolflowwasm"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/wasm/control-flow.wasm (0 => 189514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/wasm/control-flow.wasm (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/wasm/control-flow.wasm 2015-09-08 23:04:44 UTC (rev 189514)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+wasm
+\x81\x80\xA5<\xC0\xA0\xA1\xA0\x81<\xC0\xA0\xA1\xA0\x81\x80\xA5<\xC0\xA0\xA1\xA2\x81<\xC0\xA0\xA1\xA2\x82\x80\xA1.\xC0\xA0.\xC1\xA0\xA1\xA2.\xC1\xA0\xA3\xA4\x824\xC1\xA5\x80 \xC0\xA1\x81 \xC1\xA1\xC0\x82\xA1.\xC1\xA2\x80 \xC0\xA1\x81 \xC1\xA1\xC0\x824\xC1\xA5.\xC1\xA2\x81\xA3\x80 \xC0\xA1\x81 \xC1\xA1\xC0\x834\xC1\xA5\x82\xA04¢\x80 \xC0\xA1\x82 ¡\x81 \xC1\xA1\xC0\x82\x80 \xC0\xA1\x81 \xC1\xA14\xC1\xA0\xC0\x82.\xC1\xA2\x80 \xC0\xA1\x81 \xC1\xA1\xA1\xC0\x82.\xC1\xA2\x81\xA3\x80 \xC0\xA1\x81 \xC1\xA14\xC1\xA5\xC0\x81\x80\xA1\x80\xA2\xA0\xC0\x81.\xC0\xA1\x80\xA1\x80\xA2\xA0\xC0\x81\x80\xA1\x80\xA2\x80\xA3\xA0\x80\xA4\xA0\xC0\x81\x80\xA1\x80\xA2\x80\xA3\xA0\x80\xA4\xA0\xC0\x834\xC1\xA5\x82\xA04¢\x80 \xC0\xA1.\xC0\xA8\x82 ¡\x81 \xC1\xA1\xC0ifTrueifFalseifElseTrueifElseFalseifInIfwhileLoop
whileBreakwhileContinuewhileInWhiledoLoop doBreak
+doContinue labelBreak labelContinue+labelInLabelBreakInnerlabelInLabelBreakOuterwhileInWhileBreakOuter
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstresswasmcontrolflowjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/wasm-control-flow.js (0 => 189514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/wasm-control-flow.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/wasm-control-flow.js 2015-09-08 23:04:44 UTC (rev 189514)
</span><span class="lines">@@ -0,0 +1,247 @@
</span><ins>+//@ skip
+
+function shouldBe(actual, expected) {
+ if (actual !== expected)
+ throw new Error('bad value: ' + actual);
+}
+
+/*
+wasm/control-flow.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 ifTrue() {
+ var x = 0;
+ x = 5;
+ if ((x | 0) > 0)
+ return 1;
+ return 0;
+ }
+
+ function ifFalse() {
+ var x = 0;
+ if ((x | 0) > 0)
+ return 1;
+ return 0;
+ }
+
+ function ifElseTrue() {
+ var x = 0;
+ x = 5;
+ if ((x | 0) > 0)
+ return 1;
+ else
+ return 2;
+ }
+
+ function ifElseFalse() {
+ var x = 0;
+ if ((x | 0) > 0)
+ return 1;
+ else
+ return 2;
+ }
+
+ function ifInIf() {
+ var x = 0, y = 0;
+ x = 1;
+ if (x == 0) {
+ if (y == 0)
+ return 1;
+ else
+ return 2;
+ } else {
+ if (y == 0)
+ return 3;
+ else
+ return 4;
+ }
+ }
+
+ function whileLoop() {
+ var x = 0, i = 0;
+ while ((i | 0) < 5) {
+ x = (x + 1) | 0;
+ i = (i + 1) | 0;
+ }
+ return x;
+ }
+
+ function whileBreak() {
+ var x = 0, i = 0;
+ while (1) {
+ if (i == 2)
+ break;
+ x = (x + 1) | 0;
+ i = (i + 1) | 0;
+ }
+ return x;
+ }
+
+ function whileContinue() {
+ var x = 0, i = 0;
+ while ((i | 0) < 5) {
+ if (i == 2) {
+ i = 3;
+ continue;
+ }
+ x = (x + 1) | 0;
+ i = (i + 1) | 0;
+ }
+ return x;
+ }
+
+ function whileInWhile() {
+ var x = 0, i = 0, j = 0;
+ while ((i | 0) < 5) {
+ j = 0;
+ while ((j | 0) < 2) {
+ x = (x + 1) | 0;
+ j = (j + 1) | 0;
+ }
+ i = (i + 1) | 0;
+ }
+ return x;
+ }
+
+ function doLoop() {
+ var x = 0, i = 0;
+ do {
+ x = (x + 1) | 0;
+ i = (i + 1) | 0;
+ } while ((i | 0) < 0);
+ return x;
+ }
+
+ function doBreak() {
+ var x = 0, i = 0;
+ do {
+ if (i == 2)
+ break;
+ x = (x + 1) | 0;
+ i = (i + 1) | 0;
+ } while (1);
+ return x;
+ }
+
+ function doContinue() {
+ var x = 0, i = 0;
+ do {
+ if (i == 2) {
+ i = 3;
+ continue;
+ }
+ x = (x + 1) | 0;
+ i = (i + 1) | 0;
+ } while ((i | 0) < 5);
+ return x;
+ }
+
+ function labelBreak() {
+ var x = 0;
+ label: do {
+ x = 1;
+ break label;
+ x = 2;
+ } while (0);
+ return x;
+ }
+
+ function labelContinue() {
+ var x = 0;
+ label: do {
+ if (x == 1)
+ break label;
+ x = 1;
+ continue label;
+ x = 2;
+ } while (0);
+ return x;
+ }
+
+ function labelInLabelBreakInner() {
+ var x = 0;
+ outer: do {
+ x = 1;
+ inner: do {
+ x = 2;
+ break inner;
+ x = 3;
+ } while (0);
+ x = 4;
+ } while (0);
+ return x;
+ }
+
+ function labelInLabelBreakOuter() {
+ var x = 0;
+ outer: do {
+ x = 1;
+ inner: do {
+ x = 2;
+ break outer;
+ x = 3;
+ } while (0);
+ x = 4;
+ } while (0);
+ return x;
+ }
+
+ function whileInWhileBreakOuter() {
+ var x = 0, i = 0, j = 0;
+ label:
+ while ((i | 0) < 5) {
+ j = 0;
+ while ((j | 0) < 2) {
+ x = (x + 1) | 0;
+ if (x == 8)
+ break label;
+ j = (j + 1) | 0;
+ }
+ i = (i + 1) | 0;
+ }
+ return x;
+ }
+
+ return {
+ ifTrue: ifTrue,
+ ifFalse: ifFalse,
+ ifElseTrue: ifElseTrue,
+ ifElseFalse: ifElseFalse,
+ ifInIf: ifInIf,
+ whileLoop: whileLoop,
+ whileBreak: whileBreak,
+ whileContinue: whileContinue,
+ whileInWhile: whileInWhile,
+ doLoop: doLoop,
+ doBreak: doBreak,
+ doContinue: doContinue,
+ labelBreak: labelBreak,
+ labelContinue: labelContinue,
+ labelInLabelBreakInner: labelInLabelBreakInner,
+ labelInLabelBreakOuter: labelInLabelBreakOuter,
+ whileInWhileBreakOuter: whileInWhileBreakOuter,
+ };
+}
+*/
+
+var module = loadWebAssembly("wasm/control-flow.wasm");
+
+shouldBe(module.ifTrue(), 1);
+shouldBe(module.ifFalse(), 0);
+shouldBe(module.ifElseTrue(), 1);
+shouldBe(module.ifElseFalse(), 2);
+shouldBe(module.ifInIf(), 3);
+shouldBe(module.whileLoop(), 5);
+shouldBe(module.whileBreak(), 2);
+shouldBe(module.whileContinue(), 4);
+shouldBe(module.whileInWhile(), 10);
+shouldBe(module.doLoop(), 1);
+shouldBe(module.doBreak(), 2);
+shouldBe(module.doContinue(), 4);
+shouldBe(module.labelBreak(), 1);
+shouldBe(module.labelContinue(), 1);
+shouldBe(module.labelInLabelBreakInner(), 4);
+shouldBe(module.labelInLabelBreakOuter(), 2);
+shouldBe(module.whileInWhileBreakOuter(), 8);
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMFunctionCompilerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMFunctionCompiler.h (189513 => 189514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMFunctionCompiler.h 2015-09-08 23:04:34 UTC (rev 189513)
+++ trunk/Source/JavaScriptCore/wasm/WASMFunctionCompiler.h 2015-09-08 23:04:44 UTC (rev 189514)
</span><span class="lines">@@ -63,6 +63,11 @@
</span><span class="cx"> public:
</span><span class="cx"> typedef int Expression;
</span><span class="cx"> typedef int Statement;
</span><ins>+ struct JumpTarget {
+ Label label;
+ JumpList jumpList;
+ };
+ enum class JumpCondition { Zero, NonZero };
</ins><span class="cx">
</span><span class="cx"> WASMFunctionCompiler(VM& vm, CodeBlock* codeBlock, unsigned stackHeight)
</span><span class="cx"> : CCallHelpers(&vm, codeBlock)
</span><span class="lines">@@ -433,6 +438,89 @@
</span><span class="cx"> return UNUSED;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void linkTarget(JumpTarget& target)
+ {
+ target.label = label();
+ target.jumpList.link(this);
+ }
+
+ void jumpToTarget(JumpTarget& target)
+ {
+ if (target.label.isSet())
+ jump(target.label);
+ else
+ target.jumpList.append(jump());
+ }
+
+ void jumpToTargetIf(JumpCondition condition, int, JumpTarget& target)
+ {
+ load32(temporaryAddress(m_tempStackTop - 1), GPRInfo::regT0);
+ m_tempStackTop--;
+ Jump taken = branchTest32((condition == JumpCondition::Zero) ? Zero : NonZero, GPRInfo::regT0);
+ if (target.label.isSet())
+ taken.linkTo(target.label, this);
+ else
+ target.jumpList.append(taken);
+ }
+
+ void startLoop()
+ {
+ m_breakTargets.append(JumpTarget());
+ m_continueTargets.append(JumpTarget());
+ }
+
+ void endLoop()
+ {
+ m_breakTargets.removeLast();
+ m_continueTargets.removeLast();
+ }
+
+ void startSwitch()
+ {
+ m_breakTargets.append(JumpTarget());
+ }
+
+ void endSwitch()
+ {
+ m_breakTargets.removeLast();
+ }
+
+ void startLabel()
+ {
+ m_breakLabelTargets.append(JumpTarget());
+ m_continueLabelTargets.append(JumpTarget());
+
+ linkTarget(m_continueLabelTargets.last());
+ }
+
+ void endLabel()
+ {
+ linkTarget(m_breakLabelTargets.last());
+
+ m_breakLabelTargets.removeLast();
+ m_continueLabelTargets.removeLast();
+ }
+
+ JumpTarget& breakTarget()
+ {
+ return m_breakTargets.last();
+ }
+
+ JumpTarget& continueTarget()
+ {
+ return m_continueTargets.last();
+ }
+
+ JumpTarget& breakLabelTarget(uint32_t labelIndex)
+ {
+ return m_breakLabelTargets[labelIndex];
+ }
+
+ JumpTarget& continueLabelTarget(uint32_t labelIndex)
+ {
+ return m_continueLabelTargets[labelIndex];
+ }
+
</ins><span class="cx"> private:
</span><span class="cx"> union StackSlot {
</span><span class="cx"> int32_t intValue;
</span><span class="lines">@@ -481,6 +569,11 @@
</span><span class="cx"> unsigned m_numberOfLocals;
</span><span class="cx"> unsigned m_tempStackTop { 0 };
</span><span class="cx">
</span><ins>+ Vector<JumpTarget> m_breakTargets;
+ Vector<JumpTarget> m_continueTargets;
+ Vector<JumpTarget> m_breakLabelTargets;
+ Vector<JumpTarget> m_continueLabelTargets;
+
</ins><span class="cx"> Label m_beginLabel;
</span><span class="cx"> Jump m_stackOverflow;
</span><span class="cx"> JumpList m_divideErrorJumpList;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMFunctionParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.cpp (189513 => 189514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.cpp 2015-09-08 23:04:34 UTC (rev 189513)
+++ trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.cpp 2015-09-08 23:04:44 UTC (rev 189514)
</span><span class="lines">@@ -253,44 +253,77 @@
</span><span class="cx"> template <class Context>
</span><span class="cx"> ContextStatement WASMFunctionParser::parseIfStatement(Context& context)
</span><span class="cx"> {
</span><del>- parseExpressionI32(context);
</del><ins>+ ContextJumpTarget end;
+
+ ContextExpression expression = parseExpressionI32(context);
</ins><span class="cx"> PROPAGATE_ERROR();
</span><ins>+
+ context.jumpToTargetIf(Context::JumpCondition::Zero, expression, end);
+
</ins><span class="cx"> parseStatement(context);
</span><del>- // FIXME: Implement this instruction.
</del><ins>+ PROPAGATE_ERROR();
+
+ context.linkTarget(end);
</ins><span class="cx"> return UNUSED;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <class Context>
</span><span class="cx"> ContextStatement WASMFunctionParser::parseIfElseStatement(Context& context)
</span><span class="cx"> {
</span><del>- parseExpressionI32(context);
</del><ins>+ ContextJumpTarget elseTarget;
+ ContextJumpTarget end;
+
+ ContextExpression expression = parseExpressionI32(context);
</ins><span class="cx"> PROPAGATE_ERROR();
</span><ins>+
+ context.jumpToTargetIf(Context::JumpCondition::Zero, expression, elseTarget);
+
</ins><span class="cx"> parseStatement(context);
</span><span class="cx"> PROPAGATE_ERROR();
</span><ins>+
+ context.jumpToTarget(end);
+ context.linkTarget(elseTarget);
+
</ins><span class="cx"> parseStatement(context);
</span><del>- // FIXME: Implement this instruction.
</del><ins>+ PROPAGATE_ERROR();
+
+ context.linkTarget(end);
</ins><span class="cx"> return UNUSED;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <class Context>
</span><span class="cx"> ContextStatement WASMFunctionParser::parseWhileStatement(Context& context)
</span><span class="cx"> {
</span><del>- parseExpressionI32(context);
</del><ins>+ context.startLoop();
+ context.linkTarget(context.continueTarget());
+
+ ContextExpression expression = parseExpressionI32(context);
</ins><span class="cx"> PROPAGATE_ERROR();
</span><span class="cx">
</span><ins>+ context.jumpToTargetIf(Context::JumpCondition::Zero, expression, context.breakTarget());
+
</ins><span class="cx"> m_breakScopeDepth++;
</span><span class="cx"> m_continueScopeDepth++;
</span><span class="cx"> parseStatement(context);
</span><span class="cx"> PROPAGATE_ERROR();
</span><span class="cx"> m_continueScopeDepth--;
</span><span class="cx"> m_breakScopeDepth--;
</span><del>- // FIXME: Implement this instruction.
</del><ins>+
+ context.jumpToTarget(context.continueTarget());
+
+ context.linkTarget(context.breakTarget());
+ context.endLoop();
</ins><span class="cx"> return UNUSED;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <class Context>
</span><span class="cx"> ContextStatement WASMFunctionParser::parseDoStatement(Context& context)
</span><span class="cx"> {
</span><ins>+ context.startLoop();
+
+ ContextJumpTarget topOfLoop;
+ context.linkTarget(topOfLoop);
+
</ins><span class="cx"> m_breakScopeDepth++;
</span><span class="cx"> m_continueScopeDepth++;
</span><span class="cx"> parseStatement(context);
</span><span class="lines">@@ -298,55 +331,63 @@
</span><span class="cx"> m_continueScopeDepth--;
</span><span class="cx"> m_breakScopeDepth--;
</span><span class="cx">
</span><del>- parseExpressionI32(context);
- // FIXME: Implement this instruction.
</del><ins>+ context.linkTarget(context.continueTarget());
+
+ ContextExpression expression = parseExpressionI32(context);
+ PROPAGATE_ERROR();
+
+ context.jumpToTargetIf(Context::JumpCondition::NonZero, expression, topOfLoop);
+
+ context.linkTarget(context.breakTarget());
+ context.endLoop();
</ins><span class="cx"> return UNUSED;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <class Context>
</span><span class="cx"> ContextStatement WASMFunctionParser::parseLabelStatement(Context& context)
</span><span class="cx"> {
</span><ins>+ context.startLabel();
</ins><span class="cx"> m_labelDepth++;
</span><span class="cx"> parseStatement(context);
</span><span class="cx"> PROPAGATE_ERROR();
</span><span class="cx"> m_labelDepth--;
</span><del>- // FIXME: Implement this instruction.
</del><ins>+ context.endLabel();
</ins><span class="cx"> return UNUSED;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <class Context>
</span><del>-ContextStatement WASMFunctionParser::parseBreakStatement(Context&)
</del><ins>+ContextStatement WASMFunctionParser::parseBreakStatement(Context& context)
</ins><span class="cx"> {
</span><span class="cx"> FAIL_IF_FALSE(m_breakScopeDepth, "'break' is only valid inside a switch or loop statement.");
</span><del>- // FIXME: Implement this instruction.
</del><ins>+ context.jumpToTarget(context.breakTarget());
</ins><span class="cx"> return UNUSED;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <class Context>
</span><del>-ContextStatement WASMFunctionParser::parseBreakLabelStatement(Context&)
</del><ins>+ContextStatement WASMFunctionParser::parseBreakLabelStatement(Context& context)
</ins><span class="cx"> {
</span><span class="cx"> uint32_t labelIndex;
</span><span class="cx"> READ_COMPACT_UINT32_OR_FAIL(labelIndex, "Cannot read the label index.");
</span><span class="cx"> FAIL_IF_FALSE(labelIndex < m_labelDepth, "The label index is incorrect.");
</span><del>- // FIXME: Implement this instruction.
</del><ins>+ context.jumpToTarget(context.breakLabelTarget(labelIndex));
</ins><span class="cx"> return UNUSED;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <class Context>
</span><del>-ContextStatement WASMFunctionParser::parseContinueStatement(Context&)
</del><ins>+ContextStatement WASMFunctionParser::parseContinueStatement(Context& context)
</ins><span class="cx"> {
</span><span class="cx"> FAIL_IF_FALSE(m_continueScopeDepth, "'continue' is only valid inside a loop statement.");
</span><del>- // FIXME: Implement this instruction.
</del><ins>+ context.jumpToTarget(context.continueTarget());
</ins><span class="cx"> return UNUSED;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <class Context>
</span><del>-ContextStatement WASMFunctionParser::parseContinueLabelStatement(Context&)
</del><ins>+ContextStatement WASMFunctionParser::parseContinueLabelStatement(Context& context)
</ins><span class="cx"> {
</span><span class="cx"> uint32_t labelIndex;
</span><span class="cx"> READ_COMPACT_UINT32_OR_FAIL(labelIndex, "Cannot read the label index.");
</span><span class="cx"> FAIL_IF_FALSE(labelIndex < m_labelDepth, "The label index is incorrect.");
</span><del>- // FIXME: Implement this instruction.
</del><ins>+ context.jumpToTarget(context.continueLabelTarget(labelIndex));
</ins><span class="cx"> return UNUSED;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMFunctionParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.h (189513 => 189514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.h 2015-09-08 23:04:34 UTC (rev 189513)
+++ trunk/Source/JavaScriptCore/wasm/WASMFunctionParser.h 2015-09-08 23:04:44 UTC (rev 189514)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx">
</span><span class="cx"> #define ContextExpression typename Context::Expression
</span><span class="cx"> #define ContextStatement typename Context::Statement
</span><ins>+#define ContextJumpTarget typename Context::JumpTarget
</ins><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMFunctionSyntaxCheckerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMFunctionSyntaxChecker.h (189513 => 189514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMFunctionSyntaxChecker.h 2015-09-08 23:04:34 UTC (rev 189513)
+++ trunk/Source/JavaScriptCore/wasm/WASMFunctionSyntaxChecker.h 2015-09-08 23:04:44 UTC (rev 189514)
</span><span class="lines">@@ -36,6 +36,8 @@
</span><span class="cx"> public:
</span><span class="cx"> typedef int Expression;
</span><span class="cx"> typedef int Statement;
</span><ins>+ typedef int JumpTarget;
+ enum class JumpCondition { Zero, NonZero };
</ins><span class="cx">
</span><span class="cx"> void startFunction(const Vector<WASMType>& arguments, uint32_t numberOfI32LocalVariables, uint32_t numberOfF32LocalVariables, uint32_t numberOfF64LocalVariables)
</span><span class="cx"> {
</span><span class="lines">@@ -96,6 +98,25 @@
</span><span class="cx"> return UNUSED;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void linkTarget(const int&) { }
+ void jumpToTarget(const int&) { }
+ void jumpToTargetIf(JumpCondition, int, const int&)
+ {
+ m_tempStackTop--;
+ }
+
+ void startLoop() { }
+ void endLoop() { }
+ void startSwitch() { }
+ void endSwitch() { }
+ void startLabel() { }
+ void endLabel() { }
+
+ int breakTarget() { return UNUSED; }
+ int continueTarget() { return UNUSED; }
+ int breakLabelTarget(uint32_t) { return UNUSED; }
+ int continueLabelTarget(uint32_t) { return UNUSED; }
+
</ins><span class="cx"> unsigned stackHeight()
</span><span class="cx"> {
</span><span class="cx"> return m_numberOfLocals + m_tempStackHeight;
</span></span></pre>
</div>
</div>
</body>
</html>