commit 5e720d7
neauoire
·
2023-09-02 21:03:21 +0000 UTC
parent 0fd7427
Uxn can no longer error
5 files changed,
+9,
-37
+0,
-26
1@@ -19,11 +19,6 @@ char *boot_rom;
2 Uint8 dei_masks[0x100], deo_masks[0x100];
3 Uint16 dev_vers[0x10], dei_mask[0x10], deo_mask[0x10];
4
5-static const char *errors[] = {
6- "underflow",
7- "overflow",
8- "division by zero"};
9-
10 static int
11 system_load(Uxn *u, char *filename)
12 {
13@@ -164,24 +159,3 @@ system_deo(Uxn *u, Uint8 *d, Uint8 port)
14 break;
15 }
16 }
17-
18-/* Errors */
19-
20-int
21-emu_halt(Uxn *u, Uint8 instr, Uint8 err, Uint16 addr)
22-{
23- Uint8 *d = &u->dev[0];
24- Uint16 handler = PEEK2(d);
25- if(handler) {
26- u->wst.ptr = 4;
27- u->wst.dat[0] = addr >> 0x8;
28- u->wst.dat[1] = addr & 0xff;
29- u->wst.dat[2] = instr;
30- u->wst.dat[3] = err;
31- return uxn_eval(u, handler);
32- } else {
33- system_inspect(u);
34- fprintf(stderr, "%s %s, by %02x at 0x%04x.\n", (instr & 0x40) ? "Return-stack" : "Working-stack", errors[err - 1], instr, addr);
35- }
36- return 0;
37-}
+7,
-8
1@@ -17,7 +17,7 @@ WITH REGARD TO THIS SOFTWARE.
2 [ L2 ][ N2 ][ T2 ] <
3 */
4
5-#define T *ptr
6+#define T *(ptr)
7 #define N *(ptr - 1)
8 #define L *(ptr - 2)
9 #define X *(ptr - 3)
10@@ -31,21 +31,20 @@ WITH REGARD TO THIS SOFTWARE.
11 #define N2_(v) { r = (v); L = r; X = r >> 8; }
12 #define L2_(v) { r = (v); Y = r; Z = r >> 8; }
13
14-#define HALT(c) { return emu_halt(u, ins, c, pc - 1); }
15 #define FLIP { s = ins & 0x40 ? &u->wst : &u->rst; }
16-#define SET(x, y) { r = s->ptr; if(x > r) HALT(1) r += y; if(ins & 0x80) r += x; if(r > 254) HALT(2) ptr = s->dat + r - 1; s->ptr = r; }
17-#define SHIFT(y) { r = s->ptr + y; if(r > 254) HALT(2) ptr = s->dat + r - 1; s->ptr = r; }
18+#define SHIFT(y) { r = s->ptr + (y); ptr = s->dat + r - 1; s->ptr = r; }
19+#define SET(x, y) { SHIFT((ins & 0x80) ? x + y : y) }
20
21 int
22 uxn_eval(Uxn *u, Uint16 pc)
23 {
24 int t, n, l, r;
25- Uint8 *ram = u->ram;
26+ Uint8 *ram = u->ram, *rr;
27 if(!pc || u->dev[0x0f]) return 0;
28 for(;;) {
29 int ins = ram[pc++];
30 Stack *s = ins & 0x40 ? &u->rst : &u->wst;
31- Uint8 *ptr = s->dat + s->ptr - 1, *rr;
32+ Uint8 *ptr = s->dat + s->ptr - 1;
33 switch(ins & 0x1f ? ins & 0x3f : ins << 4) {
34 /* IMM */
35 case 0x000: /* BRK */ return 1;
36@@ -107,8 +106,8 @@ uxn_eval(Uxn *u, Uint16 pc)
37 case 0x39: /* SUB2 */ t=T2;n=N2; SET(4,-2) T2_(n - t) break;
38 case 0x1a: /* MUL */ t=T;n=N; SET(2,-1) T = n * t; break;
39 case 0x3a: /* MUL2 */ t=T2;n=N2; SET(4,-2) T2_(n * t) break;
40- case 0x1b: /* DIV */ t=T;n=N; SET(2,-1) if(!t) HALT(3) T = n / t; break;
41- case 0x3b: /* DIV2 */ t=T2;n=N2; SET(4,-2) if(!t) HALT(3) T2_(n / t) break;
42+ case 0x1b: /* DIV */ t=T;n=N; SET(2,-1) T = t ? n / t : 0; break;
43+ case 0x3b: /* DIV2 */ t=T2;n=N2; SET(4,-2) T2_(t ? n / t : 0) break;
44 case 0x1c: /* AND */ t=T;n=N; SET(2,-1) T = n & t; break;
45 case 0x3c: /* AND2 */ t=T2;n=N2; SET(4,-2) T2_(n & t) break;
46 case 0x1d: /* ORA */ t=T;n=N; SET(2,-1) T = n | t; break;
+0,
-1
1@@ -39,7 +39,6 @@ typedef struct Uxn {
2
3 extern Uint8 emu_dei(Uxn *u, Uint8 addr);
4 extern void emu_deo(Uxn *u, Uint8 addr);
5-extern int emu_halt(Uxn *u, Uint8 instr, Uint8 err, Uint16 addr);
6 extern Uint8 dei_masks[0x100], deo_masks[0x100];
7 extern Uint16 dev_vers[0x10], dei_mask[0x10], deo_mask[0x10];
8
+1,
-1
1@@ -270,7 +270,7 @@ main(int argc, char **argv)
2 system_connect(0xf, LINK_VERSION, LINK_DEIMASK, LINK_DEOMASK);
3 /* Read flags */
4 if(argv[i][0] == '-' && argv[i][1] == 'v')
5- return system_version("Uxn11 - Graphical Varvara Emulator", "29 Aug 2023");
6+ return system_version("Uxn11 - Graphical Varvara Emulator", "2 Sep 2023");
7 if(!emu_init())
8 return system_error("Init", "Failed to initialize varvara.");
9 if(!system_init(&u, (Uint8 *)calloc(0x10000 * RAM_PAGES, sizeof(Uint8)), argv[i++]))
+1,
-1
1@@ -76,7 +76,7 @@ main(int argc, char **argv)
2 system_connect(0xf, LINK_VERSION, LINK_DEIMASK, LINK_DEOMASK);
3 /* Read flags */
4 if(argv[i][0] == '-' && argv[i][1] == 'v')
5- return system_version("Uxncli - Console Varvara Emulator", "29 Aug 2023");
6+ return system_version("Uxncli - Console Varvara Emulator", "2 Sep 2023");
7 if(!system_init(&u, (Uint8 *)calloc(0x10000 * RAM_PAGES, sizeof(Uint8)), argv[i++]))
8 return system_error("Init", "Failed to initialize uxn.");
9 /* Game Loop */