etc/uxn
0
0
Fork 0
mirror of https://git.sr.ht/~rabbits/uxn synced 2024-11-22 22:05:11 +00:00
Code Issues Projects Releases Wiki Activity

(uxn.c) Reconnected old abc core

Browse source
This commit is contained in:
neauoire 2023-10-30 14:14:02 -07:00
parent 5abea12b46
commit b35bded3e4
6 changed files with 88 additions and 238 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,107 +0,0 @@
#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;
}

49
etc/cores/uxn-abc.c
View file

@ -11,34 +11,34 @@ 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); }
#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) { POKE2(ram + x, y) } else { ram[(x)] = (y); } } #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 PEEK(o, x) { if(m2) { o = PEEK2(ram + x); } else o = ram[(x)]; }
#define PUSH1(y) { if(s->ptr == 0xff) HALT(2) s->dat[s->ptr++] = (y); } #define DEVR(o, p) { if(m2) { o = ((emu_dei(u, p) << 8) + emu_dei(u, p + 1)); } else o = emu_dei(u, p); }
#define PUSH2(y) { if((tsp = s->ptr) >= 0xfe) HALT(2) t = (y); POKE2(&s->dat[tsp], t); s->ptr = tsp + 2; } #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 PUSHx(y) { if(m2) { PUSH2(y) } else { PUSH1(y) } } #define PUSH1(y) { s->dat[s->ptr++] = (y); }
#define POP1(o) { if(*sp == 0x00) HALT(1) o = s->dat[--*sp]; } #define PUSH2(y) { t = (y); s->dat[s->ptr++] = t >> 0x8; s->dat[s->ptr++] = t & 0xff; }
#define POP2(o) { if((tsp = *sp) <= 0x01) HALT(1) o = PEEK2(&s->dat[tsp - 2]); *sp = tsp - 2; } #define PUSHx(y) { if(m2) { PUSH2(y) } else PUSH1(y) }
#define POPx(o) { if(m2) { POP2(o) } else { POP1(o) } } #define POP1(o) { o = s->dat[--*sp]; }
#define DEVW(p, y) { if(m2) { DEO(p, y >> 8) DEO((p + 1), y) } else { DEO(p, y) } } #define POP2(o) { o = s->dat[--*sp] | s->dat[--*sp] << 0x8; }
#define DEVR(o, p) { if(m2) { o = ((DEI(p) << 8) + DEI(p + 1)); } else { o = DEI(p); } } #define POPx(o) { if(m2) { POP2(o) } else POP1(o) }
int int
uxn_eval(Uxn *u, Uint16 pc) uxn_eval(Uxn *u, Uint16 pc)
{ {
Uint8 ins, opc, m2, ksp, tsp, *sp, *ram = u->ram; Uint8 ksp, *sp, *ram = u->ram;
Uint16 a, b, c, t; Uint16 a, b, c, t;
Stack *s;
if(!pc || u->dev[0x0f]) return 0; if(!pc || u->dev[0x0f]) return 0;
for(;;) { for(;;) {
ins = ram[pc++]; Uint8 ins = ram[pc++], opc = ins & 0x1f;
/* modes */ Uint8 m2 = ins & 0x20;
opc = ins & 0x1f; Stack *s = ins & 0x40 ? &u->rst : &u->wst;
m2 = ins & 0x20; if(ins & 0x80) {
s = ins & 0x40 ? &u->rst : &u->wst; ksp = s->ptr;
if(ins & 0x80) { ksp = s->ptr; sp = &ksp; } else sp = &s->ptr; sp = &ksp;
} else
sp = &s->ptr;
/* Opcodes */ /* Opcodes */
switch(opc - (!opc * (ins >> 5))) { switch(opc - (!opc * (ins >> 5))) {
/* Immediate */ /* Immediate */
@ -77,7 +77,7 @@ uxn_eval(Uxn *u, Uint16 pc)
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((Uint32)b * a) break;
case 0x1b: /* DIV */ POPx(a) POPx(b) if(!a) HALT(3) PUSHx(b / a) 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;
case 0x1e: /* EOR */ POPx(a) POPx(b) PUSHx(b ^ a) break; case 0x1e: /* EOR */ POPx(a) POPx(b) PUSHx(b ^ a) break;
@ -85,14 +85,3 @@ uxn_eval(Uxn *u, Uint16 pc)
} }
} }
} }
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;
}

162
src/uxn.c
View file

@ -11,111 +11,77 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE. WITH REGARD TO THIS SOFTWARE.
*/ */
/* Registers #define FLIP { s = ins & 0x40 ? &u->wst : &u->rst; }
[ Z ][ Y ][ X ][ L ][ N ][ T ] < #define JUMP(x) { if(m2) pc = (x); else pc += (Sint8)(x); }
[ . ][ . ][ . ][ H2 ][ . ] < #define POKE(x, y) { if(m2) { POKE2(ram + x, y) } else ram[(x)] = (y); }
[ L2 ][ N2 ][ T2 ] < #define PEEK(o, x) { if(m2) { o = PEEK2(ram + x); } else o = ram[(x)]; }
*/ #define DEVR(o, p) { if(m2) { o = ((emu_dei(u, p) << 8) + emu_dei(u, p + 1)); } else o = emu_dei(u, p); }
#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 T *(s->dat + s->ptr) #define PUSH1(y) { s->dat[s->ptr++] = (y); }
#define N *(s->dat + (Uint8)(s->ptr - 1)) #define PUSH2(y) { t = (y); s->dat[s->ptr++] = t >> 0x8; s->dat[s->ptr++] = t & 0xff; }
#define L *(s->dat + (Uint8)(s->ptr - 2)) #define PUSHx(y) { if(m2) { PUSH2(y) } else PUSH1(y) }
#define X *(s->dat + (Uint8)(s->ptr - 3)) #define POP1(o) { o = s->dat[--*sp]; }
#define Y *(s->dat + (Uint8)(s->ptr - 4)) #define POP2(o) { o = s->dat[--*sp] | s->dat[--*sp] << 0x8; }
#define Z *(s->dat + (Uint8)(s->ptr - 5)) #define POPx(o) { if(m2) { POP2(o) } else POP1(o) }
#define T2 (N << 8 | T)
#define H2 (L << 8 | N)
#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 DEI(p) (dei_masks[p] ? emu_dei(u, (p)) : u->dev[(p)])
#define DEO(p, v) { u->dev[p] = v; if(deo_masks[p]) emu_deo(u, p); }
#define FLIP { s = ins & 0x40 ? &u->wst : &u->rst; }
#define SHIFT(y) { s->ptr += (y); }
#define SET(x, y) { SHIFT((ins & 0x80) ? x + y : y) }
int int
uxn_eval(Uxn *u, Uint16 pc) uxn_eval(Uxn *u, Uint16 pc)
{ {
int t, n, l, r; Uint8 ksp, *sp, *ram = u->ram;
Uint8 *ram = u->ram, *rr; Uint16 a, b, c, t;
if(!pc || u->dev[0x0f]) return 0; if(!pc || u->dev[0x0f]) return 0;
for(;;) { for(;;) {
int ins = ram[pc++]; Uint8 ins = ram[pc++], opc = ins & 0x1f;
Uint8 m2 = ins & 0x20;
Stack *s = ins & 0x40 ? &u->rst : &u->wst; Stack *s = ins & 0x40 ? &u->rst : &u->wst;
switch(ins & 0x1f ? ins & 0x3f : ins << 4) { if(ins & 0x80) {
/* IMM */ ksp = s->ptr;
case 0x000: /* BRK */ return 1; sp = &ksp;
case 0x200: /* JCI */ t=T; SHIFT(-1) if(!t) { pc += 2; break; } /* else fallthrough */ } else
case 0x400: /* JMI */ rr = ram + pc; pc += PEEK2(rr) + 2; break; sp = &s->ptr;
case 0x600: /* JSI */ SHIFT( 2) T2_(pc + 2); rr = ram + pc; pc += PEEK2(rr) + 2; break; /* Opcodes */
case 0x800: /* LIT */ case 0xc00: SHIFT( 1) T = ram[pc++]; break; switch(opc - (!opc * (ins >> 5))) {
case 0xa00: /* LIT2 */ case 0xe00: SHIFT( 2) rr = ram + pc; T2_(PEEK2(rr)) pc += 2; break; /* Immediate */
/* ALU */ case -0x0: /* BRK */ return 1;
case 0x01: /* INC */ t=T; SET(1, 0) T = t + 1; break; case -0x1: /* JCI */ POP1(b) if(!b) { pc += 2; break; } /* else fallthrough */
case 0x21: /* INC2 */ t=T2; SET(2, 0) T2_(t + 1) break; case -0x2: /* JMI */ pc += PEEK2(ram + pc) + 2; break;
case 0x02: /* POP */ SET(1,-1) break; case -0x3: /* JSI */ PUSH2(pc + 2) pc += PEEK2(ram + pc) + 2; break;
case 0x22: /* POP2 */ SET(2,-2) break; case -0x4: /* LIT */
case 0x03: /* NIP */ t=T; SET(2,-1) T = t; break; case -0x6: /* LITr */ PUSH1(ram[pc++]) break;
case 0x23: /* NIP2 */ t=T2; SET(4,-2) T2_(t) break; case -0x5: /* LIT2 */
case 0x04: /* SWP */ t=T;n=N; SET(2, 0) T = n; N = t; break; case -0x7: /* LIT2r */ PUSH2(PEEK2(ram + pc)) pc += 2; break;
case 0x24: /* SWP2 */ t=T2;n=N2; SET(4, 0) T2_(n) N2_(t) break; /* ALU */
case 0x05: /* ROT */ t=T;n=N;l=L; SET(3, 0) T = l; N = t; L = n; break; case 0x01: /* INC */ POPx(a) PUSHx(a + 1) break;
case 0x25: /* ROT2 */ t=T2;n=N2;l=L2; SET(6, 0) T2_(l) N2_(t) L2_(n) break; case 0x02: /* POP */ POPx(a) break;
case 0x06: /* DUP */ t=T; SET(1, 1) T = t; N = t; break; case 0x03: /* NIP */ POPx(a) POPx(b) PUSHx(a) break;
case 0x26: /* DUP2 */ t=T2; SET(2, 2) T2_(t) N2_(t) break; case 0x04: /* SWP */ POPx(a) POPx(b) PUSHx(a) PUSHx(b) break;
case 0x07: /* OVR */ t=T;n=N; SET(2, 1) T = n; N = t; L = n; break; case 0x05: /* ROT */ POPx(a) POPx(b) POPx(c) PUSHx(b) PUSHx(a) PUSHx(c) break;
case 0x27: /* OVR2 */ t=T2;n=N2; SET(4, 2) T2_(n) N2_(t) L2_(n) break; case 0x06: /* DUP */ POPx(a) PUSHx(a) PUSHx(a) break;
case 0x08: /* EQU */ t=T;n=N; SET(2,-1) T = n == t; break; case 0x07: /* OVR */ POPx(a) POPx(b) PUSHx(b) PUSHx(a) PUSHx(b) break;
case 0x28: /* EQU2 */ t=T2;n=N2; SET(4,-3) T = n == t; break; case 0x08: /* EQU */ POPx(a) POPx(b) PUSH1(b == a) break;
case 0x09: /* NEQ */ t=T;n=N; SET(2,-1) T = n != t; break; case 0x09: /* NEQ */ POPx(a) POPx(b) PUSH1(b != a) break;
case 0x29: /* NEQ2 */ t=T2;n=N2; SET(4,-3) T = n != t; break; case 0x0a: /* GTH */ POPx(a) POPx(b) PUSH1(b > a) break;
case 0x0a: /* GTH */ t=T;n=N; SET(2,-1) T = n > t; break; case 0x0b: /* LTH */ POPx(a) POPx(b) PUSH1(b < a) break;
case 0x2a: /* GTH2 */ t=T2;n=N2; SET(4,-3) T = n > t; break; case 0x0c: /* JMP */ POPx(a) JUMP(a) break;
case 0x0b: /* LTH */ t=T;n=N; SET(2,-1) T = n < t; break; case 0x0d: /* JCN */ POPx(a) POP1(b) if(b) JUMP(a) break;
case 0x2b: /* LTH2 */ t=T2;n=N2; SET(4,-3) T = n < t; break; case 0x0e: /* JSR */ POPx(a) FLIP PUSH2(pc) JUMP(a) break;
case 0x0c: /* JMP */ t=T; SET(1,-1) pc += (Sint8)t; break; case 0x0f: /* STH */ POPx(a) FLIP PUSHx(a) break;
case 0x2c: /* JMP2 */ t=T2; SET(2,-2) pc = t; break; case 0x10: /* LDZ */ POP1(a) PEEK(b, a) PUSHx(b) break;
case 0x0d: /* JCN */ t=T;n=N; SET(2,-2) if(n) pc += (Sint8)t; break; case 0x11: /* STZ */ POP1(a) POPx(b) POKE(a, b) break;
case 0x2d: /* JCN2 */ t=T2;n=L; SET(3,-3) if(n) pc = t; break; case 0x12: /* LDR */ POP1(a) PEEK(b, pc + (Sint8)a) PUSHx(b) break;
case 0x0e: /* JSR */ t=T; SET(1,-1) FLIP SHIFT(2) T2_(pc) pc += (Sint8)t; break; case 0x13: /* STR */ POP1(a) POPx(b) POKE(pc + (Sint8)a, b) break;
case 0x2e: /* JSR2 */ t=T2; SET(2,-2) FLIP SHIFT(2) T2_(pc) pc = t; break; case 0x14: /* LDA */ POP2(a) PEEK(b, a) PUSHx(b) break;
case 0x0f: /* STH */ t=T; SET(1,-1) FLIP SHIFT(1) T = t; break; case 0x15: /* STA */ POP2(a) POPx(b) POKE(a, b) break;
case 0x2f: /* STH2 */ t=T2; SET(2,-2) FLIP SHIFT(2) T2_(t) break; case 0x16: /* DEI */ POP1(a) DEVR(b, a) PUSHx(b) break;
case 0x10: /* LDZ */ t=T; SET(1, 0) T = ram[t]; break; case 0x17: /* DEO */ POP1(a) POPx(b) DEVW(a, b) break;
case 0x30: /* LDZ2 */ t=T; SET(1, 1) rr = ram + t; T2_(PEEK2(rr)) break; case 0x18: /* ADD */ POPx(a) POPx(b) PUSHx(b + a) break;
case 0x11: /* STZ */ t=T;n=N; SET(2,-2) ram[t] = n; break; case 0x19: /* SUB */ POPx(a) POPx(b) PUSHx(b - a) break;
case 0x31: /* STZ2 */ t=T;n=H2; SET(3,-3) rr = ram + t; POKE2(rr, n) break; case 0x1a: /* MUL */ POPx(a) POPx(b) PUSHx((Uint32)b * a) break;
case 0x12: /* LDR */ t=T; SET(1, 0) T = ram[pc + (Sint8)t]; break; case 0x1b: /* DIV */ POPx(a) POPx(b) PUSHx(a ? b / a : 0) break;
case 0x32: /* LDR2 */ t=T; SET(1, 1) rr = ram + pc + (Sint8)t; T2_(PEEK2(rr)) break; case 0x1c: /* AND */ POPx(a) POPx(b) PUSHx(b & a) break;
case 0x13: /* STR */ t=T;n=N; SET(2,-2) ram[pc + (Sint8)t] = n; break; case 0x1d: /* ORA */ POPx(a) POPx(b) PUSHx(b | a) break;
case 0x33: /* STR2 */ t=T;n=H2; SET(3,-3) rr = ram + pc + (Sint8)t; POKE2(rr, n) break; case 0x1e: /* EOR */ POPx(a) POPx(b) PUSHx(b ^ a) break;
case 0x14: /* LDA */ t=T2; SET(2,-1) T = ram[t]; break; case 0x1f: /* SFT */ POP1(a) POPx(b) PUSHx(b >> (a & 0xf) << (a >> 4)) break;
case 0x34: /* LDA2 */ t=T2; SET(2, 0) rr = ram + t; T2_(PEEK2(rr)) 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;
case 0x36: /* DEI2 */ t=T; SET(1, 1) T = DEI(t + 1); N = 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) T = 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) 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) T2_(n * t) 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 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 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 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 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;
} }
} }
} }

2
src/uxn.h
View file

@ -36,7 +36,7 @@ typedef struct Uxn {
/* required functions */ /* required functions */
extern Uint8 emu_dei(Uxn *u, Uint8 addr); extern Uint8 emu_dei(Uxn *u, Uint8 addr);
extern void emu_deo(Uxn *u, Uint8 addr); extern void emu_deo(Uxn *u, Uint8 addr, Uint8 value);
extern Uint8 dei_masks[0x100], deo_masks[0x100]; extern Uint8 dei_masks[0x100], deo_masks[0x100];
extern Uint16 dev_vers[0x10], dei_mask[0x10], deo_mask[0x10]; extern Uint16 dev_vers[0x10], dei_mask[0x10], deo_mask[0x10];

3
src/uxncli.c
View file

@ -29,9 +29,10 @@ emu_dei(Uxn *u, Uint8 addr)
} }
void void
emu_deo(Uxn *u, Uint8 addr) emu_deo(Uxn *u, Uint8 addr, Uint8 value)
{ {
Uint8 p = addr & 0x0f, d = addr & 0xf0; Uint8 p = addr & 0x0f, d = addr & 0xf0;
u->dev[addr] = value;
switch(d) { switch(d) {
case 0x00: system_deo(u, &u->dev[d], p); break; case 0x00: system_deo(u, &u->dev[d], p); break;
case 0x10: console_deo(&u->dev[d], p); break; case 0x10: console_deo(&u->dev[d], p); break;

3
src/uxnemu.c
View file

@ -112,9 +112,10 @@ emu_dei(Uxn *u, Uint8 addr)
} }
void void
emu_deo(Uxn *u, Uint8 addr) emu_deo(Uxn *u, Uint8 addr, Uint8 value)
{ {
Uint8 p = addr & 0x0f, d = addr & 0xf0; Uint8 p = addr & 0x0f, d = addr & 0xf0;
u->dev[addr] = value;
switch(d) { switch(d) {
case 0x00: case 0x00:
system_deo(u, &u->dev[d], p); system_deo(u, &u->dev[d], p);