commit bc055f3

Devine Lu Linvega  ·  2023-04-11 16:25:31 +0000 UTC
parent bdd6c19 
Do not share stacks
3 files changed,  +12, -14
M src/devices/system.c
M src/uxn.c
M src/uxn.h
M src/devices/system.c
+7, -7 
 1@@ -58,11 +58,11 @@ uxn_halt(Uxn *u, Uint8 instr, Uint8 err, Uint16 addr)
 2 	Uint8 *d = &u->dev[0x00];
 3 	Uint16 handler = PEEK2(d);
 4 	if(handler) {
 5-		u->wst->ptr = 4;
 6-		u->wst->dat[0] = addr >> 0x8;
 7-		u->wst->dat[1] = addr & 0xff;
 8-		u->wst->dat[2] = instr;
 9-		u->wst->dat[3] = err;
10+		u->wst.ptr = 4;
11+		u->wst.dat[0] = addr >> 0x8;
12+		u->wst.dat[1] = addr & 0xff;
13+		u->wst.dat[2] = instr;
14+		u->wst.dat[3] = err;
15 		return uxn_eval(u, handler);
16 	} else {
17 		system_inspect(u);
18@@ -74,8 +74,8 @@ uxn_halt(Uxn *u, Uint8 instr, Uint8 err, Uint16 addr)
19 void
20 system_inspect(Uxn *u)
21 {
22-	system_print(u->wst, "wst");
23-	system_print(u->rst, "rst");
24+	system_print(&u->wst, "wst");
25+	system_print(&u->rst, "rst");
26 }
27 
28 int
M src/uxn.c
+4, -6 
 1@@ -41,14 +41,14 @@ uxn_eval(Uxn *u, Uint16 pc)
 2 		instr = u->ram[pc++];
 3 		opcode = instr & 0x1f;
 4 		/* 2 Mode */ m2 = instr & 0x20;
 5-		/* r Mode */ s = instr & 0x40 ? u->rst : u->wst;
 6+		/* r Mode */ s = instr & 0x40 ? &u->rst : &u->wst;
 7 		/* k Mode */ if(instr & 0x80) { ksp = s->ptr; sp = &ksp; } else sp = &s->ptr;
 8 		switch(opcode - (!opcode * (instr >> 5))) {
 9 		/* Immediate */
10 		case -0x0: /* BRK */ return 1;
11 		case -0x1: /* JCI */ POP8(b) if(!b) { pc += 2; break; }
12 		case -0x2: /* JMI */ PEEK16(a, pc) pc += a + 2; break;
13-		case -0x3: /* JSI */ s = u->rst; PUSH16(pc + 2) PEEK16(a, pc) pc += a + 2; break;
14+		case -0x3: /* JSI */ s = &u->rst; PUSH16(pc + 2) PEEK16(a, pc) pc += a + 2; break;
15 		case -0x4: /* LIT */
16 		case -0x6: /* LITr */ a = u->ram[pc++]; PUSH8(a) break;
17 		case -0x5: /* LIT2 */
18@@ -67,8 +67,8 @@ uxn_eval(Uxn *u, Uint16 pc)
19 		case 0x0b: /* LTH */ POP(a) POP(b) PUSH8(b < a) break;
20 		case 0x0c: /* JMP */ POP(a) JUMP(a) break;
21 		case 0x0d: /* JCN */ POP(a) POP8(b) if(b) JUMP(a) break;
22-		case 0x0e: /* JSR */ POP(a) s = (instr & 0x40) ? u->wst : u->rst; PUSH16(pc) JUMP(a) break;
23-		case 0x0f: /* STH */ POP(a) s = (instr & 0x40) ? u->wst : u->rst; PUSH(a) break;
24+		case 0x0e: /* JSR */ POP(a) s = (instr & 0x40) ? &u->wst : &u->rst; PUSH16(pc) JUMP(a) break;
25+		case 0x0f: /* STH */ POP(a) s = (instr & 0x40) ? &u->wst : &u->rst; PUSH(a) break;
26 		case 0x10: /* LDZ */ POP8(a) PEEK(b, a) PUSH(b) break;
27 		case 0x11: /* STZ */ POP8(a) POP(b) POKE(a, b) break;
28 		case 0x12: /* LDR */ POP8(a) PEEK(b, pc + (Sint8)a) PUSH(b) break;
29@@ -96,8 +96,6 @@ uxn_boot(Uxn *u, Uint8 *ram)
30 	char *cptr = (char *)u;
31 	for(i = 0; i < sizeof(*u); i++)
32 		cptr[i] = 0;
33-	u->wst = (Stack *)(ram + 0xf0000);
34-	u->rst = (Stack *)(ram + 0xf0100);
35 	u->ram = ram;
36 	return 1;
37 }
M src/uxn.h
+1, -1 
1@@ -30,7 +30,7 @@ typedef struct {
2 
3 typedef struct Uxn {
4 	Uint8 *ram, dev[256];
5-	Stack *wst, *rst;
6+	Stack wst, rst;
7 	Uint8 (*dei)(struct Uxn *u, Uint8 addr);
8 	void (*deo)(struct Uxn *u, Uint8 addr);
9 } Uxn;