From 9792e244bbbc8ab5935cbd91f53b6ad42ffb9e11 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 27 Aug 2023 22:15:39 +0100 Subject: Add WASM block instruction --- .../backends/wasm/structure/ast/instructions/WasmBlock.java | 9 +++++++++ .../wasm/structure/ast/instructions/WasmInstruction.java | 2 +- .../wasm/structure/binary/WasmBinaryFormatInstructions.java | 9 +++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 src/main/java/org/shedlang/compiler/backends/wasm/structure/ast/instructions/WasmBlock.java (limited to 'src/main/java') diff --git a/src/main/java/org/shedlang/compiler/backends/wasm/structure/ast/instructions/WasmBlock.java b/src/main/java/org/shedlang/compiler/backends/wasm/structure/ast/instructions/WasmBlock.java new file mode 100644 index 00000000..52295370 --- /dev/null +++ b/src/main/java/org/shedlang/compiler/backends/wasm/structure/ast/instructions/WasmBlock.java @@ -0,0 +1,9 @@ +package org.shedlang.compiler.backends.wasm.structure.ast.instructions; + +import java.util.List; + +public record WasmBlock( + WasmBlockType blockType, + List body +) implements WasmInstruction { +} diff --git a/src/main/java/org/shedlang/compiler/backends/wasm/structure/ast/instructions/WasmInstruction.java b/src/main/java/org/shedlang/compiler/backends/wasm/structure/ast/instructions/WasmInstruction.java index 1c3a1c9f..19bb1c50 100644 --- a/src/main/java/org/shedlang/compiler/backends/wasm/structure/ast/instructions/WasmInstruction.java +++ b/src/main/java/org/shedlang/compiler/backends/wasm/structure/ast/instructions/WasmInstruction.java @@ -1,4 +1,4 @@ package org.shedlang.compiler.backends.wasm.structure.ast.instructions; -public sealed interface WasmInstruction permits WasmCall, WasmCallIndirect, WasmDrop, WasmGlobalGet, WasmGlobalSet, WasmI32Add, WasmI32Const, WasmI32Eq, WasmI32Load, WasmI32Ne, WasmI32Store, WasmI32Sub, WasmI64Const, WasmIf, WasmLocalGet, WasmLocalSet, WasmMemoryAddressConst, WasmMemoryGrow, WasmReturn, WasmTableElementIndexConst { +public sealed interface WasmInstruction permits WasmBlock, WasmCall, WasmCallIndirect, WasmDrop, WasmGlobalGet, WasmGlobalSet, WasmI32Add, WasmI32Const, WasmI32Eq, WasmI32Load, WasmI32Ne, WasmI32Store, WasmI32Sub, WasmI64Const, WasmIf, WasmLocalGet, WasmLocalSet, WasmMemoryAddressConst, WasmMemoryGrow, WasmReturn, WasmTableElementIndexConst { } diff --git a/src/main/java/org/shedlang/compiler/backends/wasm/structure/binary/WasmBinaryFormatInstructions.java b/src/main/java/org/shedlang/compiler/backends/wasm/structure/binary/WasmBinaryFormatInstructions.java index 6591d817..1a9501d5 100644 --- a/src/main/java/org/shedlang/compiler/backends/wasm/structure/binary/WasmBinaryFormatInstructions.java +++ b/src/main/java/org/shedlang/compiler/backends/wasm/structure/binary/WasmBinaryFormatInstructions.java @@ -22,6 +22,15 @@ public class WasmBinaryFormatInstructions { // == Control Instructions == + case WasmBlock block -> { + writer.writeByte(0x02); + writeBlockType(block.blockType(), writer); + for (var subInstruction : block.body()) { + writeInstruction(subInstruction, writer); + } + writer.writeByte(0x0b); + } + case WasmIf if_ -> { writer.writeByte(0x04); writeBlockType(if_.blockType(), writer); -- cgit v1.2.3