From 765a15478963dd0ba9657c20bf78140bdd3a11f4 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Tue, 27 Jun 2023 22:16:03 +0100
Subject: Rename WasmTableOffsetConst to WasmTableElementIndexConst

---
 .../shedlang/compiler/backends/wasm/WasmCodeGenClosures.java  |  2 +-
 .../wasm/structure/ast/instructions/WasmInstruction.java      |  2 +-
 .../ast/instructions/WasmTableElementIndexConst.java          | 11 +++++++++++
 .../wasm/structure/ast/instructions/WasmTableOffsetConst.java | 11 -----------
 .../wasm/structure/binary/WasmBinaryFormatInstructions.java   |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)
 create mode 100644 src/main/java/org/shedlang/compiler/backends/wasm/structure/ast/instructions/WasmTableElementIndexConst.java
 delete mode 100644 src/main/java/org/shedlang/compiler/backends/wasm/structure/ast/instructions/WasmTableOffsetConst.java

(limited to 'src/main/java')

diff --git a/src/main/java/org/shedlang/compiler/backends/wasm/WasmCodeGenClosures.java b/src/main/java/org/shedlang/compiler/backends/wasm/WasmCodeGenClosures.java
index 8a5eb207..5a9e0628 100644
--- a/src/main/java/org/shedlang/compiler/backends/wasm/WasmCodeGenClosures.java
+++ b/src/main/java/org/shedlang/compiler/backends/wasm/WasmCodeGenClosures.java
@@ -69,7 +69,7 @@ public class WasmCodeGenClosures {
 
         context = context
             .addInstruction(new WasmLocalGet(closurePointer))
-            .addInstruction(new WasmTableOffsetConst(new WasmFuncName(functionName)))
+            .addInstruction(new WasmTableElementIndexConst(new WasmFuncName(functionName)))
             .addInstruction(new WasmI32Store(functionPointerMemoryArg()));
 
         for (var freeVariable : freeVariables) {
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 d9d2db58..46f7e0e7 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, WasmI32Const, WasmI32Load, WasmI32Store, WasmI64Const, WasmLocalGet, WasmLocalSet, WasmMemoryAddressConst, WasmReturn, WasmTableOffsetConst {
+public sealed interface WasmInstruction permits WasmCall, WasmCallIndirect, WasmDrop, WasmI32Const, WasmI32Load, WasmI32Store, WasmI64Const, WasmLocalGet, WasmLocalSet, WasmMemoryAddressConst, WasmReturn, WasmTableElementIndexConst {
 }
diff --git a/src/main/java/org/shedlang/compiler/backends/wasm/structure/ast/instructions/WasmTableElementIndexConst.java b/src/main/java/org/shedlang/compiler/backends/wasm/structure/ast/instructions/WasmTableElementIndexConst.java
new file mode 100644
index 00000000..5ca587bb
--- /dev/null
+++ b/src/main/java/org/shedlang/compiler/backends/wasm/structure/ast/instructions/WasmTableElementIndexConst.java
@@ -0,0 +1,11 @@
+package org.shedlang.compiler.backends.wasm.structure.ast.instructions;
+
+import org.shedlang.compiler.backends.wasm.structure.ast.modules.WasmFuncName;
+
+/**
+ * This is a fake instruction that corresponds to an i32.const instruction for
+ * a table index. Encapsulating this in its own instruction avoids having to
+ * separately track relocation.
+ */
+public record WasmTableElementIndexConst(WasmFuncName funcName) implements WasmInstruction {
+}
diff --git a/src/main/java/org/shedlang/compiler/backends/wasm/structure/ast/instructions/WasmTableOffsetConst.java b/src/main/java/org/shedlang/compiler/backends/wasm/structure/ast/instructions/WasmTableOffsetConst.java
deleted file mode 100644
index 4045a8ab..00000000
--- a/src/main/java/org/shedlang/compiler/backends/wasm/structure/ast/instructions/WasmTableOffsetConst.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.shedlang.compiler.backends.wasm.structure.ast.instructions;
-
-import org.shedlang.compiler.backends.wasm.structure.ast.modules.WasmFuncName;
-
-/**
- * This is a fake instruction that corresponds to an i32.const instruction for
- * a table index. Encapsulating this in its own instruction avoids having to
- * separately track relocation.
- */
-public record WasmTableOffsetConst(WasmFuncName funcName) implements WasmInstruction {
-}
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 7306d929..77c54489 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
@@ -84,7 +84,7 @@ public class WasmBinaryFormatInstructions {
                 writer.writeMemoryAddressConst(memoryAddressConst.address());
             }
 
-            case WasmTableOffsetConst tableIndexConst -> {
+            case WasmTableElementIndexConst tableIndexConst -> {
                 writer.writeByte(0x41);
                 writer.writeTableElementIndexConst(tableIndexConst.funcName());
             }
-- 
cgit v1.2.3