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

Improved abc core

This commit is contained in:
Devine Lu Linvega 2024-02-18 21:18:08 -08:00
parent 99d41a2027
commit d9861c1a04
1 changed files with 35 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
etc/cores/uxn-abc.c
View File

@ -11,46 +11,40 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE. WITH REGARD TO THIS SOFTWARE.
*/ */
#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 JUMP(x) { if(m2) pc = (x); else pc += (Sint8)(x); }
#define POKE(x, y) { if(m2) { tp = &ram[x]; POKE2(tp, y) } else ram[(x)] = (y); } #define POP1(o) { o = s->dat[--*sp]; }
#define PEEK(o, x) { if(m2) { tp = &ram[x]; o = PEEK2(tp); } else o = ram[(x)]; } #define POP2(o) { o = s->dat[--*sp] | (s->dat[--*sp] << 0x8); }
#define DEVR(o, p) { if(m2) { o = (emu_dei(u, p) << 8) | emu_dei(u, p + 1); } else o = emu_dei(u, p); } #define POPx(o) { if(m2) { POP2(o) } else POP1(o) }
#define DEVW(p, y) { if(m2) { emu_deo(u, p, y >> 8); emu_deo(u, p + 1, y); } else emu_deo(u, p, y); } #define PUSH1(y) { s->dat[s->ptr++] = (y); }
#define PUSH1(y) { s->dat[s->ptr++] = (y); } #define PUSH2(y) { tt = (y); s->dat[s->ptr++] = tt >> 0x8; s->dat[s->ptr++] = tt; }
#define PUSH2(y) { t = (y); s->dat[s->ptr++] = t >> 0x8; s->dat[s->ptr++] = t; } #define PUSHx(y) { if(m2) { PUSH2(y) } else PUSH1(y) }
#define PUSHx(y) { if(m2) { PUSH2(y) } else PUSH1(y) } #define PEEK(o, x, r) { if(m2) { r = (x); o = ram[r++] << 8 | ram[r]; } else o = ram[(x)]; }
#define POP1(o) { o = s->dat[--*sp]; } #define POKE(x, y, r) { if(m2) { r = (x); ram[r++] = y >> 8; ram[r] = y; } else ram[(x)] = (y); }
#define POP2(o) { o = s->dat[--*sp] | (s->dat[--*sp] << 0x8); } #define DEVR(o, p) { if(m2) { o = (emu_dei(u, p) << 8) | emu_dei(u, p + 1); } else o = emu_dei(u, p); }
#define POPx(o) { if(m2) { POP2(o) } else POP1(o) } #define DEVW(p, y) { if(m2) { emu_deo(u, p, y >> 8); emu_deo(u, p + 1, y); } else emu_deo(u, p, y); }
int int
uxn_eval(Uxn *u, Uint16 pc) uxn_eval(Uxn *u, Uint16 pc)
{ {
Uint8 ksp, *sp, *tp, *ram = u->ram; Uint8 t, kp, *sp, *ram = u->ram;
Uint16 a, b, c, t; Uint16 tt, a, b, c;
if(!pc || u->dev[0x0f]) return 0; if(!pc || u->dev[0x0f]) return 0;
for(;;) { for(;;) {
Uint8 ins = ram[pc++], opc = ins & 0x1f; Uint8 ins = ram[pc++];
Uint8 m2 = ins & 0x20; /* 2 */ Uint8 m2 = ins & 0x20;
Stack *s = ins & 0x40 ? &u->rst : &u->wst; /* r */ Stack *s = ins & 0x40 ? &u->rst : &u->wst;
if(ins & 0x80) { /* k */ if(ins & 0x80) kp = s->ptr, sp = &kp; else sp = &s->ptr;
ksp = s->ptr; switch(ins & 0x1f) {
sp = &ksp; case 0x00: case 0x20:
} else switch(ins) {
sp = &s->ptr; case 0x00: /* BRK */ return 1;
/* Opcodes */ case 0x20: /* JCI */ POP1(b) if(!b) { pc += 2; break; }
switch(opc - (!opc * (ins >> 5))) { case 0x40: /* JMI */ a = ram[pc++] << 8 | ram[pc++]; pc += a; break;
/* Immediate */ case 0x60: /* JSI */ PUSH2(pc + 2) a = ram[pc++] << 8 | ram[pc++]; pc += a; break;
case -0x0: /* BRK */ return 1; case 0x80: case 0xc0: /* LIT */ PUSH1(ram[pc++]) break;
case -0x1: /* JCI */ POP1(b) if(!b) { pc += 2; break; } /* else fallthrough */ case 0xa0: case 0xe0: /* LIT2 */ PUSH1(ram[pc++]) PUSH1(ram[pc++]) break;
case -0x2: /* JMI */ pc += PEEK2(ram + pc) + 2; break; } break;
case -0x3: /* JSI */ PUSH2(pc + 2) pc += PEEK2(ram + pc) + 2; break;
case -0x4: /* LIT */
case -0x6: /* LITr */ PUSH1(ram[pc++]) break;
case -0x5: /* LIT2 */
case -0x7: /* LIT2r */ PUSH2(PEEK2(ram + pc)) pc += 2; break;
/* ALU */
case 0x01: /* INC */ POPx(a) PUSHx(a + 1) break; case 0x01: /* INC */ POPx(a) PUSHx(a + 1) break;
case 0x02: /* POP */ POPx(a) break; case 0x02: /* POP */ POPx(a) break;
case 0x03: /* NIP */ POPx(a) POPx(b) PUSHx(a) break; case 0x03: /* NIP */ POPx(a) POPx(b) PUSHx(a) break;
@ -66,17 +60,17 @@ uxn_eval(Uxn *u, Uint16 pc)
case 0x0d: /* JCN */ POPx(a) POP1(b) if(b) JUMP(a) break; case 0x0d: /* JCN */ POPx(a) POP1(b) if(b) JUMP(a) break;
case 0x0e: /* JSR */ POPx(a) FLIP PUSH2(pc) JUMP(a) break; case 0x0e: /* JSR */ POPx(a) FLIP PUSH2(pc) JUMP(a) break;
case 0x0f: /* STH */ POPx(a) FLIP PUSHx(a) break; case 0x0f: /* STH */ POPx(a) FLIP PUSHx(a) break;
case 0x10: /* LDZ */ POP1(a) PEEK(b, a) PUSHx(b) break; case 0x10: /* LDZ */ POP1(a) PEEK(b, a, t) PUSHx(b) break;
case 0x11: /* STZ */ POP1(a) POPx(b) POKE(a, b) break; case 0x11: /* STZ */ POP1(a) POPx(b) POKE(a, b, t) break;
case 0x12: /* LDR */ POP1(a) PEEK(b, pc + (Sint8)a) PUSHx(b) break; case 0x12: /* LDR */ POP1(a) PEEK(b, pc + (Sint8)a, tt) PUSHx(b) break;
case 0x13: /* STR */ POP1(a) POPx(b) POKE(pc + (Sint8)a, b) break; case 0x13: /* STR */ POP1(a) POPx(b) POKE(pc + (Sint8)a, b, tt) break;
case 0x14: /* LDA */ POP2(a) PEEK(b, a) PUSHx(b) break; case 0x14: /* LDA */ POP2(a) PEEK(b, a, tt) PUSHx(b) break;
case 0x15: /* STA */ POP2(a) POPx(b) POKE(a, b) break; case 0x15: /* STA */ POP2(a) POPx(b) POKE(a, b, tt) break;
case 0x16: /* DEI */ POP1(a) DEVR(b, a) PUSHx(b) break; case 0x16: /* DEI */ POP1(a) DEVR(b, a) PUSHx(b) break;
case 0x17: /* DEO */ POP1(a) POPx(b) DEVW(a, b) break; case 0x17: /* DEO */ POP1(a) POPx(b) DEVW(a, b) break;
case 0x18: /* ADD */ POPx(a) POPx(b) PUSHx(b + a) break; case 0x18: /* ADD */ POPx(a) POPx(b) PUSHx(b + a) break;
case 0x19: /* SUB */ POPx(a) POPx(b) PUSHx(b - a) break; case 0x19: /* SUB */ POPx(a) POPx(b) PUSHx(b - a) break;
case 0x1a: /* MUL */ POPx(a) POPx(b) PUSHx((Uint32)b * a) break; case 0x1a: /* MUL */ POPx(a) POPx(b) PUSHx(b * a) break;
case 0x1b: /* DIV */ POPx(a) POPx(b) PUSHx(a ? b / a : 0) break; case 0x1b: /* DIV */ POPx(a) POPx(b) PUSHx(a ? b / a : 0) break;
case 0x1c: /* AND */ POPx(a) POPx(b) PUSHx(b & a) break; case 0x1c: /* AND */ POPx(a) POPx(b) PUSHx(b & a) break;
case 0x1d: /* ORA */ POPx(a) POPx(b) PUSHx(b | a) break; case 0x1d: /* ORA */ POPx(a) POPx(b) PUSHx(b | a) break;