From 009852fcfcbae6679c9155a7f1f2bd819e748b59 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Wed, 19 Jul 2023 20:59:10 +0100
Subject: Add memory-store instruction to Patio IR

---
 .../compiler/patio/PatioInstructionSerializer.java      |  6 ++++++
 .../compiler/patio/instructions/PatioInstruction.java   |  2 +-
 .../compiler/patio/instructions/PatioMemoryStore.java   | 17 +++++++++++++++++
 .../compiler/patio/PatioInstructionSerializerTests.java |  9 +++++++++
 .../org/shedlang/compiler/patio/instructions/Patio.java |  4 ++++
 5 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/org/shedlang/compiler/patio/instructions/PatioMemoryStore.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 fad162dd..42420d00 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 {
                     treeNamed("offset", treeInt(memoryLoad.offset()))
                 );
 
+            case PatioMemoryStore memoryStore ->
+                treeList(
+                    treeIdentifier("memory-store"),
+                    treeNamed("offset", treeInt(memoryStore.offset()))
+                );
+
             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 2083f0d3..a5323ae5 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, PatioReturn {
+public sealed interface PatioInstruction permits PatioAlloc, PatioDiscard, PatioMemoryLoad, PatioMemoryStore, PatioReturn {
     Source source();
 }
diff --git a/src/main/java/org/shedlang/compiler/patio/instructions/PatioMemoryStore.java b/src/main/java/org/shedlang/compiler/patio/instructions/PatioMemoryStore.java
new file mode 100644
index 00000000..7d7d4a83
--- /dev/null
+++ b/src/main/java/org/shedlang/compiler/patio/instructions/PatioMemoryStore.java
@@ -0,0 +1,17 @@
+package org.shedlang.compiler.patio.instructions;
+
+import org.shedlang.compiler.sources.Source;
+
+/**
+ * Pop a pointer and a value from the stack. Store the value at the given offset
+ * from that pointer.
+ *
+ * <p>Specifically, the values should have been pushed onto the stack in the following order:</p>
+ *
+ * <ul>
+ *     <li>The pointer.</li>
+ *     <li>The value to store.</li>
+ * </ul>
+ */
+public record PatioMemoryStore(int offset, 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 0890911f..a4dcd0d1 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("(memory-load offset=4)"));
     }
 
+    @Test
+    public void canSerializeMemoryStore() {
+        var instruction = Patio.memoryStore(4);
+
+        var string = serialize(instruction);
+
+        assertThat(string, equalTo("(memory-store offset=4)"));
+    }
+
     @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 715b8a4f..179e4000 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 PatioMemoryLoad(offset, Sources.NULL);
     }
 
+    public static PatioInstruction memoryStore(int offset) {
+        return new PatioMemoryStore(offset, Sources.NULL);
+    }
+
     public static PatioInstruction return_() {
         return new PatioReturn(Sources.NULL);
     }
-- 
cgit v1.2.3