Test and fix DEO with (DEI/DEO2 et al still incorrect)

3 files changed, 22 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index c7a3af6..4e5bab3 100644
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,7 @@ endif
 main: $(BUILD_DIR) $(ROM) $(BIN)
 
 $(ROM): $(TOOLS_BIN2CARR)
-        ./tools/bin2carr/build/bin2carr -n uxn_rom -e u16 -o $(ROM) $(ROM_SRC)
+        ./tools/bin2carr/build/bin2carr -n uxn_rom -e u8 -o $(ROM) $(ROM_SRC)
 
 # Strip and fix header to create final .gba file.
 $(BIN): $(ELF)
diff --git a/src/main.c b/src/main.c
index 9bb38c9..0e5e384 100644
--- a/src/main.c
+++ b/src/main.c
@@ -207,11 +207,16 @@ 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,
+        // 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,
         // 0xa0, 0x2c, 0xe9, 0x80, 0x08, 0x37,
+        0xa0, 0x6b, 0x4f, 0x80, 0x18, 0x17, 0x80, 0x18,  0x17, 0xa0, 0x0a, 0x18, 0x17,
+    // 0xa0, 0x6b, 0x4f, 0x80, 0x18, 0x17, 0x80, 0x18,
+    // 0x17, 0xa0, 0x0a, 0x18, 0x17, 0xc0, 0x6b, 0x80,
+    // 0x4f, 0x0f, 0x6f, 0x80, 0x18, 0x17, 0x80, 0x18,
+    // 0x17, 0xa0, 0x0a, 0x18, 0x17, 0x00, 0x00,
     };
     memcpy(uxn_ram + PAGE_PROGRAM, uxn_rom, sizeof(uxn_rom));
 
@@ -231,7 +236,6 @@ init_uxn() {
 }
 
 // TODO:
-//  - OPrk modes
 //  - Test DEI functions
 
 int
@@ -264,11 +268,6 @@ main(void) {
     // Main loop.
     // uxn_eval(&u, PAGE_PROGRAM);
     u8 frame_counter = 0;
-    // NOTE: A VBLANK is 83776 cycles, anything other than that will make it so
-    // we fail to render at 60FPS.
-
-    // TODO: ...
-    // TODO: ...
 
     uxn_eval_asm(PAGE_PROGRAM);
 
@@ -293,7 +292,7 @@ main(void) {
             txt_printf("%02x ", wst[i]);
         }
     }
-    txt_printf("\n\n");
+    // txt_printf("\n\n");
     // txt_printf("RST (");
     // txt_printf("SIZE: %d)", rst_ptr - (uintptr_t)rst);
     // for (size_t i = 0; i < 64; i++) {
diff --git a/src/uxn-core.s b/src/uxn-core.s
index 1a365ed..5b20e03 100644
--- a/src/uxn-core.s
+++ b/src/uxn-core.s
@@ -485,13 +485,24 @@ dei2:
     b       uxn_decode
 
 deo:
+    @ Get args (idx/port/value).
     wpop8   r3
     mov     r4, r3, lsr #4 @ idx
     and     r3, #0x0f      @ port
     wpop8   r5             @ value
+
+    @ Find current devide.
     ldr     r6, =deo_map
     ldr     r6, [r6, r4, lsl #2]
+
+    @ Save registers that can be affected.
     stmfd   sp!, {r0, r7, lr}
+    ldr     r0, =wst_ptr
+    str     r1, [r0]
+    ldr     r0, =rst_ptr
+    str     r2, [r0]
+
+    @ Call the deo function.
     ldr     r0, =device_data
     lsl     r4, #4
     add     r0, r4
@@ -499,6 +510,8 @@ deo:
     mov     r1, r3
     mov     lr, pc
     bx      r6
+
+    @ Restore saved variables.
     ldmfd   sp!, {r0, r7, lr}
     ldr     r1, wst_ptr
     ldr     r2, rst_ptr