From 4eafe23fb726d231ead6a535f9e97f278c4114e0 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 23 Jul 2023 21:42:15 +0100 Subject: Support results from ifs in WASM Patio code gen --- .../compiler/backends/wasm/WasmPatioCodeGen.java | 52 +++++++++++++++++----- 1 file changed, 41 insertions(+), 11 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/org/shedlang/compiler/backends/wasm/WasmPatioCodeGen.java b/src/main/java/org/shedlang/compiler/backends/wasm/WasmPatioCodeGen.java index 6ec4e39f..143ed791 100644 --- a/src/main/java/org/shedlang/compiler/backends/wasm/WasmPatioCodeGen.java +++ b/src/main/java/org/shedlang/compiler/backends/wasm/WasmPatioCodeGen.java @@ -187,22 +187,28 @@ public class WasmPatioCodeGen { case PatioIf patioIf -> { context = generateOperand(patioIf.condition(), context); - context = context.enterBlock(); - context = generateInstructions(patioIf.trueBody().body(), context); - var wasmTrueBody = context.instructions; - context = context.exitBlock(); + var trueBodyResult = generateBlock(patioIf.trueBody(), context); + var trueBody = trueBodyResult.value; + context = trueBodyResult.context; - context = context.enterBlock(); - context = generateInstructions(patioIf.falseBody().body(), context); - var wasmFalseBody = context.instructions; - context = context.exitBlock(); + var falseBodyResult = generateBlock(patioIf.falseBody(), context); + var falseBody = falseBodyResult.value; + context = falseBodyResult.context; context = context.addInstruction(new WasmIf( - new WasmBlockType(List.of()), - wasmTrueBody, - wasmFalseBody + new WasmBlockType( + patioIf.targets().stream() + .map(patioTarget -> patioOperandToWasmValueType(patioTarget)) + .toList() + ), + trueBody, + falseBody )); + for (var patioTarget : Lists.reversed(patioIf.targets())) { + context = popIntoPatioLocal(patioTarget, context); + } + yield context; } @@ -267,6 +273,23 @@ public class WasmPatioCodeGen { }; } + private static Context.Result> generateBlock( + PatioBlock block, + Context context + ) { + context = context.enterBlock(); + context = generateInstructions(block.body(), context); + + for (var patioResult : block.results()) { + context = generateOperand(patioResult, context); + } + + var wasmBody = context.instructions; + context = context.exitBlock(); + + return context.toResult(wasmBody); + } + private static Context generateBinaryOperation( PatioInstructionBinaryOperation patioInstruction, WasmInstruction wasmInstruction, @@ -530,5 +553,12 @@ public class WasmPatioCodeGen { this.patioLocalNameToWasmLocalIndex ); } + + private Result toResult(T value) { + return new Result<>(value, this); + } + + private record Result(T value, Context context) { + } } } -- cgit v1.2.3