From f08393c11645f29f93467f5c32fdce4abf41d2e7 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Wed, 19 Jul 2023 21:06:44 +0100 Subject: Add local-store instruction to Patio IR --- .../org/shedlang/compiler/patio/PatioInstructionSerializer.java | 6 ++++++ .../shedlang/compiler/patio/instructions/PatioInstruction.java | 2 +- .../org/shedlang/compiler/patio/instructions/PatioLocalLoad.java | 1 - .../shedlang/compiler/patio/instructions/PatioLocalStore.java | 9 +++++++++ .../shedlang/compiler/patio/PatioInstructionSerializerTests.java | 9 +++++++++ .../java/org/shedlang/compiler/patio/instructions/Patio.java | 4 ++++ 6 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 src/main/java/org/shedlang/compiler/patio/instructions/PatioLocalStore.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 342adc3a..a729f225 100644 --- a/src/main/java/org/shedlang/compiler/patio/PatioInstructionSerializer.java +++ b/src/main/java/org/shedlang/compiler/patio/PatioInstructionSerializer.java @@ -43,6 +43,12 @@ public class PatioInstructionSerializer { treeString(localLoad.name()) ); + case PatioLocalStore localStore -> + treeList( + treeIdentifier("local-store"), + treeString(localStore.name()) + ); + case PatioMemoryLoad memoryLoad -> treeList( treeIdentifier("memory-load"), 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 fa6fe302..f839e6e7 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, PatioLocalLoad, PatioMemoryLoad, PatioMemoryStore, PatioPushFunctionPointer, PatioReturn { +public sealed interface PatioInstruction permits PatioAlloc, PatioDiscard, PatioLocalLoad, PatioLocalStore, PatioMemoryLoad, PatioMemoryStore, PatioPushFunctionPointer, PatioReturn { Source source(); } diff --git a/src/main/java/org/shedlang/compiler/patio/instructions/PatioLocalLoad.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioLocalLoad.java index 984b9ee4..4ec34a12 100644 --- a/src/main/java/org/shedlang/compiler/patio/instructions/PatioLocalLoad.java +++ b/src/main/java/org/shedlang/compiler/patio/instructions/PatioLocalLoad.java @@ -5,6 +5,5 @@ import org.shedlang.compiler.sources.Source; /** * Load the local with the given name and push it onto the stack. */ - public record PatioLocalLoad(String name, Source source) implements PatioInstruction { } diff --git a/src/main/java/org/shedlang/compiler/patio/instructions/PatioLocalStore.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioLocalStore.java new file mode 100644 index 00000000..317a1172 --- /dev/null +++ b/src/main/java/org/shedlang/compiler/patio/instructions/PatioLocalStore.java @@ -0,0 +1,9 @@ +package org.shedlang.compiler.patio.instructions; + +import org.shedlang.compiler.sources.Source; + +/** + * Pop a value from the stack and store it as the local with the given name. + */ +public record PatioLocalStore(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 cc788078..35ed5e19 100644 --- a/src/test/java/org/shedlang/compiler/patio/PatioInstructionSerializerTests.java +++ b/src/test/java/org/shedlang/compiler/patio/PatioInstructionSerializerTests.java @@ -35,6 +35,15 @@ public class PatioInstructionSerializerTests { assertThat(string, equalTo("(local-load \"x\")")); } + @Test + public void canSerializeLocalStore() { + var instruction = Patio.localStore("x"); + + var string = serialize(instruction); + + assertThat(string, equalTo("(local-store \"x\")")); + } + @Test public void canSerializeMemoryLoad() { var instruction = Patio.memoryLoad(4); 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 1e64aa5e..672de3ed 100644 --- a/src/test/java/org/shedlang/compiler/patio/instructions/Patio.java +++ b/src/test/java/org/shedlang/compiler/patio/instructions/Patio.java @@ -17,6 +17,10 @@ public class Patio { return new PatioLocalLoad(name, Sources.NULL); } + public static PatioInstruction localStore(String name) { + return new PatioLocalStore(name, Sources.NULL); + } + public static PatioInstruction memoryLoad(int offset) { return new PatioMemoryLoad(offset, Sources.NULL); } -- cgit v1.2.3