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

Use tnl core

This commit is contained in:
neauoire 2023-08-09 19:50:29 -07:00
parent 2ed94d4c28
commit 86c26de680
3 changed files with 94 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

161
src/uxn.c
View File

@ -11,85 +11,109 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE. WITH REGARD TO THIS SOFTWARE.
*/ */
#define HALT(c) { return emu_halt(u, ins, (c), pc - 1); } /* Registers
[ . ][ . ][ . ][ L ][ N ][ T ] <
[ . ][ . ][ . ][ H2 ][ T ] <
[ L2 ][ N2 ][ T2 ] <
*/
#define T *ptr
#define N *(ptr-1)
#define L *(ptr-2)
#define T2 PEEK2((ptr-1))
#define H2 PEEK2((ptr-2))
#define N2 PEEK2((ptr-3))
#define L2 PEEK2((ptr-5))
#define HALT(c) { return emu_halt(u, ins, c, pc - 1); }
#define FLIP { s = ins & 0x40 ? &u->wst : &u->rst; } #define FLIP { s = ins & 0x40 ? &u->wst : &u->rst; }
#define JUMP(x) { if(m2) pc = (x); else pc += (Sint8)(x); } #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 POKE(x, y) { if(m2) { POKE2(ram + x, y) } else { ram[(x)] = (y); } } #define PUT1(v) { *(ptr--) = v; }
#define PEEK(o, x) { if(m2) { o = PEEK2(ram + x); } else o = ram[(x)]; } #define PUT2(v) { r = (v); *(ptr--) = r; *(ptr--) = r >> 8; }
#define DEVW(p, y) { if(m2) { DEO(p, y >> 8) DEO((p + 1), y) } else { DEO(p, y) } }
#define DEVR(o, p) { if(m2) { o = DEI(p) << 8 | DEI(p + 1); } else { o = DEI(p); } }
#define PUSH1(y) { if(s->ptr == 0xff) HALT(2) s->dat[s->ptr++] = (y); }
#define PUSH2(y) { if((tsp = s->ptr) >= 0xfe) HALT(2) t = (y); POKE2(&s->dat[tsp], t); s->ptr = tsp + 2; }
#define PUSHx(y) { if(m2) { PUSH2(y) } else { PUSH1(y) } }
#define PUSH11(y, z) { if(s->ptr >= 0xfe) HALT(2) s->dat[s->ptr++] = (y); s->dat[s->ptr++] = (z); }
#define PUSH22(y, z) { if((tsp = s->ptr) >= 0xfc) HALT(2) POKE2(&s->dat[tsp], (y)); POKE2(&s->dat[tsp+2], (z)); s->ptr = tsp + 4; }
#define PUSHxx(y, z) { if(m2) { PUSH22(y, z) } else { PUSH11(y, z) } }
#define POP1(o) { if(*sp == 0x00) HALT(1) o = s->dat[--*sp]; }
#define POP2(o) { if((tsp = *sp) <= 0x01) HALT(1) o = PEEK2(&s->dat[tsp - 2]); *sp = tsp - 2; }
#define POPx(o) { if(m2) { POP2(o) } else { POP1(o) } }
#define POP11(o, p) { if(*sp <= 0x01) HALT(1) o = s->dat[--*sp]; p = s->dat[--*sp]; }
#define POP22(o, p) { if((tsp = *sp) <= 0x03) HALT(1) o = PEEK2(&s->dat[tsp - 2]); p = PEEK2(&s->dat[tsp - 4]); *sp = tsp - 4; }
#define POPxx(o, p) { if(m2) { POP22(o, p) } else { POP11(o, p) } }
int int
uxn_eval(Uxn *u, Uint16 pc) uxn_eval(Uxn *u, Uint16 pc)
{ {
Uint8 ins, opc, m2, ksp, tsp, *sp, *ram = u->ram; int t, n, l, k, r;
Uint16 a, b, c, t; Uint8 *ram = u->ram, *ptr, ins;
Stack *s; Stack *s;
if(!pc || u->dev[0x0f]) return 0; if(!pc || u->dev[0x0f]) return 0;
for(;;) { for(;;) {
ins = ram[pc++]; ins = ram[pc++];
/* modes */ k = ins & 0x80 ? 0xff : 0;
opc = ins & 0x1f;
m2 = ins & 0x20;
s = ins & 0x40 ? &u->rst : &u->wst; s = ins & 0x40 ? &u->rst : &u->wst;
if(ins & 0x80) { ksp = s->ptr; sp = &ksp; } else sp = &s->ptr; ptr = s->dat + s->ptr - 1;
/* Opcodes */ switch(!(ins & 0x1f) ? (0 - (ins >> 5)) & 0xff : ins & 0x3f) {
switch(opc - (!opc * (ins >> 5))) { /* IMM */
/* Immediate */ case 0x00: /* BRK */ return 1;
case -0x0: /* BRK */ return 1; case 0xff: /* JCI */ if(!s->dat[--s->ptr]) { pc += 2; break; }
case -0x1: /* JCI */ POP1(b) if(!b) { pc += 2; break; } /* else fallthrough */ case 0xfe: /* JMI */ pc += PEEK2(ram + pc) + 2; break;
case -0x2: /* JMI */ pc += PEEK2(ram + pc) + 2; break; case 0xfd: /* JSI */ SET(0, 2) PUT2(pc + 2) pc += PEEK2(ram + pc) + 2; break;
case -0x3: /* JSI */ PUSH2(pc + 2) pc += PEEK2(ram + pc) + 2; break; case 0xfc: /* LITr */ case 0xfa: SET(0, 1) PUT1(ram[pc++]) break;
case -0x4: /* LIT */ case 0xfb: /* LIT2r*/ case 0xf9: SET(0, 2) PUT2(PEEK2(ram + pc)) pc += 2; break;
case -0x6: /* LITr */ PUSH1(ram[pc++]) break;
case -0x5: /* LIT2 */
case -0x7: /* LIT2r */ PUSH2(PEEK2(ram + pc)) pc += 2; break;
/* ALU */ /* ALU */
case 0x01: /* INC */ POPx(a) PUSHx(a + 1) break; case 0x01: /* INC */ t=T; SET(1, 0) PUT1(t + 1) break;
case 0x02: /* POP */ POPx(a) break; case 0x21: /* INC2 */ t=T2; SET(2, 0) PUT2(t + 1) break;
case 0x03: /* NIP */ POPxx(a, b) PUSHx(a) break; case 0x02: /* POP */ SET(1,-1) break;
case 0x04: /* SWP */ POPxx(a, b) PUSHxx(a, b) break; case 0x22: /* POP2 */ SET(2,-2) break;
case 0x05: /* ROT */ POPxx(a, b) POPx(c) PUSHxx(b, a) PUSHx(c) break; case 0x03: /* NIP */ t=T; SET(2,-1) PUT1(t) break;
case 0x06: /* DUP */ POPx(a) PUSHxx(a, a) break; case 0x23: /* NIP2 */ t=T2; SET(4,-2) PUT2(t) break;
case 0x07: /* OVR */ POPxx(a, b) PUSHxx(b, a) PUSHx(b) break; case 0x04: /* SWP */ t=T;n=N; SET(2, 0) PUT1(n) PUT1(t) break;
case 0x08: /* EQU */ POPxx(a, b) PUSH1(b == a) break; case 0x24: /* SWP2 */ t=T2;n=N2; SET(4, 0) PUT2(n) PUT2(t) break;
case 0x09: /* NEQ */ POPxx(a, b) PUSH1(b != a) break; case 0x05: /* ROT */ t=T;n=N;l=L; SET(3, 0) PUT1(l) PUT1(t) PUT1(n) break;
case 0x0a: /* GTH */ POPxx(a, b) PUSH1(b > a) break; case 0x25: /* ROT2 */ t=T2;n=N2;l=L2; SET(6, 0) PUT2(l) PUT2(t) PUT2(n) break;
case 0x0b: /* LTH */ POPxx(a, b) PUSH1(b < a) break; case 0x06: /* DUP */ t=T; SET(1, 1) PUT1(t) PUT1(t) break;
case 0x0c: /* JMP */ POPx(a) JUMP(a) break; case 0x26: /* DUP2 */ t=T2; SET(2, 2) PUT2(t) PUT2(t) break;
case 0x0d: /* JCN */ POPx(a) POP1(b) if(b) JUMP(a) break; case 0x07: /* OVR */ t=T;n=N; SET(2, 1) PUT1(n) PUT1(t) PUT1(n) break;
case 0x0e: /* JSR */ POPx(a) FLIP PUSH2(pc) JUMP(a) break; case 0x27: /* OVR2 */ t=T2;n=N2; SET(4, 2) PUT2(n) PUT2(t) PUT2(n) break;
case 0x0f: /* STH */ POPx(a) FLIP PUSHx(a) break; case 0x08: /* EQU */ t=T;n=N; SET(2,-1) PUT1(n == t) break;
case 0x10: /* LDZ */ POP1(a) PEEK(b, a) PUSHx(b) break; case 0x28: /* EQU2 */ t=T2;n=N2; SET(4,-3) PUT1(n == t) break;
case 0x11: /* STZ */ POP1(a) POPx(b) POKE(a, b) break; case 0x09: /* NEQ */ t=T;n=N; SET(2,-1) PUT1(n != t) break;
case 0x12: /* LDR */ POP1(a) PEEK(b, pc + (Sint8)a) PUSHx(b) break; case 0x29: /* NEQ2 */ t=T2;n=N2; SET(4,-3) PUT1(n != t) break;
case 0x13: /* STR */ POP1(a) POPx(b) POKE(pc + (Sint8)a, b) break; case 0x0a: /* GTH */ t=T;n=N; SET(2,-1) PUT1(n > t) break;
case 0x14: /* LDA */ POP2(a) PEEK(b, a) PUSHx(b) break; case 0x2a: /* GTH2 */ t=T2;n=N2; SET(4,-3) PUT1(n > t) break;
case 0x15: /* STA */ POP2(a) POPx(b) POKE(a, b) break; case 0x0b: /* LTH */ t=T;n=N; SET(2,-1) PUT1(n < t) break;
case 0x16: /* DEI */ POP1(a) DEVR(b, a) PUSHx(b) break; case 0x2b: /* LTH2 */ t=T2;n=N2; SET(4,-3) PUT1(n < t) break;
case 0x17: /* DEO */ POP1(a) POPx(b) DEVW(a, b) break; case 0x0c: /* JMP */ t=T; SET(1,-1) pc += (Sint8)t; break;
case 0x18: /* ADD */ POPxx(a, b) PUSHx(b + a) break; case 0x2c: /* JMP2 */ t=T2; SET(2,-2) pc = t; break;
case 0x19: /* SUB */ POPxx(a, b) PUSHx(b - a) break; case 0x0d: /* JCN */ t=T;n=N; SET(2,-2) if(n) pc += (Sint8)t; break;
case 0x1a: /* MUL */ POPxx(a, b) PUSHx((Uint32)b * a) break; case 0x2d: /* JCN2 */ t=T2;n=L; SET(3,-3) if(n) pc = t; break;
case 0x1b: /* DIV */ POPxx(a, b) if(!a) HALT(3) PUSHx(b / a) break; case 0x0e: /* JSR */ t=T; SET(1,-1) FLIP SET(0,2) PUT2(pc) pc += (Sint8)t; break;
case 0x1c: /* AND */ POPxx(a, b) PUSHx(b & a) break; case 0x2e: /* JSR2 */ t=T2; SET(2,-2) FLIP SET(0,2) PUT2(pc) pc = t; break;
case 0x1d: /* ORA */ POPxx(a, b) PUSHx(b | a) break; case 0x0f: /* STH */ t=T; SET(1,-1) FLIP SET(0,1) PUT1(t) break;
case 0x1e: /* EOR */ POPxx(a, b) PUSHx(b ^ a) break; case 0x2f: /* STH2 */ t=T2; SET(2,-2) FLIP SET(0,2) PUT2(t) break;
case 0x1f: /* SFT */ POP1(a) POPx(b) PUSHx(b >> (a & 0xf) << (a >> 4)) break; case 0x10: /* LDZ */ t=T; SET(1, 0) PUT1(ram[t]) break;
case 0x30: /* LDZ2 */ t=T; SET(1, 1) PUT2(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) POKE2(ram + t, n) break;
case 0x12: /* LDR */ t=T; SET(1, 0) PUT1(ram[pc + (Sint8)t]) break;
case 0x32: /* LDR2 */ t=T; SET(1, 1) PUT2(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) POKE2(ram + pc + (Sint8)t, n) break;
case 0x14: /* LDA */ t=T2; SET(2,-1) PUT1(ram[t]) break;
case 0x34: /* LDA2 */ t=T2; SET(2, 0) PUT2(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) POKE2(ram + t, n) break;
case 0x16: /* DEI */ t=T; SET(1, 0) PUT1(DEI(t)) break;
case 0x36: /* DEI2 */ t=T; SET(1, 1) PUT1(DEI(t + 1)) PUT1(DEI(t)) break;
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) PUT1(n + t) break;
case 0x38: /* ADD2 */ t=T2;n=N2; SET(4,-2) PUT2(n + t) break;
case 0x19: /* SUB */ t=T;n=N; SET(2,-1) PUT1(n - t) break;
case 0x39: /* SUB2 */ t=T2;n=N2; SET(4,-2) PUT2(n - t) break;
case 0x1a: /* MUL */ t=T;n=N; SET(2,-1) PUT1(n * t) break;
case 0x3a: /* MUL2 */ t=T2;n=N2; SET(4,-2) PUT2(n * t) break;
case 0x1b: /* DIV */ t=T;n=N; SET(2,-1) if(!t) HALT(3) PUT1(n / t) break;
case 0x3b: /* DIV2 */ t=T2;n=N2; SET(4,-2) if(!t) HALT(3) PUT2(n / t) break;
case 0x1c: /* AND */ t=T;n=N; SET(2,-1) PUT1(n & t) break;
case 0x3c: /* AND2 */ t=T2;n=N2; SET(4,-2) PUT2(n & t) break;
case 0x1d: /* ORA */ t=T;n=N; SET(2,-1) PUT1(n | t) break;
case 0x3d: /* ORA2 */ t=T2;n=N2; SET(4,-2) PUT2(n | t) break;
case 0x1e: /* EOR */ t=T;n=N; SET(2,-1) PUT1(n ^ t) break;
case 0x3e: /* EOR2 */ t=T2;n=N2; SET(4,-2) PUT2(n ^ t) break;
case 0x1f: /* SFT */ t=T;n=N; SET(2,-1) PUT1(n >> (t & 0xf) << (t >> 4)) break;
case 0x3f: /* SFT2 */ t=T;n=H2; SET(3,-1) PUT2(n >> (t & 0xf) << (t >> 4)) break;
} }
} }
} }
@ -103,5 +127,4 @@ uxn_boot(Uxn *u, Uint8 *ram)
cptr[i] = 0; cptr[i] = 0;
u->ram = ram; u->ram = ram;
return 1; return 1;
} }

2
src/uxn11.c
View File

@ -219,7 +219,7 @@ main(int argc, char **argv)
system_connect(0xc, DATETIME_VERSION, DATETIME_DEIMASK, DATETIME_DEOMASK); system_connect(0xc, DATETIME_VERSION, DATETIME_DEIMASK, DATETIME_DEOMASK);
/* Read flags */ /* Read flags */
if(argv[i][0] == '-' && argv[i][1] == 'v') if(argv[i][0] == '-' && argv[i][1] == 'v')
return system_version("Uxn11 - Graphical Varvara Emulator", "8 Aug 2023"); return system_version("Uxn11 - Graphical Varvara Emulator", "9 Aug 2023");
rom_path = argv[1]; rom_path = argv[1];
if(!uxn_boot(&u, (Uint8 *)calloc(0x10000 * RAM_PAGES, sizeof(Uint8)))) if(!uxn_boot(&u, (Uint8 *)calloc(0x10000 * RAM_PAGES, sizeof(Uint8))))

2
src/uxncli.c
View File

@ -56,7 +56,7 @@ main(int argc, char **argv)
system_connect(0xc, DATETIME_VERSION, DATETIME_DEIMASK, DATETIME_DEOMASK); system_connect(0xc, DATETIME_VERSION, DATETIME_DEIMASK, DATETIME_DEOMASK);
/* Read flags */ /* Read flags */
if(argv[i][0] == '-' && argv[i][1] == 'v') if(argv[i][0] == '-' && argv[i][1] == 'v')
return system_version("Uxncli - Console Varvara Emulator", "8 Aug 2023"); return system_version("Uxncli - Console Varvara Emulator", "9 Aug 2023");
/* Continue.. */ /* Continue.. */
if(!uxn_boot(&u, (Uint8 *)calloc(0x10000 * RAM_PAGES, sizeof(Uint8)))) if(!uxn_boot(&u, (Uint8 *)calloc(0x10000 * RAM_PAGES, sizeof(Uint8))))
return system_error("Boot", "Failed"); return system_error("Boot", "Failed");