From 2f16ed8127a15cee37c2fe7b5f7df3e468564d33 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Wed, 19 Jul 2023 21:02:42 +0100 Subject: Add push-function-pointer instruction to Patio IR --- .../org/shedlang/compiler/patio/PatioInstructionSerializer.java | 6 ++++++ .../shedlang/compiler/patio/instructions/PatioInstruction.java | 2 +- .../compiler/patio/instructions/PatioPushFunctionPointer.java | 9 +++++++++ .../shedlang/compiler/patio/PatioInstructionSerializerTests.java | 9 +++++++++ .../java/org/shedlang/compiler/patio/instructions/Patio.java | 4 ++++ 5 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 src/main/java/org/shedlang/compiler/patio/instructions/PatioPushFunctionPointer.java (limited to 'src') diff --git a/src/main/java/org/shedlang/compiler/patio/PatioInstructionSerializer.java b/src/main/java/org/shedlang/compiler/patio/PatioInstructionSerializer.java index 42420d00..f49b693f 100644 --- a/src/main/java/org/shedlang/compiler/patio/PatioInstructionSerializer.java +++ b/src/main/java/org/shedlang/compiler/patio/PatioInstructionSerializer.java @@ -49,6 +49,12 @@ public class PatioInstructionSerializer { treeNamed("offset", treeInt(memoryStore.offset())) ); + case PatioPushFunctionPointer patioPushFunctionPointer -> + treeList( + treeIdentifier("push-function-pointer"), + treeString(patioPushFunctionPointer.name()) + ); + case PatioReturn return_ -> treeList(treeIdentifier("return")); }; diff --git a/src/main/java/org/shedlang/compiler/patio/instructions/PatioInstruction.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioInstruction.java index a5323ae5..eec38e63 100644 --- a/src/main/java/org/shedlang/compiler/patio/instructions/PatioInstruction.java +++ b/src/main/java/org/shedlang/compiler/patio/instructions/PatioInstruction.java @@ -2,6 +2,6 @@ package org.shedlang.compiler.patio.instructions; import org.shedlang.compiler.sources.Source; -public sealed interface PatioInstruction permits PatioAlloc, PatioDiscard, PatioMemoryLoad, PatioMemoryStore, PatioReturn { +public sealed interface PatioInstruction permits PatioAlloc, PatioDiscard, PatioMemoryLoad, PatioMemoryStore, PatioPushFunctionPointer, PatioReturn { Source source(); } diff --git a/src/main/java/org/shedlang/compiler/patio/instructions/PatioPushFunctionPointer.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioPushFunctionPointer.java new file mode 100644 index 00000000..d01bd035 --- /dev/null +++ b/src/main/java/org/shedlang/compiler/patio/instructions/PatioPushFunctionPointer.java @@ -0,0 +1,9 @@ +package org.shedlang.compiler.patio.instructions; + +import org.shedlang.compiler.sources.Source; + +/** + * Push a pointer to the function with the given name onto the stack. + */ +public record PatioPushFunctionPointer(String name, Source source) implements PatioInstruction { +} diff --git a/src/test/java/org/shedlang/compiler/patio/PatioInstructionSerializerTests.java b/src/test/java/org/shedlang/compiler/patio/PatioInstructionSerializerTests.java index a4dcd0d1..14c86697 100644 --- a/src/test/java/org/shedlang/compiler/patio/PatioInstructionSerializerTests.java +++ b/src/test/java/org/shedlang/compiler/patio/PatioInstructionSerializerTests.java @@ -44,6 +44,15 @@ public class PatioInstructionSerializerTests { assertThat(string, equalTo("(memory-store offset=4)")); } + @Test + public void canSerializePushFunctionPointer() { + var instruction = Patio.pushFunctionPointer("f"); + + var string = serialize(instruction); + + assertThat(string, equalTo("(push-function-pointer \"f\")")); + } + @Test public void canSerializeReturn() { var instruction = Patio.return_(); diff --git a/src/test/java/org/shedlang/compiler/patio/instructions/Patio.java b/src/test/java/org/shedlang/compiler/patio/instructions/Patio.java index 179e4000..8d08ba27 100644 --- a/src/test/java/org/shedlang/compiler/patio/instructions/Patio.java +++ b/src/test/java/org/shedlang/compiler/patio/instructions/Patio.java @@ -21,6 +21,10 @@ public class Patio { return new PatioMemoryStore(offset, Sources.NULL); } + public static PatioInstruction pushFunctionPointer(String name) { + return new PatioPushFunctionPointer(name, Sources.NULL); + } + public static PatioInstruction return_() { return new PatioReturn(Sources.NULL); } -- cgit v1.2.3