Fix DEI/DEO not saving stack pointers

2 files changed, 111 insertions, 24 deletions

diff --git a/src/main.c b/src/main.c
index 08da0aa..c6e5b7d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -213,9 +213,9 @@ init_uxn() {
     //     // 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,
-    // 0xc0, 0x6b, 0x80, 0x4f, 
-    // 0x0f, 
-    // 0x6f, 
+    // 0xc0, 0x6b, 0x80, 0x4f,
+    // 0x0f,
+    // 0x6f,
     // 0x80, 0x18,
     // 0x17, 0x80, 0x18, 0x17, 0xa0, 0x0a, 0x18, 0x17,
     // // 0x00, 0x00,
@@ -238,7 +238,7 @@ init_uxn() {
 }
 
 // TODO:
-//  - Test DEI functions
+//  - Change rom include using objcopy instead of my flimsy bin2carr rom
 
 int
 main(void) {
@@ -273,14 +273,14 @@ main(void) {
 
     uxn_eval_asm(PAGE_PROGRAM);
 
-    // txt_printf("\nROM");
-    // for (size_t i = 0; i < 32; i++) {
-    //     if (i % 8 == 0) {
-    //         txt_printf("\n");
-    //     }
-    //     txt_printf("%02x ", uxn_ram[i + PAGE_PROGRAM]);
-    // }
-    // txt_printf("\n");
+    txt_printf("\nROM");
+    for (size_t i = 0; i < 32; i++) {
+        if (i % 8 == 0) {
+            txt_printf("\n");
+        }
+        txt_printf("%02x ", uxn_ram[i + PAGE_PROGRAM]);
+    }
+    txt_printf("\n");
 
     txt_printf("\nWST (");
     txt_printf("SIZE: %d)", wst_ptr - (uintptr_t)wst);
@@ -295,18 +295,18 @@ main(void) {
         }
     }
     txt_printf("\n\n");
-    txt_printf("RST (");
-    txt_printf("SIZE: %d)", rst_ptr - (uintptr_t)rst);
-    for (size_t i = 0; i < 32; 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("RST (");
+    // txt_printf("SIZE: %d)", rst_ptr - (uintptr_t)rst);
+    // for (size_t i = 0; i < 32; 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 f110b61..c2ba5bb 100644
--- a/src/uxn-core.s
+++ b/src/uxn-core.s
@@ -453,6 +453,10 @@ dei:
     ldr     r6, =dei_map
     ldr     r6, [r6, r4, lsl #2]
     stmfd   sp!, {r0, r7, lr}
+    ldr     r0, =wst_ptr
+    str     r1, [r0]
+    ldr     r0, =rst_ptr
+    str     r2, [r0]
     ldr     r0, =device_data
     lsl     r4, #4
     add     r0, r4
@@ -472,6 +476,10 @@ dei2:
     ldr     r6, =dei_map
     ldr     r6, [r6, r4, lsl #2]
     stmfd   sp!, {r0, r7, lr}
+    ldr     r0, =wst_ptr
+    str     r1, [r0]
+    ldr     r0, =rst_ptr
+    str     r2, [r0]
     ldr     r0, =device_data
     lsl     r4, #4
     add     r0, r4
@@ -518,13 +526,24 @@ deo:
     b       uxn_decode
 
 deo2:
+    @ Get args (idx/port/value).
     wpop8   r3
     mov     r4, r3, lsr #4 @ idx
     and     r3, #0x0f      @ port
     wpop16  r5, r6         @ 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
@@ -532,6 +551,8 @@ deo2:
     mov     r1, r3
     mov     lr, pc
     bx      r6
+
+    @ Restore saved variables.
     ldmfd   sp!, {r0, r7, lr}
     ldr     r1, wst_ptr
     ldr     r2, rst_ptr
@@ -544,6 +565,10 @@ deir:
     ldr     r6, =dei_map
     ldr     r6, [r6, r4, lsl #2]
     stmfd   sp!, {r0, r7, lr}
+    ldr     r0, =wst_ptr
+    str     r1, [r0]
+    ldr     r0, =rst_ptr
+    str     r2, [r0]
     ldr     r0, =device_data
     lsl     r4, #4
     add     r0, r4
@@ -563,6 +588,10 @@ dei2r:
     ldr     r6, =dei_map
     ldr     r6, [r6, r4, lsl #2]
     stmfd   sp!, {r0, r7, lr}
+    ldr     r0, =wst_ptr
+    str     r1, [r0]
+    ldr     r0, =rst_ptr
+    str     r2, [r0]
     ldr     r0, =device_data
     lsl     r4, #4
     add     r0, r4
@@ -576,13 +605,24 @@ dei2r:
     b       uxn_decode
 
 deor:
+    @ Get args (idx/port/value).
     rpop8   r3
     mov     r4, r3, lsr #4 @ idx
     and     r3, #0x0f      @ port
     rpop8   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
@@ -590,19 +630,32 @@ deor:
     mov     r1, r3
     mov     lr, pc
     bx      r6
+
+    @ Restore saved variables.
     ldmfd   sp!, {r0, r7, lr}
     ldr     r1, wst_ptr
     ldr     r2, rst_ptr
     b       uxn_decode
 
 deo2r:
+    @ Get args (idx/port/value).
     rpop8   r3
     mov     r4, r3, lsr #4 @ idx
     and     r3, #0x0f      @ port
     rpop16  r5, r6         @ 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
@@ -610,6 +663,8 @@ deo2r:
     mov     r1, r3
     mov     lr, pc
     bx      r6
+
+    @ Restore saved variables.
     ldmfd   sp!, {r0, r7, lr}
     ldr     r1, wst_ptr
     ldr     r2, rst_ptr
@@ -622,6 +677,10 @@ deik:
     ldr     r6, =dei_map
     ldr     r6, [r6, r4, lsl #2]
     stmfd   sp!, {r0, r7, lr}
+    ldr     r0, =wst_ptr
+    str     r1, [r0]
+    ldr     r0, =rst_ptr
+    str     r2, [r0]
     ldr     r0, =device_data
     lsl     r4, #4
     add     r0, r4
@@ -641,6 +700,10 @@ dei2k:
     ldr     r6, =dei_map
     ldr     r6, [r6, r4, lsl #2]
     stmfd   sp!, {r0, r7, lr}
+    ldr     r0, =wst_ptr
+    str     r1, [r0]
+    ldr     r0, =rst_ptr
+    str     r2, [r0]
     ldr     r0, =device_data
     lsl     r4, #4
     add     r0, r4
@@ -661,6 +724,10 @@ deok:
     ldr     r6, =deo_map
     ldr     r6, [r6, r4, lsl #2]
     stmfd   sp!, {r0, r7, lr}
+    ldr     r0, =wst_ptr
+    str     r1, [r0]
+    ldr     r0, =rst_ptr
+    str     r2, [r0]
     ldr     r0, =device_data
     lsl     r4, #4
     add     r0, r4
@@ -681,6 +748,10 @@ deo2k:
     ldr     r6, =deo_map
     ldr     r6, [r6, r4, lsl #2]
     stmfd   sp!, {r0, r7, lr}
+    ldr     r0, =wst_ptr
+    str     r1, [r0]
+    ldr     r0, =rst_ptr
+    str     r2, [r0]
     ldr     r0, =device_data
     lsl     r4, #4
     add     r0, r4
@@ -700,6 +771,10 @@ deikr:
     ldr     r6, =dei_map
     ldr     r6, [r6, r4, lsl #2]
     stmfd   sp!, {r0, r7, lr}
+    ldr     r0, =wst_ptr
+    str     r1, [r0]
+    ldr     r0, =rst_ptr
+    str     r2, [r0]
     ldr     r0, =device_data
     lsl     r4, #4
     add     r0, r4
@@ -719,6 +794,10 @@ dei2kr:
     ldr     r6, =dei_map
     ldr     r6, [r6, r4, lsl #2]
     stmfd   sp!, {r0, r7, lr}
+    ldr     r0, =wst_ptr
+    str     r1, [r0]
+    ldr     r0, =rst_ptr
+    str     r2, [r0]
     ldr     r0, =device_data
     lsl     r4, #4
     add     r0, r4
@@ -739,6 +818,10 @@ deokr:
     ldr     r6, =deo_map
     ldr     r6, [r6, r4, lsl #2]
     stmfd   sp!, {r0, r7, lr}
+    ldr     r0, =wst_ptr
+    str     r1, [r0]
+    ldr     r0, =rst_ptr
+    str     r2, [r0]
     ldr     r0, =device_data
     lsl     r4, #4
     add     r0, r4
@@ -759,6 +842,10 @@ deo2kr:
     ldr     r6, =deo_map
     ldr     r6, [r6, r4, lsl #2]
     stmfd   sp!, {r0, r7, lr}
+    ldr     r0, =wst_ptr
+    str     r1, [r0]
+    ldr     r0, =rst_ptr
+    str     r2, [r0]
     ldr     r0, =device_data
     lsl     r4, #4
     add     r0, r4