Dariaceli's Git
Browse code

(uxn.c) Aligned macros

neauoire authored on 09/08/2023 23:18:35
Showing 3 changed files
src/uxn.c
History View file @ 2320338
... ... 
@@ -28,7 +28,7 @@ WITH REGARD TO THIS SOFTWARE.
28 28 
 #define HALT(c)    { return emu_halt(u, ins, c, pc - 1); }
29 29 
 #define FLIP       { s = ins & 0x40 ? &u->wst : &u->rst; }
30 30 
 #define SET(x, y)  { if(x > s->ptr) HALT(1) tmp = (x & k) + y + s->ptr; if(tmp > 254) HALT(2) s->ptr = tmp; sp = s->dat + tmp - 1; }
31 
-#define PUT(o, v)  { *(sp - o) = v; }
31 
+#define PUT1(o, v) { *(sp - o) = v; }
32 32 
 #define PUT2(o, v) { tmp = (v); POKE2(sp - 1 - o, tmp); }
33 33
34 34 
 int
... ... 
@@ -50,70 +50,70 @@ uxn_eval(Uxn *u, Uint16 pc)
50 50 
 			case 0xff: /* JCI   */                          if(!s->dat[--s->ptr]) { pc += 2; break; }
51 51 
 			case 0xfe: /* JMI   */                          pc += PEEK2(ram + pc) + 2; break;
52 52 
 			case 0xfd: /* JSI   */                SET(0, 2) PUT2(0, pc + 2) pc += PEEK2(ram + pc) + 2; break;
53 
-			case 0xfc: /* LITr */ case 0xfa:      SET(0, 1) PUT(0, ram[pc++]) break;
53 
+			case 0xfc: /* LITr */ case 0xfa:      SET(0, 1) PUT1(0, ram[pc++]) break;
54 54 
 			case 0xfb: /* LIT2r*/ case 0xf9:      SET(0, 2) PUT2(0, PEEK2(ram + pc)) pc += 2; break;
55 55 
 			/* ALU */
56 
-			case 0x01: /* INC  */ t=T;            SET(1, 0) PUT(0, t + 1) break;
56 
+			case 0x01: /* INC  */ t=T;            SET(1, 0) PUT1(0, t + 1) break;
57 57 
 			case 0x21: /* INC2 */ t=T2;           SET(2, 0) PUT2(0, t + 1) break;
58 58 
 			case 0x02: /* POP  */                 SET(1,-1) break;
59 59 
 			case 0x22: /* POP2 */                 SET(2,-2) break;
60 
-			case 0x03: /* NIP  */ t=T;            SET(2,-1) PUT(0, t) break;
60 
+			case 0x03: /* NIP  */ t=T;            SET(2,-1) PUT1(0, t) break;
61 61 
 			case 0x23: /* NIP2 */ t=T2;           SET(4,-2) PUT2(0, t) break;
62 
-			case 0x04: /* SWP  */ t=T;n=N;        SET(2, 0) PUT(0, n) PUT(1, t) break;
62 
+			case 0x04: /* SWP  */ t=T;n=N;        SET(2, 0) PUT1(0, n) PUT1(1, t) break;
63 63 
 			case 0x24: /* SWP2 */ t=T2;n=N2;      SET(4, 0) PUT2(0, n) PUT2(2, t) break;
64 
-			case 0x05: /* ROT  */ t=T;n=N;l=L;    SET(3, 0) PUT(0, l) PUT(1, t) PUT(2, n) break;
64 
+			case 0x05: /* ROT  */ t=T;n=N;l=L;    SET(3, 0) PUT1(0, l) PUT1(1, t) PUT1(2, n) break;
65 65 
 			case 0x25: /* ROT2 */ t=T2;n=N2;l=L2; SET(6, 0) PUT2(0, l) PUT2(2, t) PUT2(4, n) break;
66 
-			case 0x06: /* DUP  */ t=T;            SET(1, 1) PUT(0, t) PUT(1, t) break;
66 
+			case 0x06: /* DUP  */ t=T;            SET(1, 1) PUT1(0, t) PUT1(1, t) break;
67 67 
 			case 0x26: /* DUP2 */ t=T2;           SET(2, 2) PUT2(0, t) PUT2(2, t) break;
68 
-			case 0x07: /* OVR  */ t=T;n=N;        SET(2, 1) PUT(0, n) PUT(1, t) PUT(2, n) break;
68 
+			case 0x07: /* OVR  */ t=T;n=N;        SET(2, 1) PUT1(0, n) PUT1(1, t) PUT1(2, n) break;
69 69 
 			case 0x27: /* OVR2 */ t=T2;n=N2;      SET(4, 2) PUT2(0, n) PUT2(2, t) PUT2(4, n) break;
70 
-			case 0x08: /* EQU  */ t=T;n=N;        SET(2,-1) PUT(0, n == t) break;
71 
-			case 0x28: /* EQU2 */ t=T2;n=N2;      SET(4,-3) PUT(0, n == t) break;
72 
-			case 0x09: /* NEQ  */ t=T;n=N;        SET(2,-1) PUT(0, n != t) break;
73 
-			case 0x29: /* NEQ2 */ t=T2;n=N2;      SET(4,-3) PUT(0, n != t) break;
74 
-			case 0x0a: /* GTH  */ t=T;n=N;        SET(2,-1) PUT(0, n > t) break;
75 
-			case 0x2a: /* GTH2 */ t=T2;n=N2;      SET(4,-3) PUT(0, n > t) break;
76 
-			case 0x0b: /* LTH  */ t=T;n=N;        SET(2,-1) PUT(0, n < t) break;
77 
-			case 0x2b: /* LTH2 */ t=T2;n=N2;      SET(4,-3) PUT(0, n < t) break;
70 
+			case 0x08: /* EQU  */ t=T;n=N;        SET(2,-1) PUT1(0, n == t) break;
71 
+			case 0x28: /* EQU2 */ t=T2;n=N2;      SET(4,-3) PUT1(0, n == t) break;
72 
+			case 0x09: /* NEQ  */ t=T;n=N;        SET(2,-1) PUT1(0, n != t) break;
73 
+			case 0x29: /* NEQ2 */ t=T2;n=N2;      SET(4,-3) PUT1(0, n != t) break;
74 
+			case 0x0a: /* GTH  */ t=T;n=N;        SET(2,-1) PUT1(0, n > t) break;
75 
+			case 0x2a: /* GTH2 */ t=T2;n=N2;      SET(4,-3) PUT1(0, n > t) break;
76 
+			case 0x0b: /* LTH  */ t=T;n=N;        SET(2,-1) PUT1(0, n < t) break;
77 
+			case 0x2b: /* LTH2 */ t=T2;n=N2;      SET(4,-3) PUT1(0, n < t) break;
78 78 
 			case 0x0c: /* JMP  */ t=T;            SET(1,-1) pc += (Sint8)t; break;
79 79 
 			case 0x2c: /* JMP2 */ t=T2;           SET(2,-2) pc = t; break;
80 80 
 			case 0x0d: /* JCN  */ t=T;n=N;        SET(2,-2) if(n) pc += (Sint8)t; break;
81 81 
 			case 0x2d: /* JCN2 */ t=T2;n=L;       SET(3,-3) if(n) pc = t; break;
82 82 
 			case 0x0e: /* JSR  */ t=T;            SET(1,-1) FLIP SET(0,2) PUT2(0, pc) pc += (Sint8)t; break;
83 83 
 			case 0x2e: /* JSR2 */ t=T2;           SET(2,-2) FLIP SET(0,2) PUT2(0, pc) pc = t; break;
84 
-			case 0x0f: /* STH  */ t=T;            SET(1,-1) FLIP SET(0,1) PUT(0, t) break;
84 
+			case 0x0f: /* STH  */ t=T;            SET(1,-1) FLIP SET(0,1) PUT1(0, t) break;
85 85 
 			case 0x2f: /* STH2 */ t=T2;           SET(2,-2) FLIP SET(0,2) PUT2(0, t) break;
86 
-			case 0x10: /* LDZ  */ t=T;            SET(1, 0) PUT(0, ram[t]) break;
86 
+			case 0x10: /* LDZ  */ t=T;            SET(1, 0) PUT1(0, ram[t]) break;
87 87 
 			case 0x30: /* LDZ2 */ t=T;            SET(1, 1) PUT2(0, PEEK2(ram + t)) break;
88 88 
 			case 0x11: /* STZ  */ t=T;n=N;        SET(2,-2) ram[t] = n; break;
89 89 
 			case 0x31: /* STZ2 */ t=T;n=H2;       SET(3,-3) POKE2(ram + t, n) break;
90 
-			case 0x12: /* LDR  */ t=T;            SET(1, 0) PUT(0, ram[pc + (Sint8)t]) break;
90 
+			case 0x12: /* LDR  */ t=T;            SET(1, 0) PUT1(0, ram[pc + (Sint8)t]) break;
91 91 
 			case 0x32: /* LDR2 */ t=T;            SET(1, 1) PUT2(0, PEEK2(ram + pc + (Sint8)t)) break;
92 92 
 			case 0x13: /* STR  */ t=T;n=N;        SET(2,-2) ram[pc + (Sint8)t] = n; break;
93 93 
 			case 0x33: /* STR2 */ t=T;n=H2;       SET(3,-3) POKE2(ram + pc + (Sint8)t, n) break;
94 
-			case 0x14: /* LDA  */ t=T2;           SET(2,-1) PUT(0, ram[t]) break;
94 
+			case 0x14: /* LDA  */ t=T2;           SET(2,-1) PUT1(0, ram[t]) break;
95 95 
 			case 0x34: /* LDA2 */ t=T2;           SET(2, 0) PUT2(0, PEEK2(ram + t)) break;
96 96 
 			case 0x15: /* STA  */ t=T2;n=L;       SET(3,-3) ram[t] = n; break;
97 97 
 			case 0x35: /* STA2 */ t=T2;n=N2;      SET(4,-4) POKE2(ram + t, n) break;
98 
-			case 0x16: /* DEI  */ t=T;            SET(1, 0) PUT(0, DEI(t)) break;
99 
-			case 0x36: /* DEI2 */ t=T;            SET(1, 1) PUT(0, DEI(t + 1)) PUT(1, DEI(t)) break;
98 
+			case 0x16: /* DEI  */ t=T;            SET(1, 0) PUT1(0, DEI(t)) break;
99 
+			case 0x36: /* DEI2 */ t=T;            SET(1, 1) PUT1(0, DEI(t + 1)) PUT1(1, DEI(t)) break;
100 100 
 			case 0x17: /* DEO  */ t=T;n=N;        SET(2,-2) DEO(t, n) break;
101 101 
 			case 0x37: /* DEO2 */ t=T;n=N;l=L;    SET(3,-3) DEO(t, l) DEO((t + 1), n) break;
102 
-			case 0x18: /* ADD  */ t=T;n=N;        SET(2,-1) PUT(0, n + t) break;
102 
+			case 0x18: /* ADD  */ t=T;n=N;        SET(2,-1) PUT1(0, n + t) break;
103 103 
 			case 0x38: /* ADD2 */ t=T2;n=N2;      SET(4,-2) PUT2(0, n + t) break;
104 
-			case 0x19: /* SUB  */ t=T;n=N;        SET(2,-1) PUT(0, n - t) break;
104 
+			case 0x19: /* SUB  */ t=T;n=N;        SET(2,-1) PUT1(0, n - t) break;
105 105 
 			case 0x39: /* SUB2 */ t=T2;n=N2;      SET(4,-2) PUT2(0, n - t) break;
106 
-			case 0x1a: /* MUL  */ t=T;n=N;        SET(2,-1) PUT(0, n * t) break;
106 
+			case 0x1a: /* MUL  */ t=T;n=N;        SET(2,-1) PUT1(0, n * t) break;
107 107 
 			case 0x3a: /* MUL2 */ t=T2;n=N2;      SET(4,-2) PUT2(0, n * t) break;
108 
-			case 0x1b: /* DIV  */ t=T;n=N;        SET(2,-1) if(!t) HALT(3) PUT(0, n / t) break;
108 
+			case 0x1b: /* DIV  */ t=T;n=N;        SET(2,-1) if(!t) HALT(3) PUT1(0, n / t) break;
109 109 
 			case 0x3b: /* DIV2 */ t=T2;n=N2;      SET(4,-2) if(!t) HALT(3) PUT2(0, n / t) break;
110 
-			case 0x1c: /* AND  */ t=T;n=N;        SET(2,-1) PUT(0, n & t) break;
110 
+			case 0x1c: /* AND  */ t=T;n=N;        SET(2,-1) PUT1(0, n & t) break;
111 111 
 			case 0x3c: /* AND2 */ t=T2;n=N2;      SET(4,-2) PUT2(0, n & t) break;
112 
-			case 0x1d: /* ORA  */ t=T;n=N;        SET(2,-1) PUT(0, n | t) break;
112 
+			case 0x1d: /* ORA  */ t=T;n=N;        SET(2,-1) PUT1(0, n | t) break;
113 113 
 			case 0x3d: /* ORA2 */ t=T2;n=N2;      SET(4,-2) PUT2(0, n | t) break;
114 
-			case 0x1e: /* EOR  */ t=T;n=N;        SET(2,-1) PUT(0, n ^ t) break;
114 
+			case 0x1e: /* EOR  */ t=T;n=N;        SET(2,-1) PUT1(0, n ^ t) break;
115 115 
 			case 0x3e: /* EOR2 */ t=T2;n=N2;      SET(4,-2) PUT2(0, n ^ t) break;
116 
-			case 0x1f: /* SFT  */ t=T;n=N;        SET(2,-1) PUT(0, n >> (t & 0xf) << (t >> 4)) break;
116 
+			case 0x1f: /* SFT  */ t=T;n=N;        SET(2,-1) PUT1(0, n >> (t & 0xf) << (t >> 4)) break;
117 117 
 			case 0x3f: /* SFT2 */ t=T;n=H2;       SET(3,-1) PUT2(0, n >> (t & 0xf) << (t >> 4)) break;
118 118 
 		}
119 119 
 	}
src/uxncli.c
History View file @ 2320338
... ... 
@@ -56,7 +56,7 @@ main(int argc, char **argv)
56 56 
 	system_connect(0xc, DATETIME_VERSION, DATETIME_DEIMASK, DATETIME_DEOMASK);
57 57 
 	/* Read flags */
58 58 
 	if(argv[i][0] == '-' && argv[i][1] == 'v')
59 
-		return system_version("Uxncli - Console Varvara Emulator", "8 Aug 2023");
59 
+		return system_version("Uxncli - Console Varvara Emulator", "9 Aug 2023");
60 60 
 	/* Continue.. */
61 61 
 	if(!uxn_boot(&u, (Uint8 *)calloc(0x10000 * RAM_PAGES, sizeof(Uint8))))
62 62 
 		return system_error("Boot", "Failed");
src/uxnemu.c
History View file @ 2320338
... ... 
@@ -521,7 +521,7 @@ main(int argc, char **argv)
521 521 
 	system_connect(0xc, DATETIME_VERSION, DATETIME_DEIMASK, DATETIME_DEOMASK);
522 522 
 	/* Read flags */
523 523 
 	if(argv[i][0] == '-' && argv[i][1] == 'v')
524 
-		return system_version("Uxnemu - Graphical Varvara Emulator", "8 Aug 2023");
524 
+		return system_version("Uxnemu - Graphical Varvara Emulator", "9 Aug 2023");
525 525 
 	if(strcmp(argv[i], "-2x") == 0 || strcmp(argv[i], "-3x") == 0)
526 526 
 		set_zoom(argv[i++][1] - '0', 0);
527 527 
 	/* Continue.. */