Dariaceli's Git
Browse code

Removed GETVEC macro

Devine Lu Linvega authored on 01/03/2023 18:42:03
Showing 6 changed files
src/devices/controller.c
History View file @ 53f3c18
... ... 
@@ -17,7 +17,7 @@ controller_down(Uxn *u, Uint8 *d, Uint8 mask)
17 17 
 {
18 18 
 	if(mask) {
19 19 
 		d[2] |= mask;
20 
-		uxn_eval(u, GETVEC(d));
20 
+		uxn_eval(u, PEEK16(d));
21 21 
 	}
22 22 
 }
23 23
... ... 
@@ -26,7 +26,7 @@ controller_up(Uxn *u, Uint8 *d, Uint8 mask)
26 26 
 {
27 27 
 	if(mask) {
28 28 
 		d[2] &= (~mask);
29 
-		uxn_eval(u, GETVEC(d));
29 
+		uxn_eval(u, PEEK16(d));
30 30 
 	}
31 31 
 }
32 32
... ... 
@@ -35,7 +35,7 @@ controller_key(Uxn *u, Uint8 *d, Uint8 key)
35 35 
 {
36 36 
 	if(key) {
37 37 
 		d[3] = key;
38 
-		uxn_eval(u, GETVEC(d));
38 
+		uxn_eval(u, PEEK16(d));
39 39 
 		d[3] = 0x00;
40 40 
 	}
41 41 
 }
src/devices/mouse.c
History View file @ 53f3c18
... ... 
@@ -16,14 +16,14 @@ void
16 16 
 mouse_down(Uxn *u, Uint8 *d, Uint8 mask)
17 17 
 {
18 18 
 	d[6] |= mask;
19 
-	uxn_eval(u, GETVEC(d));
19 
+	uxn_eval(u, PEEK16(d));
20 20 
 }
21 21
22 22 
 void
23 23 
 mouse_up(Uxn *u, Uint8 *d, Uint8 mask)
24 24 
 {
25 25 
 	d[6] &= (~mask);
26 
-	uxn_eval(u, GETVEC(d));
26 
+	uxn_eval(u, PEEK16(d));
27 27 
 }
28 28
29 29 
 void
... ... 
@@ -31,7 +31,7 @@ mouse_pos(Uxn *u, Uint8 *d, Uint16 x, Uint16 y)
31 31 
 {
32 32 
 	POKDEV(0x2, x);
33 33 
 	POKDEV(0x4, y);
34 
-	uxn_eval(u, GETVEC(d));
34 
+	uxn_eval(u, PEEK16(d));
35 35 
 }
36 36
37 37 
 void
... ... 
@@ -39,7 +39,7 @@ mouse_scroll(Uxn *u, Uint8 *d, Uint16 x, Uint16 y)
39 39 
 {
40 40 
 	POKDEV(0xa, x);
41 41 
 	POKDEV(0xc, -y);
42 
-	uxn_eval(u, GETVEC(d));
42 
+	uxn_eval(u, PEEK16(d));
43 43 
 	POKDEV(0xa, 0);
44 44 
 	POKDEV(0xc, 0);
45 45 
 }
src/devices/system.c
History View file @ 53f3c18
... ... 
@@ -87,7 +87,7 @@ int
87 87 
 uxn_halt(Uxn *u, Uint8 instr, Uint8 err, Uint16 addr)
88 88 
 {
89 89 
 	Uint8 *d = &u->dev[0x00];
90 
-	Uint16 handler = GETVEC(d);
90 
+	Uint16 handler = PEEK16(d);
91 91 
 	if(handler) {
92 92 
 		u->wst->ptr = 4;
93 93 
 		u->wst->dat[0] = addr >> 0x8;
src/uxn.h
History View file @ 53f3c18
... ... 
@@ -16,7 +16,6 @@ WITH REGARD TO THIS SOFTWARE.
16 16 
 #define POKE16(d, v) { (d)[0] = (v) >> 8; (d)[1] = (v); }
17 17 
 #define PEEK16(d) ((d)[0] << 8 | (d)[1])
18 18
19 
-#define GETVEC(d) ((d)[0] << 8 | (d)[1])
20 19 
 #define POKDEV(x, y) { d[(x)] = (y) >> 8; d[(x) + 1] = (y); }
21 20 
 #define PEKDEV(o, x) { (o) = (d[(x)] << 8) + d[(x) + 1]; }
22 21
src/uxncli.c
History View file @ 53f3c18
... ... 
@@ -31,7 +31,7 @@ console_input(Uxn *u, char c)
31 31 
 {
32 32 
 	Uint8 *d = &u->dev[0x10];
33 33 
 	d[0x02] = c;
34 
-	return uxn_eval(u, GETVEC(d));
34 
+	return uxn_eval(u, PEEK16(d));
35 35 
 }
36 36
37 37 
 static void
src/uxnemu.c
History View file @ 53f3c18
... ... 
@@ -67,7 +67,7 @@ console_input(Uxn *u, char c)
67 67 
 {
68 68 
 	Uint8 *d = &u->dev[0x10];
69 69 
 	d[0x02] = c;
70 
-	return uxn_eval(u, GETVEC(d));
70 
+	return uxn_eval(u, PEEK16(d));
71 71 
 }
72 72
73 73 
 static void
... ... 
@@ -388,7 +388,7 @@ handle_events(Uxn *u)
388 388 
 		}
389 389 
 		/* Audio */
390 390 
 		else if(event.type >= audio0_event && event.type < audio0_event + POLYPHONY) {
391 
-			uxn_eval(u, GETVEC(&u->dev[0x30 + 0x10 * (event.type - audio0_event)]));
391 
+			uxn_eval(u, PEEK16(&u->dev[0x30 + 0x10 * (event.type - audio0_event)]));
392 392 
 		}
393 393 
 		/* Mouse */
394 394 
 		else if(event.type == SDL_MOUSEMOTION)
... ... 
@@ -445,7 +445,7 @@ run(Uxn *u)
445 445 
 		exec_deadline = now + deadline_interval;
446 446 
 		if(!handle_events(u))
447 447 
 			return 0;
448 
-		uxn_eval(u, GETVEC(&u->dev[0x20]));
448 
+		uxn_eval(u, PEEK16(&u->dev[0x20]));
449 449 
 		if(uxn_screen.fg.changed || uxn_screen.bg.changed)
450 450 
 			redraw();
451 451 
 		now = SDL_GetPerformanceCounter();