aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2023-06-30 19:35:21 +0100
committerMichael Williamson <mike@zwobble.org>2023-06-30 19:35:21 +0100
commit71c588ca231d275c5263b3e9ca5f7f57c4e048a1 (patch)
tree7e132e16697d881fd3472fc1b81f9731ecd7ae4e /src
parente8e3854cdda2c5aa2d47069e90698f5288f28b7c (diff)
Add field-load instruction
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/shedlang/compiler/backends/llvm/LlvmCodeGen.java17
-rw-r--r--src/main/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenContext.java5
-rw-r--r--src/main/java/org/shedlang/compiler/backends/wasm/WasmCodeGen.java15
-rw-r--r--src/main/java/org/shedlang/compiler/stackir/InstructionSerializer.java7
-rw-r--r--src/main/java/org/shedlang/compiler/stackir/instructions/FieldLoadInstruction.java15
-rw-r--r--src/main/java/org/shedlang/compiler/stackir/instructions/Instruction.java2
-rw-r--r--src/test/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenFieldLoadTests.java41
-rw-r--r--src/test/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenTesting.java34
-rw-r--r--src/test/java/org/shedlang/compiler/backends/wasm/WasmCodeGenFieldLoadTests.java38
-rw-r--r--src/test/java/org/shedlang/compiler/stackir/InstructionSerializerTests.java12
-rw-r--r--src/test/java/org/shedlang/compiler/stackir/instructions/Instructions.java4
11 files changed, 189 insertions, 1 deletions
diff --git a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCodeGen.java b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCodeGen.java
index cd302929..135e9552 100644
--- a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCodeGen.java
+++ b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCodeGen.java
@@ -136,6 +136,23 @@ public class LlvmCodeGen {
case DiscardInstruction discardInstruction ->
context.pop().context();
+ case FieldLoadInstruction fieldLoad -> {
+ var receiverResult = context.pop();
+ var receiver = receiverResult.value();
+ context = receiverResult.context();
+
+ var fieldLoadResult = LlvmCodeGenNamespaces.fieldLoad(
+ fieldLoad.namespaceName(),
+ receiver,
+ fieldLoad.fieldName(),
+ context
+ );
+ var fieldValue = fieldLoadResult.value();
+ context = fieldLoadResult.context();
+
+ yield context.push(fieldValue);
+ }
+
case LocalLoadInstruction localLoad ->
context.push(context.shedLocal(localLoad.name()));
diff --git a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenContext.java b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenContext.java
index e7dddf02..90541aca 100644
--- a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenContext.java
+++ b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenContext.java
@@ -163,6 +163,11 @@ public record LlvmCodeGenContext(
LlvmType returnType,
List<LlvmParam> params
) {
+ if (!instructions.isEmpty()) {
+ // TODO: better error
+ throw new RuntimeException("unterminated basic block");
+ }
+
return new LlvmFunctionDefinition(
name,
returnType,
diff --git a/src/main/java/org/shedlang/compiler/backends/wasm/WasmCodeGen.java b/src/main/java/org/shedlang/compiler/backends/wasm/WasmCodeGen.java
index 71043f81..212c81ff 100644
--- a/src/main/java/org/shedlang/compiler/backends/wasm/WasmCodeGen.java
+++ b/src/main/java/org/shedlang/compiler/backends/wasm/WasmCodeGen.java
@@ -164,6 +164,21 @@ public class WasmCodeGen {
case DiscardInstruction discard ->
context.addInstruction(new WasmDrop());
+ case FieldLoadInstruction fieldLoad -> {
+ var receiverResult = context.generateLocal(WasmCodeGenLocalSpace.RECEIVER);
+ var receiver = receiverResult.value();
+ context = receiverResult.context();
+
+ context = context.addInstruction(new WasmLocalSet(receiver));
+
+ yield WasmCodeGenNamespaces.fieldLoad(
+ fieldLoad.namespaceName(),
+ receiver,
+ fieldLoad.fieldName(),
+ context
+ );
+ }
+
case LocalLoadInstruction localLoad ->
context.addInstruction(new WasmLocalGet(context.shedLocal(localLoad.name())));
diff --git a/src/main/java/org/shedlang/compiler/stackir/InstructionSerializer.java b/src/main/java/org/shedlang/compiler/stackir/InstructionSerializer.java
index 35789b18..ef832b90 100644
--- a/src/main/java/org/shedlang/compiler/stackir/InstructionSerializer.java
+++ b/src/main/java/org/shedlang/compiler/stackir/InstructionSerializer.java
@@ -74,6 +74,13 @@ public class InstructionSerializer {
treeList(
treeIdentifier("discard")
);
+
+ case FieldLoadInstruction fieldLoad ->
+ treeList(
+ treeIdentifier("field-load"),
+ treeString(fieldLoad.namespaceName().toString()),
+ treeString(fieldLoad.fieldName())
+ );
case LocalLoadInstruction localLoadInstruction ->
treeList(
diff --git a/src/main/java/org/shedlang/compiler/stackir/instructions/FieldLoadInstruction.java b/src/main/java/org/shedlang/compiler/stackir/instructions/FieldLoadInstruction.java
new file mode 100644
index 00000000..98ea9952
--- /dev/null
+++ b/src/main/java/org/shedlang/compiler/stackir/instructions/FieldLoadInstruction.java
@@ -0,0 +1,15 @@
+package org.shedlang.compiler.stackir.instructions;
+
+import org.shedlang.compiler.sources.Source;
+import org.shedlang.compiler.types.NamespaceName;
+
+/**
+ * Pop a value from the stack, get the given field from the popped value, and
+ * push the field's value onto the stack.
+ */
+public record FieldLoadInstruction(
+ NamespaceName namespaceName,
+ String fieldName,
+ Source source
+) implements Instruction {
+}
diff --git a/src/main/java/org/shedlang/compiler/stackir/instructions/Instruction.java b/src/main/java/org/shedlang/compiler/stackir/instructions/Instruction.java
index 1fb0bede..6a21404c 100644
--- a/src/main/java/org/shedlang/compiler/stackir/instructions/Instruction.java
+++ b/src/main/java/org/shedlang/compiler/stackir/instructions/Instruction.java
@@ -3,7 +3,7 @@ package org.shedlang.compiler.stackir.instructions;
import org.shedlang.compiler.sources.Source;
public sealed interface Instruction
- permits CallInstruction, DefineFunctionInstruction, DiscardInstruction, LocalLoadInstruction, LocalStoreInstruction, NamespaceFieldStoreInstruction, NamespaceImportInstruction, PushBoolInstruction, PushIntInstruction, PushStringInstruction, PushUnitInstruction, ReturnInstruction {
+ permits CallInstruction, DefineFunctionInstruction, DiscardInstruction, FieldLoadInstruction, LocalLoadInstruction, LocalStoreInstruction, NamespaceFieldStoreInstruction, NamespaceImportInstruction, PushBoolInstruction, PushIntInstruction, PushStringInstruction, PushUnitInstruction, ReturnInstruction {
Source source();
}
diff --git a/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenFieldLoadTests.java b/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenFieldLoadTests.java
new file mode 100644
index 00000000..6bb8c5c7
--- /dev/null
+++ b/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenFieldLoadTests.java
@@ -0,0 +1,41 @@
+package org.shedlang.compiler.backends.llvm;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.shedlang.compiler.backends.llvm.ir.ast.operands.LlvmVariableLocal;
+import org.shedlang.compiler.stackir.instructions.Instructions;
+import org.shedlang.compiler.testing.snapshots.SnapshotResolver;
+import org.shedlang.compiler.testing.snapshots.Snapshotter;
+import org.shedlang.compiler.typechecker.TypeCheckerContext;
+import org.shedlang.compiler.types.NamespaceName;
+import org.shedlang.compiler.types.Types;
+import org.shedlang.compiler.util.P;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+import static org.shedlang.compiler.backends.llvm.LlvmCodeGenTesting.serializeContext;
+
+@ExtendWith({SnapshotResolver.class})
+public class LlvmCodeGenFieldLoadTests {
+ @Test
+ public void fieldLoadPopsReceiverAndPushesFieldValue(Snapshotter snapshotter) throws IOException {
+ var namespaceName = new NamespaceName(List.of("Example", "Project"));
+ var instruction = Instructions.fieldLoad(namespaceName, "y");
+ var typeInfo = TypeCheckerContext.EMPTY
+ .addNamespaceFields(namespaceName, P.orderedMap(
+ Map.entry("x", Types.INT),
+ Map.entry("y", Types.INT),
+ Map.entry("z", Types.INT)
+ ))
+ .toTypeInfo();
+ var context = LlvmCodeGenContext.fromTypeInfo(typeInfo)
+ .push(new LlvmVariableLocal("a"))
+ .push(new LlvmVariableLocal("b"));
+
+ var result = LlvmCodeGen.generateInstruction(instruction, context);
+
+ snapshotter.assertSnapshot(serializeContext(result));
+ }
+}
diff --git a/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenTesting.java b/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenTesting.java
new file mode 100644
index 00000000..e480f3da
--- /dev/null
+++ b/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenTesting.java
@@ -0,0 +1,34 @@
+package org.shedlang.compiler.backends.llvm;
+
+import org.shedlang.compiler.backends.llvm.ir.LlvmIrSerializer;
+import org.shedlang.compiler.backends.llvm.ir.ast.instructions.LlvmReturnVoid;
+import org.shedlang.compiler.backends.llvm.ir.ast.types.LlvmTypes;
+
+import java.io.IOException;
+import java.util.List;
+
+public class LlvmCodeGenTesting {
+ private LlvmCodeGenTesting() {
+ }
+
+ public static String serializeContext(LlvmCodeGenContext context) throws IOException {
+ context = context.addTerminatorInstruction(new LlvmReturnVoid());
+ var function = context.toFunction("f", LlvmTypes.VOID, List.of());
+ var module = context.addTopLevelEntity(function).toModule();
+
+ var builder = new StringBuilder();
+
+ builder.append("Stack:\n");
+ for (var operand : context.stack()) {
+ builder.append(" * ");
+ LlvmIrSerializer.serializeOperand(operand, builder);
+ builder.append("\n");
+ }
+ builder.append("\n");
+
+ builder.append("Module:\n");
+ LlvmIrSerializer.serializeModule(module, builder);
+
+ return builder.toString();
+ }
+}
diff --git a/src/test/java/org/shedlang/compiler/backends/wasm/WasmCodeGenFieldLoadTests.java b/src/test/java/org/shedlang/compiler/backends/wasm/WasmCodeGenFieldLoadTests.java
new file mode 100644
index 00000000..03f1c457
--- /dev/null
+++ b/src/test/java/org/shedlang/compiler/backends/wasm/WasmCodeGenFieldLoadTests.java
@@ -0,0 +1,38 @@
+package org.shedlang.compiler.backends.wasm;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.shedlang.compiler.stackir.instructions.Instructions;
+import org.shedlang.compiler.testing.snapshots.SnapshotResolver;
+import org.shedlang.compiler.testing.snapshots.Snapshotter;
+import org.shedlang.compiler.typechecker.TypeCheckerContext;
+import org.shedlang.compiler.types.NamespaceName;
+import org.shedlang.compiler.types.Types;
+import org.shedlang.compiler.util.P;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+import static org.shedlang.compiler.backends.wasm.WasmCodeGenTesting.objdumpContext;
+
+@ExtendWith({SnapshotResolver.class})
+public class WasmCodeGenFieldLoadTests {
+ @Test
+ public void fieldLoadPopsReceiverAndPushesFieldValue(Snapshotter snapshotter) throws IOException, InterruptedException {
+ var namespaceName = new NamespaceName(List.of("Example", "Project"));
+ var instruction = Instructions.fieldLoad(namespaceName, "y");
+ var typeInfo = TypeCheckerContext.EMPTY
+ .addNamespaceFields(namespaceName, P.orderedMap(
+ Map.entry("x", Types.INT),
+ Map.entry("y", Types.INT),
+ Map.entry("z", Types.INT)
+ ))
+ .toTypeInfo();
+ var context = WasmCodeGenContext.fromTypeInfo(typeInfo);
+
+ var result = WasmCodeGen.generateInstruction(instruction, context);
+
+ snapshotter.assertSnapshot(objdumpContext(result));
+ }
+}
diff --git a/src/test/java/org/shedlang/compiler/stackir/InstructionSerializerTests.java b/src/test/java/org/shedlang/compiler/stackir/InstructionSerializerTests.java
index 5877613d..74e018f3 100644
--- a/src/test/java/org/shedlang/compiler/stackir/InstructionSerializerTests.java
+++ b/src/test/java/org/shedlang/compiler/stackir/InstructionSerializerTests.java
@@ -64,6 +64,18 @@ public class InstructionSerializerTests {
}
@Test
+ public void canSerializeFieldLoad() {
+ var instruction = Instructions.fieldLoad(
+ new NamespaceName(List.of("Example", "Lib")),
+ "x"
+ );
+
+ var string = serialize(instruction);
+
+ assertThat(string, equalTo("(field-load \"Example/Lib\" \"x\")"));
+ }
+
+ @Test
public void canSerializeLocalLoad() {
var instruction = Instructions.localLoad("x");
diff --git a/src/test/java/org/shedlang/compiler/stackir/instructions/Instructions.java b/src/test/java/org/shedlang/compiler/stackir/instructions/Instructions.java
index 6108947b..adc0731b 100644
--- a/src/test/java/org/shedlang/compiler/stackir/instructions/Instructions.java
+++ b/src/test/java/org/shedlang/compiler/stackir/instructions/Instructions.java
@@ -18,6 +18,10 @@ public class Instructions {
return new DiscardInstruction(Sources.NULL);
}
+ public static Instruction fieldLoad(NamespaceName namespaceName, String fieldName) {
+ return new FieldLoadInstruction(namespaceName, fieldName, Sources.NULL);
+ }
+
public static Instruction localLoad(String name) {
return new LocalLoadInstruction(name, Sources.NULL);
}