Add relative store str/str2 ops

1 files changed, 23 insertions, 6 deletions

diff --git a/src/uxn-core.s b/src/uxn-core.s
index 7d5eb69..0e5cdbc 100644
--- a/src/uxn-core.s
+++ b/src/uxn-core.s
@@ -100,15 +100,15 @@ uxn_ret:
     strb    \a, [r2], #2
 .endm
 
-.macro zsave8 val, off
-    strb    \val, [r7, \off]
+.macro zsave8 a, off
+    strb    \a, [r7, \off]
 .endm
 
-.macro zsave16 val, off
+.macro zsave16 a, off
     add     \off, r7
-    strb    \val, [\off, #1]
-    lsr     \val, #8
-    strb    \val, [\off]
+    strb    \a, [\off, #1]
+    lsr     \a, #8
+    strb    \a, [\off]
 .endm
 
 .macro zload8 dst, off
@@ -119,6 +119,17 @@ uxn_ret:
     ldrb    \dst, [r0, \off]
 .endm
 
+.macro rsave8 a, off
+    strb    \a, [r0, \off]
+.endm
+
+.macro rsave16 a, off
+    adds    \off, r0
+    strb    \a, [\off, #1]
+    lsr     \a, #8
+    strb    \a, [\off]
+.endm
+
 @ OP table
 op_table:
     .word brk   @ 0x00
@@ -642,9 +653,15 @@ ldr2:
     b       uxn_decode
 
 str:
+    wpop8s  r4
+    wpop8   r3
+    rsave8  r3, r4
     b       uxn_decode
 
 str2:
+    wpop8s  r4
+    wpop16  r3, r5
+    rsave16 r3, r4
     b       uxn_decode
 
 lda: