Fix signed issue with immediate jump ops

2 files changed, 16 insertions, 11 deletions

diff --git a/src/main.c b/src/main.c
index 3be4c49..08da0aa 100644
--- a/src/main.c
+++ b/src/main.c
@@ -273,16 +273,16 @@ main(void) {
 
     uxn_eval_asm(PAGE_PROGRAM);
 
-//     txt_printf("\nROM");
-//     for (size_t i = 0; i < 64; i++) {
-//         if (i % 8 == 0) {
-//             txt_printf("\n");
-//         }
-//         txt_printf("%02x ", uxn_ram[i + PAGE_PROGRAM]);
-//     }
-//     txt_printf("\n");
-
-    txt_printf("WST (");
+    // 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);
     for (size_t i = 0; i < 32; i++) {
         if (i % 8 == 0) {
diff --git a/src/uxn-core.s b/src/uxn-core.s
index ba05cc9..f110b61 100644
--- a/src/uxn-core.s
+++ b/src/uxn-core.s
@@ -854,16 +854,19 @@ jci:
     ldrb    r5, [r0], #1
     ldrb    r3, [r0], #1
     orr     r3, r3, r5, lsl #8
+    lsl     r3, r3, #16
+    asr     r3, r3, #16
     wpop8   r4
     cmp     r4, #0
     addne   r0, r3
-    addeq   r0, #2
     b       uxn_decode
 
 jmi:
     ldrb    r5, [r0], #1
     ldrb    r3, [r0], #1
     orr     r3, r3, r5, lsl #8
+    lsl     r3, r3, #16
+    asr     r3, r3, #16
     add     r0, r3
     b       uxn_decode
 
@@ -871,6 +874,8 @@ jsi:
     ldrb    r5, [r0], #1
     ldrb    r3, [r0], #1
     orr     r3, r3, r5, lsl #8
+    lsl     r3, r3, #16
+    asr     r3, r3, #16
     mov     r4, r0
     rpush16 r4
     add     r0, r3