Add swp, rot, dup, ovr instructions

2 files changed, 67 insertions, 3 deletions

diff --git a/src/main.c b/src/main.c
index 888d0cd..2ac42c1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -70,9 +70,21 @@ init_uxn() {
         // 0xa0, 0x12, 0x34, 0x02,
         // 0xa0, 0x12, 0x34, 0x22,
         // 0xa0, 0x00, 0x00,
-        // NIP.
-        0xa0, 0x12, 0x34, 0x03, // -> ( 34 )
-        0xa0, 0x12, 0x34, 0xa0, 0x56, 0x78, 0x23, // -> ( 56 78 )
+        // // NIP.
+        // 0xa0, 0x12, 0x34, 0x03, // -> ( 34 )
+        // 0xa0, 0x12, 0x34, 0xa0, 0x56, 0x78, 0x23, // -> ( 56 78 )
+        // SWP.
+        0xa0, 0x12, 0x34, 0x04, // -> ( 34 12 )
+        0xa0, 0x12, 0x34, 0xa0, 0x56, 0x78, 0x24, // -> ( 56 78 12 34 )
+        // ROT.
+        0xa0, 0x12, 0x34, 0x80, 0x56, 0x05, // -> ( 34 56 12 )
+        0xa0, 0x12, 0x34, 0xa0, 0x56, 0x78, 0xa0, 0x9a, 0xbc, 0x25, // -> ( 56 78 9a bc 12 34 )
+        // DUP.
+        0xa0, 0x12, 0x34, 0x06, // -> ( 12 34 34 )
+        0xa0, 0x12, 0x34, 0x26, // -> ( 12 34 12 34 )
+        // OVR.
+        0xa0, 0x12, 0x34, 0x07, // -> ( 12 34 12 )
+        0xa0, 0x12, 0x34, 0xa0, 0x56, 0x78, 0x27, // -> ( 12 34 56 78 12 34 )
 
     };
     memcpy(uxn_ram + PAGE_PROGRAM, uxn_rom, sizeof(uxn_rom));
diff --git a/src/uxn-core.s b/src/uxn-core.s
index 730da32..7e6ad8a 100644
--- a/src/uxn-core.s
+++ b/src/uxn-core.s
@@ -117,27 +117,79 @@ nip2:
     b       uxn_decode
 
 swp:
+    ldrb    r3, [r1, #-1]!
+    ldrb    r4, [r1, #-1]!
+    strb    r3, [r1], #1
+    strb    r4, [r1], #1
     b       uxn_decode
 
 swp2:
+    ldrb    r3, [r1, #-1]!
+    ldrb    r5, [r1, #-1]!
+    orr     r3, r3, r5, lsl #8
+    ldrb    r4, [r1, #-1]!
+    ldrb    r5, [r1, #-1]!
+    orr     r4, r4, r5, lsl #8
+    strb    r3, [r1, #1]
+    lsr     r3, #8
+    strb    r3, [r1], #2
+    strb    r4, [r1, #1]
+    lsr     r4, #8
+    strb    r4, [r1], #2
     b       uxn_decode
 
 rot:
+    ldrb    r5, [r1, #-1]!
+    ldrb    r4, [r1, #-1]!
+    ldrb    r3, [r1, #-1]!
+    strb    r4, [r1], #1
+    strb    r5, [r1], #1
+    strb    r3, [r1], #1
     b       uxn_decode
 
 rot2:
+    ldrb    r5, [r1, #-1]!
+    ldrb    r6, [r1, #-1]!
+    orr     r5, r5, r6, lsl #8
+    ldrb    r4, [r1, #-1]!
+    ldrb    r6, [r1, #-1]!
+    orr     r4, r4, r6, lsl #8
+    ldrb    r3, [r1, #-1]!
+    ldrb    r6, [r1, #-1]!
+    orr     r3, r3, r6, lsl #8
+    strb    r4, [r1, #1]
+    lsr     r4, #8
+    strb    r4, [r1], #2
+    strb    r5, [r1, #1]
+    lsr     r5, #8
+    strb    r5, [r1], #2
+    strb    r3, [r1, #1]
+    lsr     r3, #8
+    strb    r3, [r1], #2
     b       uxn_decode
 
 dup:
+    ldrb    r3, [r1, #-1]
+    strb    r3, [r1], #1
     b       uxn_decode
 
 dup2:
+    ldrb    r3, [r1, #-2]
+    ldrb    r4, [r1, #-1]
+    strb    r3, [r1], #1
+    strb    r4, [r1], #1
     b       uxn_decode
 
 ovr:
+    ldrb    r3, [r1, #-2]
+    strb    r3, [r1], #1
     b       uxn_decode
 
 ovr2:
+    ldrb    r3, [r1, #-4]
+    ldrb    r4, [r1, #-3]
+    strb    r3, [r1], #1
+    strb    r4, [r1], #1
     b       uxn_decode
 
 equ: