aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2023-07-23 21:42:15 +0100
committerMichael Williamson <mike@zwobble.org>2023-07-23 21:42:15 +0100
commit4eafe23fb726d231ead6a535f9e97f278c4114e0 (patch)
treed3da21f16b889176392d4822297f3cc185505692 /src/main/java
parent33baf1088a59b1af47a68b4f27c9070a08fe1031 (diff)
Support results from ifs in WASM Patio code gen
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/org/shedlang/compiler/backends/wasm/WasmPatioCodeGen.java52
1 files changed, 41 insertions, 11 deletions
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<List<WasmInstruction>> 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 <T> Result<T> toResult(T value) {
+ return new Result<>(value, this);
+ }
+
+ private record Result<T>(T value, Context context) {
+ }
}
}