Fix DEI/DEO not saving stack pointers

1 files changed, 87 insertions, 0 deletions

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