aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2023-06-27 22:16:03 +0100
committerMichael Williamson <mike@zwobble.org>2023-06-27 22:16:03 +0100
commit765a15478963dd0ba9657c20bf78140bdd3a11f4 (patch)
tree0eb28ae01c690739ad2a0b981b314efff70a1621 /src/main/java
parent72a4d7d93fe53512c202cbe1ff3a46542a3c5364 (diff)
Rename WasmTableOffsetConst to WasmTableElementIndexConst
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/org/shedlang/compiler/backends/wasm/WasmCodeGenClosures.java2
-rw-r--r--src/main/java/org/shedlang/compiler/backends/wasm/structure/ast/instructions/WasmInstruction.java2
-rw-r--r--src/main/java/org/shedlang/compiler/backends/wasm/structure/ast/instructions/WasmTableElementIndexConst.java (renamed from src/main/java/org/shedlang/compiler/backends/wasm/structure/ast/instructions/WasmTableOffsetConst.java)2
-rw-r--r--src/main/java/org/shedlang/compiler/backends/wasm/structure/binary/WasmBinaryFormatInstructions.java2
4 files changed, 4 insertions, 4 deletions
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/WasmTableOffsetConst.java b/src/main/java/org/shedlang/compiler/backends/wasm/structure/ast/instructions/WasmTableElementIndexConst.java
index 4045a8ab..5ca587bb 100644
--- 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/WasmTableElementIndexConst.java
@@ -7,5 +7,5 @@ import org.shedlang.compiler.backends.wasm.structure.ast.modules.WasmFuncName;
* a table index. Encapsulating this in its own instruction avoids having to
* separately track relocation.
*/
-public record WasmTableOffsetConst(WasmFuncName funcName) implements WasmInstruction {
+public record WasmTableElementIndexConst(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());
}