Add load operations ldr/ldr2

1 files changed, 17 insertions, 0 deletions

diff --git a/src/uxn-core.s b/src/uxn-core.s
index ed860d6..7d5eb69 100644
--- a/src/uxn-core.s
+++ b/src/uxn-core.s
@@ -66,6 +66,10 @@ uxn_ret:
     ldrb    \a, [r1, #-1]!
 .endm
 
+.macro wpop8s a
+    ldrsb   \a, [r1, #-1]!
+.endm
+
 .macro wpop16 a, b
     ldrb    \a, [r1, #-1]!
     ldrb    \b, [r1, #-1]!
@@ -111,6 +115,10 @@ uxn_ret:
     ldrb    \dst, [r7, \off]
 .endm
 
+.macro rload8 dst, off
+    ldrb    \dst, [r0, \off]
+.endm
+
 @ OP table
 op_table:
     .word brk   @ 0x00
@@ -619,9 +627,18 @@ stz2:
     b       uxn_decode
 
 ldr:
+    wpop8s  r4
+    rload8  r3, r4
+    wpush8  r3
     b       uxn_decode
 
 ldr2:
+    wpop8s  r4
+    rload8  r3, r4
+    wpush8  r3
+    add     r4, #1
+    rload8  r3, r4
+    wpush8  r3
     b       uxn_decode
 
 str: