Add nip instructions

1 files changed, 11 insertions, 1 deletions

diff --git a/src/uxn-core.s b/src/uxn-core.s
index 95afc1a..730da32 100644
--- a/src/uxn-core.s
+++ b/src/uxn-core.s
@@ -95,15 +95,25 @@ inc2:
     b       uxn_decode
 
 pop:
+    sub     r1, #1
     b       uxn_decode
 
 pop2:
+    sub     r1, #2
     b       uxn_decode
 
 nip:
+    ldrb    r3, [r1, #-1]!
+    strb    r3, [r1, #-1]
     b       uxn_decode
 
 nip2:
+    ldrb    r3, [r1, #-1]!
+    ldrb    r5, [r1, #-1]!
+    orr     r3, r3, r5, lsl #8
+    strb    r3, [r1, #-1]
+    lsr     r3, #8
+    strb    r3, [r1, #-2]
     b       uxn_decode
 
 swp:
@@ -280,7 +290,7 @@ mul2:
     ldrb    r4, [r1, #-1]!
     ldrb    r5, [r1, #-1]!
     orr     r4, r4, r5, lsl #8
-    mul     r3, r3, r4
+    mul     r3, r4, r3
     strb    r3, [r1, #1]
     lsr     r3, #8
     strb    r3, [r1], #2