Dariaceli's Git
Browse code

(uxn.c) Renamed POP/PUSH to POPx/PUSHx

neauoire authored on 07/08/2023 23:22:57
Showing 2 changed files
src/devices/screen.c
History View file @ c68936b
... ... 
@@ -46,6 +46,24 @@ screen_fill(Uint8 *layer, int x1, int y1, int x2, int y2, int color)
46 46 
 			layer[x + y * width] = color;
47 47 
 }
48 48
49 
+static void
50 
+screen_blit(Uint8 *layer, Uint8 *ram, Uint16 addr, int x1, int y1, int color, int flipx, int flipy, int twobpp)
51 
+{
52 
+	int v, h, width = uxn_screen.width, height = uxn_screen.height, opaque = (color % 5);
53 
+	for(v = 0; v < 8; v++) {
54 
+		Uint16 c = ram[(addr + v) & 0xffff] | (twobpp ? (ram[(addr + v + 8) & 0xffff] << 8) : 0);
55 
+		Uint16 y = y1 + (flipy ? 7 - v : v);
56 
+		for(h = 7; h >= 0; --h, c >>= 1) {
57 
+			Uint8 ch = (c & 1) | ((c >> 7) & 2);
58 
+			if(opaque || ch) {
59 
+				Uint16 x = x1 + (flipx ? 7 - h : h);
60 
+				if(x < width && y < height)
61 
+					layer[x + y * width] = blending[ch][color];
62 
+			}
63 
+		}
64 
+	}
65 
+}
66 
+
49 67 
 void
50 68 
 screen_palette(Uint8 *addr)
51 69 
 {
... ... 
@@ -167,28 +185,15 @@ screen_deo(Uint8 *ram, Uint8 *d, Uint8 port)
167 185 
 		Uint8 length = move >> 4;
168 186 
 		Uint8 twobpp = !!(ctrl & 0x80);
169 187 
 		Uint8 *layer = (ctrl & 0x40) ? uxn_screen.fg : uxn_screen.bg;
170 
-		Uint8 color = ctrl & 0xf, opaque = color % 5;
188 
+		Uint8 color = ctrl & 0xf;
171 189 
 		Uint16 x = PEEK2(d + 0x8), dx = (move & 0x1) << 3;
172 190 
 		Uint16 y = PEEK2(d + 0xa), dy = (move & 0x2) << 2;
173 191 
 		Uint16 addr = PEEK2(d + 0xc), addr_incr = (move & 0x4) << (1 + twobpp);
174 192 
 		int flipx = (ctrl & 0x10), fx = flipx ? -1 : 1;
175 193 
 		int flipy = (ctrl & 0x20), fy = flipy ? -1 : 1;
176 
-		int v, h, width = uxn_screen.width, height = uxn_screen.height;
177 194 
 		Uint16 dyx = dy * fx, dxy = dx * fy;
178 195 
 		for(i = 0; i <= length; i++) {
179 
-			Uint16 x1 = x + dyx * i, y1 = y + dxy * i;
180 
-			for(v = 0; v < 8; v++) {
181 
-				Uint16 c = ram[(addr + v) & 0xffff] | (twobpp ? (ram[(addr + v + 8) & 0xffff] << 8) : 0);
182 
-				Uint16 y = y1 + (flipy ? 7 - v : v);
183 
-				for(h = 7; h >= 0; --h, c >>= 1) {
184 
-					Uint8 ch = (c & 1) | ((c >> 7) & 2);
185 
-					if(opaque || ch) {
186 
-						Uint16 x = x1 + (flipx ? 7 - h : h);
187 
-						if(x < width && y < height)
188 
-							layer[x + y * width] = blending[ch][color];
189 
-					}
190 
-				}
191 
-			}
196 
+			screen_blit(layer, ram, addr, x + dyx * i, y + dxy * i, color, flipx, flipy, twobpp);
192 197 
 			addr += addr_incr;
193 198 
 		}
194 199 
 		screen_change(x, y, x + dyx * length + 8, y + dxy * length + 8);
src/uxn.c
History View file @ c68936b
... ... 
@@ -18,10 +18,10 @@ WITH REGARD TO THIS SOFTWARE.
18 18 
 #define PEEK(o, x) { if(m2) { o = PEEK2(ram + x); } else o = ram[(x)]; }
19 19 
 #define PUSH1(y)   { if(s->ptr == 0xff) HALT(2) s->dat[s->ptr++] = (y); }
20 20 
 #define PUSH2(y)   { if((tsp = s->ptr) >= 0xfe) HALT(2) t = (y); POKE2(&s->dat[tsp], t); s->ptr = tsp + 2; }
21 
-#define PUSH(y)    { if(m2) { PUSH2(y) } else { PUSH1(y) } }
21 
+#define PUSHx(y)   { if(m2) { PUSH2(y) } else { PUSH1(y) } }
22 22 
 #define POP1(o)    { if(*sp == 0x00) HALT(1) o = s->dat[--*sp]; }
23 23 
 #define POP2(o)    { if((tsp = *sp) <= 0x01) HALT(1) o = PEEK2(&s->dat[tsp - 2]); *sp = tsp - 2; }
24 
-#define POP(o)     { if(m2) { POP2(o) } else { POP1(o) } }
24 
+#define POPx(o)    { if(m2) { POP2(o) } else { POP1(o) } }
25 25 
 #define DEVW(p, y) { if(m2) { DEO(p, y >> 8) DEO((p + 1), y) } else { DEO(p, y) } }
26 26 
 #define DEVR(o, p) { if(m2) { o = ((DEI(p) << 8) + DEI(p + 1)); } else { o = DEI(p); } }
27 27
... ... 
@@ -51,37 +51,37 @@ uxn_eval(Uxn *u, Uint16 pc)
51 51 
 		case -0x5: /* LIT2  */
52 52 
 		case -0x7: /* LIT2r */ PUSH2(PEEK2(ram + pc)) pc += 2; break;
53 53 
 		/* ALU */
54 
-		case 0x01: /* INC */ POP(a) PUSH(a + 1) break;
55 
-		case 0x02: /* POP */ POP(a) break;
56 
-		case 0x03: /* NIP */ POP(a) POP(b) PUSH(a) break;
57 
-		case 0x04: /* SWP */ POP(a) POP(b) PUSH(a) PUSH(b) break;
58 
-		case 0x05: /* ROT */ POP(a) POP(b) POP(c) PUSH(b) PUSH(a) PUSH(c) break;
59 
-		case 0x06: /* DUP */ POP(a) PUSH(a) PUSH(a) break;
60 
-		case 0x07: /* OVR */ POP(a) POP(b) PUSH(b) PUSH(a) PUSH(b) break;
61 
-		case 0x08: /* EQU */ POP(a) POP(b) PUSH1(b == a) break;
62 
-		case 0x09: /* NEQ */ POP(a) POP(b) PUSH1(b != a) break;
63 
-		case 0x0a: /* GTH */ POP(a) POP(b) PUSH1(b > a) break;
64 
-		case 0x0b: /* LTH */ POP(a) POP(b) PUSH1(b < a) break;
65 
-		case 0x0c: /* JMP */ POP(a) JUMP(a) break;
66 
-		case 0x0d: /* JCN */ POP(a) POP1(b) if(b) JUMP(a) break;
67 
-		case 0x0e: /* JSR */ POP(a) FLIP PUSH2(pc) JUMP(a) break;
68 
-		case 0x0f: /* STH */ POP(a) FLIP PUSH(a) break;
69 
-		case 0x10: /* LDZ */ POP1(a) PEEK(b, a) PUSH(b) break;
70 
-		case 0x11: /* STZ */ POP1(a) POP(b) POKE(a, b) break;
71 
-		case 0x12: /* LDR */ POP1(a) PEEK(b, pc + (Sint8)a) PUSH(b) break;
72 
-		case 0x13: /* STR */ POP1(a) POP(b) POKE(pc + (Sint8)a, b) break;
73 
-		case 0x14: /* LDA */ POP2(a) PEEK(b, a) PUSH(b) break;
74 
-		case 0x15: /* STA */ POP2(a) POP(b) POKE(a, b) break;
75 
-		case 0x16: /* DEI */ POP1(a) DEVR(b, a) PUSH(b) break;
76 
-		case 0x17: /* DEO */ POP1(a) POP(b) DEVW(a, b) break;
77 
-		case 0x18: /* ADD */ POP(a) POP(b) PUSH(b + a) break;
78 
-		case 0x19: /* SUB */ POP(a) POP(b) PUSH(b - a) break;
79 
-		case 0x1a: /* MUL */ POP(a) POP(b) PUSH((Uint32)b * a) break;
80 
-		case 0x1b: /* DIV */ POP(a) POP(b) if(!a) HALT(3) PUSH(b / a) break;
81 
-		case 0x1c: /* AND */ POP(a) POP(b) PUSH(b & a) break;
82 
-		case 0x1d: /* ORA */ POP(a) POP(b) PUSH(b | a) break;
83 
-		case 0x1e: /* EOR */ POP(a) POP(b) PUSH(b ^ a) break;
84 
-		case 0x1f: /* SFT */ POP1(a) POP(b) PUSH(b >> (a & 0xf) << (a >> 4)) break;
54 
+		case 0x01: /* INC */ POPx(a) PUSHx(a + 1) break;
55 
+		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;
65 
+		case 0x0c: /* JMP */ POPx(a) JUMP(a) break;
66 
+		case 0x0d: /* JCN */ POPx(a) POP1(b) if(b) JUMP(a) break;
67 
+		case 0x0e: /* JSR */ POPx(a) FLIP PUSH2(pc) JUMP(a) break;
68 
+		case 0x0f: /* STH */ POPx(a) FLIP PUSHx(a) break;
69 
+		case 0x10: /* LDZ */ POP1(a) PEEK(b, a) PUSHx(b) break;
70 
+		case 0x11: /* STZ */ POP1(a) POPx(b) POKE(a, b) break;
71 
+		case 0x12: /* LDR */ POP1(a) PEEK(b, pc + (Sint8)a) PUSHx(b) break;
72 
+		case 0x13: /* STR */ POP1(a) POPx(b) POKE(pc + (Sint8)a, b) break;
73 
+		case 0x14: /* LDA */ POP2(a) PEEK(b, a) PUSHx(b) break;
74 
+		case 0x15: /* STA */ POP2(a) POPx(b) POKE(a, b) break;
75 
+		case 0x16: /* DEI */ POP1(a) DEVR(b, a) PUSHx(b) break;
76 
+		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;
84 
+		case 0x1f: /* SFT */ POP1(a) POPx(b) PUSHx(b >> (a & 0xf) << (a >> 4)) break;
85 85 
 		}
86 86 
 	}
87 87 
 }