From 2dcdafd76ea85f03254b05d6d337d2cb99b58b98 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Wed, 27 Dec 2023 16:07:04 +0000
Subject: Support bool-to-int and int-to-bool on wasm64

---
 .../compiler/backends/wasm/PatioToWasm.java        | 34 ++++++++++++++--------
 1 file changed, 22 insertions(+), 12 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/org/shedlang/compiler/backends/wasm/PatioToWasm.java b/src/main/java/org/shedlang/compiler/backends/wasm/PatioToWasm.java
index b1ac6248..cdc18039 100644
--- a/src/main/java/org/shedlang/compiler/backends/wasm/PatioToWasm.java
+++ b/src/main/java/org/shedlang/compiler/backends/wasm/PatioToWasm.java
@@ -202,12 +202,17 @@ public class PatioToWasm {
             case PatioBlock patioBlock ->
                 generateInstructions(patioBlock.body(), context);
 
-            case PatioBoolToInt patioBoolToInt ->
-                generateOperandToPatioLocal(
-                    patioBoolToInt.target(),
-                    patioBoolToInt.value(),
-                    context
-                );
+            case PatioBoolToInt patioBoolToInt -> {
+                context = generateOperand(patioBoolToInt.value(), context);
+
+                if (platformTarget == WasmTarget.WASM64) {
+                    context = context.addInstruction(new WasmI64ExtendI32Unsigned());
+                }
+
+                context = popIntoPatioLocal(patioBoolToInt.target(), context);
+
+                yield context;
+            }
 
             case PatioCall patioCall -> {
                 for (var patioArg : patioCall.args()) {
@@ -305,12 +310,17 @@ public class PatioToWasm {
                     context
                 );
 
-            case PatioIntToBool patioIntToBool ->
-                generateOperandToPatioLocal(
-                    patioIntToBool.target(),
-                    patioIntToBool.value(),
-                    context
-                );
+            case PatioIntToBool patioIntToBool -> {
+                context = generateOperand(patioIntToBool.value(), context);
+
+                if (platformTarget == WasmTarget.WASM64) {
+                    context = context.addInstruction(new WasmI32WrapI64());
+                }
+
+                context = popIntoPatioLocal(patioIntToBool.target(), context);
+
+                yield context;
+            }
 
             case PatioIntToDataPtr patioIntToDataPtr ->
                 generateOperandToPatioLocal(
-- 
cgit v1.2.3