From 71c588ca231d275c5263b3e9ca5f7f57c4e048a1 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Fri, 30 Jun 2023 19:35:21 +0100 Subject: Add field-load instruction --- .../shedlang/compiler/backends/llvm/LlvmCodeGen.java | 17 +++++++++++++++++ .../compiler/backends/llvm/LlvmCodeGenContext.java | 5 +++++ .../shedlang/compiler/backends/wasm/WasmCodeGen.java | 15 +++++++++++++++ .../compiler/stackir/InstructionSerializer.java | 7 +++++++ .../stackir/instructions/FieldLoadInstruction.java | 15 +++++++++++++++ .../compiler/stackir/instructions/Instruction.java | 2 +- 6 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 src/main/java/org/shedlang/compiler/stackir/instructions/FieldLoadInstruction.java (limited to 'src/main/java') 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 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(); } -- cgit v1.2.3