Dariaceli's Git
Browse code

Merged POPxPOPx and PUSHxPUSHx

neauoire authored on 09/08/2023 00:13:39
Showing 1 changed files
src/uxn.c
History View file @ 901f76e
... ... 
@@ -11,19 +11,21 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
11 11 
 WITH REGARD TO THIS SOFTWARE.
12 12 
 */
13 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 JUMP(x)    { if(m2) pc = (x); else pc += (Sint8)(x); }
17 
-#define POKE(x, y) { if(m2) { POKE2(ram + x, y) } else { ram[(x)] = (y); } }
18 
-#define PEEK(o, x) { if(m2) { o = PEEK2(ram + x); } else o = ram[(x)]; }
19 
-#define PUSH1(y)   { if(s->ptr == 0xff) HALT(2) s->dat[s->ptr++] = (y); }
20 
-#define PUSH2(y)   { if((tsp = s->ptr) >= 0xfe) HALT(2) t = (y); POKE2(&s->dat[tsp], t); s->ptr = tsp + 2; }
21 
-#define PUSHx(y)   { if(m2) { PUSH2(y) } else { PUSH1(y) } }
22 
-#define POP1(o)    { if(*sp == 0x00) HALT(1) o = s->dat[--*sp]; }
23 
-#define POP2(o)    { if((tsp = *sp) <= 0x01) HALT(1) o = PEEK2(&s->dat[tsp - 2]); *sp = tsp - 2; }
24 
-#define POPx(o)    { if(m2) { POP2(o) } else { POP1(o) } }
25 
-#define DEVW(p, y) { if(m2) { DEO(p, y >> 8) DEO((p + 1), y) } else { DEO(p, y) } }
26 
-#define DEVR(o, p) { if(m2) { o = DEI(p) << 8 | DEI(p + 1); } else { o = DEI(p); } }
14 
+#define HALT(c)      { return emu_halt(u, ins, (c), pc - 1); }
15 
+#define FLIP         { s = ins & 0x40 ? &u->wst : &u->rst; }
16 
+#define JUMP(x)      { if(m2) pc = (x); else pc += (Sint8)(x); }
17 
+#define POKE(x, y)   { if(m2) { POKE2(ram + x, y) } else { ram[(x)] = (y); } }
18 
+#define PEEK(o, x)   { if(m2) { o = PEEK2(ram + x); } else o = ram[(x)]; }
19 
+#define PUSH1(y)     { if(s->ptr == 0xff) HALT(2) s->dat[s->ptr++] = (y); }
20 
+#define PUSH2(y)     { if((tsp = s->ptr) >= 0xfe) HALT(2) t = (y); POKE2(&s->dat[tsp], t); s->ptr = tsp + 2; }
21 
+#define PUSHx(y)     { if(m2) { PUSH2(y) } else { PUSH1(y) } }
22 
+#define PUSHxx(y, z) { if(m2) { PUSH2(y) PUSH2(z) } else { PUSH1(y) PUSH1(z) } }
23 
+#define POP1(o)      { if(*sp == 0x00) HALT(1) o = s->dat[--*sp]; }
24 
+#define POP2(o)      { if((tsp = *sp) <= 0x01) HALT(1) o = PEEK2(&s->dat[tsp - 2]); *sp = tsp - 2; }
25 
+#define POPx(o)      { if(m2) { POP2(o) } else { POP1(o) } }
26 
+#define POPxx(o, p)  { if(m2) { POP2(o) POP2(p) } else { POP1(o) POP1(p) } }
27 
+#define DEVW(p, y)   { if(m2) { DEO(p, y >> 8) DEO((p + 1), y) } else { DEO(p, y) } }
28 
+#define DEVR(o, p)   { if(m2) { o = DEI(p) << 8 | DEI(p + 1); } else { o = DEI(p); } }
27 29
28 30 
 int
29 31 
 uxn_eval(Uxn *u, Uint16 pc)
... ... 
@@ -53,15 +55,15 @@ uxn_eval(Uxn *u, Uint16 pc)
53 55 
 		/* ALU */
54 56 
 		case 0x01: /* INC */ POPx(a) PUSHx(a + 1) break;
55 57 
 		case 0x02: /* POP */ POPx(a) break;
56 
-		case 0x03: /* NIP */ POPx(a) POPx(b) PUSHx(a) break;
57 
-		case 0x04: /* SWP */ POPx(a) POPx(b) PUSHx(a) PUSHx(b) break;
58 
-		case 0x05: /* ROT */ POPx(a) POPx(b) POPx(c) PUSHx(b) PUSHx(a) PUSHx(c) break;
59 
-		case 0x06: /* DUP */ POPx(a) PUSHx(a) PUSHx(a) break;
60 
-		case 0x07: /* OVR */ POPx(a) POPx(b) PUSHx(b) PUSHx(a) PUSHx(b) break;
61 
-		case 0x08: /* EQU */ POPx(a) POPx(b) PUSH1(b == a) break;
62 
-		case 0x09: /* NEQ */ POPx(a) POPx(b) PUSH1(b != a) break;
63 
-		case 0x0a: /* GTH */ POPx(a) POPx(b) PUSH1(b > a) break;
64 
-		case 0x0b: /* LTH */ POPx(a) POPx(b) PUSH1(b < a) break;
58 
+		case 0x03: /* NIP */ POPxx(a, b) PUSHx(a) break;
59 
+		case 0x04: /* SWP */ POPxx(a, b) PUSHxx(a, b) break;
60 
+		case 0x05: /* ROT */ POPxx(a, b) POPx(c) PUSHxx(b, a) PUSHx(c) break;
61 
+		case 0x06: /* DUP */ POPx(a) PUSHxx(a, a) break;
62 
+		case 0x07: /* OVR */ POPxx(a, b) PUSHxx(b, a) PUSHx(b) break;
63 
+		case 0x08: /* EQU */ POPxx(a, b) PUSH1(b == a) break;
64 
+		case 0x09: /* NEQ */ POPxx(a, b) PUSH1(b != a) break;
65 
+		case 0x0a: /* GTH */ POPxx(a, b) PUSH1(b > a) break;
66 
+		case 0x0b: /* LTH */ POPxx(a, b) PUSH1(b < a) break;
65 67 
 		case 0x0c: /* JMP */ POPx(a) JUMP(a) break;
66 68 
 		case 0x0d: /* JCN */ POPx(a) POP1(b) if(b) JUMP(a) break;
67 69 
 		case 0x0e: /* JSR */ POPx(a) FLIP PUSH2(pc) JUMP(a) break;
... ... 
@@ -74,13 +76,13 @@ uxn_eval(Uxn *u, Uint16 pc)
74 76 
 		case 0x15: /* STA */ POP2(a) POPx(b) POKE(a, b) break;
75 77 
 		case 0x16: /* DEI */ POP1(a) DEVR(b, a) PUSHx(b) break;
76 78 
 		case 0x17: /* DEO */ POP1(a) POPx(b) DEVW(a, b) break;
77 
-		case 0x18: /* ADD */ POPx(a) POPx(b) PUSHx(b + a) break;
78 
-		case 0x19: /* SUB */ POPx(a) POPx(b) PUSHx(b - a) break;
79 
-		case 0x1a: /* MUL */ POPx(a) POPx(b) PUSHx((Uint32)b * a) break;
80 
-		case 0x1b: /* DIV */ POPx(a) POPx(b) if(!a) HALT(3) PUSHx(b / a) break;
81 
-		case 0x1c: /* AND */ POPx(a) POPx(b) PUSHx(b & a) break;
82 
-		case 0x1d: /* ORA */ POPx(a) POPx(b) PUSHx(b | a) break;
83 
-		case 0x1e: /* EOR */ POPx(a) POPx(b) PUSHx(b ^ a) break;
79 
+		case 0x18: /* ADD */ POPxx(a, b) PUSHx(b + a) break;
80 
+		case 0x19: /* SUB */ POPxx(a, b) PUSHx(b - a) break;
81 
+		case 0x1a: /* MUL */ POPxx(a, b) PUSHx((Uint32)b * a) break;
82 
+		case 0x1b: /* DIV */ POPxx(a, b) if(!a) HALT(3) PUSHx(b / a) break;
83 
+		case 0x1c: /* AND */ POPxx(a, b) PUSHx(b & a) break;
84 
+		case 0x1d: /* ORA */ POPxx(a, b) PUSHx(b | a) break;
85 
+		case 0x1e: /* EOR */ POPxx(a, b) PUSHx(b ^ a) break;
84 86 
 		case 0x1f: /* SFT */ POP1(a) POPx(b) PUSHx(b >> (a & 0xf) << (a >> 4)) break;
85 87 
 		}
86 88 
 	}