support for loop

Co-authored-by:  Jiaaaaatai <[email protected]

Author: ahuoguo

benchmarks/wasm/for_loop.wat

@@ -0,0 +1,40 @@
+(module
+  (func $for_loop (result i32)
+    (local i32)
+    (local i32)
+
+    for
+       (
+        ;; init
+        i32.const 0
+        local.set 0
+        i32.const 0
+        local.set 1
+        |
+        ;; cond
+        local.get 1
+        i32.const 10
+        i32.gt_s
+        i32.eqz
+        |
+        ;; post
+        local.get 1
+        i32.const 1
+        i32.add
+        local.set 1
+        )
+
+        ;; es
+        local.get 0
+        local.get 1
+        i32.add
+        local.set 0
+
+     local.get 0
+
+
+     )
+
+     (export "for_loop" (func 0))
+
+  )

grammar/WatLexer.g4

@@ -60,6 +60,8 @@ UNREACHABLE: 'unreachable' ;
 DROP: 'drop' ;
 BLOCK: 'block' ;
 LOOP: 'loop' ;
+FOR : 'for';
+VBAR: '|';
 END: 'end' ;
 BR: 'br' ;
 BR_IF: 'br_if' ;

grammar/WatParser.g4

@@ -130,6 +130,11 @@ instr
   | blockInstr
   | foldedInstr
   | resumeInstr
+  | forLoop
+  ;
+
+forLoop
+  : 'for' '(' instrList '|' instrList '|' instrList ')' instrList
   ;
 
 plainInstr

src/main/java/wasm/WatLexer.java

@@ -240,6 +240,18 @@ public class WatParserBaseListener implements WatParserListener {
 	 * <p>The default implementation does nothing.</p>
 	 */
 	@Override public void exitInstr(WatParser.InstrContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void enterForLoop(WatParser.ForLoopContext ctx) { }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation does nothing.</p>
+	 */
+	@Override public void exitForLoop(WatParser.ForLoopContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *

src/main/java/wasm/WatParser.java

@@ -145,6 +145,13 @@ public class WatParserBaseVisitor<T> extends AbstractParseTreeVisitor<T> impleme
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
 	@Override public T visitInstr(WatParser.InstrContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitForLoop(WatParser.ForLoopContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *

src/main/java/wasm/WatParserBaseListener.java

@@ -197,6 +197,16 @@ public interface WatParserListener extends ParseTreeListener {
 	 * @param ctx the parse tree
 	 */
 	void exitInstr(WatParser.InstrContext ctx);
+	/**
+	 * Enter a parse tree produced by {@link WatParser#forLoop}.
+	 * @param ctx the parse tree
+	 */
+	void enterForLoop(WatParser.ForLoopContext ctx);
+	/**
+	 * Exit a parse tree produced by {@link WatParser#forLoop}.
+	 * @param ctx the parse tree
+	 */
+	void exitForLoop(WatParser.ForLoopContext ctx);
 	/**
 	 * Enter a parse tree produced by {@link WatParser#plainInstr}.
 	 * @param ctx the parse tree

src/main/java/wasm/WatParserBaseVisitor.java

@@ -124,6 +124,12 @@ public interface WatParserVisitor<T> extends ParseTreeVisitor<T> {
 	 * @return the visitor result
 	 */
 	T visitInstr(WatParser.InstrContext ctx);
+	/**
+	 * Visit a parse tree produced by {@link WatParser#forLoop}.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	T visitForLoop(WatParser.ForLoopContext ctx);
 	/**
 	 * Visit a parse tree produced by {@link WatParser#plainInstr}.
 	 * @param ctx the parse tree

src/main/java/wasm/WatParserListener.java

@@ -65,6 +65,7 @@ case class Select(ty: Option[List[ValueType]]) extends Instr
 case class Block(ty: BlockType, instrs: List[Instr]) extends Instr
 case class IdBlock(id: Int, ty: BlockType, instrs: List[Instr]) extends Instr
 case class Loop(ty: BlockType, instrs: List[Instr]) extends Instr
+case class ForLoop(init:List[Instr], cond: List[Instr], post: List[Instr], body: List[Instr]) extends Instr
 case class IdLoop(id: Int, ty: BlockType, instrs: List[Instr]) extends Instr
 case class If(ty: BlockType, thenInstrs: List[Instr], elseInstrs: List[Instr]) extends Instr
 case class IdIf(ty: BlockType, thenInstrs: IdBlock, elseInstrs: IdBlock) extends Instr