etc
/
uxn
mirror of https://git.sr.ht/~rabbits/uxn
0
1
Fork 0
Code Issues Projects Releases Wiki Activity

Added a copy of abc core with joint pops/pushes

This commit is contained in:
neauoire 2023-08-09 12:12:31 -07:00
parent e90c716cdc
commit 61896abc7f
2 changed files with 111 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
etc/cores/uxn-abc-join.c Normal file
View File

@ -0,0 +1,107 @@
#include "uxn.h"
/*
Copyright (u) 2022-2023 Devine Lu Linvega, Andrew Alderwick, Andrew Richards
Permission to use, copy, modify, and distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE.
*/
#define HALT(c) { return emu_halt(u, ins, (c), pc - 1); }
#define FLIP { s = ins & 0x40 ? &u->wst : &u->rst; }
#define JUMP(x) { if(m2) pc = (x); else pc += (Sint8)(x); }
#define POKE(x, y) { if(m2) { POKE2(ram + x, y) } else { ram[(x)] = (y); } }
#define PEEK(o, x) { if(m2) { o = PEEK2(ram + x); } else o = ram[(x)]; }
#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
uxn_eval(Uxn *u, Uint16 pc)
{
Uint8 ins, opc, m2, ksp, tsp, *sp, *ram = u->ram;
Uint16 a, b, c, t;
Stack *s;
if(!pc || u->dev[0x0f]) return 0;
for(;;) {
ins = ram[pc++];
/* modes */
opc = ins & 0x1f;
m2 = ins & 0x20;
s = ins & 0x40 ? &u->rst : &u->wst;
if(ins & 0x80) { ksp = s->ptr; sp = &ksp; } else sp = &s->ptr;
/* Opcodes */
switch(opc - (!opc * (ins >> 5))) {
/* Immediate */
case -0x0: /* BRK */ return 1;
case -0x1: /* JCI */ POP1(b) if(!b) { pc += 2; break; } /* else fallthrough */
case -0x2: /* JMI */ pc += PEEK2(ram + pc) + 2; 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 0x02: /* POP */ POPx(a) break;
case 0x03: /* NIP */ POPxx(a, b) PUSHx(a) break;
case 0x04: /* SWP */ POPxx(a, b) PUSHxx(a, b) break;
case 0x05: /* ROT */ POPxx(a, b) POPx(c) PUSHxx(b, a) PUSHx(c) break;
case 0x06: /* DUP */ POPx(a) PUSHxx(a, a) break;
case 0x07: /* OVR */ POPxx(a, b) PUSHxx(b, a) PUSHx(b) break;
case 0x08: /* EQU */ POPxx(a, b) PUSH1(b == a) break;
case 0x09: /* NEQ */ POPxx(a, b) PUSH1(b != a) break;
case 0x0a: /* GTH */ POPxx(a, b) PUSH1(b > a) break;
case 0x0b: /* LTH */ POPxx(a, b) PUSH1(b < a) break;
case 0x0c: /* JMP */ POPx(a) 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 0x0f: /* STH */ POPx(a) FLIP PUSHx(a) break;
case 0x10: /* LDZ */ POP1(a) PEEK(b, a) PUSHx(b) break;
case 0x11: /* STZ */ POP1(a) POPx(b) POKE(a, b) break;
case 0x12: /* LDR */ POP1(a) PEEK(b, pc + (Sint8)a) PUSHx(b) break;
case 0x13: /* STR */ POP1(a) POPx(b) POKE(pc + (Sint8)a, b) break;
case 0x14: /* LDA */ POP2(a) PEEK(b, a) PUSHx(b) break;
case 0x15: /* STA */ POP2(a) POPx(b) POKE(a, 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 0x18: /* ADD */ POPxx(a, b) PUSHx(b + a) break;
case 0x19: /* SUB */ POPxx(a, b) PUSHx(b - a) break;
case 0x1a: /* MUL */ POPxx(a, b) PUSHx((Uint32)b * a) break;
case 0x1b: /* DIV */ POPxx(a, b) if(!a) HALT(3) PUSHx(b / a) break;
case 0x1c: /* AND */ POPxx(a, b) PUSHx(b & a) break;
case 0x1d: /* ORA */ POPxx(a, b) PUSHx(b | a) break;
case 0x1e: /* EOR */ POPxx(a, b) PUSHx(b ^ a) break;
case 0x1f: /* SFT */ POP1(a) POPx(b) PUSHx(b >> (a & 0xf) << (a >> 4)) break;
}
}
}
int
uxn_boot(Uxn *u, Uint8 *ram)
{
Uint32 i;
char *cptr = (char *)u;
for(i = 0; i < sizeof(*u); i++)
cptr[i] = 0;
u->ram = ram;
return 1;
}

9
etc/cores/uxn.h
View File

@ -9,17 +9,17 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE.
*/
#define PAGE_PROGRAM 0x0100
/* clang-format off */
#define POKE2(d, v) { (d)[0] = (v) >> 8; (d)[1] = (v); }
#define PEEK2(d) ((d)[0] << 8 | (d)[1])
#define DEO(p, value) { u->dev[p] = value; if((deo_mask[p >> 4] >> (p & 0xf)) & 0x1) emu_deo(u, p); }
#define DEO(p, v) { u->dev[p] = v; if((deo_mask[p >> 4] >> (p & 0xf)) & 0x1) emu_deo(u, p); }
#define DEI(p) ((dei_mask[(p) >> 4] >> ((p) & 0xf)) & 0x1 ? emu_dei(u, (p)) : u->dev[(p)])
/* clang-format on */
#define PAGE_PROGRAM 0x0100
typedef unsigned char Uint8;
typedef signed char Sint8;
typedef unsigned short Uint16;
@ -42,8 +42,7 @@ typedef struct Uxn {
extern Uint8 emu_dei(Uxn *u, Uint8 addr);
extern void emu_deo(Uxn *u, Uint8 addr);
extern int emu_halt(Uxn *u, Uint8 instr, Uint8 err, Uint16 addr);
extern Uint16 dei_mask[];
extern Uint16 deo_mask[];
extern Uint16 dev_vers[0x10], dei_mask[0x10], deo_mask[0x10];
/* built-ins */