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

1 files changed, 13 insertions, 0 deletions

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