Add conditional jumps jcn/jcn2

2 files changed, 15 insertions, 1 deletions

diff --git a/src/main.c b/src/main.c
index 9199f31..93a6187 100644
--- a/src/main.c
+++ b/src/main.c
@@ -140,7 +140,11 @@ init_uxn() {
         // 0xa0, 0xab, 0xcd, 0xa0, 0x01, 0x08, 0x35,
         // JMP
         // 0x80, 0x01, 0x0c, 0x00, 0x80, 0xaa,
-        0xa0, 0x01, 0x05, 0x2c, 0x00, 0x80, 0xbb,
+        // 0xa0, 0x01, 0x05, 0x2c, 0x00, 0x80, 0xbb,
+        // 0xa0, 0xab, 0xcd, 0x80, 0x01, 0x80, 0x01, 0x0d, 0x04, 0x02,
+        // 0xa0, 0xab, 0xcd, 0x80, 0x00, 0x80, 0x01, 0x0d, 0x04, 0x02,
+        0xa0, 0xab, 0xcd, 0x80, 0x01, 0xa0, 0x01, 0x0a, 0x2d, 0x04, 0x02,
+        0xa0, 0xab, 0xcd, 0x80, 0x00, 0xa0, 0x01, 0x15, 0x2d, 0x04, 0x02,
     };
     memcpy(uxn_ram + PAGE_PROGRAM, uxn_rom, sizeof(uxn_rom));
 }
diff --git a/src/uxn-core.s b/src/uxn-core.s
index c14c0f3..71f7c5e 100644
--- a/src/uxn-core.s
+++ b/src/uxn-core.s
@@ -609,9 +609,19 @@ jmp2:
     b       uxn_decode
 
 jcn:
+    wpop8s  r3
+    wpop8   r4
+    cmp     r4, #0
+    addne   r0, r3
     b       uxn_decode
 
 jcn2:
+    wpop16  r3, r5
+    wpop8   r4
+    cmp     r4, #0
+    movne   r0, r7
+    cmp     r4, #0
+    addne   r0, r0, r3
     b       uxn_decode
 
 jsr: