Fix jmp and nip instructions

1 files changed, 29 insertions, 29 deletions

diff --git a/src/uxn-core.s b/src/uxn-core.s
index befb02c..318b258 100644
--- a/src/uxn-core.s
+++ b/src/uxn-core.s
@@ -1183,17 +1183,18 @@ jcn2:
 jsr:
     mov     r3, r0
     sub     r3, r3, r7
+    wpop8s  r4
     rpush16 r3
-    wpop8s  r3
-    add     r0, r3
+    add     r0, r4
     b       uxn_decode
 
 jsr2:
     mov     r3, r0
     sub     r3, r3, r7
-    wpop16  r3, r5
+    wpop16  r4, r5
+    rpush16 r3
     mov     r0, r7
-    add     r0, r0, r3
+    add     r0, r0, r4
     b       uxn_decode
 
 sth:
@@ -1440,14 +1441,14 @@ pop2r:
 
 nipr:
     rpop8   r3
-    strb    r3, [r1, #-1]
+    strb    r3, [r2, #-1]
     b       uxn_decode
 
 nip2r:
     rpop16  r3, r5
-    strb    r3, [r1, #-1]
+    strb    r3, [r2, #-1]
     lsr     r3, #8
-    strb    r3, [r1, #-2]
+    strb    r3, [r2, #-2]
     b       uxn_decode
 
 swpr:
@@ -1606,17 +1607,18 @@ jcn2r:
 jsrr:
     mov     r3, r0
     sub     r3, r3, r7
-    wpush16 r3
-    rpop8s  r3
-    add     r0, r3
+    rpop8s  r4
+    rpush16 r3
+    add     r0, r4
     b       uxn_decode
 
 jsr2r:
     mov     r3, r0
     sub     r3, r3, r7
-    rpop16  r3, r5
+    rpop16  r4, r5
+    rpush16 r3
     mov     r0, r7
-    add     r0, r0, r3
+    add     r0, r0, r4
     b       uxn_decode
 
 sthr:
@@ -1861,14 +1863,12 @@ pop2k:
 
 nipk:
     wpeek8  r3, #-1
-    strb    r3, [r1, #-1]
+    wpush8  r3
     b       uxn_decode
 
 nip2k:
     wpeek16 r3, r5, #-1, #-2
-    strb    r3, [r1, #-1]
-    lsr     r3, #8
-    strb    r3, [r1, #-2]
+    wpush16 r3
     b       uxn_decode
 
 swpk:
@@ -2027,17 +2027,18 @@ jcn2k:
 jsrk:
     mov     r3, r0
     sub     r3, r3, r7
+    wpeek8s r4, #-1
     rpush16 r3
-    wpeek8s r3, #-1
-    add     r0, r3
+    add     r0, r4
     b       uxn_decode
 
 jsr2k:
     mov     r3, r0
     sub     r3, r3, r7
-    wpeek16 r3, r5, #-1, #-2
+    wpeek16 r4, r5, #-1, #-2
+    rpush16 r3
     mov     r0, r7
-    add     r0, r0, r3
+    add     r0, r0, r4
     b       uxn_decode
 
 sthk:
@@ -2282,14 +2283,12 @@ pop2kr:
 
 nipkr:
     rpeek8  r3, #-1
-    strb    r3, [r1, #-1]
+    wpush8  r3
     b       uxn_decode
 
 nip2kr:
     rpeek16 r3, r5, #-1, #-2
-    strb    r3, [r1, #-1]
-    lsr     r3, #8
-    strb    r3, [r1, #-2]
+    rpush16 r3
     b       uxn_decode
 
 swpkr:
@@ -2448,17 +2447,18 @@ jcn2kr:
 jsrkr:
     mov     r3, r0
     sub     r3, r3, r7
-    wpush16 r3
-    rpeek8s r3, #-1
-    add     r0, r3
+    rpeek8s r4, #-1
+    rpush16 r3
+    add     r0, r4
     b       uxn_decode
 
 jsr2kr:
     mov     r3, r0
     sub     r3, r3, r7
-    rpeek16 r3, r5, #-1, #-2
+    rpeek16 r4, r5, #-1, #-2
+    rpush16 r3
     mov     r0, r7
-    add     r0, r0, r3
+    add     r0, r0, r4
     b       uxn_decode
 
 sthkr: