Add absolute load instructions lda/lda2

2 files changed, 23 insertions, 8 deletions

diff --git a/src/main.c b/src/main.c
index 6a7b7cd..33f53c3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -126,13 +126,16 @@ init_uxn() {
         // 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, 0xa0, 0xaa, 0xbb,
-        0xa0, 0xff, 0xee, 0x80, 0xfa, 0x33,
-        0x80, 0xff, 0x80, 1, 0x13, 0xa0, 0xaa, 0xbb,
-        0xa0, 0xff, 0xee, 0x80, 1, 0x33, 0xa0, 0xaa, 0xbb,
+        // // LDR / SRT
+        // 0xa0, 0xab, 0xcd, 0x80, 0xfb, 0x12,
+        // 0xa0, 0xab, 0xcd, 0x80, 0xfb, 0x32,
+        // 0x80, 1, 0x12, 0xa0, 0xaa, 0xbb,
+        // 0xa0, 0xff, 0xee, 0x80, 0xfa, 0x33,
+        // 0x80, 0xff, 0x80, 1, 0x13, 0xa0, 0xaa, 0xbb,
+        // 0xa0, 0xff, 0xee, 0x80, 1, 0x33, 0xa0, 0xaa, 0xbb,
+        // LDA /STA
+        0xa0, 0x01, 0x05, 0x14, 0xa0, 0xaa, 0xbb,
+        0xa0, 0x01, 0x05, 0x34, 0xa0, 0xcc, 0xdd,
     };
     memcpy(uxn_ram + PAGE_PROGRAM, uxn_rom, sizeof(uxn_rom));
 }
@@ -140,7 +143,6 @@ init_uxn() {
 // TODO:
 //  - Division
 //  - DEI/DEO
-//  - Relative load/store
 //  - Absolute load/store
 //  - Jump instructions (JMP/JCN/JCI/JMI/JSI/JSR)
 //  - OPr modes
diff --git a/src/uxn-core.s b/src/uxn-core.s
index 0e5cdbc..7307dce 100644
--- a/src/uxn-core.s
+++ b/src/uxn-core.s
@@ -119,6 +119,10 @@ uxn_ret:
     ldrb    \dst, [r0, \off]
 .endm
 
+.macro aload8 dst, off
+    ldrb    \dst, [r7, \off]
+.endm
+
 .macro rsave8 a, off
     strb    \a, [r0, \off]
 .endm
@@ -665,9 +669,18 @@ str2:
     b       uxn_decode
 
 lda:
+    wpop16  r4, r5
+    aload8  r3, r4
+    wpush8  r3
     b       uxn_decode
 
 lda2:
+    wpop16  r4, r5
+    aload8  r3, r4
+    wpush8  r3
+    add     r4, #1
+    aload8  r3, r4
+    wpush8  r3
     b       uxn_decode
 
 sta: