Add immediate jump operations jci/jmi/jsi

2 files changed, 46 insertions, 10 deletions

diff --git a/src/main.c b/src/main.c
index ecd9766..41f3f21 100644
--- a/src/main.c
+++ b/src/main.c
@@ -60,9 +60,9 @@ init_uxn() {
         // 0x80, 0x03, 0x80, 0x04, 0x1a,             // #03 #04 MUL      -> 0c
         // 0xa0, 0x00, 0x03, 0xa0, 0x00, 0x04, 0x3a, // #0003 #0004 MUL2 -> 000c
         // 0xa0, 0x00, 0xff, 0xa0, 0x00, 0x02, 0x3a, // #00ff #0002 MUL2 -> 01fe
-        // DIV test.
-        0x80, 0x08, 0x80, 0x04, 0x1b,             // #08 #04 DIV      -> 02
-        0xa0, 0x00, 0x08, 0xa0, 0x00, 0x04, 0x3b, // #0008 #0004 DIV2 -> 0002
+        // // DIV test.
+        // 0x80, 0x08, 0x80, 0x04, 0x1b,             // #08 #04 DIV      -> 02
+        // 0xa0, 0x00, 0x08, 0xa0, 0x00, 0x04, 0x3b, // #0008 #0004 DIV2 -> 0002
         // // INC test.
         // 0x80, 0x09, 0x01,                         // #09 INC          -> 0a
         // 0xa0, 0x00, 0x09, 0x21,                   // #0009 INC2       -> 000a
@@ -152,13 +152,21 @@ init_uxn() {
         // JSR
         // 0x80, 0x03, 0x0e, 0x80, 0x01, 0x00, 0x80, 0x02, 0x6c,
         // 0x80, 0x03, 0x0e, 0x80, 0x01, 0x00, 0x80, 0x02, 0x6c,
+        // JMI/JSI/JCI
+        // 0x40, 0x00, 0x01, 0x00, 0xa0, 0xaa, 0xbb, 0xa0, 0xcc, 0xdd,
+        // 0x40, 0x00, 0x03, 0x80, 0xff, 0x00, 0xa0, 0xaa, 0xbb, 0xa0, 0xcc, 0xdd,
+        // 0x40, 0x00, 0x03, 0x80, 0xff, 0x00, 0xa0, 0xaa, 0xbb, 0xa0, 0xcc, 0xdd, 0x40, 0xff, 0xf7,
+        // 0x40, 0x00, 0x04, 0x00, 0xa0, 0xaa, 0xbb, 0xa0, 0xcc, 0xdd,
+        // 0x40, 0x00, 0x03, 0x80, 0xff, 0x00, 0xa0, 0xaa, 0xbb, 0xa0, 0xcc, 0xdd,
+        // 0x60, 0x00, 0x03, 0x80, 0xff, 0x00, 0xa0, 0xaa, 0xbb, 0xa0, 0xcc, 0xdd,
+        // 0x60, 0x00, 0x03, 0x80, 0xff, 0x00, 0xa0, 0xaa, 0xbb, 0xa0, 0xcc, 0xdd, 0x6c
+        0x80, 0x01, 0x20, 0x00, 0x03, 0x80, 0xff, 0x00, 0xa0, 0xaa, 0xbb, 0xa0, 0xcc, 0xdd,
     };
     memcpy(uxn_ram + PAGE_PROGRAM, uxn_rom, sizeof(uxn_rom));
 }
 
 // TODO:
 //  - DEI/DEO
-//  - Jump instructions (JCI/JMI/JSI)
 //  - OPr modes
 //  - OPk modes
 //  - OPrk modes
diff --git a/src/uxn-core.s b/src/uxn-core.s
index ec7537f..d32f303 100644
--- a/src/uxn-core.s
+++ b/src/uxn-core.s
@@ -94,6 +94,16 @@ uxn_ret:
     strb    \a, [r2], #1
 .endm
 
+.macro rpop8s a
+    ldrsb   \a, [r2, #-1]!
+.endm
+
+.macro rpop16 a, b
+    ldrb    \a, [r2, #-1]!
+    ldrb    \b, [r2, #-1]!
+    orr     \a, \a, \b, lsl #8
+.endm
+
 .macro rpush16 a
     strb    \a, [r2, #1]
     lsr     \a, #8
@@ -255,7 +265,7 @@ op_table:
     .word brk   @ 0x69
     .word brk   @ 0x6a
     .word brk   @ 0x6b
-    .word brk   @ 0x6c
+    .word jmp2r @ 0x6c
     .word brk   @ 0x6d
     .word brk   @ 0x6e
     .word brk   @ 0x6f
@@ -412,17 +422,29 @@ brk:
     b       uxn_ret
 
 jci:
-    wpop8   r3
-    cmp     r3, #0
-    @ TODO: What to do here? Reference not fully clear.
+    ldrb    r5, [r0], #1
+    ldrsb   r3, [r0], #1
+    orr     r3, r3, r5, lsl #8
+    wpop8   r4
+    cmp     r4, #0
+    addne   r0, r3
+    addeq   r0, #2
     b       uxn_decode
 
 jmi:
-    @ TODO: What to do here? Reference not fully clear.
+    ldrb    r5, [r0], #1
+    ldrsb   r3, [r0], #1
+    orr     r3, r3, r5, lsl #8
+    add     r0, r3
     b       uxn_decode
 
 jsi:
-    @ TODO: What to do here? Reference not fully clear.
+    ldrb    r5, [r0], #1
+    ldrsb   r3, [r0], #1
+    orr     r3, r3, r5, lsl #8
+    mov     r4, r0
+    rpush16 r4
+    add     r0, r3
     b       uxn_decode
 
 lit:
@@ -618,6 +640,12 @@ jmp2:
     add     r0, r0, r3
     b       uxn_decode
 
+jmp2r:
+    rpop16  r3, r5
+    mov     r0, r7
+    add     r0, r0, r3
+    b       uxn_decode
+
 jcn:
     wpop8s  r3
     wpop8   r4