commit deaf17c

Use HALT macro

  1@@ -13,15 +13,19 @@ WITH REGARD TO THIS SOFTWARE.
  2 
  3 /* clang-format off */
  4 
  5-#define PUSH8(s, x) { if(s->ptr == 0xff) { errcode = 2; goto err; } s->dat[s->ptr++] = (x); }
  6-#define PUSH16(s, x) { if((j = s->ptr) >= 0xfe) { errcode = 2; goto err; } k = (x); s->dat[j] = k >> 8; s->dat[j + 1] = k; s->ptr = j + 2; }
  7+/*	a,b,c: general use.  bs: byte/short bool. src, dst: stack ptrs, swapped in return mode.
  8+	pc: program counter. sp: ptr to src stack ptr. kptr: "keep" mode copy of src stack ptr.
  9+	x,y: macro in params. d: macro in device. j,k,dev: macro temp variables. o: macro out param. */
 10+
 11+#define HALT(c) { return uxn_halt(u, instr, (c), pc - 1); }
 12+#define PUSH8(s, x) { if(s->ptr == 0xff) HALT(2) s->dat[s->ptr++] = (x); }
 13+#define PUSH16(s, x) { if((j = s->ptr) >= 0xfe) HALT(2) k = (x); s->dat[j] = k >> 8; s->dat[j + 1] = k; s->ptr = j + 2; }
 14 #define PUSH(s, x) { if(bs) { PUSH16(s, (x)) } else { PUSH8(s, (x)) } }
 15-#define POP8(o) { if(!(j = *sp)) { errcode = 1; goto err; } o = (Uint16)src->dat[--j]; *sp = j; }
 16-#define POP16(o) { if((j = *sp) <= 1) { errcode = 1; goto err; } o = src->dat[j - 1]; o += src->dat[j - 2] << 8; *sp = j - 2; }
 17+#define POP8(o) { if(!(j = *sp)) HALT(1) o = (Uint16)src->dat[--j]; *sp = j; }
 18+#define POP16(o) { if((j = *sp) <= 1) HALT(1) o = src->dat[j - 1]; o += src->dat[j - 2] << 8; *sp = j - 2; }
 19 #define POP(o) { if(bs) { POP16(o) } else { POP8(o) } }
 20 #define POKE(x, y) { if(bs) { u->ram[(x)] = (y) >> 8; u->ram[(x) + 1] = (y); } else { u->ram[(x)] = y; } }
 21-#define PEEK16(o, x) { o = (u->ram[(x)] << 8) + u->ram[(x) + 1]; }
 22-#define PEEK(o, x) { if(bs) { PEEK16(o, x) } else { o = u->ram[(x)]; } }
 23+#define PEEK(o, x) { if(bs) { o = (u->ram[(x)] << 8) + u->ram[(x) + 1]; } else { o = u->ram[(x)]; } }
 24 #define DEVR(o, x) { o = u->dei(u, x); if (bs) o = (o << 8) + u->dei(u, ((x) + 1) & 0xFF); }
 25 #define DEVW(x, y) { if (bs) { u->deo(u, (x), (y) >> 8); u->deo(u, ((x) + 1) & 0xFF, (y)); } else { u->deo(u, x, (y)); } }
 26 #define JUMP(x) { if(bs) pc = (x); else pc += (Sint8)(x); }
 27@@ -29,28 +33,20 @@ WITH REGARD TO THIS SOFTWARE.
 28 int
 29 uxn_eval(Uxn *u, Uint16 pc)
 30 {
 31-	unsigned int a, b, c, j, k, bs, instr, errcode;
 32+	unsigned int a, b, c, j, k, bs, instr;
 33 	Uint8 kptr, *sp;
 34 	Stack *src, *dst;
 35 	if(!pc || u->dev[0x0f]) return 0;
 36 	while((instr = u->ram[pc++])) {
 37 		/* Return Mode */
 38-		if(instr & 0x40) {
 39-			src = u->rst; dst = u->wst;
 40-		} else {
 41-			src = u->wst; dst = u->rst;
 42-		}
 43+		if(instr & 0x40) { src = u->rst; dst = u->wst; }
 44+		else { src = u->wst; dst = u->rst; }
 45 		/* Keep Mode */
 46-		if(instr & 0x80) {
 47-			kptr = src->ptr;
 48-			sp = &kptr;
 49-		} else {
 50-			sp = &src->ptr;
 51-		}
 52+		if(instr & 0x80) { kptr = src->ptr; sp = &kptr; }
 53+		else sp = &src->ptr;
 54 		/* Short Mode */
 55 		bs = instr & 0x20 ? 1 : 0;
 56 		switch(instr & 0x1f) {
 57-		/* Stack */
 58 		case 0x00: /* LIT */ PEEK(a, pc) PUSH(src, a) pc += 1 + bs; break;
 59 		case 0x01: /* INC */ POP(a) PUSH(src, a + 1) break;
 60 		case 0x02: /* POP */ POP(a) break;
 61@@ -59,7 +55,6 @@ uxn_eval(Uxn *u, Uint16 pc)
 62 		case 0x05: /* ROT */ POP(a) POP(b) POP(c) PUSH(src, b) PUSH(src, a) PUSH(src, c) break;
 63 		case 0x06: /* DUP */ POP(a) PUSH(src, a) PUSH(src, a) break;
 64 		case 0x07: /* OVR */ POP(a) POP(b) PUSH(src, b) PUSH(src, a) PUSH(src, b) break;
 65-		/* Logic */
 66 		case 0x08: /* EQU */ POP(a) POP(b) PUSH8(src, b == a) break;
 67 		case 0x09: /* NEQ */ POP(a) POP(b) PUSH8(src, b != a) break;
 68 		case 0x0a: /* GTH */ POP(a) POP(b) PUSH8(src, b > a) break;
 69@@ -68,7 +63,6 @@ uxn_eval(Uxn *u, Uint16 pc)
 70 		case 0x0d: /* JCN */ POP(a) POP8(b) if(b) JUMP(a) break;
 71 		case 0x0e: /* JSR */ POP(a) PUSH16(dst, pc) JUMP(a) break;
 72 		case 0x0f: /* STH */ POP(a) PUSH(dst, a) break;
 73-		/* Memory */
 74 		case 0x10: /* LDZ */ POP8(a) PEEK(b, a) PUSH(src, b) break;
 75 		case 0x11: /* STZ */ POP8(a) POP(b) POKE(a, b) break;
 76 		case 0x12: /* LDR */ POP8(a) PEEK(b, pc + (Sint8)a) PUSH(src, b) break;
 77@@ -77,11 +71,10 @@ uxn_eval(Uxn *u, Uint16 pc)
 78 		case 0x15: /* STA */ POP16(a) POP(b) POKE(a, b) break;
 79 		case 0x16: /* DEI */ POP8(a) DEVR(b, a) PUSH(src, b) break;
 80 		case 0x17: /* DEO */ POP8(a) POP(b) DEVW(a, b) break;
 81-		/* Arithmetic */
 82 		case 0x18: /* ADD */ POP(a) POP(b) PUSH(src, b + a) break;
 83 		case 0x19: /* SUB */ POP(a) POP(b) PUSH(src, b - a) break;
 84 		case 0x1a: /* MUL */ POP(a) POP(b) PUSH(src, (Uint32)b * a) break;
 85-		case 0x1b: /* DIV */ POP(a) POP(b) if(a == 0) { errcode = 3; goto err; } PUSH(src, b / a) break;
 86+		case 0x1b: /* DIV */ POP(a) POP(b) if(a == 0) HALT(3) PUSH(src, b / a) break;
 87 		case 0x1c: /* AND */ POP(a) POP(b) PUSH(src, b & a) break;
 88 		case 0x1d: /* ORA */ POP(a) POP(b) PUSH(src, b | a) break;
 89 		case 0x1e: /* EOR */ POP(a) POP(b) PUSH(src, b ^ a) break;
 90@@ -89,23 +82,21 @@ uxn_eval(Uxn *u, Uint16 pc)
 91 		}
 92 	}
 93 	return 1;
 94-err:
 95-	return uxn_halt(u, instr, errcode, pc - 1);
 96 }
 97 
 98 /* clang-format on */
 99 
100 int
101-uxn_boot(Uxn *u, Uint8 *ram, Uint8 (*dei)(struct Uxn *, Uint8), void (*deo)(struct Uxn *, Uint8, Uint8))
102+uxn_boot(Uxn *u, Uint8 *ram, Dei *dei, Deo *deo)
103 {
104 	Uint32 i;
105 	char *cptr = (char *)u;
106 	for(i = 0; i < sizeof(*u); i++)
107 		cptr[i] = 0x00;
108-	u->ram = ram;
109 	u->wst = (Stack *)(ram + 0x10000);
110 	u->rst = (Stack *)(ram + 0x10100);
111 	u->dev = (Uint8 *)(ram + 0x10200);
112+	u->ram = ram;
113 	u->dei = dei;
114 	u->deo = deo;
115 	return 1;