...
|
...
|
@@ -17,11 +17,12 @@ WITH REGARD TO THIS SOFTWARE.
|
17
|
17
|
pc: program counter. sp: ptr to src stack ptr. kptr: "keep" mode copy of src stack ptr.
|
18
|
18
|
x,y: macro in params. d: macro in device. j,k,dev: macro temp variables. o: macro out param. */
|
19
|
19
|
|
20
|
|
-#define PUSH8(s, x) { if(s->ptr == 0xff) { errcode = 2; goto err; } s->dat[s->ptr++] = (x); }
|
21
|
|
-#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; }
|
|
20
|
+#define HALT(c) { return uxn_halt(u, instr, (c), pc - 1); }
|
|
21
|
+#define PUSH8(s, x) { if(s->ptr == 0xff) HALT(2) s->dat[s->ptr++] = (x); }
|
|
22
|
+#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; }
|
22
|
23
|
#define PUSH(s, x) { if(bs) { PUSH16(s, (x)) } else { PUSH8(s, (x)) } }
|
23
|
|
-#define POP8(o) { if(!(j = *sp)) { errcode = 1; goto err; } o = (Uint16)src->dat[--j]; *sp = j; }
|
24
|
|
-#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; }
|
|
24
|
+#define POP8(o) { if(!(j = *sp)) HALT(1) o = (Uint16)src->dat[--j]; *sp = j; }
|
|
25
|
+#define POP16(o) { if((j = *sp) <= 1) HALT(1) o = src->dat[j - 1]; o += src->dat[j - 2] << 8; *sp = j - 2; }
|
25
|
26
|
#define POP(o) { if(bs) { POP16(o) } else { POP8(o) } }
|
26
|
27
|
#define POKE(x, y) { if(bs) { u->ram[(x)] = (y) >> 8; u->ram[(x) + 1] = (y); } else { u->ram[(x)] = y; } }
|
27
|
28
|
#define PEEK16(o, x) { o = (u->ram[(x)] << 8) + u->ram[(x) + 1]; }
|
...
|
...
|
@@ -33,7 +34,7 @@ WITH REGARD TO THIS SOFTWARE.
|
33
|
34
|
int
|
34
|
35
|
uxn_eval(Uxn *u, Uint16 pc)
|
35
|
36
|
{
|
36
|
|
- unsigned int a, b, c, j, k, bs, instr, errcode;
|
|
37
|
+ unsigned int a, b, c, j, k, bs, instr;
|
37
|
38
|
Uint8 kptr, *sp;
|
38
|
39
|
Stack *src, *dst;
|
39
|
40
|
if(!pc || u->dev[0x0f]) return 0;
|
...
|
...
|
@@ -43,7 +44,7 @@ uxn_eval(Uxn *u, Uint16 pc)
|
43
|
44
|
else { src = u->wst; dst = u->rst; }
|
44
|
45
|
/* Keep Mode */
|
45
|
46
|
if(instr & 0x80) { kptr = src->ptr; sp = &kptr; }
|
46
|
|
- else { sp = &src->ptr; }
|
|
47
|
+ else sp = &src->ptr;
|
47
|
48
|
/* Short Mode */
|
48
|
49
|
bs = instr & 0x20 ? 1 : 0;
|
49
|
50
|
switch(instr & 0x1f) {
|
...
|
...
|
@@ -74,7 +75,7 @@ uxn_eval(Uxn *u, Uint16 pc)
|
74
|
75
|
case 0x18: /* ADD */ POP(a) POP(b) PUSH(src, b + a) break;
|
75
|
76
|
case 0x19: /* SUB */ POP(a) POP(b) PUSH(src, b - a) break;
|
76
|
77
|
case 0x1a: /* MUL */ POP(a) POP(b) PUSH(src, (Uint32)b * a) break;
|
77
|
|
- case 0x1b: /* DIV */ POP(a) POP(b) if(a == 0) { errcode = 3; goto err; } PUSH(src, b / a) break;
|
|
78
|
+ case 0x1b: /* DIV */ POP(a) POP(b) if(a == 0) HALT(3) PUSH(src, b / a) break;
|
78
|
79
|
case 0x1c: /* AND */ POP(a) POP(b) PUSH(src, b & a) break;
|
79
|
80
|
case 0x1d: /* ORA */ POP(a) POP(b) PUSH(src, b | a) break;
|
80
|
81
|
case 0x1e: /* EOR */ POP(a) POP(b) PUSH(src, b ^ a) break;
|
...
|
...
|
@@ -82,8 +83,6 @@ uxn_eval(Uxn *u, Uint16 pc)
|
82
|
83
|
}
|
83
|
84
|
}
|
84
|
85
|
return 1;
|
85
|
|
-err:
|
86
|
|
- return uxn_halt(u, instr, errcode, pc - 1);
|
87
|
86
|
}
|
88
|
87
|
|
89
|
88
|
/* clang-format on */
|