commit 9a4625b
Devine Lu Linvega
·
2023-04-10 18:32:16 +0000 UTC
parent 8260d94
Ported to new core
6 files changed,
+126,
-150
+14,
-14
1@@ -15,25 +15,25 @@ WITH REGARD TO THIS SOFTWARE.
2 */
3
4 Uint8
5-datetime_dei(Uint8 *d, Uint8 port)
6+datetime_dei(Uxn *u, Uint8 addr)
7 {
8 time_t seconds = time(NULL);
9 struct tm zt = {0};
10 struct tm *t = localtime(&seconds);
11 if(t == NULL)
12 t = &zt;
13- switch(port) {
14- case 0x0: return (t->tm_year + 1900) >> 8;
15- case 0x1: return (t->tm_year + 1900);
16- case 0x2: return t->tm_mon;
17- case 0x3: return t->tm_mday;
18- case 0x4: return t->tm_hour;
19- case 0x5: return t->tm_min;
20- case 0x6: return t->tm_sec;
21- case 0x7: return t->tm_wday;
22- case 0x8: return t->tm_yday >> 8;
23- case 0x9: return t->tm_yday;
24- case 0xa: return t->tm_isdst;
25- default: return d[port];
26+ switch(addr) {
27+ case 0xc0: return (t->tm_year + 1900) >> 8;
28+ case 0xc1: return (t->tm_year + 1900);
29+ case 0xc2: return t->tm_mon;
30+ case 0xc3: return t->tm_mday;
31+ case 0xc4: return t->tm_hour;
32+ case 0xc5: return t->tm_min;
33+ case 0xc6: return t->tm_sec;
34+ case 0xc7: return t->tm_wday;
35+ case 0xc8: return t->tm_yday >> 8;
36+ case 0xc9: return t->tm_yday;
37+ case 0xca: return t->tm_isdst;
38+ default: return u->dev[addr];
39 }
40 }
+1,
-1
1@@ -9,4 +9,4 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
2 WITH REGARD TO THIS SOFTWARE.
3 */
4
5-Uint8 datetime_dei(Uint8 *d, Uint8 port);
6+Uint8 datetime_dei(Uxn *u, Uint8 addr);
+72,
-78
1@@ -11,104 +11,98 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
2 WITH REGARD TO THIS SOFTWARE.
3 */
4
5-/* a,b,c: general use. m2: byte/short mode flag.
6- tsp: macro temp stack ptr. ksp: "keep" mode copy of stack ptr. sp: ptr to stack ptr.
7- x,y: macro in params. o: macro out param. */
8+#define T s->dat[s->ptr - 1]
9+#define N s->dat[s->ptr - 2]
10+#define L s->dat[s->ptr - 3]
11+#define H2 PEEK2(s->dat + s->ptr - 3)
12+#define T2 PEEK2(s->dat + s->ptr - 2)
13+#define N2 PEEK2(s->dat + s->ptr - 4)
14+#define L2 PEEK2(s->dat + s->ptr - 6)
15
16-#define HALT(c) { return uxn_halt(u, instr, (c), pc - 1); }
17-#define JUMP(x) { if(m2) pc = (x); else pc += (Sint8)(x); }
18+/* Registers
19
20-#define PUSH8(x) { if(s->ptr == 0xff) HALT(2) s->dat[s->ptr++] = (x); }
21-#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; }
22-#define PUSH(x) { if(m2) { PUSH16(x) } else { PUSH8(x) } }
23+[ . ][ . ][ . ][ L ][ N ][ T ] <
24+[ . ][ . ][ . ][ H2 ][ T ] <
25+[ L2 ][ N2 ][ T2 ] <
26
27-#define POP8(o) { if(*sp == 0x00) HALT(1) o = s->dat[--*sp]; }
28-#define POP16(o) { if((tsp = *sp) <= 0x01) HALT(1) o = s->dat[tsp - 1] | (s->dat[tsp - 2] << 8); *sp = tsp - 2; }
29-#define POP(o) { if(m2) { POP16(o) } else { POP8(o) } }
30-
31-#define POKE(x, y) { if(m2) { t = (y); u->ram[(x)] = t >> 8; u->ram[(x) + 1] = t; } else { u->ram[(x)] = (y); } }
32-#define PEEK16(o, x) { o = (u->ram[(x)] << 8) | u->ram[(x) + 1]; }
33-#define PEEK(o, x) { if(m2) PEEK16(o, x) else o = u->ram[(x)]; }
34+*/
35
36-#define DEVR(o, x) { o = u->dei(u, x); if(m2) o = (o << 8) | u->dei(u, (x) + 1); }
37-#define DEVW(x, y) { if(m2) { u->deo(u, (x), (y) >> 8); u->deo(u, (x) + 1, (y)); } else { u->deo(u, x, (y)); } }
38+#define HALT(c) { return uxn_halt(u, ins, (c), pc - 1); }
39+#define SET(mul, add) { if(mul > s->ptr) HALT(1) tmp = s->ptr + k * mul + add; if(tmp > 254) HALT(2) s->ptr = tmp; }
40+#define PUT(o, v) { s->dat[(Uint8)(s->ptr - 1 - (o))] = (v); }
41+#define PUT2(o, v) { tmp = (v); s->dat[(Uint8)(s->ptr - o - 2)] = tmp >> 8; s->dat[(Uint8)(s->ptr - o - 1)] = tmp; }
42+#define PUSH(stack, v) { if(s->ptr > 254) HALT(2) stack->dat[stack->ptr++] = (v); }
43+#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; }
44+#define DEO(a, b) { u->dev[(a)] = (b); if((deo_mask[(a) >> 4] >> ((a) & 0xf)) & 0x1) uxn_deo(u, (a)); }
45+#define DEI(a, b) { PUT((a), ((dei_mask[(b) >> 4] >> ((b) & 0xf)) & 0x1) ? uxn_dei(u, (b)) : u->dev[(b)]) }
46
47 int
48 uxn_eval(Uxn *u, Uint16 pc)
49 {
50- Uint8 instr, opcode, m2, ksp, tsp, *sp;
51- Uint16 a, b, c, t;
52+ Uint8 ins, opc, k;
53+ Uint16 t, n, l, tmp;
54 Stack *s;
55 if(!pc || u->dev[0x0f]) return 0;
56 for(;;) {
57- instr = u->ram[pc++];
58- opcode = instr & 0x1f;
59- /* Short Mode */
60- m2 = instr & 0x20;
61- /* Return Mode */
62- s = instr & 0x40 ? u->rst : u->wst;
63- /* Keep Mode */
64- if(instr & 0x80) { ksp = s->ptr; sp = &ksp; }
65- else sp = &s->ptr;
66- /* Opcodes */
67- switch(opcode - (!opcode * (instr >> 5))) {
68- /* Immediate */
69- case -0x0: /* BRK */ return 1;
70- case -0x1: /* JCI */ POP8(b) if(!b) { pc += 2; break; }
71- case -0x2: /* JMI */ PEEK16(a, pc) pc += a + 2; break;
72- case -0x3: /* JSI */ s = u->rst; PUSH16(pc + 2) PEEK16(a, pc) pc += a + 2; break;
73- case -0x4: /* LIT */
74- case -0x6: /* LITr */ a = u->ram[pc++]; PUSH8(a) break;
75- case -0x5: /* LIT2 */
76- case -0x7: /* LIT2r */ PEEK16(a, pc) PUSH16(a) pc += 2; break;
77- /* ALU */
78- case 0x01: /* INC */ POP(a) PUSH(a + 1) break;
79- case 0x02: /* POP */ POP(a) break;
80- case 0x03: /* NIP */ POP(a) POP(b) PUSH(a) break;
81- case 0x04: /* SWP */ POP(a) POP(b) PUSH(a) PUSH(b) break;
82- case 0x05: /* ROT */ POP(a) POP(b) POP(c) PUSH(b) PUSH(a) PUSH(c) break;
83- case 0x06: /* DUP */ POP(a) PUSH(a) PUSH(a) break;
84- case 0x07: /* OVR */ POP(a) POP(b) PUSH(b) PUSH(a) PUSH(b) break;
85- case 0x08: /* EQU */ POP(a) POP(b) PUSH8(b == a) break;
86- case 0x09: /* NEQ */ POP(a) POP(b) PUSH8(b != a) break;
87- case 0x0a: /* GTH */ POP(a) POP(b) PUSH8(b > a) break;
88- case 0x0b: /* LTH */ POP(a) POP(b) PUSH8(b < a) break;
89- case 0x0c: /* JMP */ POP(a) JUMP(a) break;
90- case 0x0d: /* JCN */ POP(a) POP8(b) if(b) JUMP(a) break;
91- case 0x0e: /* JSR */ POP(a) s = (instr & 0x40) ? u->wst : u->rst; PUSH16(pc) JUMP(a) break;
92- case 0x0f: /* STH */ POP(a) s = (instr & 0x40) ? u->wst : u->rst; PUSH(a) break;
93- case 0x10: /* LDZ */ POP8(a) PEEK(b, a) PUSH(b) break;
94- case 0x11: /* STZ */ POP8(a) POP(b) POKE(a, b) break;
95- case 0x12: /* LDR */ POP8(a) PEEK(b, pc + (Sint8)a) PUSH(b) break;
96- case 0x13: /* STR */ POP8(a) POP(b) POKE(pc + (Sint8)a, b) break;
97- case 0x14: /* LDA */ POP16(a) PEEK(b, a) PUSH(b) break;
98- case 0x15: /* STA */ POP16(a) POP(b) POKE(a, b) break;
99- case 0x16: /* DEI */ POP8(a) DEVR(b, a) PUSH(b) break;
100- case 0x17: /* DEO */ POP8(a) POP(b) DEVW(a, b) break;
101- case 0x18: /* ADD */ POP(a) POP(b) PUSH(b + a) break;
102- case 0x19: /* SUB */ POP(a) POP(b) PUSH(b - a) break;
103- case 0x1a: /* MUL */ POP(a) POP(b) PUSH((Uint32)b * a) break;
104- case 0x1b: /* DIV */ POP(a) POP(b) if(!a) HALT(3) PUSH(b / a) break;
105- case 0x1c: /* AND */ POP(a) POP(b) PUSH(b & a) break;
106- case 0x1d: /* ORA */ POP(a) POP(b) PUSH(b | a) break;
107- case 0x1e: /* EOR */ POP(a) POP(b) PUSH(b ^ a) break;
108- case 0x1f: /* SFT */ POP8(a) POP(b) PUSH(b >> (a & 0x0f) << ((a & 0xf0) >> 4)) break;
109+ ins = u->ram[pc++];
110+ k = !!(ins & 0x80);
111+ s = ins & 0x40 ? u->rst : u->wst;
112+ opc = !(ins & 0x1f) ? 0 - (ins >> 5) : ins & 0x3f;
113+ switch(opc) {
114+ /* IMM */
115+ case 0x00: /* BRK */ return 1;
116+ case 0xff: /* JCI */ pc += !!s->dat[--s->ptr] * PEEK2(u->ram + pc) + 2; break;
117+ case 0xfe: /* JMI */ pc += PEEK2(u->ram + pc) + 2; break;
118+ case 0xfd: /* JSI */ PUSH2(u->rst, pc + 2) pc += PEEK2(u->ram + pc) + 2; break;
119+ case 0xfc: /* LIT */ PUSH(s, u->ram[pc++]) break;
120+ case 0xfb: /* LIT2 */ PUSH2(s, PEEK2(u->ram + pc)) pc += 2; break;
121+ case 0xfa: /* LITr */ PUSH(s, u->ram[pc++]) break;
122+ case 0xf9: /* LIT2r */ PUSH2(s, PEEK2(u->ram + pc)) pc += 2; break;
123+ /* ALU */
124+ 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;
125+ case 0x02: /* POP */ SET(1,-1) break; case 0x22: SET(2,-2) break;
126+ case 0x03: /* NIP */ t=T; SET(2,-1) PUT(0, t) break; case 0x23: t=T2; SET(4,-2) PUT2(0, t) break;
127+ 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;
128+ 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;
129+ 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;
130+ 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;
131+ 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;
132+ 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;
133+ 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;
134+ 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;
135+ case 0x0c: /* JMP */ t=T; SET(1,-1) pc += (Sint8)t; break; case 0x2c: t=T2; SET(2,-2) pc = t; break;
136+ 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;
137+ 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;
138+ 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;
139+ 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;
140+ 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;
141+ 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;
142+ 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;
143+ 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;
144+ 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;
145+ 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;
146+ 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;
147+ 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;
148+ 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;
149+ 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;
150+ 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;
151+ 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;
152+ 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;
153+ 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;
154+ 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;
155 }
156- }
157+ }
158 }
159
160 int
161-uxn_boot(Uxn *u, Uint8 *ram, Dei *dei, Deo *deo)
162+uxn_boot(Uxn *u, Uint8 *ram)
163 {
164 Uint32 i;
165 char *cptr = (char *)u;
166 for(i = 0; i < sizeof(*u); i++)
167- cptr[i] = 0x00;
168+ cptr[i] = 0;
169 u->wst = (Stack *)(ram + 0xf0000);
170 u->rst = (Stack *)(ram + 0xf0100);
171- u->dev = (Uint8 *)(ram + 0xf0200);
172 u->ram = ram;
173- u->dei = dei;
174- u->deo = deo;
175 return 1;
176-}
177+}
+19,
-13
1@@ -9,12 +9,6 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
2 WITH REGARD TO THIS SOFTWARE.
3 */
4
5-typedef unsigned char Uint8;
6-typedef signed char Sint8;
7-typedef unsigned short Uint16;
8-typedef signed short Sint16;
9-typedef unsigned int Uint32;
10-
11 #define PAGE_PROGRAM 0x0100
12
13 /* clang-format off */
14@@ -24,20 +18,32 @@ typedef unsigned int Uint32;
15
16 /* clang-format on */
17
18+typedef unsigned char Uint8;
19+typedef signed char Sint8;
20+typedef unsigned short Uint16;
21+typedef signed short Sint16;
22+typedef unsigned int Uint32;
23+
24 typedef struct {
25 Uint8 dat[255], ptr;
26 } Stack;
27
28 typedef struct Uxn {
29- Uint8 *ram, *dev;
30+ Uint8 *ram, dev[256];
31 Stack *wst, *rst;
32 Uint8 (*dei)(struct Uxn *u, Uint8 addr);
33- void (*deo)(struct Uxn *u, Uint8 addr, Uint8 value);
34+ void (*deo)(struct Uxn *u, Uint8 addr);
35 } Uxn;
36
37-typedef Uint8 Dei(Uxn *u, Uint8 addr);
38-typedef void Deo(Uxn *u, Uint8 addr, Uint8 value);
39+/* required functions */
40+
41+extern Uint8 uxn_dei(Uxn *u, Uint8 addr);
42+extern void uxn_deo(Uxn *u, Uint8 addr);
43+extern int uxn_halt(Uxn *u, Uint8 instr, Uint8 err, Uint16 addr);
44+extern Uint16 dei_mask[];
45+extern Uint16 deo_mask[];
46+
47+/* built-ins */
48
49-int uxn_halt(Uxn *u, Uint8 instr, Uint8 err, Uint16 addr);
50-int uxn_boot(Uxn *u, Uint8 *ram, Dei *dei, Deo *deo);
51-int uxn_eval(Uxn *u, Uint16 pc);
52+int uxn_boot(Uxn *u, Uint8 *ram);
53+int uxn_eval(Uxn *u, Uint16 pc);
+10,
-12
1@@ -40,6 +40,9 @@ char *rom_path;
2 #define PAD 4
3 #define CONINBUFSIZE 256
4
5+Uint16 deo_mask[] = {0xff08, 0x0300, 0xc028, 0x8000, 0x8000, 0x8000, 0x8000, 0x0000, 0x0000, 0x0000, 0xa260, 0xa260, 0x0000, 0x0000, 0x0000, 0x0000};
6+Uint16 dei_mask[] = {0x0000, 0x0000, 0x003c, 0x0014, 0x0014, 0x0014, 0x0014, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x07ff, 0x0000, 0x0000, 0x0000};
7+
8 static int
9 emu_error(char *msg, const char *err)
10 {
11@@ -47,23 +50,20 @@ emu_error(char *msg, const char *err)
12 return 0;
13 }
14
15-static Uint8
16-emu_dei(Uxn *u, Uint8 addr)
17+Uint8
18+uxn_dei(Uxn *u, Uint8 addr)
19 {
20- Uint8 p = addr & 0x0f, d = addr & 0xf0;
21- switch(d) {
22+ switch(addr & 0xf0) {
23 case 0x20: return screen_dei(u, addr);
24- case 0xc0: return datetime_dei(&u->dev[d], p);
25+ case 0xc0: return datetime_dei(u, addr);
26 }
27 return u->dev[addr];
28 }
29
30-static void
31-emu_deo(Uxn *u, Uint8 addr, Uint8 v)
32+void
33+uxn_deo(Uxn *u, Uint8 addr)
34 {
35 Uint8 p = addr & 0x0f, d = addr & 0xf0;
36- Uint16 mask = 0x1 << (d >> 4);
37- u->dev[addr] = v;
38 switch(d) {
39 case 0x00:
40 system_deo(u, &u->dev[d], p);
41@@ -75,8 +75,6 @@ emu_deo(Uxn *u, Uint8 addr, Uint8 v)
42 case 0xa0: file_deo(0, u->ram, &u->dev[d], p); break;
43 case 0xb0: file_deo(1, u->ram, &u->dev[d], p); break;
44 }
45- if(p == 0x01 && !(SUPPORT & mask))
46- fprintf(stderr, "Warning: Incompatible emulation, device: %02x.\n", d);
47 }
48
49 static void
50@@ -214,7 +212,7 @@ main(int argc, char **argv)
51 if(argc < 2)
52 return emu_error("Usage", "uxn11 game.rom args");
53 rom_path = argv[1];
54- if(!uxn_boot(&u, (Uint8 *)calloc(0x10000 * RAM_PAGES, sizeof(Uint8)), emu_dei, emu_deo))
55+ if(!uxn_boot(&u, (Uint8 *)calloc(0x10000 * RAM_PAGES, sizeof(Uint8))))
56 return emu_error("Boot", "Failed");
57 /* start sequence */
58 if(!emu_start(&u, rom_path))
+10,
-32
1@@ -3,6 +3,7 @@
2
3 #include "uxn.h"
4 #include "devices/system.h"
5+#include "devices/console.h"
6 #include "devices/file.h"
7 #include "devices/datetime.h"
8
9@@ -17,7 +18,8 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 WITH REGARD TO THIS SOFTWARE.
11 */
12
13-#define SUPPORT 0x1c03 /* devices mask */
14+Uint16 deo_mask[] = {0x6a08, 0x0300, 0xc028, 0x8000, 0x8000, 0x8000, 0x8000, 0x0000, 0x0000, 0x0000, 0xa260, 0xa260, 0x0000, 0x0000, 0x0000, 0x0000};
15+Uint16 dei_mask[] = {0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x07ff, 0x0000, 0x0000, 0x0000};
16
17 static int
18 emu_error(char *msg, const char *err)
19@@ -26,49 +28,25 @@ emu_error(char *msg, const char *err)
20 return 1;
21 }
22
23-static int
24-console_input(Uxn *u, char c)
25-{
26- Uint8 *d = &u->dev[0x10];
27- d[0x02] = c;
28- return uxn_eval(u, PEEK2(d));
29-}
30-
31-static void
32-console_deo(Uint8 *d, Uint8 port)
33-{
34- FILE *fd = port == 0x8 ? stdout : port == 0x9 ? stderr :
35- 0;
36- if(fd) {
37- fputc(d[port], fd);
38- fflush(fd);
39- }
40-}
41-
42-static Uint8
43-emu_dei(Uxn *u, Uint8 addr)
44+Uint8
45+uxn_dei(Uxn *u, Uint8 addr)
46 {
47- Uint8 p = addr & 0x0f, d = addr & 0xf0;
48- switch(d) {
49- case 0xc0: return datetime_dei(&u->dev[d], p);
50+ switch(addr & 0xf0) {
51+ case 0xc0: return datetime_dei(u, addr);
52 }
53 return u->dev[addr];
54 }
55
56-static void
57-emu_deo(Uxn *u, Uint8 addr, Uint8 v)
58+void
59+uxn_deo(Uxn *u, Uint8 addr)
60 {
61 Uint8 p = addr & 0x0f, d = addr & 0xf0;
62- Uint16 mask = 0x1 << (d >> 4);
63- u->dev[addr] = v;
64 switch(d) {
65 case 0x00: system_deo(u, &u->dev[d], p); break;
66 case 0x10: console_deo(&u->dev[d], p); break;
67 case 0xa0: file_deo(0, u->ram, &u->dev[d], p); break;
68 case 0xb0: file_deo(1, u->ram, &u->dev[d], p); break;
69 }
70- if(p == 0x01 && !(SUPPORT & mask))
71- fprintf(stderr, "Warning: Incompatible emulation, device: %02x.\n", d);
72 }
73
74 int
75@@ -78,7 +56,7 @@ main(int argc, char **argv)
76 int i;
77 if(argc < 2)
78 return emu_error("Usage", "uxncli game.rom args");
79- if(!uxn_boot(&u, (Uint8 *)calloc(0x10000 * RAM_PAGES, sizeof(Uint8)), emu_dei, emu_deo))
80+ if(!uxn_boot(&u, (Uint8 *)calloc(0x10000 * RAM_PAGES, sizeof(Uint8))))
81 return emu_error("Boot", "Failed");
82 if(!system_load(&u, argv[1]))
83 return emu_error("Load", "Failed");