Add load operations ldr/ldr2

2 files changed, 42 insertions, 21 deletions

diff --git a/src/main.c b/src/main.c
index 5f20029..6c65153 100644
--- a/src/main.c
+++ b/src/main.c
@@ -121,11 +121,15 @@ init_uxn() {
         // 0xa0, 0x34, 0x01, 0x1f, // -> ( 1a )
         // 0xa0, 0x34, 0x33, 0x1f, // -> ( 30 )
         // 0xa0, 0x12, 0x48, 0x80, 0x34, 0x3f, // -> ( 09 20 )
-        // STZ / LDZ.
-        0xa0, 0x34, 0x00, 0x11,             // STZ   (u8*)uxn_ram[1] = 0x34
-        0xa0, 0xaa, 0xbb, 0x80, 0x01, 0x31, // STZ2 (u16*)uxn_ram[1] = 0x34
-        0x80, 0x00, 0x10,                   // LDZ  -> ( 34 )
-        0x80, 0x01, 0x30,                   // LDZ2 -> ( aa bb )
+        // // STZ / LDZ.
+        // 0xa0, 0x34, 0x00, 0x11,             // STZ   (u8*)uxn_ram[1] = 0x34
+        // 0xa0, 0xaa, 0xbb, 0x80, 0x01, 0x31, // STZ2 (u16*)uxn_ram[1] = 0x34
+        // 0x80, 0x00, 0x10,                   // LDZ  -> ( 34 )
+        // 0x80, 0x01, 0x30,                   // LDZ2 -> ( aa bb )
+        // LDR / SRT
+        0xa0, 0xab, 0xcd, 0x80, 0xfb, 0x12,
+        0xa0, 0xab, 0xcd, 0x80, 0xfb, 0x32,
+        0x80, 1, 0x12, 0x00, 0xaa, 0xbb,
     };
     memcpy(uxn_ram + PAGE_PROGRAM, uxn_rom, sizeof(uxn_rom));
 }
@@ -182,14 +186,14 @@ main(void) {
         io_ports[i] = 0;
     }
 
-    // txt_printf("ROM");
-    // for (size_t i = 0; i < 64; i++) {
-    //     if (i % 8 == 0) {
-    //         txt_printf("\n");
-    //     }
-    //     txt_printf("%02x ", uxn_ram[i + PAGE_PROGRAM]);
-    // }
-    // txt_printf("\n\n");
+    txt_printf("ROM");
+    for (size_t i = 0; i < 64; i++) {
+        if (i % 8 == 0) {
+            txt_printf("\n");
+        }
+        txt_printf("%02x ", uxn_ram[i + PAGE_PROGRAM]);
+    }
+    txt_printf("\n\n");
 
     uxn_eval_asm(PAGE_PROGRAM);
     txt_printf("WST (");
@@ -217,14 +221,14 @@ main(void) {
     //         txt_printf("%02x ", rst[i]);
     //     }
     // }
-    txt_printf("\n\n");
-    txt_printf("RAM (ZP)\n");
-    for (size_t i = 0; i < 64; i++) {
-        if (i % 8 == 0) {
-            txt_printf("\n");
-        }
-        txt_printf("%02x ", uxn_ram[i]);
-    }
+    // txt_printf("\n\n");
+    // txt_printf("RAM (ZP)\n");
+    // for (size_t i = 0; i < 64; i++) {
+    //     if (i % 8 == 0) {
+    //         txt_printf("\n");
+    //     }
+    //     txt_printf("%02x ", uxn_ram[i]);
+    // }
 
     uintptr_t stack_size = wst_ptr - (uintptr_t)wst;
     while(true) {
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: