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

Ported to new core

This commit is contained in:
Devine Lu Linvega 2023-04-10 11:32:16 -07:00
parent 8260d9496f
commit 9a4625ba16
6 changed files with 126 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/devices/datetime.c
View File

@ -15,25 +15,25 @@ WITH REGARD TO THIS SOFTWARE.
*/ */
Uint8 Uint8
datetime_dei(Uint8 *d, Uint8 port) datetime_dei(Uxn *u, Uint8 addr)
{ {
time_t seconds = time(NULL); time_t seconds = time(NULL);
struct tm zt = {0}; struct tm zt = {0};
struct tm *t = localtime(&seconds); struct tm *t = localtime(&seconds);
if(t == NULL) if(t == NULL)
t = &zt; t = &zt;
switch(port) { switch(addr) {
case 0x0: return (t->tm_year + 1900) >> 8; case 0xc0: return (t->tm_year + 1900) >> 8;
case 0x1: return (t->tm_year + 1900); case 0xc1: return (t->tm_year + 1900);
case 0x2: return t->tm_mon; case 0xc2: return t->tm_mon;
case 0x3: return t->tm_mday; case 0xc3: return t->tm_mday;
case 0x4: return t->tm_hour; case 0xc4: return t->tm_hour;
case 0x5: return t->tm_min; case 0xc5: return t->tm_min;
case 0x6: return t->tm_sec; case 0xc6: return t->tm_sec;
case 0x7: return t->tm_wday; case 0xc7: return t->tm_wday;
case 0x8: return t->tm_yday >> 8; case 0xc8: return t->tm_yday >> 8;
case 0x9: return t->tm_yday; case 0xc9: return t->tm_yday;
case 0xa: return t->tm_isdst; case 0xca: return t->tm_isdst;
default: return d[port]; default: return u->dev[addr];
} }
} }

2
src/devices/datetime.h
View File

@ -9,4 +9,4 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE. WITH REGARD TO THIS SOFTWARE.
*/ */
Uint8 datetime_dei(Uint8 *d, Uint8 port); Uint8 datetime_dei(Uxn *u, Uint8 addr);

150
src/uxn.c
View File

@ -11,104 +11,98 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE. WITH REGARD TO THIS SOFTWARE.
*/ */
/* a,b,c: general use. m2: byte/short mode flag. #define T s->dat[s->ptr - 1]
tsp: macro temp stack ptr. ksp: "keep" mode copy of stack ptr. sp: ptr to stack ptr. #define N s->dat[s->ptr - 2]
x,y: macro in params. o: macro out param. */ #define L s->dat[s->ptr - 3]
#define H2 PEEK2(s->dat + s->ptr - 3)
#define T2 PEEK2(s->dat + s->ptr - 2)
#define N2 PEEK2(s->dat + s->ptr - 4)
#define L2 PEEK2(s->dat + s->ptr - 6)
#define HALT(c) { return uxn_halt(u, instr, (c), pc - 1); } /* Registers
#define JUMP(x) { if(m2) pc = (x); else pc += (Sint8)(x); }
#define PUSH8(x) { if(s->ptr == 0xff) HALT(2) s->dat[s->ptr++] = (x); } [ . ][ . ][ . ][ L ][ N ][ T ] <
#define PUSH16(x) { if((tsp = s->ptr) >= 0xfe) HALT(2) t = (x); s->dat[tsp] = t >> 8; s->dat[tsp + 1] = t; s->ptr = tsp + 2; } [ . ][ . ][ . ][ H2 ][ T ] <
#define PUSH(x) { if(m2) { PUSH16(x) } else { PUSH8(x) } } [ L2 ][ N2 ][ T2 ] <
#define POP8(o) { if(*sp == 0x00) HALT(1) o = s->dat[--*sp]; } */
#define POP16(o) { if((tsp = *sp) <= 0x01) HALT(1) o = s->dat[tsp - 1] | (s->dat[tsp - 2] << 8); *sp = tsp - 2; }
#define POP(o) { if(m2) { POP16(o) } else { POP8(o) } }
#define POKE(x, y) { if(m2) { t = (y); u->ram[(x)] = t >> 8; u->ram[(x) + 1] = t; } else { u->ram[(x)] = (y); } } #define HALT(c) { return uxn_halt(u, ins, (c), pc - 1); }
#define PEEK16(o, x) { o = (u->ram[(x)] << 8) | u->ram[(x) + 1]; } #define SET(mul, add) { if(mul > s->ptr) HALT(1) tmp = s->ptr + k * mul + add; if(tmp > 254) HALT(2) s->ptr = tmp; }
#define PEEK(o, x) { if(m2) PEEK16(o, x) else o = u->ram[(x)]; } #define PUT(o, v) { s->dat[(Uint8)(s->ptr - 1 - (o))] = (v); }
#define PUT2(o, v) { tmp = (v); s->dat[(Uint8)(s->ptr - o - 2)] = tmp >> 8; s->dat[(Uint8)(s->ptr - o - 1)] = tmp; }
#define DEVR(o, x) { o = u->dei(u, x); if(m2) o = (o << 8) | u->dei(u, (x) + 1); } #define PUSH(stack, v) { if(s->ptr > 254) HALT(2) stack->dat[stack->ptr++] = (v); }
#define DEVW(x, y) { if(m2) { u->deo(u, (x), (y) >> 8); u->deo(u, (x) + 1, (y)); } else { u->deo(u, x, (y)); } } #define PUSH2(stack, v) { if(s->ptr > 253) HALT(2) tmp = (v); stack->dat[stack->ptr] = tmp >> 8; stack->dat[stack->ptr + 1] = tmp; stack->ptr += 2; }
#define DEO(a, b) { u->dev[(a)] = (b); if((deo_mask[(a) >> 4] >> ((a) & 0xf)) & 0x1) uxn_deo(u, (a)); }
#define DEI(a, b) { PUT((a), ((dei_mask[(b) >> 4] >> ((b) & 0xf)) & 0x1) ? uxn_dei(u, (b)) : u->dev[(b)]) }
int int
uxn_eval(Uxn *u, Uint16 pc) uxn_eval(Uxn *u, Uint16 pc)
{ {
Uint8 instr, opcode, m2, ksp, tsp, *sp; Uint8 ins, opc, k;
Uint16 a, b, c, t; Uint16 t, n, l, tmp;
Stack *s; Stack *s;
if(!pc || u->dev[0x0f]) return 0; if(!pc || u->dev[0x0f]) return 0;
for(;;) { for(;;) {
instr = u->ram[pc++]; ins = u->ram[pc++];
opcode = instr & 0x1f; k = !!(ins & 0x80);
/* Short Mode */ s = ins & 0x40 ? u->rst : u->wst;
m2 = instr & 0x20; opc = !(ins & 0x1f) ? 0 - (ins >> 5) : ins & 0x3f;
/* Return Mode */ switch(opc) {
s = instr & 0x40 ? u->rst : u->wst; /* IMM */
/* Keep Mode */ case 0x00: /* BRK */ return 1;
if(instr & 0x80) { ksp = s->ptr; sp = &ksp; } case 0xff: /* JCI */ pc += !!s->dat[--s->ptr] * PEEK2(u->ram + pc) + 2; break;
else sp = &s->ptr; case 0xfe: /* JMI */ pc += PEEK2(u->ram + pc) + 2; break;
/* Opcodes */ case 0xfd: /* JSI */ PUSH2(u->rst, pc + 2) pc += PEEK2(u->ram + pc) + 2; break;
switch(opcode - (!opcode * (instr >> 5))) { case 0xfc: /* LIT */ PUSH(s, u->ram[pc++]) break;
/* Immediate */ case 0xfb: /* LIT2 */ PUSH2(s, PEEK2(u->ram + pc)) pc += 2; break;
case -0x0: /* BRK */ return 1; case 0xfa: /* LITr */ PUSH(s, u->ram[pc++]) break;
case -0x1: /* JCI */ POP8(b) if(!b) { pc += 2; break; } case 0xf9: /* LIT2r */ PUSH2(s, PEEK2(u->ram + pc)) pc += 2; break;
case -0x2: /* JMI */ PEEK16(a, pc) pc += a + 2; break; /* ALU */
case -0x3: /* JSI */ s = u->rst; PUSH16(pc + 2) PEEK16(a, pc) pc += a + 2; break; case 0x01: /* INC */ t=T; SET(1, 0) PUT(0, t + 1) break; case 0x21: t=T2; SET(2, 0) PUT2(0, t + 1) break;
case -0x4: /* LIT */ case 0x02: /* POP */ SET(1,-1) break; case 0x22: SET(2,-2) break;
case -0x6: /* LITr */ a = u->ram[pc++]; PUSH8(a) break; case 0x03: /* NIP */ t=T; SET(2,-1) PUT(0, t) break; case 0x23: t=T2; SET(4,-2) PUT2(0, t) break;
case -0x5: /* LIT2 */ case 0x04: /* SWP */ t=T;n=N; SET(2, 0) PUT(0, n) PUT(1, t) break; case 0x24: t=T2;n=N2; SET(4, 0) PUT2(0, n) PUT2(2, t) break;
case -0x7: /* LIT2r */ PEEK16(a, pc) PUSH16(a) pc += 2; break; case 0x05: /* ROT */ t=T;n=N;l=L; SET(3, 0) PUT(0, l) PUT(1, t) PUT(2, n) break; case 0x25: t=T2;n=N2;l=L2; SET(6, 0) PUT2(0, l) PUT2(2, t) PUT2(4, n) break;
/* ALU */ case 0x06: /* DUP */ t=T; SET(1, 1) PUT(0, t) PUT(1, t) break; case 0x26: t=T2; SET(2, 2) PUT2(0, t) PUT2(2, t) break;
case 0x01: /* INC */ POP(a) PUSH(a + 1) break; case 0x07: /* OVR */ t=T;n=N; SET(2, 1) PUT(0, n) PUT(1, t) PUT(2, n) break; case 0x27: t=T2;n=N2; SET(4, 2) PUT2(0, n) PUT2(2, t) PUT2(4, n) break;
case 0x02: /* POP */ POP(a) break; case 0x08: /* EQU */ t=T;n=N; SET(2,-1) PUT(0, n == t) break; case 0x28: t=T2;n=N2; SET(4,-3) PUT(0, n == t) break;
case 0x03: /* NIP */ POP(a) POP(b) PUSH(a) break; case 0x09: /* NEQ */ t=T;n=N; SET(2,-1) PUT(0, n != t) break; case 0x29: t=T2;n=N2; SET(4,-3) PUT(0, n != t) break;
case 0x04: /* SWP */ POP(a) POP(b) PUSH(a) PUSH(b) break; case 0x0a: /* GTH */ t=T;n=N; SET(2,-1) PUT(0, n > t) break; case 0x2a: t=T2;n=N2; SET(4,-3) PUT(0, n > t) break;
case 0x05: /* ROT */ POP(a) POP(b) POP(c) PUSH(b) PUSH(a) PUSH(c) break; case 0x0b: /* LTH */ t=T;n=N; SET(2,-1) PUT(0, n < t) break; case 0x2b: t=T2;n=N2; SET(4,-3) PUT(0, n < t) break;
case 0x06: /* DUP */ POP(a) PUSH(a) PUSH(a) break; case 0x0c: /* JMP */ t=T; SET(1,-1) pc += (Sint8)t; break; case 0x2c: t=T2; SET(2,-2) pc = t; break;
case 0x07: /* OVR */ POP(a) POP(b) PUSH(b) PUSH(a) PUSH(b) break; case 0x0d: /* JCN */ t=T;n=N; SET(2,-2) pc += !!n * (Sint8)t; break; case 0x2d: t=T2;n=L; SET(3,-3) if(n) pc = t; break;
case 0x08: /* EQU */ POP(a) POP(b) PUSH8(b == a) break; case 0x0e: /* JSR */ t=T; SET(1,-1) PUSH2(u->rst, pc) pc += (Sint8)t; break; case 0x2e: t=T2; SET(2,-2) PUSH2(u->rst, pc) pc = t; break;
case 0x09: /* NEQ */ POP(a) POP(b) PUSH8(b != a) break; case 0x0f: /* STH */ t=T; SET(1,-1) PUSH((ins & 0x40 ? u->wst : u->rst), t) break; case 0x2f: t=T2; SET(2,-2) PUSH2((ins & 0x40 ? u->wst : u->rst), t) break;
case 0x0a: /* GTH */ POP(a) POP(b) PUSH8(b > a) break; case 0x10: /* LDZ */ t=T; SET(1, 0) PUT(0, u->ram[t]) break; case 0x30: t=T; SET(1, 1) PUT2(0, PEEK2(u->ram + t)) break;
case 0x0b: /* LTH */ POP(a) POP(b) PUSH8(b < a) break; case 0x11: /* STZ */ t=T;n=N; SET(2,-2) u->ram[t] = n; break; case 0x31: t=T;n=H2; SET(3,-3) POKE2(u->ram + t, n) break;
case 0x0c: /* JMP */ POP(a) JUMP(a) break; case 0x12: /* LDR */ t=T; SET(1, 0) PUT(0, u->ram[pc + (Sint8)t]) break; case 0x32: t=T; SET(1, 1) PUT2(0, PEEK2(u->ram + pc + (Sint8)t)) break;
case 0x0d: /* JCN */ POP(a) POP8(b) if(b) JUMP(a) break; case 0x13: /* STR */ t=T;n=N; SET(2,-2) u->ram[pc + (Sint8)t] = n; break; case 0x33: t=T;n=H2; SET(3,-3) POKE2(u->ram + pc + (Sint8)t, n) break;
case 0x0e: /* JSR */ POP(a) s = (instr & 0x40) ? u->wst : u->rst; PUSH16(pc) JUMP(a) break; case 0x14: /* LDA */ t=T2; SET(2,-1) PUT(0, u->ram[t]) break; case 0x34: t=T2; SET(2, 0) PUT2(0, PEEK2(u->ram + t)) break;
case 0x0f: /* STH */ POP(a) s = (instr & 0x40) ? u->wst : u->rst; PUSH(a) break; case 0x15: /* STA */ t=T2;n=L; SET(3,-3) u->ram[t] = n; break; case 0x35: t=T2;n=N2; SET(4,-4) POKE2(u->ram + t, n) break;
case 0x10: /* LDZ */ POP8(a) PEEK(b, a) PUSH(b) break; case 0x16: /* DEI */ t=T; SET(1, 0) DEI(0, t) break; case 0x36: t=T; SET(1, 1) DEI(1, t) DEI(0, t + 1) break;
case 0x11: /* STZ */ POP8(a) POP(b) POKE(a, b) break; case 0x17: /* DEO */ t=T;n=N; SET(2,-2) DEO(t, n) break; case 0x37: t=T;n=N;l=L; SET(3,-3) DEO(t, l) DEO(t + 1, n) break;
case 0x12: /* LDR */ POP8(a) PEEK(b, pc + (Sint8)a) PUSH(b) break; case 0x18: /* ADD */ t=T;n=N; SET(2,-1) PUT(0, n + t) break; case 0x38: t=T2;n=N2; SET(4,-2) PUT2(0, n + t) break;
case 0x13: /* STR */ POP8(a) POP(b) POKE(pc + (Sint8)a, b) break; case 0x19: /* SUB */ t=T;n=N; SET(2,-1) PUT(0, n - t) break; case 0x39: t=T2;n=N2; SET(4,-2) PUT2(0, n - t) break;
case 0x14: /* LDA */ POP16(a) PEEK(b, a) PUSH(b) break; case 0x1a: /* MUL */ t=T;n=N; SET(2,-1) PUT(0, n * t) break; case 0x3a: t=T2;n=N2; SET(4,-2) PUT2(0, n * t) break;
case 0x15: /* STA */ POP16(a) POP(b) POKE(a, b) break; case 0x1b: /* DIV */ t=T;n=N; SET(2,-1) PUT(0, n / t) break; case 0x3b: t=T2;n=N2; SET(4,-2) PUT2(0, n / t) break;
case 0x16: /* DEI */ POP8(a) DEVR(b, a) PUSH(b) break; case 0x1c: /* AND */ t=T;n=N; SET(2,-1) PUT(0, n & t) break; case 0x3c: t=T2;n=N2; SET(4,-2) PUT2(0, n & t) break;
case 0x17: /* DEO */ POP8(a) POP(b) DEVW(a, b) break; case 0x1d: /* ORA */ t=T;n=N; SET(2,-1) PUT(0, n | t) break; case 0x3d: t=T2;n=N2; SET(4,-2) PUT2(0, n | t) break;
case 0x18: /* ADD */ POP(a) POP(b) PUSH(b + a) break; case 0x1e: /* EOR */ t=T;n=N; SET(2,-1) PUT(0, n ^ t) break; case 0x3e: t=T2;n=N2; SET(4,-2) PUT2(0, n ^ t) break;
case 0x19: /* SUB */ POP(a) POP(b) PUSH(b - a) break; case 0x1f: /* SFT */ t=T;n=N; SET(2,-1) PUT(0, n >> (t & 0xf) << (t >> 4)) break; case 0x3f: t=T;n=H2; SET(3,-1) PUT2(0, n >> (t & 0xf) << (t >> 4)) break;
case 0x1a: /* MUL */ POP(a) POP(b) PUSH((Uint32)b * a) break;
case 0x1b: /* DIV */ POP(a) POP(b) if(!a) HALT(3) PUSH(b / a) break;
case 0x1c: /* AND */ POP(a) POP(b) PUSH(b & a) break;
case 0x1d: /* ORA */ POP(a) POP(b) PUSH(b | a) break;
case 0x1e: /* EOR */ POP(a) POP(b) PUSH(b ^ a) break;
case 0x1f: /* SFT */ POP8(a) POP(b) PUSH(b >> (a & 0x0f) << ((a & 0xf0) >> 4)) break;
} }
} }
} }
int int
uxn_boot(Uxn *u, Uint8 *ram, Dei *dei, Deo *deo) uxn_boot(Uxn *u, Uint8 *ram)
{ {
Uint32 i; Uint32 i;
char *cptr = (char *)u; char *cptr = (char *)u;
for(i = 0; i < sizeof(*u); i++) for(i = 0; i < sizeof(*u); i++)
cptr[i] = 0x00; cptr[i] = 0;
u->wst = (Stack *)(ram + 0xf0000); u->wst = (Stack *)(ram + 0xf0000);
u->rst = (Stack *)(ram + 0xf0100); u->rst = (Stack *)(ram + 0xf0100);
u->dev = (Uint8 *)(ram + 0xf0200);
u->ram = ram; u->ram = ram;
u->dei = dei;
u->deo = deo;
return 1; return 1;
} }

32
src/uxn.h
View File

@ -9,12 +9,6 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE. WITH REGARD TO THIS SOFTWARE.
*/ */
typedef unsigned char Uint8;
typedef signed char Sint8;
typedef unsigned short Uint16;
typedef signed short Sint16;
typedef unsigned int Uint32;
#define PAGE_PROGRAM 0x0100 #define PAGE_PROGRAM 0x0100
/* clang-format off */ /* clang-format off */
@ -24,20 +18,32 @@ typedef unsigned int Uint32;
/* clang-format on */ /* clang-format on */
typedef unsigned char Uint8;
typedef signed char Sint8;
typedef unsigned short Uint16;
typedef signed short Sint16;
typedef unsigned int Uint32;
typedef struct { typedef struct {
Uint8 dat[255], ptr; Uint8 dat[255], ptr;
} Stack; } Stack;
typedef struct Uxn { typedef struct Uxn {
Uint8 *ram, *dev; Uint8 *ram, dev[256];
Stack *wst, *rst; Stack *wst, *rst;
Uint8 (*dei)(struct Uxn *u, Uint8 addr); Uint8 (*dei)(struct Uxn *u, Uint8 addr);
void (*deo)(struct Uxn *u, Uint8 addr, Uint8 value); void (*deo)(struct Uxn *u, Uint8 addr);
} Uxn; } Uxn;
typedef Uint8 Dei(Uxn *u, Uint8 addr); /* required functions */
typedef void Deo(Uxn *u, Uint8 addr, Uint8 value);
int uxn_halt(Uxn *u, Uint8 instr, Uint8 err, Uint16 addr); extern Uint8 uxn_dei(Uxn *u, Uint8 addr);
int uxn_boot(Uxn *u, Uint8 *ram, Dei *dei, Deo *deo); extern void uxn_deo(Uxn *u, Uint8 addr);
int uxn_eval(Uxn *u, Uint16 pc); extern int uxn_halt(Uxn *u, Uint8 instr, Uint8 err, Uint16 addr);
extern Uint16 dei_mask[];
extern Uint16 deo_mask[];
/* built-ins */
int uxn_boot(Uxn *u, Uint8 *ram);
int uxn_eval(Uxn *u, Uint16 pc);

22
src/uxn11.c
View File

@ -40,6 +40,9 @@ char *rom_path;
#define PAD 4 #define PAD 4
#define CONINBUFSIZE 256 #define CONINBUFSIZE 256
Uint16 deo_mask[] = {0xff08, 0x0300, 0xc028, 0x8000, 0x8000, 0x8000, 0x8000, 0x0000, 0x0000, 0x0000, 0xa260, 0xa260, 0x0000, 0x0000, 0x0000, 0x0000};
Uint16 dei_mask[] = {0x0000, 0x0000, 0x003c, 0x0014, 0x0014, 0x0014, 0x0014, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x07ff, 0x0000, 0x0000, 0x0000};
static int static int
emu_error(char *msg, const char *err) emu_error(char *msg, const char *err)
{ {
@ -47,23 +50,20 @@ emu_error(char *msg, const char *err)
return 0; return 0;
} }
static Uint8 Uint8
emu_dei(Uxn *u, Uint8 addr) uxn_dei(Uxn *u, Uint8 addr)
{ {
Uint8 p = addr & 0x0f, d = addr & 0xf0; switch(addr & 0xf0) {
switch(d) {
case 0x20: return screen_dei(u, addr); case 0x20: return screen_dei(u, addr);
case 0xc0: return datetime_dei(&u->dev[d], p); case 0xc0: return datetime_dei(u, addr);
} }
return u->dev[addr]; return u->dev[addr];
} }
static void void
emu_deo(Uxn *u, Uint8 addr, Uint8 v) uxn_deo(Uxn *u, Uint8 addr)
{ {
Uint8 p = addr & 0x0f, d = addr & 0xf0; Uint8 p = addr & 0x0f, d = addr & 0xf0;
Uint16 mask = 0x1 << (d >> 4);
u->dev[addr] = v;
switch(d) { switch(d) {
case 0x00: case 0x00:
system_deo(u, &u->dev[d], p); system_deo(u, &u->dev[d], p);
@ -75,8 +75,6 @@ emu_deo(Uxn *u, Uint8 addr, Uint8 v)
case 0xa0: file_deo(0, u->ram, &u->dev[d], p); break; case 0xa0: file_deo(0, u->ram, &u->dev[d], p); break;
case 0xb0: file_deo(1, u->ram, &u->dev[d], p); break; case 0xb0: file_deo(1, u->ram, &u->dev[d], p); break;
} }
if(p == 0x01 && !(SUPPORT & mask))
fprintf(stderr, "Warning: Incompatible emulation, device: %02x.\n", d);
} }
static void static void
@ -214,7 +212,7 @@ main(int argc, char **argv)
if(argc < 2) if(argc < 2)
return emu_error("Usage", "uxn11 game.rom args"); return emu_error("Usage", "uxn11 game.rom args");
rom_path = argv[1]; rom_path = argv[1];
if(!uxn_boot(&u, (Uint8 *)calloc(0x10000 * RAM_PAGES, sizeof(Uint8)), emu_dei, emu_deo)) if(!uxn_boot(&u, (Uint8 *)calloc(0x10000 * RAM_PAGES, sizeof(Uint8))))
return emu_error("Boot", "Failed"); return emu_error("Boot", "Failed");
/* start sequence */ /* start sequence */
if(!emu_start(&u, rom_path)) if(!emu_start(&u, rom_path))

42
src/uxncli.c
View File

@ -3,6 +3,7 @@
#include "uxn.h" #include "uxn.h"
#include "devices/system.h" #include "devices/system.h"
#include "devices/console.h"
#include "devices/file.h" #include "devices/file.h"
#include "devices/datetime.h" #include "devices/datetime.h"
@ -17,7 +18,8 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE. WITH REGARD TO THIS SOFTWARE.
*/ */
#define SUPPORT 0x1c03 /* devices mask */ Uint16 deo_mask[] = {0x6a08, 0x0300, 0xc028, 0x8000, 0x8000, 0x8000, 0x8000, 0x0000, 0x0000, 0x0000, 0xa260, 0xa260, 0x0000, 0x0000, 0x0000, 0x0000};
Uint16 dei_mask[] = {0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x07ff, 0x0000, 0x0000, 0x0000};
static int static int
emu_error(char *msg, const char *err) emu_error(char *msg, const char *err)
@ -26,49 +28,25 @@ emu_error(char *msg, const char *err)
return 1; return 1;
} }
static int Uint8
console_input(Uxn *u, char c) uxn_dei(Uxn *u, Uint8 addr)
{ {
Uint8 *d = &u->dev[0x10]; switch(addr & 0xf0) {
d[0x02] = c; case 0xc0: return datetime_dei(u, addr);
return uxn_eval(u, PEEK2(d));
}
static void
console_deo(Uint8 *d, Uint8 port)
{
FILE *fd = port == 0x8 ? stdout : port == 0x9 ? stderr :
0;
if(fd) {
fputc(d[port], fd);
fflush(fd);
}
}
static Uint8
emu_dei(Uxn *u, Uint8 addr)
{
Uint8 p = addr & 0x0f, d = addr & 0xf0;
switch(d) {
case 0xc0: return datetime_dei(&u->dev[d], p);
} }
return u->dev[addr]; return u->dev[addr];
} }
static void void
emu_deo(Uxn *u, Uint8 addr, Uint8 v) uxn_deo(Uxn *u, Uint8 addr)
{ {
Uint8 p = addr & 0x0f, d = addr & 0xf0; Uint8 p = addr & 0x0f, d = addr & 0xf0;
Uint16 mask = 0x1 << (d >> 4);
u->dev[addr] = v;
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;
case 0xa0: file_deo(0, u->ram, &u->dev[d], p); break; case 0xa0: file_deo(0, u->ram, &u->dev[d], p); break;
case 0xb0: file_deo(1, u->ram, &u->dev[d], p); break; case 0xb0: file_deo(1, u->ram, &u->dev[d], p); break;
} }
if(p == 0x01 && !(SUPPORT & mask))
fprintf(stderr, "Warning: Incompatible emulation, device: %02x.\n", d);
} }
int int
@ -78,7 +56,7 @@ main(int argc, char **argv)
int i; int i;
if(argc < 2) if(argc < 2)
return emu_error("Usage", "uxncli game.rom args"); return emu_error("Usage", "uxncli game.rom args");
if(!uxn_boot(&u, (Uint8 *)calloc(0x10000 * RAM_PAGES, sizeof(Uint8)), emu_dei, emu_deo)) if(!uxn_boot(&u, (Uint8 *)calloc(0x10000 * RAM_PAGES, sizeof(Uint8))))
return emu_error("Boot", "Failed"); return emu_error("Boot", "Failed");
if(!system_load(&u, argv[1])) if(!system_load(&u, argv[1]))
return emu_error("Load", "Failed"); return emu_error("Load", "Failed");