Fix DEO to work consistently with existing deo_fn

2 files changed, 92 insertions, 46 deletions

diff --git a/src/main.c b/src/main.c
index 5696b21..21313a3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -36,28 +36,37 @@ extern uintptr_t deo_map[16];
 extern uintptr_t dei_map[16];
 extern uintptr_t wst_ptr;
 extern uintptr_t rst_ptr;
+extern u8 device_0[16];
+extern u8 device_1[16];
+extern u8 device_2[16];
+extern u8 device_3[16];
+extern u8 device_4[16];
+extern u8 device_5[16];
+extern u8 device_6[16];
+extern u8 device_7[16];
+extern u8 device_8[16];
+extern u8 device_a[16];
+extern u8 device_b[16];
+extern u8 device_c[16];
+extern u8 device_d[16];
+extern u8 device_e[16];
+extern u8 device_f[16];
 
 EWRAM_BSS
 u8 uxn_ram[KB(64)];
 
 void
-stub_a(u8 port, u16 val) {
-    (void)port;
-    (void)val;
-    txt_printf("a");
-}
-
-void
-deo_console(u8 port, u16 val) {
+deo_console(u8 *dev, u8 port) {
     switch(port) {
     case 0x8:
-        txt_putc(val);
+        txt_putc(dev[port]);
         return;
     case 0x9:
         txt_printf("ERROR: %c");
-        txt_putc(val);
+        txt_putc(dev[port]);
         return;
     }
+    txt_printf("\n");
 }
 
 void
@@ -190,10 +199,10 @@ init_uxn() {
         // 0x60, 0x00, 0x03, 0x80, 0xff, 0x00, 0xa0, 0xaa, 0xbb, 0xa0, 0xcc, 0xdd, 0x6c
         // 0x80, 0x01, 0x20, 0x00, 0x03, 0x80, 0xff, 0x00, 0xa0, 0xaa, 0xbb, 0xa0, 0xcc, 0xdd,
         // DEO/DEO2
-        // 0x80, 0x68, 0x80, 0x18, 0x17, 0x80, 0x65, 0x80,  0x18, 0x17, 0x80, 0x6c, 0x80, 0x18, 0x17, 0x80,
-        // 0x6c, 0x80, 0x18, 0x17, 0x80, 0x6f, 0x80, 0x18,  0x17, 0x80, 0x0a, 0x80, 0x18, 0x17,
-        0xa0, 0x00, 0x68, 0x80, 0x18, 0x37, 0x80, 0x65, 0x80,  0x18, 0x17, 0x80, 0x6c, 0x80, 0x18, 0x17, 0x80,
+        0x80, 0x68, 0x80, 0x18, 0x17, 0x80, 0x65, 0x80,  0x18, 0x17, 0x80, 0x6c, 0x80, 0x18, 0x17, 0x80,
         0x6c, 0x80, 0x18, 0x17, 0x80, 0x6f, 0x80, 0x18,  0x17, 0x80, 0x0a, 0x80, 0x18, 0x17,
+        // 0xa0, 0x00, 0x68, 0x80, 0x18, 0x37, 0x80, 0x65, 0x80,  0x18, 0x17, 0x80, 0x6c, 0x80, 0x18, 0x17, 0x80,
+        // 0x6c, 0x80, 0x18, 0x17, 0x80, 0x6f, 0x80, 0x18,  0x17, 0x80, 0x0a, 0x80, 0x18, 0x17,
     };
     memcpy(uxn_ram + PAGE_PROGRAM, uxn_rom, sizeof(uxn_rom));
 }
@@ -244,10 +253,9 @@ main(void) {
         rst[i] = 0;
         // TODO: Init device memory.
     }
-    deo_map[0] = stub_a;
+    // TODO: ...
     deo_map[1] = deo_console;
-    deo_map[2] = stub_c;
-    // ...
+    // TODO: ...
 
     uxn_eval_asm(PAGE_PROGRAM);
 
@@ -260,31 +268,31 @@ main(void) {
     // }
     // txt_printf("\n\n");
 
-    txt_printf("WST (");
-    txt_printf("SIZE: %d)", wst_ptr - (uintptr_t)wst);
-    for (size_t i = 0; i < 64; i++) {
-        if (i % 8 == 0) {
-            txt_printf("\n");
-        }
-        if (i >= (wst_ptr - (uintptr_t)wst)) {
-            txt_printf("%02x ", 0);
-        } else {
-            txt_printf("%02x ", wst[i]);
-        }
-    }
-    txt_printf("\n\n");
-    txt_printf("RST (");
-    txt_printf("SIZE: %d)", rst_ptr - (uintptr_t)rst);
-    for (size_t i = 0; i < 64; i++) {
-        if (i % 8 == 0) {
-            txt_printf("\n");
-        }
-        if (i >= (rst_ptr - (uintptr_t)rst)) {
-            txt_printf("%02x ", 0);
-        } else {
-            txt_printf("%02x ", rst[i]);
-        }
-    }
+    // txt_printf("WST (");
+    // txt_printf("SIZE: %d)", wst_ptr - (uintptr_t)wst);
+    // for (size_t i = 0; i < 64; i++) {
+    //     if (i % 8 == 0) {
+    //         txt_printf("\n");
+    //     }
+    //     if (i >= (wst_ptr - (uintptr_t)wst)) {
+    //         txt_printf("%02x ", 0);
+    //     } else {
+    //         txt_printf("%02x ", wst[i]);
+    //     }
+    // }
+    // txt_printf("\n\n");
+    // txt_printf("RST (");
+    // txt_printf("SIZE: %d)", rst_ptr - (uintptr_t)rst);
+    // for (size_t i = 0; i < 64; i++) {
+    //     if (i % 8 == 0) {
+    //         txt_printf("\n");
+    //     }
+    //     if (i >= (rst_ptr - (uintptr_t)rst)) {
+    //         txt_printf("%02x ", 0);
+    //     } else {
+    //         txt_printf("%02x ", rst[i]);
+    //     }
+    // }
     // txt_printf("\n\n");
     // txt_printf("RAM (ZP)\n");
     // for (size_t i = 0; i < 64; i++) {
diff --git a/src/uxn-core.s b/src/uxn-core.s
index c73d44c..17f57a3 100644
--- a/src/uxn-core.s
+++ b/src/uxn-core.s
@@ -18,7 +18,39 @@ rst: .space 256
 rst_ptr: .word rst
 
 .global device_data
-device_data: .space 256
+device_data:
+    .global device_0
+    device_0: .space 16
+    .global device_1
+    device_1: .space 16
+    .global device_2
+    device_2: .space 16
+    .global device_3
+    device_3: .space 16
+    .global device_4
+    device_4: .space 16
+    .global device_5
+    device_5: .space 16
+    .global device_6
+    device_6: .space 16
+    .global device_7
+    device_7: .space 16
+    .global device_8
+    device_8: .space 16
+    .global device_9
+    device_9: .space 16
+    .global device_a
+    device_a: .space 16
+    .global device_b
+    device_b: .space 16
+    .global device_c
+    device_c: .space 16
+    .global device_d
+    device_d: .space 16
+    .global device_e
+    device_e: .space 16
+    .global device_f
+    device_f: .space 16
 
 @ UXN evaluation function.
 @
@@ -824,8 +856,11 @@ deo:
     adr     r6, deo_map
     ldr     r6, [r6, r4, lsl #2]
     stmfd   sp!, {r0, r7, lr}
-    mov     r0, r3
-    mov     r1, r5
+    adr     r0, device_data
+    lsl     r4, #4
+    add     r0, r4
+    strb    r5, [r0, r3]
+    mov     r1, r3
     mov     lr, pc
     bx      r6
     ldmfd   sp!, {r0, r7, lr}
@@ -841,8 +876,11 @@ deo2:
     adr     r6, deo_map
     ldr     r6, [r6, r4, lsl #2]
     stmfd   sp!, {r0, r7, lr}
-    mov     r0, r3
-    mov     r1, r5
+    adr     r0, device_data
+    lsl     r4, #4
+    add     r0, r4
+    strh    r5, [r0, r3]
+    mov     r1, r3
     mov     lr, pc
     bx      r6
     ldmfd   sp!, {r0, r7, lr}