Add div/div2 instructions

2 files changed, 40 insertions, 12 deletions

diff --git a/src/main.c b/src/main.c
index 7468b50..ecd9766 100644
--- a/src/main.c
+++ b/src/main.c
@@ -60,6 +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
         // // INC test.
         // 0x80, 0x09, 0x01,                         // #09 INC          -> 0a
         // 0xa0, 0x00, 0x09, 0x21,                   // #0009 INC2       -> 000a
@@ -148,15 +151,14 @@ init_uxn() {
         // 0xa0, 0xab, 0xcd, 0x80, 0x00, 0xa0, 0x01, 0x15, 0x2d, 0x04, 0x02,
         // JSR
         // 0x80, 0x03, 0x0e, 0x80, 0x01, 0x00, 0x80, 0x02, 0x6c,
-        0x80, 0x03, 0x0e, 0x80, 0x01, 0x00, 0x80, 0x02, 0x6c,
+        // 0x80, 0x03, 0x0e, 0x80, 0x01, 0x00, 0x80, 0x02, 0x6c,
     };
     memcpy(uxn_ram + PAGE_PROGRAM, uxn_rom, sizeof(uxn_rom));
 }
 
 // TODO:
-//  - Division
 //  - DEI/DEO
-//  - Jump instructions (JMP/JCN/JCI/JMI/JSI/JSR)
+//  - Jump instructions (JCI/JMI/JSI)
 //  - OPr modes
 //  - OPk modes
 //  - OPrk modes
diff --git a/src/uxn-core.s b/src/uxn-core.s
index 99c5b1c..ec7537f 100644
--- a/src/uxn-core.s
+++ b/src/uxn-core.s
@@ -179,7 +179,7 @@ op_table:
     .word ora   @ 0x1d
     .word eor   @ 0x1e
     .word sft   @ 0x1f
-    .word brk   @ 0x20
+    .word jci   @ 0x20
     .word inc2  @ 0x21
     .word pop2  @ 0x22
     .word nip2  @ 0x23
@@ -211,8 +211,7 @@ op_table:
     .word ora2  @ 0x3d
     .word eor2  @ 0x3e
     .word sft2  @ 0x3f
-@ TODO: Can we mask this instead of having empty space?
-    .word brk   @ 0x40
+    .word jmi   @ 0x40
     .word brk   @ 0x41
     .word brk   @ 0x42
     .word brk   @ 0x43
@@ -244,7 +243,7 @@ op_table:
     .word brk   @ 0x5d
     .word brk   @ 0x5e
     .word brk   @ 0x5f
-    .word brk   @ 0x60
+    .word jsi   @ 0x60
     .word brk   @ 0x61
     .word brk   @ 0x62
     .word brk   @ 0x63
@@ -340,7 +339,7 @@ op_table:
     .word brk   @ 0xbd
     .word brk   @ 0xbe
     .word brk   @ 0xbf
-    .word brk   @ 0xc0
+    .word litr  @ 0xc0
     .word brk   @ 0xc1
     .word brk   @ 0xc2
     .word brk   @ 0xc3
@@ -372,7 +371,7 @@ op_table:
     .word brk   @ 0xdd
     .word brk   @ 0xde
     .word brk   @ 0xdf
-    .word brk   @ 0xe0
+    .word lit2r @ 0xe0
     .word brk   @ 0xe1
     .word brk   @ 0xe2
     .word brk   @ 0xe3
@@ -397,7 +396,6 @@ op_table:
     .word brk   @ 0xf6
     .word brk   @ 0xf7
     .word brk   @ 0xf8
-@ TODO: Can we mask this instead of having empty space?
     .word lit2  @ 0xf9
     .word lit   @ 0xfa
     .word lit2  @ 0xfb
@@ -439,6 +437,18 @@ lit2:
     wpush8  r4
     b       uxn_decode
 
+litr:
+    next    r3
+    rpush8  r3
+    b       uxn_decode
+
+lit2r:
+    next    r3
+    next    r4
+    rpush8  r3
+    rpush8  r4
+    b       uxn_decode
+
 inc:
     wpop8   r3
     add     r3, #1
@@ -786,11 +796,27 @@ mul2:
     b       uxn_decode
 
 div:
-@ TODO: Implement using ____aeabi_uidiv_from_thumb
+    wpop8   r3
+    wpop8   r4
+    push    {r0, r1, r2, r7, lr}
+    mov     r1, r3
+    mov     r0, r4
+    bl      __aeabi_uidiv
+    mov     r3, r0
+    pop     {r0, r1, r2, r7, lr}
+    wpush8  r3
     b       uxn_decode
 
 div2:
-@ TODO: Implement using ____aeabi_uidiv_from_thumb
+    wpop16  r3, r5
+    wpop16  r4, r5
+    push    {r0, r1, r2, r7, lr}
+    mov     r1, r3
+    mov     r0, r4
+    bl      __aeabi_uidiv
+    mov     r3, r0
+    pop     {r0, r1, r2, r7, lr}
+    wpush16 r3
     b       uxn_decode
 
 and: