Fix k mode instructions

3 files changed, 268 insertions, 264 deletions

diff --git a/src/main.c b/src/main.c
index c6e5b7d..70d1445 100644
--- a/src/main.c
+++ b/src/main.c
@@ -220,7 +220,9 @@ init_uxn() {
     // 0x17, 0x80, 0x18, 0x17, 0xa0, 0x0a, 0x18, 0x17,
     // // 0x00, 0x00,
     // };
-    memcpy(uxn_ram + PAGE_PROGRAM, uxn_rom, sizeof(uxn_rom));
+    uxn_rom = _binary_build_uxn_rom_start;
+    uxn_rom_size = (size_t)_binary_build_uxn_rom_size;
+    memcpy(uxn_ram + PAGE_PROGRAM, uxn_rom, uxn_rom_size);
 
     // Initialize stack and device memory.
     for (size_t i = 0; i < 256; i++) {
@@ -238,7 +240,8 @@ init_uxn() {
 }
 
 // TODO:
-//  - Change rom include using objcopy instead of my flimsy bin2carr rom
+// - Make sure we are evaluating everything on the main loop, not just one
+//   vector.
 
 int
 main(void) {
@@ -273,14 +276,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 +298,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/rom.c b/src/rom.c
new file mode 100644
index 0000000..01fd451
--- /dev/null
+++ b/src/rom.c
@@ -0,0 +1,5 @@
+extern u8 _binary_build_uxn_rom_start[];
+extern u8 _binary_build_uxn_rom_size[];
+
+u8 *uxn_rom;
+size_t uxn_rom_size;
diff --git a/src/uxn-core.s b/src/uxn-core.s
index c2ba5bb..befb02c 100644
--- a/src/uxn-core.s
+++ b/src/uxn-core.s
@@ -83,17 +83,17 @@ uxn_ret:
     strb    \a, [r1], #2
 .endm
 
-.macro wpeek a, b
-    ldrb    \a, [r1, \b]
+.macro wpeek8 a, off
+    ldrb    \a, [r1, \off]
 .endm
 
-.macro wpeek8 a
-    ldrb    \a, [r1, #-1]
+.macro wpeek8s a, off
+    ldrsb   \a, [r1, \off]
 .endm
 
-.macro wpeek16 a, b
-    ldrb    \a, [r1, #-1]
-    ldrb    \b, [r1, #-2]
+.macro wpeek16 a, b, offa, offb
+    ldrb    \a, [r1, \offa]
+    ldrb    \b, [r1, \offb]
     orr     \a, \a, \b, lsl #8
 .endm
 
@@ -121,17 +121,17 @@ uxn_ret:
     strb    \a, [r2], #2
 .endm
 
-.macro rpeek a, b
-    ldrb    \a, [r2, \b]
+.macro rpeek8 a, off
+    ldrb    \a, [r2, \off]
 .endm
 
-.macro rpeek8 a
-    ldrb    \a, [r2, #-1]
+.macro rpeek8s a, off
+    ldrsb   \a, [r2, \off]
 .endm
 
-.macro rpeek16 a, b
-    ldrb    \a, [r2, #-1]
-    ldrb    \b, [r2, #-2]
+.macro rpeek16 a, b, offa, offb
+    ldrb    \a, [r2, \offa]
+    ldrb    \b, [r2, \offb]
     orr     \a, \a, \b, lsl #8
 .endm
 
@@ -671,7 +671,7 @@ deo2r:
     b       uxn_decode
 
 deik:
-    wpeek8  r3
+    wpeek8  r3, #-1
     mov     r4, r3, lsr #4 @ idx
     and     r3, #0x0f      @ port
     ldr     r6, =dei_map
@@ -694,7 +694,7 @@ deik:
     b       uxn_decode
 
 dei2k:
-    wpeek8  r3
+    wpeek8  r3, #-1
     mov     r4, r3, lsr #4 @ idx
     and     r3, #0x0f      @ port
     ldr     r6, =dei_map
@@ -717,10 +717,10 @@ dei2k:
     b       uxn_decode
 
 deok:
-    wpeek8  r3
+    wpeek8  r3, #-1
     mov     r4, r3, lsr #4 @ idx
     and     r3, #0x0f      @ port
-    wpeek8  r5             @ value
+    wpeek8  r5, #-2        @ value
     ldr     r6, =deo_map
     ldr     r6, [r6, r4, lsl #2]
     stmfd   sp!, {r0, r7, lr}
@@ -741,10 +741,10 @@ deok:
     b       uxn_decode
 
 deo2k:
-    wpeek8  r3
-    mov     r4, r3, lsr #4 @ idx
-    and     r3, #0x0f      @ port
-    wpeek16 r5, r6         @ value
+    wpeek8  r3, #-1
+    mov     r4, r3, lsr #4   @ idx
+    and     r3, #0x0f        @ port
+    wpeek16 r5, r6, #-2, #-3 @ value
     ldr     r6, =deo_map
     ldr     r6, [r6, r4, lsl #2]
     stmfd   sp!, {r0, r7, lr}
@@ -765,7 +765,7 @@ deo2k:
     b       uxn_decode
 
 deikr:
-    rpeek8  r3
+    rpeek8  r3, #-1
     mov     r4, r3, lsr #4 @ idx
     and     r3, #0x0f      @ port
     ldr     r6, =dei_map
@@ -788,7 +788,7 @@ deikr:
     b       uxn_decode
 
 dei2kr:
-    rpeek8  r3
+    rpeek8  r3, #-1
     mov     r4, r3, lsr #4 @ idx
     and     r3, #0x0f      @ port
     ldr     r6, =dei_map
@@ -811,10 +811,10 @@ dei2kr:
     b       uxn_decode
 
 deokr:
-    rpeek8  r3
+    rpeek8  r3, #-1
     mov     r4, r3, lsr #4 @ idx
     and     r3, #0x0f      @ port
-    rpeek8  r5             @ value
+    rpeek8  r5, #-2        @ value
     ldr     r6, =deo_map
     ldr     r6, [r6, r4, lsl #2]
     stmfd   sp!, {r0, r7, lr}
@@ -835,10 +835,10 @@ deokr:
     b       uxn_decode
 
 deo2kr:
-    rpeek8  r3
-    mov     r4, r3, lsr #4 @ idx
-    and     r3, #0x0f      @ port
-    rpeek16 r5, r6         @ value
+    rpeek8  r3, #-1
+    mov     r4, r3, lsr #4   @ idx
+    and     r3, #0x0f        @ port
+    rpeek16 r5, r6, #-2, #-3 @ value
     ldr     r6, =deo_map
     ldr     r6, [r6, r4, lsl #2]
     stmfd   sp!, {r0, r7, lr}
@@ -1060,25 +1060,25 @@ rot2:
     b       uxn_decode
 
 dup:
-    wpeek   r3, #-1
+    wpeek8  r3, #-1
     wpush8  r3
     b       uxn_decode
 
 dup2:
-    wpeek   r3, #-2
-    wpeek   r4, #-1
+    wpeek8  r3, #-2
+    wpeek8  r4, #-1
     wpush8  r3
     wpush8  r4
     b       uxn_decode
 
 ovr:
-    wpeek   r3, #-2
+    wpeek8  r3, #-2
     wpush8  r3
     b       uxn_decode
 
 ovr2:
-    wpeek   r3, #-4
-    wpeek   r4, #-3
+    wpeek8  r3, #-4
+    wpeek8  r4, #-3
     wpush8  r3
     wpush8  r4
     b       uxn_decode
@@ -1431,11 +1431,11 @@ inc2r:
     b       uxn_decode
 
 popr:
-    sub     r1, #1
+    sub     r2, #1
     b       uxn_decode
 
 pop2r:
-    sub     r1, #2
+    sub     r2, #2
     b       uxn_decode
 
 nipr:
@@ -1483,25 +1483,25 @@ rot2r:
     b       uxn_decode
 
 dupr:
-    rpeek   r3, #-1
+    rpeek8  r3, #-1
     rpush8  r3
     b       uxn_decode
 
 dup2r:
-    rpeek   r3, #-2
-    rpeek   r4, #-1
+    rpeek8  r3, #-2
+    rpeek8  r4, #-1
     rpush8  r3
     rpush8  r4
     b       uxn_decode
 
 ovrr:
-    rpeek   r3, #-2
+    rpeek8  r3, #-2
     rpush8  r3
     b       uxn_decode
 
 ovr2r:
-    rpeek   r3, #-4
-    rpeek   r4, #-3
+    rpeek8  r3, #-4
+    rpeek8  r4, #-3
     rpush8  r3
     rpush8  r4
     b       uxn_decode
@@ -1606,7 +1606,7 @@ jcn2r:
 jsrr:
     mov     r3, r0
     sub     r3, r3, r7
-    rpush16 r3
+    wpush16 r3
     rpop8s  r3
     add     r0, r3
     b       uxn_decode
@@ -1842,96 +1842,94 @@ sft2r:
 .align 2
 
 inck:
-    wpeek8  r3
+    wpeek8  r3, #-1
     add     r3, #1
     wpush8  r3
     b       uxn_decode
 
 inc2k:
-    wpeek16 r3, r5
+    wpeek16 r3, r5, #-1, #-2
     add     r3, r3, #1
     wpush16 r3
     b       uxn_decode
 
 popk:
-    sub     r1, #1
     b       uxn_decode
 
 pop2k:
-    sub     r1, #2
     b       uxn_decode
 
 nipk:
-    wpeek8  r3
+    wpeek8  r3, #-1
     strb    r3, [r1, #-1]
     b       uxn_decode
 
 nip2k:
-    wpeek16 r3, r5
+    wpeek16 r3, r5, #-1, #-2
     strb    r3, [r1, #-1]
     lsr     r3, #8
     strb    r3, [r1, #-2]
     b       uxn_decode
 
 swpk:
-    wpeek8  r3
-    wpeek8  r4
+    wpeek8  r3, #-1
+    wpeek8  r4, #-2
     wpush8  r3
     wpush8  r4
     b       uxn_decode
 
 swp2k:
-    wpeek16 r3, r5
-    wpeek16 r4, r5
+    wpeek16 r3, r5, #-1, #-2
+    wpeek16 r4, r5, #-3, #-4
     wpush16 r3
     wpush16 r4
     b       uxn_decode
 
 rotk:
-    wpeek8  r5
-    wpeek8  r4
-    wpeek8  r3
+    wpeek8  r5, #-1
+    wpeek8  r4, #-2
+    wpeek8  r3, #-3
     wpush8  r4
     wpush8  r5
     wpush8  r3
     b       uxn_decode
 
 rot2k:
-    wpeek16 r5, r6
-    wpeek16 r4, r6
-    wpeek16 r3, r6
+    wpeek16 r5, r6, #-1, #-2
+    wpeek16 r4, r6, #-3, #-4
+    wpeek16 r3, r6, #-5, #-6
     wpush16 r4
     wpush16 r5
     wpush16 r3
     b       uxn_decode
 
 dupk:
-    wpeek   r3, #-1
+    wpeek8  r3, #-1
     wpush8  r3
     b       uxn_decode
 
 dup2k:
-    wpeek   r3, #-2
-    wpeek   r4, #-1
+    wpeek8  r3, #-2
+    wpeek8  r4, #-1
     wpush8  r3
     wpush8  r4
     b       uxn_decode
 
 ovrk:
-    wpeek   r3, #-2
+    wpeek8  r3, #-2
     wpush8  r3
     b       uxn_decode
 
 ovr2k:
-    wpeek   r3, #-4
-    wpeek   r4, #-3
+    wpeek8  r3, #-4
+    wpeek8  r4, #-3
     wpush8  r3
     wpush8  r4
     b       uxn_decode
 
 equk:
-    wpeek8  r3
-    wpeek8  r4
+    wpeek8  r3, #-1
+    wpeek8  r4, #-2
     sub     r3, r4, r3
     rsbs    r4, r3, #0
     adc     r4, r4, r3
@@ -1939,8 +1937,8 @@ equk:
     b       uxn_decode
 
 equ2k:
-    wpeek16 r3, r5
-    wpeek16 r4, r5
+    wpeek16 r3, r5, #-1, #-2
+    wpeek16 r4, r5, #-3, #-4
     sub     r3, r4, r3
     rsbs    r4, r3, #0
     adc     r4, r4, r3
@@ -1948,24 +1946,24 @@ equ2k:
     b       uxn_decode
 
 neqk:
-    wpeek8  r3
-    wpeek8  r4
+    wpeek8  r3, #-1
+    wpeek8  r4, #-2
     subs    r3, r4, r3
     movne   r3, #1
     wpush8  r3
     b       uxn_decode
 
 neq2k:
-    wpeek16 r3, r5
-    wpeek16 r4, r5
+    wpeek16 r3, r5, #-1, #-2
+    wpeek16 r4, r5, #-3, #-4
     subs    r3, r4, r3
     movne   r3, #1
     wpush8  r3
     b       uxn_decode
 
 gthk:
-    wpeek8  r3
-    wpeek8  r4
+    wpeek8  r3, #-1
+    wpeek8  r4, #-2
     cmp     r4, r3
     movls   r3, #0
     movhi   r3, #1
@@ -1973,8 +1971,8 @@ gthk:
     b       uxn_decode
 
 gth2k:
-    wpeek16 r3, r5
-    wpeek16 r4, r5
+    wpeek16 r3, r5, #-1, #-2
+    wpeek16 r4, r5, #-3, #-4
     cmp     r4, r3
     movls   r3, #0
     movhi   r3, #1
@@ -1982,8 +1980,8 @@ gth2k:
     b       uxn_decode
 
 lthk:
-    wpeek8  r3
-    wpeek8  r4
+    wpeek8  r3, #-1
+    wpeek8  r4, #-2
     cmp     r4, r3
     movcs   r3, #0
     movcc   r3, #1
@@ -1991,8 +1989,8 @@ lthk:
     b       uxn_decode
 
 lth2k:
-    wpeek16 r3, r5
-    wpeek16 r4, r5
+    wpeek16 r3, r5, #-1, #-2
+    wpeek16 r4, r5, #-3, #-4
     cmp     r4, r3
     movcs   r3, #0
     movcc   r3, #1
@@ -2000,26 +1998,26 @@ lth2k:
     b       uxn_decode
 
 jmpk:
-    wpop8s  r3
+    wpeek8s r3, #-1
     add     r0, r3
     b       uxn_decode
 
 jmp2k:
-    wpeek16 r3, r5
+    wpeek16 r3, r5, #-1, #-2
     mov     r0, r7
     add     r0, r0, r3
     b       uxn_decode
 
 jcnk:
-    wpop8s  r3
-    wpeek8  r4
+    wpeek8s r3, #-1
+    wpeek8  r4, #-2
     cmp     r4, #0
     addne   r0, r3
     b       uxn_decode
 
 jcn2k:
-    wpeek16 r3, r5
-    wpeek8  r4
+    wpeek16 r3, r5, #-1, #-2
+    wpeek8  r4, #-3
     cmp     r4, #0
     movne   r0, r7
     cmp     r4, #0
@@ -2030,36 +2028,36 @@ jsrk:
     mov     r3, r0
     sub     r3, r3, r7
     rpush16 r3
-    wpop8s  r3
+    wpeek8s r3, #-1
     add     r0, r3
     b       uxn_decode
 
 jsr2k:
     mov     r3, r0
     sub     r3, r3, r7
-    wpeek16 r3, r5
+    wpeek16 r3, r5, #-1, #-2
     mov     r0, r7
     add     r0, r0, r3
     b       uxn_decode
 
 sthk:
-    wpeek8  r3
+    wpeek8  r3, #-1
     rpush8  r3
     b       uxn_decode
 
 sth2k:
-    wpeek16 r3, r5
+    wpeek16 r3, r5, #-1, #-2
     rpush16 r3
     b       uxn_decode
 
 ldzk:
-    wpeek8  r3
+    wpeek8  r3, #-1
     zload8  r4, r3
     wpush8  r4
     b       uxn_decode
 
 ldz2k:
-    wpeek8  r3
+    wpeek8  r3, #-1
     zload8  r4, r3
     wpush8  r4
     add     r3, #1
@@ -2068,25 +2066,25 @@ ldz2k:
     b       uxn_decode
 
 stzk:
-    wpeek8  r3
-    wpeek8  r4
+    wpeek8  r3, #-1
+    wpeek8  r4, #-2
     zsave8  r4, r3
     b       uxn_decode
 
 stz2k:
-    wpeek8  r3
-    wpeek16 r4, r5
+    wpeek8  r3, #-1
+    wpeek16 r4, r5, #-2, #-3
     zsave16 r4, r3
     b       uxn_decode
 
 ldrk:
-    wpop8s  r4
+    wpeek8s r4, #-1
     rload8  r3, r4
     wpush8  r3
     b       uxn_decode
 
 ldr2k:
-    wpop8s  r4
+    wpeek8s r4, #-1
     rload8  r3, r4
     wpush8  r3
     add     r4, #1
@@ -2095,25 +2093,25 @@ ldr2k:
     b       uxn_decode
 
 strk:
-    wpop8s  r4
-    wpeek8  r3
+    wpeek8s r4, #-1
+    wpeek8  r3, #-2
     rsave8  r3, r4
     b       uxn_decode
 
 str2k:
-    wpop8s  r4
-    wpeek16 r3, r5
+    wpeek8s r4, #-1
+    wpeek16 r3, r5, #-2, #-3
     rsave16 r3, r4
     b       uxn_decode
 
 ldak:
-    wpeek16 r4, r5
+    wpeek16 r4, r5, #-1, #-2
     aload8  r3, r4
     wpush8  r3
     b       uxn_decode
 
 lda2k:
-    wpeek16 r4, r5
+    wpeek16 r4, r5, #-1, #-2
     aload8  r3, r4
     wpush8  r3
     add     r4, #1
@@ -2122,62 +2120,62 @@ lda2k:
     b       uxn_decode
 
 stak:
-    wpeek16 r4, r5
-    wpeek8  r3
+    wpeek16 r4, r5, #-1, #-2
+    wpeek8  r3, #-3
     asave8  r3, r4
     b       uxn_decode
 
 sta2k:
-    wpeek16 r4, r5
-    wpeek16 r3, r5
+    wpeek16 r4, r5, #-1, #-2
+    wpeek16 r3, r5, #-3, #-4
     asave16 r3, r4
     b       uxn_decode
 
 addk:
-    wpeek8  r3
-    wpeek8  r4
+    wpeek8  r3, #-1
+    wpeek8  r4, #-2
     add     r3, r3, r4
     wpush8  r3
     b       uxn_decode
 
 add2k:
-    wpeek16 r3, r5
-    wpeek16 r4, r5
+    wpeek16 r3, r5, #-1, #-2
+    wpeek16 r4, r5, #-3, #-4
     add     r3, r3, r4
     wpush16 r3
     b       uxn_decode
 
 subk:
-    wpeek8  r3
-    wpeek8  r4
+    wpeek8  r3, #-1
+    wpeek8  r4, #-2
     sub     r4, r4, r3
     wpush8  r4
     b       uxn_decode
 
 sub2k:
-    wpeek16 r3, r5
-    wpeek16 r4, r5
+    wpeek16 r3, r5, #-1, #-2
+    wpeek16 r4, r5, #-3, #-4
     sub     r3, r4, r3
     wpush16 r3
     b       uxn_decode
 
 mulk:
-    wpeek8  r3
-    wpeek8  r4
+    wpeek8  r3, #-1
+    wpeek8  r4, #-2
     mul     r4, r3, r4
     wpush8  r4
     b       uxn_decode
 
 mul2k:
-    wpeek16 r3, r5
-    wpeek16 r4, r5
+    wpeek16 r3, r5, #-1, #-2
+    wpeek16 r4, r5, #-3, #-4
     mul     r3, r4, r3
     wpush16 r3
     b       uxn_decode
 
 divk:
-    wpeek8  r3
-    wpeek8  r4
+    wpeek8  r3, #-1
+    wpeek8  r4, #-2
     push    {r0, r1, r2, r7, lr}
     mov     r1, r3
     mov     r0, r4
@@ -2188,8 +2186,8 @@ divk:
     b       uxn_decode
 
 div2k:
-    wpeek16 r3, r5
-    wpeek16 r4, r5
+    wpeek16 r3, r5, #-1, #-2
+    wpeek16 r4, r5, #-3, #-4
     push    {r0, r1, r2, r7, lr}
     mov     r1, r3
     mov     r0, r4
@@ -2200,50 +2198,50 @@ div2k:
     b       uxn_decode
 
 andk:
-    wpeek8  r3
-    wpeek8  r4
+    wpeek8  r3, #-1
+    wpeek8  r4, #-2
     and     r3, r3, r4
     wpush8  r3
     b       uxn_decode
 
 and2k:
-    wpeek16 r3, r5
-    wpeek16 r4, r5
+    wpeek16 r3, r5, #-1, #-2
+    wpeek16 r4, r5, #-3, #-4
     and     r3, r3, r4
     wpush16 r3
     b       uxn_decode
 
 orak:
-    wpeek8  r3
-    wpeek8  r4
+    wpeek8  r3, #-1
+    wpeek8  r4, #-2
     orr     r3, r3, r4
     wpush8  r3
     b       uxn_decode
 
 ora2k:
-    wpeek16 r3, r5
-    wpeek16 r4, r5
+    wpeek16 r3, r5, #-1, #-2
+    wpeek16 r4, r5, #-3, #-4
     orr     r3, r3, r4
     wpush16 r3
     b       uxn_decode
 
 eork:
-    wpeek8  r3
-    wpeek8  r4
+    wpeek8  r3, #-1
+    wpeek8  r4, #-2
     eor     r3, r3, r4
     wpush8  r3
     b       uxn_decode
 
 eor2k:
-    wpeek16 r3, r5
-    wpeek16 r4, r5
+    wpeek16 r3, r5, #-1, #-2
+    wpeek16 r4, r5, #-3, #-4
     eor     r3, r3, r4
     wpush16 r3
     b       uxn_decode
 
 sftk:
-    wpeek8  r4
-    wpeek8  r3
+    wpeek8  r4, #-1
+    wpeek8  r3, #-2
     lsr r5, r4, #4
     and r4, #0x0f
     lsr r3, r3, r4
@@ -2252,8 +2250,8 @@ sftk:
     b       uxn_decode
 
 sft2k:
-    wpeek8  r4
-    wpeek16 r3, r5
+    wpeek8  r4, #-1
+    wpeek16 r3, r5, #-2, #-3
     lsr r5, r4, #4
     and r4, #0x0f
     lsr r3, r3, r4
@@ -2265,96 +2263,94 @@ sft2k:
 .align 2
 
 inckr:
-    rpeek8  r3
+    rpeek8  r3, #-1
     add     r3, #1
     rpush8  r3
     b       uxn_decode
 
 inc2kr:
-    rpeek16 r3, r5
+    rpeek16 r3, r5, #-1, #-2
     add     r3, r3, #1
     rpush16 r3
     b       uxn_decode
 
 popkr:
-    sub     r1, #1
     b       uxn_decode
 
 pop2kr:
-    sub     r1, #2
     b       uxn_decode
 
 nipkr:
-    rpeek8  r3
+    rpeek8  r3, #-1
     strb    r3, [r1, #-1]
     b       uxn_decode
 
 nip2kr:
-    rpeek16 r3, r5
+    rpeek16 r3, r5, #-1, #-2
     strb    r3, [r1, #-1]
     lsr     r3, #8
     strb    r3, [r1, #-2]
     b       uxn_decode
 
 swpkr:
-    rpeek8  r3
-    rpeek8  r4
+    rpeek8  r3, #-1
+    rpeek8  r4, #-2
     rpush8  r3
     rpush8  r4
     b       uxn_decode
 
 swp2kr:
-    rpeek16 r3, r5
-    rpeek16 r4, r5
+    rpeek16 r3, r5, #-1, #-2
+    rpeek16 r4, r5, #-3, #-4
     rpush16 r3
     rpush16 r4
     b       uxn_decode
 
 rotkr:
-    rpeek8  r5
-    rpeek8  r4
-    rpeek8  r3
+    rpeek8  r5, #-1
+    rpeek8  r4, #-2
+    rpeek8  r3, #-3
     rpush8  r4
     rpush8  r5
     rpush8  r3
     b       uxn_decode
 
 rot2kr:
-    rpeek16 r5, r6
-    rpeek16 r4, r6
-    rpeek16 r3, r6
+    rpeek16 r5, r6, #-1, #-2
+    rpeek16 r4, r6, #-3, #-4
+    rpeek16 r3, r6, #-5, #-6
     rpush16 r4
     rpush16 r5
     rpush16 r3
     b       uxn_decode
 
 dupkr:
-    rpeek   r3, #-1
+    rpeek8  r3, #-1
     rpush8  r3
     b       uxn_decode
 
 dup2kr:
-    rpeek   r3, #-2
-    rpeek   r4, #-1
+    rpeek8  r3, #-2
+    rpeek8  r4, #-1
     rpush8  r3
     rpush8  r4
     b       uxn_decode
 
 ovrkr:
-    rpeek   r3, #-2
+    rpeek8  r3, #-2
     rpush8  r3
     b       uxn_decode
 
 ovr2kr:
-    rpeek   r3, #-4
-    rpeek   r4, #-3
+    rpeek8  r3, #-4
+    rpeek8  r4, #-3
     rpush8  r3
     rpush8  r4
     b       uxn_decode
 
 equkr:
-    rpeek8  r3
-    rpeek8  r4
+    rpeek8  r3, #-1
+    rpeek8  r4, #-2
     sub     r3, r4, r3
     rsbs    r4, r3, #0
     adc     r4, r4, r3
@@ -2362,8 +2358,8 @@ equkr:
     b       uxn_decode
 
 equ2kr:
-    rpeek16 r3, r5
-    rpeek16 r4, r5
+    rpeek16 r3, r5, #-1, #-2
+    rpeek16 r4, r5, #-3, #-4
     sub     r3, r4, r3
     rsbs    r4, r3, #0
     adc     r4, r4, r3
@@ -2371,24 +2367,24 @@ equ2kr:
     b       uxn_decode
 
 neqkr:
-    rpeek8  r3
-    rpeek8  r4
+    rpeek8  r3, #-1
+    rpeek8  r4, #-2
     subs    r3, r4, r3
     movne   r3, #1
     rpush8  r3
     b       uxn_decode
 
 neq2kr:
-    rpeek16 r3, r5
-    rpeek16 r4, r5
+    rpeek16 r3, r5, #-1, #-2
+    rpeek16 r4, r5, #-3, #-4
     subs    r3, r4, r3
     movne   r3, #1
     rpush8  r3
     b       uxn_decode
 
 gthkr:
-    rpeek8  r3
-    rpeek8  r4
+    rpeek8  r3, #-1
+    rpeek8  r4, #-2
     cmp     r4, r3
     movls   r3, #0
     movhi   r3, #1
@@ -2396,8 +2392,8 @@ gthkr:
     b       uxn_decode
 
 gth2kr:
-    rpeek16 r3, r5
-    rpeek16 r4, r5
+    rpeek16 r3, r5, #-1, #-2
+    rpeek16 r4, r5, #-3, #-4
     cmp     r4, r3
     movls   r3, #0
     movhi   r3, #1
@@ -2405,8 +2401,8 @@ gth2kr:
     b       uxn_decode
 
 lthkr:
-    rpeek8  r3
-    rpeek8  r4
+    rpeek8  r3, #-1
+    rpeek8  r4, #-2
     cmp     r4, r3
     movcs   r3, #0
     movcc   r3, #1
@@ -2414,8 +2410,8 @@ lthkr:
     b       uxn_decode
 
 lth2kr:
-    rpeek16 r3, r5
-    rpeek16 r4, r5
+    rpeek16 r3, r5, #-1, #-2
+    rpeek16 r4, r5, #-3, #-4
     cmp     r4, r3
     movcs   r3, #0
     movcc   r3, #1
@@ -2423,26 +2419,26 @@ lth2kr:
     b       uxn_decode
 
 jmpkr:
-    rpop8s  r3
+    rpeek8s r3, #-1
     add     r0, r3
     b       uxn_decode
 
 jmp2kr:
-    rpeek16 r3, r5
+    rpeek16 r3, r5, #-1, #-2
     mov     r0, r7
     add     r0, r0, r3
     b       uxn_decode
 
 jcnkr:
-    rpop8s  r3
-    rpeek8  r4
+    rpeek8s r3, #-1
+    rpeek8  r4, #-2
     cmp     r4, #0
     addne   r0, r3
     b       uxn_decode
 
 jcn2kr:
-    rpeek16 r3, r5
-    rpeek8  r4
+    rpeek16 r3, r5, #-1, #-2
+    rpeek8  r4, #-3
     cmp     r4, #0
     movne   r0, r7
     cmp     r4, #0
@@ -2452,37 +2448,37 @@ jcn2kr:
 jsrkr:
     mov     r3, r0
     sub     r3, r3, r7
-    rpush16 r3
-    rpop8s  r3
+    wpush16 r3
+    rpeek8s r3, #-1
     add     r0, r3
     b       uxn_decode
 
 jsr2kr:
     mov     r3, r0
     sub     r3, r3, r7
-    rpeek16 r3, r5
+    rpeek16 r3, r5, #-1, #-2
     mov     r0, r7
     add     r0, r0, r3
     b       uxn_decode
 
 sthkr:
-    rpeek8  r3
+    rpeek8  r3, #-1
     wpush8  r3
     b       uxn_decode
 
 sth2kr:
-    rpeek16 r3, r5
+    rpeek16 r3, r5, #-1, #-2
     wpush16 r3
     b       uxn_decode
 
 ldzkr:
-    rpeek8  r3
+    rpeek8  r3, #-1
     zload8  r4, r3
     rpush8  r4
     b       uxn_decode
 
 ldz2kr:
-    rpeek8  r3
+    rpeek8  r3, #-1
     zload8  r4, r3
     rpush8  r4
     add     r3, #1
@@ -2491,25 +2487,25 @@ ldz2kr:
     b       uxn_decode
 
 stzkr:
-    rpeek8  r3
-    rpeek8  r4
+    rpeek8  r3, #-1
+    rpeek8  r4, #-2
     zsave8  r4, r3
     b       uxn_decode
 
 stz2kr:
-    rpeek8  r3
-    rpeek16 r4, r5
+    rpeek8  r3, #-1
+    rpeek16 r4, r5, #-2, #-3
     zsave16 r4, r3
     b       uxn_decode
 
 ldrkr:
-    rpop8s  r4
+    rpeek8s r4, #-1
     rload8  r3, r4
     rpush8  r3
     b       uxn_decode
 
 ldr2kr:
-    rpop8s  r4
+    rpeek8s r4, #-1
     rload8  r3, r4
     rpush8  r3
     add     r4, #1
@@ -2518,25 +2514,25 @@ ldr2kr:
     b       uxn_decode
 
 strkr:
-    rpop8s  r4
-    rpeek8  r3
+    rpeek8s r4, #-1
+    rpeek8  r3, #-2
     rsave8  r3, r4
     b       uxn_decode
 
 str2kr:
-    rpop8s  r4
-    rpeek16 r3, r5
+    rpeek8s r4, #-1
+    rpeek16 r3, r5, #-1, #-2
     rsave16 r3, r4
     b       uxn_decode
 
 ldakr:
-    rpeek16 r4, r5
+    rpeek16 r4, r5, #-1, #-2
     aload8  r3, r4
     rpush8  r3
     b       uxn_decode
 
 lda2kr:
-    rpeek16 r4, r5
+    rpeek16 r4, r5, #-1, #-2
     aload8  r3, r4
     rpush8  r3
     add     r4, #1
@@ -2545,62 +2541,62 @@ lda2kr:
     b       uxn_decode
 
 stakr:
-    rpeek16 r4, r5
-    rpeek8  r3
+    rpeek16 r4, r5, #-1, #-2
+    rpeek8  r3, #-3
     asave8  r3, r4
     b       uxn_decode
 
 sta2kr:
-    rpeek16 r4, r5
-    rpeek16 r3, r5
+    rpeek16 r4, r5, #-1, #-2
+    rpeek16 r3, r5, #-3, #-4
     asave16 r3, r4
     b       uxn_decode
 
 addkr:
-    rpeek8  r3
-    rpeek8  r4
+    rpeek8  r3, #-1
+    rpeek8  r4, #-2
     add     r3, r3, r4
     rpush8  r3
     b       uxn_decode
 
 add2kr:
-    rpeek16 r3, r5
-    rpeek16 r4, r5
+    rpeek16 r3, r5, #-1, #-2
+    rpeek16 r4, r5, #-3, #-4
     add     r3, r3, r4
     rpush16 r3
     b       uxn_decode
 
 subkr:
-    rpeek8  r3
-    rpeek8  r4
+    rpeek8  r3, #-1
+    rpeek8  r4, #-2
     sub     r4, r4, r3
     rpush8  r4
     b       uxn_decode
 
 sub2kr:
-    rpeek16 r3, r5
-    rpeek16 r4, r5
+    rpeek16 r3, r5, #-1, #-2
+    rpeek16 r4, r5, #-3, #-4
     sub     r3, r4, r3
     rpush16 r3
     b       uxn_decode
 
 mulkr:
-    rpeek8  r3
-    rpeek8  r4
+    rpeek8  r3, #-1
+    rpeek8  r4, #-2
     mul     r4, r3, r4
     rpush8  r4
     b       uxn_decode
 
 mul2kr:
-    rpeek16 r3, r5
-    rpeek16 r4, r5
+    rpeek16 r3, r5, #-1, #-2
+    rpeek16 r4, r5, #-3, #-4
     mul     r3, r4, r3
     rpush16 r3
     b       uxn_decode
 
 divkr:
-    rpeek8  r3
-    rpeek8  r4
+    rpeek8  r3, #-1
+    rpeek8  r4, #-2
     push    {r0, r1, r2, r7, lr}
     mov     r1, r3
     mov     r0, r4
@@ -2611,8 +2607,8 @@ divkr:
     b       uxn_decode
 
 div2kr:
-    rpeek16 r3, r5
-    rpeek16 r4, r5
+    rpeek16 r3, r5, #-1, #-2
+    rpeek16 r4, r5, #-3, #-4
     push    {r0, r1, r2, r7, lr}
     mov     r1, r3
     mov     r0, r4
@@ -2623,50 +2619,50 @@ div2kr:
     b       uxn_decode
 
 andkr:
-    rpeek8  r3
-    rpeek8  r4
+    rpeek8  r3, #-1
+    rpeek8  r4, #-2
     and     r3, r3, r4
     rpush8  r3
     b       uxn_decode
 
 and2kr:
-    rpeek16 r3, r5
-    rpeek16 r4, r5
+    rpeek16 r3, r5, #-1, #-2
+    rpeek16 r4, r5, #-3, #-4
     and     r3, r3, r4
     rpush16 r3
     b       uxn_decode
 
 orakr:
-    rpeek8  r3
-    rpeek8  r4
+    rpeek8  r3, #-1
+    rpeek8  r4, #-2
     orr     r3, r3, r4
     rpush8  r3
     b       uxn_decode
 
 ora2kr:
-    rpeek16 r3, r5
-    rpeek16 r4, r5
+    rpeek16 r3, r5, #-1, #-2
+    rpeek16 r4, r5, #-3, #-4
     orr     r3, r3, r4
     rpush16 r3
     b       uxn_decode
 
 eorkr:
-    rpeek8  r3
-    rpeek8  r4
+    rpeek8  r3, #-1
+    rpeek8  r4, #-2
     eor     r3, r3, r4
     rpush8  r3
     b       uxn_decode
 
 eor2kr:
-    rpeek16 r3, r5
-    rpeek16 r4, r5
+    rpeek16 r3, r5, #-1, #-2
+    rpeek16 r4, r5, #-3, #-4
     eor     r3, r3, r4
     rpush16 r3
     b       uxn_decode
 
 sftkr:
-    rpeek8  r4
-    rpeek8  r3
+    rpeek8  r4, #-1
+    rpeek8  r3, #-2
     lsr r5, r4, #4
     and r4, #0x0f
     lsr r3, r3, r4
@@ -2675,8 +2671,8 @@ sftkr:
     b       uxn_decode
 
 sft2kr:
-    rpeek8  r4
-    rpeek16 r3, r5
+    rpeek8  r4, #-1
+    rpeek16 r3, r5, #-2, #-3
     lsr r5, r4, #4
     and r4, #0x0f
     lsr r3, r3, r4