d6
/
uxn11
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(uxn.c) Remove T2_ macro for non-modifying transformations

This commit is contained in:
Devine Lu Linvega 2024-07-01 13:15:17 -08:00
parent 223bc51e0e
commit 3b880b83cf
1 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
src/uxn.c
View File

@ -49,69 +49,69 @@ uxn_eval(Uint16 pc)
case 0x02: /* POP */ SET(1,-1) break; case 0x02: /* POP */ SET(1,-1) break;
case 0x22: /* POP2 */ SET(2,-2) break; case 0x22: /* POP2 */ SET(2,-2) break;
case 0x03: /* NIP */ t=T; SET(2,-1) T = t; break; case 0x03: /* NIP */ t=T; SET(2,-1) T = t; break;
case 0x23: /* NIP2 */ t=T2; SET(4,-2) T2_(t) break; case 0x23: /* NIP2 */ t=T,n=N; SET(4,-2) T = t, N = n; break;
case 0x04: /* SWP */ t=T;n=N; SET(2, 0) T = n; N = 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) T2_(n) N2_(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 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) T2_(l) N2_(t) L2_(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 0x06: /* DUP */ t=T; SET(1, 1) T = t, N = t; break;
case 0x26: /* DUP2 */ t=T2; SET(2, 2) T2_(t) N2_(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 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) T2_(n) N2_(t) L2_(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 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 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; case 0x09: /* NEQ */ t=T,n=N; SET(2,-1) T = n != t; break;
case 0x29: /* NEQ2 */ t=T2;n=N2; SET(4,-3) T = n != t; break; case 0x29: /* NEQ2 */ t=T2,n=N2; SET(4,-3) T = n != t; break;
case 0x0a: /* GTH */ t=T;n=N; SET(2,-1) T = n > t; break; case 0x0a: /* GTH */ t=T,n=N; SET(2,-1) T = n > t; break;
case 0x2a: /* GTH2 */ t=T2;n=N2; SET(4,-3) T = n > t; break; case 0x2a: /* GTH2 */ t=T2,n=N2; SET(4,-3) T = n > t; break;
case 0x0b: /* LTH */ t=T;n=N; SET(2,-1) T = n < t; break; case 0x0b: /* LTH */ t=T,n=N; SET(2,-1) T = n < t; break;
case 0x2b: /* LTH2 */ t=T2;n=N2; SET(4,-3) T = n < t; break; case 0x2b: /* LTH2 */ t=T2,n=N2; SET(4,-3) T = n < t; break;
case 0x0c: /* JMP */ t=T; SET(1,-1) pc += (Sint8)t; break; case 0x0c: /* JMP */ t=T; SET(1,-1) pc += (Sint8)t; break;
case 0x2c: /* JMP2 */ t=T2; SET(2,-2) pc = t; break; 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 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 0x2d: /* JCN2 */ t=T2,n=L; SET(3,-3) if(n) pc = t; break;
case 0x0e: /* JSR */ t=T; SET(1,-1) FLIP(2) T2_(pc) pc += (Sint8)t; break; case 0x0e: /* JSR */ t=T; SET(1,-1) FLIP(2) T2_(pc) pc += (Sint8)t; break;
case 0x2e: /* JSR2 */ t=T2; SET(2,-2) FLIP(2) T2_(pc) pc = t; break; case 0x2e: /* JSR2 */ t=T2; SET(2,-2) FLIP(2) T2_(pc) pc = t; break;
case 0x0f: /* STH */ t=T; SET(1,-1) FLIP(1) T = t; break; case 0x0f: /* STH */ t=T; SET(1,-1) FLIP(1) T = t; break;
case 0x2f: /* STH2 */ t=T2; SET(2,-2) FLIP(2) T2_(t) break; case 0x2f: /* STH2 */ t=T,n=N; SET(2,-2) FLIP(2) T = t, N = n; break;
case 0x10: /* LDZ */ t=T; SET(1, 0) T = uxn.ram[t]; break; case 0x10: /* LDZ */ t=T; SET(1, 0) T = uxn.ram[t]; break;
case 0x30: /* LDZ2 */ t=T; SET(1, 1) N = uxn.ram[t++]; T = uxn.ram[(Uint8)t]; break; case 0x30: /* LDZ2 */ t=T; SET(1, 1) N = uxn.ram[t++], T = uxn.ram[(Uint8)t]; break;
case 0x11: /* STZ */ t=T;n=N; SET(2,-2) uxn.ram[t] = n; break; case 0x11: /* STZ */ t=T,n=N; SET(2,-2) uxn.ram[t] = n; break;
case 0x31: /* STZ2 */ t=T;n=H2; SET(3,-3) uxn.ram[t++] = n >> 8; uxn.ram[(Uint8)t] = n; break; case 0x31: /* STZ2 */ t=T,n=H2; SET(3,-3) uxn.ram[t++] = n >> 8, uxn.ram[(Uint8)t] = n; break;
case 0x12: /* LDR */ t=T; SET(1, 0) r = pc + (Sint8)t; T = uxn.ram[r]; break; case 0x12: /* LDR */ t=T; SET(1, 0) r = pc + (Sint8)t, T = uxn.ram[r]; break;
case 0x32: /* LDR2 */ t=T; SET(1, 1) r = pc + (Sint8)t; N = uxn.ram[r++]; T = uxn.ram[r]; break; case 0x32: /* LDR2 */ t=T; SET(1, 1) r = pc + (Sint8)t, N = uxn.ram[r++], T = uxn.ram[r]; break;
case 0x13: /* STR */ t=T;n=N; SET(2,-2) r = pc + (Sint8)t; uxn.ram[r] = n; break; case 0x13: /* STR */ t=T,n=N; SET(2,-2) r = pc + (Sint8)t, uxn.ram[r] = n; break;
case 0x33: /* STR2 */ t=T;n=H2; SET(3,-3) r = pc + (Sint8)t; uxn.ram[r++] = n >> 8; uxn.ram[r] = n; break; case 0x33: /* STR2 */ t=T,n=H2; SET(3,-3) r = pc + (Sint8)t, uxn.ram[r++] = n >> 8, uxn.ram[r] = n; break;
case 0x14: /* LDA */ t=T2; SET(2,-1) T = uxn.ram[t]; break; case 0x14: /* LDA */ t=T2; SET(2,-1) T = uxn.ram[t]; break;
case 0x34: /* LDA2 */ t=T2; SET(2, 0) N = uxn.ram[t++]; T = uxn.ram[t]; break; case 0x34: /* LDA2 */ t=T2; SET(2, 0) N = uxn.ram[t++], T = uxn.ram[t]; break;
case 0x15: /* STA */ t=T2;n=L; SET(3,-3) uxn.ram[t] = n; break; case 0x15: /* STA */ t=T2,n=L; SET(3,-3) uxn.ram[t] = n; break;
case 0x35: /* STA2 */ t=T2;n=N2; SET(4,-4) uxn.ram[t++] = n >> 8; uxn.ram[t] = n; break; case 0x35: /* STA2 */ t=T2,n=N2; SET(4,-4) uxn.ram[t++] = n >> 8, uxn.ram[t] = n; break;
case 0x16: /* DEI */ t=T; SET(1, 0) T = emu_dei(t); break; case 0x16: /* DEI */ t=T; SET(1, 0) T = emu_dei(t); break;
case 0x36: /* DEI2 */ t=T; SET(1, 1) N = emu_dei(t++); T = emu_dei(t); break; case 0x36: /* DEI2 */ t=T; SET(1, 1) N = emu_dei(t++), T = emu_dei(t); break;
case 0x17: /* DEO */ t=T;n=N; SET(2,-2) emu_deo(t, n); break; case 0x17: /* DEO */ t=T,n=N; SET(2,-2) emu_deo(t, n); break;
case 0x37: /* DEO2 */ t=T;n=N;l=L; SET(3,-3) emu_deo(t++, l); emu_deo(t, n); break; case 0x37: /* DEO2 */ t=T,n=N,l=L; SET(3,-3) emu_deo(t++, l), emu_deo(t, n); break;
case 0x18: /* ADD */ t=T;n=N; SET(2,-1) T = n + t; 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) T2_(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 0x19: /* SUB */ t=T,n=N; SET(2,-1) T = n - t; break;
case 0x39: /* SUB2 */ t=T2;n=N2; SET(4,-2) T2_(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 0x1a: /* MUL */ t=T,n=N; SET(2,-1) T = n * t; break;
case 0x3a: /* MUL2 */ t=T2;n=N2; SET(4,-2) T2_(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) T = t ? n / t : 0; break; case 0x1b: /* DIV */ t=T,n=N; SET(2,-1) T = t ? n / t : 0; break;
case 0x3b: /* DIV2 */ t=T2;n=N2; SET(4,-2) T2_(t ? n / t : 0) break; case 0x3b: /* DIV2 */ t=T2,n=N2; SET(4,-2) T2_(t ? n / t : 0) break;
case 0x1c: /* AND */ t=T;n=N; SET(2,-1) T = 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) T2_(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 0x1d: /* ORA */ t=T,n=N; SET(2,-1) T = n | t; break;
case 0x3d: /* ORA2 */ t=T2;n=N2; SET(4,-2) T2_(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 0x1e: /* EOR */ t=T,n=N; SET(2,-1) T = n ^ t; break;
case 0x3e: /* EOR2 */ t=T2;n=N2; SET(4,-2) T2_(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 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) T2_(n >> (t & 0xf) << (t >> 4)) break; } case 0x3f: /* SFT2 */ t=T,n=H2; SET(3,-1) T2_(n >> (t & 0xf) << (t >> 4)) break; }
} else } else
switch(ins) { switch(ins) {
case 0x00: /* BRK */ return 1; case 0x00: /* BRK */ return 1;
case 0x20: /* JCI */ if(!uxn.wst.dat[uxn.wst.ptr--]) { pc += 2; break; } /* fall */ case 0x20: /* JCI */ if(!uxn.wst.dat[uxn.wst.ptr--]) { pc += 2; break; } /* fall */
case 0x40: /* JMI */ rr = uxn.ram + pc; pc += 2 + PEEK2(rr); break; case 0x40: /* JMI */ rr = uxn.ram + pc, pc += 2 + PEEK2(rr); break;
case 0x60: /* JSI */ rr = uxn.ram + pc; pc += 2; uxn.rst.dat[++uxn.rst.ptr] = pc >> 8; uxn.rst.dat[++uxn.rst.ptr] = pc; pc += PEEK2(rr); break; case 0x60: /* JSI */ rr = uxn.ram + pc, pc += 2, uxn.rst.dat[++uxn.rst.ptr] = pc >> 8, uxn.rst.dat[++uxn.rst.ptr] = pc, pc += PEEK2(rr); break;
case 0xa0: /* LIT2 */ uxn.wst.dat[++uxn.wst.ptr] = uxn.ram[pc++]; /* fall */ case 0xa0: /* LIT2 */ uxn.wst.dat[++uxn.wst.ptr] = uxn.ram[pc++]; /* fall */
case 0x80: /* LIT */ uxn.wst.dat[++uxn.wst.ptr] = uxn.ram[pc++]; break; case 0x80: /* LIT */ uxn.wst.dat[++uxn.wst.ptr] = uxn.ram[pc++]; break;
case 0xe0: /* LIT2r */ uxn.rst.dat[++uxn.rst.ptr] = uxn.ram[pc++]; /* fall */ case 0xe0: /* LIT2r */ uxn.rst.dat[++uxn.rst.ptr] = uxn.ram[pc++]; /* fall */