@@ -11,26 +11,29 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

 WITH REGARD TO THIS SOFTWARE.

 */

+/* Registers

+[ Z ][ Y ][ X ][ L ][ N ][ T ] <

+[ . ][ . ][ . ][   H2   ][ T ] <

+[   L2   ][   N2   ][   T2   ] <

+*/

+

 #define T *ptr

 #define N *(ptr - 1)

 #define L *(ptr - 2)

+#define X *(ptr - 3)

+#define Y *(ptr - 4)

+#define Z *(ptr - 5)

 #define T2 (N << 8 | T)

 #define H2 (L << 8 | N)

-#define N2 (*(ptr - 3) << 8 | L)

-#define L2 (*(ptr - 5) << 8 | *(ptr - 4))

-

-/* Registers

-[ . ][ . ][ . ][ L ][ N ][ T ] <

-[ . ][ . ][ . ][   H2   ][ T ] <

-[   L2   ][   N2   ][   T2   ] <

-*/

+#define N2 (X << 8 | L)

+#define L2 (Z << 8 | Y)

+#define T2_(v) { r = (v); T = r; N = r >> 8; }

+#define N2_(v) { r = (v); L = r; X = r >> 8; }

+#define L2_(v) { r = (v); Y = r; Z = r >> 8; }

 #define HALT(c)         { return emu_halt(u, ins, c, pc - 1); }

 #define FLIP            { s = ins & 0x40 ? &u->wst : &u->rst; }

 #define SET(x, y)       { r = s->ptr; if(x > r) HALT(1) r += (x & k) + y; if(r > 254) HALT(2) ptr = s->dat + r - 1; s->ptr = r; }

-#define PUT2(a)         { r = (a); POKE2c(rr, ptr - 1, r) }

-#define PUT2x2(a, b)    { POKE2c(rr, ptr - 1, a) POKE2c(rr, ptr - 3, b) }

-#define PUT2x3(a, b, c) { POKE2c(rr, ptr - 1, a) POKE2c(rr, ptr - 3, b) POKE2c(rr, ptr - 5, c) }

 int

 uxn_eval(Uxn *u, Uint16 pc)

@@ -48,24 +51,24 @@ uxn_eval(Uxn *u, Uint16 pc)

 			case 0x000: /* BRK  */                          return 1;

 			case 0x200: /* JCI  */ t=T;           SET(0,-1) if(!t) { pc += 2; break; } /* else fallthrough */

 			case 0x400: /* JMI  */                          pc += PEEK2(ram + pc) + 2; break;

-			case 0x600: /* JSI  */                SET(0, 2) PUT2(pc + 2) pc += PEEK2(ram + pc) + 2; break;

+			case 0x600: /* JSI  */                SET(0, 2) T2_(pc + 2) pc += PEEK2(ram + pc) + 2; break;

 			case 0x800: /* LIT  */ case 0xc00:    SET(0, 1) T = ram[pc++]; break;

-			case 0xa00: /* LIT2 */ case 0xe00:    SET(0, 2) PUT2(PEEK2(ram + pc)) pc += 2; break;

+			case 0xa00: /* LIT2 */ case 0xe00:    SET(0, 2) T2_(PEEK2(ram + pc)) pc += 2; break;

 			/* ALU */

 			case 0x01: /* INC  */ t=T;            SET(1, 0) T = t + 1; break;

-			case 0x21: /* INC2 */ t=T2;           SET(2, 0) PUT2(t + 1) break;

+			case 0x21: /* INC2 */ t=T2;           SET(2, 0) T2_(t + 1) break;

 			case 0x02: /* POP  */                 SET(1,-1) break;

 			case 0x22: /* POP2 */                 SET(2,-2) break;

 			case 0x03: /* NIP  */ t=T;            SET(2,-1) T = t; break;

-			case 0x23: /* NIP2 */ t=T2;           SET(4,-2) PUT2(t) break;

+			case 0x23: /* NIP2 */ t=T2;           SET(4,-2) T2_(t) break;

 			case 0x04: /* SWP  */ t=T;n=N;        SET(2, 0) T = n; N = t; break;

-			case 0x24: /* SWP2 */ t=T2;n=N2;      SET(4, 0) PUT2x2(n, t) break;

+			case 0x24: /* SWP2 */ t=T2;n=N2;      SET(4, 0) T2_(n) N2_(t) break;

 			case 0x05: /* ROT  */ t=T;n=N;l=L;    SET(3, 0) T = l; N = t; L = n; break;

-			case 0x25: /* ROT2 */ t=T2;n=N2;l=L2; SET(6, 0) PUT2x3(l, t, n) break;

+			case 0x25: /* ROT2 */ t=T2;n=N2;l=L2; SET(6, 0) T2_(l) N2_(t) L2_(n) break;

 			case 0x06: /* DUP  */ t=T;            SET(1, 1) T = t; N = t; break;

-			case 0x26: /* DUP2 */ t=T2;           SET(2, 2) PUT2x2(t, t) break;

+			case 0x26: /* DUP2 */ t=T2;           SET(2, 2) T2_(t) N2_(t) break;

 			case 0x07: /* OVR  */ t=T;n=N;        SET(2, 1) T = n; N = t; L = n; break;

-			case 0x27: /* OVR2 */ t=T2;n=N2;      SET(4, 2) PUT2x3(n, t, n) break;

+			case 0x27: /* OVR2 */ t=T2;n=N2;      SET(4, 2) T2_(n) N2_(t) L2_(n) break;

 			case 0x08: /* EQU  */ t=T;n=N;        SET(2,-1) T = n == t; break;

 			case 0x28: /* EQU2 */ t=T2;n=N2;      SET(4,-3) T = n == t; break;

 			case 0x09: /* NEQ  */ t=T;n=N;        SET(2,-1) T = n != t; break;

@@ -78,20 +81,20 @@ uxn_eval(Uxn *u, Uint16 pc)

 			case 0x2c: /* JMP2 */ t=T2;           SET(2,-2) pc = t; break;

 			case 0x0d: /* JCN  */ t=T;n=N;        SET(2,-2) if(n) pc += (Sint8)t; break;

 			case 0x2d: /* JCN2 */ t=T2;n=L;       SET(3,-3) if(n) pc = t; break;

-			case 0x0e: /* JSR  */ t=T;            SET(1,-1) FLIP SET(0,2) PUT2(pc) pc += (Sint8)t; break;

-			case 0x2e: /* JSR2 */ t=T2;           SET(2,-2) FLIP SET(0,2) PUT2(pc) pc = t; break;

+			case 0x0e: /* JSR  */ t=T;            SET(1,-1) FLIP SET(0,2) T2_(pc) pc += (Sint8)t; break;

+			case 0x2e: /* JSR2 */ t=T2;           SET(2,-2) FLIP SET(0,2) T2_(pc) pc = t; break;

 			case 0x0f: /* STH  */ t=T;            SET(1,-1) FLIP SET(0,1) T = t; break;

-			case 0x2f: /* STH2 */ t=T2;           SET(2,-2) FLIP SET(0,2) PUT2(t) break;

+			case 0x2f: /* STH2 */ t=T2;           SET(2,-2) FLIP SET(0,2) T2_(t) break;

 			case 0x10: /* LDZ  */ t=T;            SET(1, 0) T = ram[t]; break;

-			case 0x30: /* LDZ2 */ t=T;            SET(1, 1) PUT2(PEEK2(ram + t)) break;

+			case 0x30: /* LDZ2 */ t=T;            SET(1, 1) T2_(PEEK2(ram + t)) break;

 			case 0x11: /* STZ  */ t=T;n=N;        SET(2,-2) ram[t] = n; break;

 			case 0x31: /* STZ2 */ t=T;n=H2;       SET(3,-3) rr = ram + t; POKE2(rr, n) break;

 			case 0x12: /* LDR  */ t=T;            SET(1, 0) T = ram[pc + (Sint8)t]; break;

-			case 0x32: /* LDR2 */ t=T;            SET(1, 1) PUT2(PEEK2(ram + pc + (Sint8)t)) break;

+			case 0x32: /* LDR2 */ t=T;            SET(1, 1) T2_(PEEK2(ram + pc + (Sint8)t)) break;

 			case 0x13: /* STR  */ t=T;n=N;        SET(2,-2) ram[pc + (Sint8)t] = n; break;

 			case 0x33: /* STR2 */ t=T;n=H2;       SET(3,-3) rr = ram + pc + (Sint8)t; POKE2(rr, n) break;

 			case 0x14: /* LDA  */ t=T2;           SET(2,-1) T = ram[t]; break;

-			case 0x34: /* LDA2 */ t=T2;           SET(2, 0) PUT2(PEEK2(ram + t)) break;

+			case 0x34: /* LDA2 */ t=T2;           SET(2, 0) T2_(PEEK2(ram + t)) break;

 			case 0x15: /* STA  */ t=T2;n=L;       SET(3,-3) ram[t] = n; break;

 			case 0x35: /* STA2 */ t=T2;n=N2;      SET(4,-4) rr = ram + t; POKE2(rr, n) break;

 			case 0x16: /* DEI  */ t=T;            SET(1, 0) T = DEI(t); break;

@@ -99,21 +102,21 @@ uxn_eval(Uxn *u, Uint16 pc)

 			case 0x17: /* DEO  */ t=T;n=N;        SET(2,-2) DEO(t, n) break;

 			case 0x37: /* DEO2 */ t=T;n=N;l=L;    SET(3,-3) DEO(t, l) DEO((t + 1), n) break;

 			case 0x18: /* ADD  */ t=T;n=N;        SET(2,-1) T = n + t; break;

-			case 0x38: /* ADD2 */ t=T2;n=N2;      SET(4,-2) PUT2(n + t) break;

+			case 0x38: /* ADD2 */ t=T2;n=N2;      SET(4,-2) T2_(n + t) break;

 			case 0x19: /* SUB  */ t=T;n=N;        SET(2,-1) T = n - t; break;

-			case 0x39: /* SUB2 */ t=T2;n=N2;      SET(4,-2) PUT2(n - t) break;

+			case 0x39: /* SUB2 */ t=T2;n=N2;      SET(4,-2) T2_(n - t) break;

 			case 0x1a: /* MUL  */ t=T;n=N;        SET(2,-1) T = n * t; break;

-			case 0x3a: /* MUL2 */ t=T2;n=N2;      SET(4,-2) PUT2(n * t) break;

+			case 0x3a: /* MUL2 */ t=T2;n=N2;      SET(4,-2) T2_(n * t) break;

 			case 0x1b: /* DIV  */ t=T;n=N;        SET(2,-1) if(!t) HALT(3) T = n / t; break;

-			case 0x3b: /* DIV2 */ t=T2;n=N2;      SET(4,-2) if(!t) HALT(3) PUT2(n / t) break;

+			case 0x3b: /* DIV2 */ t=T2;n=N2;      SET(4,-2) if(!t) HALT(3) T2_(n / t) break;

 			case 0x1c: /* AND  */ t=T;n=N;        SET(2,-1) T = n & t; break;

-			case 0x3c: /* AND2 */ t=T2;n=N2;      SET(4,-2) PUT2(n & t) break;

+			case 0x3c: /* AND2 */ t=T2;n=N2;      SET(4,-2) T2_(n & t) break;

 			case 0x1d: /* ORA  */ t=T;n=N;        SET(2,-1) T = n | t; break;

-			case 0x3d: /* ORA2 */ t=T2;n=N2;      SET(4,-2) PUT2(n | t) break;

+			case 0x3d: /* ORA2 */ t=T2;n=N2;      SET(4,-2) T2_(n | t) break;

 			case 0x1e: /* EOR  */ t=T;n=N;        SET(2,-1) T = n ^ t; break;

-			case 0x3e: /* EOR2 */ t=T2;n=N2;      SET(4,-2) PUT2(n ^ t) break;

+			case 0x3e: /* EOR2 */ t=T2;n=N2;      SET(4,-2) T2_(n ^ t) break;

 			case 0x1f: /* SFT  */ t=T;n=N;        SET(2,-1) T = n >> (t & 0xf) << (t >> 4); break;

-			case 0x3f: /* SFT2 */ t=T;n=H2;       SET(3,-1) PUT2(n >> (t & 0xf) << (t >> 4)) break;

+			case 0x3f: /* SFT2 */ t=T;n=H2;       SET(3,-1) T2_(n >> (t & 0xf) << (t >> 4)) break;

 		}

 	}

 }