Dariaceli's Git
Browse code

(uxn.c) Formatting

Devine Lu Linvega authored on 11/04/2023 17:24:54
Showing 1 changed files
src/uxn.c
History View file @ fc8400d
... ... 
@@ -34,7 +34,7 @@ WITH REGARD TO THIS SOFTWARE.
34 34 
 #define PUSH(stack, v) { if((stack)->ptr > 254) HALT(2) (stack)->dat[(stack)->ptr++] = (v); }
35 35 
 #define PUSH2(stack, v) { if((stack)->ptr > 253) HALT(2) tmp = (v); (stack)->dat[(stack)->ptr] = tmp >> 8; (stack)->dat[(stack)->ptr + 1] = tmp; (stack)->ptr += 2; }
36 36 
 #define DEO(a, b) { u->dev[(a)] = (b); if((deo_mask[(a) >> 4] >> ((a) & 0xf)) & 0x1) uxn_deo(u, (a)); }
37 
-#define DEI(a, b) { PUT((a), ((dei_mask[(b) >> 4] >> ((b) & 0xf)) & 0x1) ? uxn_dei(u, (b)) : u->dev[(b)])  }
37 
+#define DEI(a, b) { PUT((a), ((dei_mask[(b) >> 4] >> ((b) & 0xf)) & 0x1) ? uxn_dei(u, (b)) : u->dev[(b)]) }
38 38
39 39 
 int
40 40 
 uxn_eval(Uxn *u, Uint16 pc)
... ... 
@@ -59,37 +59,68 @@ uxn_eval(Uxn *u, Uint16 pc)
59 59 
 			case 0xfa: /* LITr  */ PUSH(s, u->ram[pc++]) break;
60 60 
 			case 0xf9: /* LIT2r */ PUSH2(s, PEEK2(u->ram + pc)) pc += 2; break;
61 61 
 			/* ALU */
62 
-			case 0x01: /* INC  */ t=T;         SET(1, 0) PUT(0, t + 1) break;                           case 0x21: t=T2;           SET(2, 0) PUT2(0, t + 1) break;
63 
-			case 0x02: /* POP  */              SET(1,-1) break;                                         case 0x22:                 SET(2,-2) break;
64 
-			case 0x03: /* NIP  */ t=T;         SET(2,-1) PUT(0, t) break;                               case 0x23: t=T2;           SET(4,-2) PUT2(0, t) break;
65 
-			case 0x04: /* SWP  */ t=T;n=N;     SET(2, 0) PUT(0, n) PUT(1, t) break;                     case 0x24: t=T2;n=N2;      SET(4, 0) PUT2(0, n) PUT2(2, t) break;
66 
-			case 0x05: /* ROT  */ t=T;n=N;l=L; SET(3, 0) PUT(0, l) PUT(1, t) PUT(2, n) break;           case 0x25: t=T2;n=N2;l=L2; SET(6, 0) PUT2(0, l) PUT2(2, t) PUT2(4, n) break;
67 
-			case 0x06: /* DUP  */ t=T;         SET(1, 1) PUT(0, t) PUT(1, t) break;                     case 0x26: 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;           case 0x27: t=T2;n=N2;      SET(4, 2) PUT2(0, n) PUT2(2, t) PUT2(4, n) break;
69 
-			case 0x08: /* EQU  */ t=T;n=N;     SET(2,-1) PUT(0, n == t) break;                          case 0x28: t=T2;n=N2;      SET(4,-3) PUT(0, n == t) break;
70 
-			case 0x09: /* NEQ  */ t=T;n=N;     SET(2,-1) PUT(0, n != t) break;                          case 0x29: t=T2;n=N2;      SET(4,-3) PUT(0, n != t) break;
71 
-			case 0x0a: /* GTH  */ t=T;n=N;     SET(2,-1) PUT(0, n > t) break;                           case 0x2a: t=T2;n=N2;      SET(4,-3) PUT(0, n > t) break;
72 
-			case 0x0b: /* LTH  */ t=T;n=N;     SET(2,-1) PUT(0, n < t) break;                           case 0x2b: t=T2;n=N2;      SET(4,-3) PUT(0, n < t) break;
73 
-			case 0x0c: /* JMP  */ t=T;         SET(1,-1) pc += (Sint8)t; break;                         case 0x2c: t=T2;           SET(2,-2) pc = t; break;
74 
-			case 0x0d: /* JCN  */ t=T;n=N;     SET(2,-2) pc += !!n * (Sint8)t; break;                   case 0x2d: t=T2;n=L;       SET(3,-3) if(n) pc = t; break;
75 
-			case 0x0e: /* JSR  */ t=T;         SET(1,-1) PUSH2(&u->rst, pc) pc += (Sint8)t; break;       case 0x2e: t=T2;           SET(2,-2) PUSH2(&u->rst, pc) pc = t; break;
76 
-			case 0x0f: /* STH  */ t=T;         SET(1,-1) PUSH((ins & 0x40 ? &u->wst : &u->rst), t) break; case 0x2f: t=T2;           SET(2,-2) PUSH2((ins & 0x40 ? &u->wst : &u->rst), t) break;
77 
-			case 0x10: /* LDZ  */ t=T;         SET(1, 0) PUT(0, u->ram[t]) break;                       case 0x30: t=T;            SET(1, 1) PUT2(0, PEEK2(u->ram + t)) break;
78 
-			case 0x11: /* STZ  */ t=T;n=N;     SET(2,-2) u->ram[t] = n; break;                          case 0x31: t=T;n=H2;       SET(3,-3) POKE2(u->ram + t, n) break;
79 
-			case 0x12: /* LDR  */ t=T;         SET(1, 0) PUT(0, u->ram[pc + (Sint8)t]) break;           case 0x32: t=T;            SET(1, 1) PUT2(0, PEEK2(u->ram + pc + (Sint8)t)) break;
80 
-			case 0x13: /* STR  */ t=T;n=N;     SET(2,-2) u->ram[pc + (Sint8)t] = n; break;              case 0x33: t=T;n=H2;       SET(3,-3) POKE2(u->ram + pc + (Sint8)t, n) break;
81 
-			case 0x14: /* LDA  */ t=T2;        SET(2,-1) PUT(0, u->ram[t]) break;                       case 0x34: t=T2;           SET(2, 0) PUT2(0, PEEK2(u->ram + t)) break;
82 
-			case 0x15: /* STA  */ t=T2;n=L;    SET(3,-3) u->ram[t] = n; break;                          case 0x35: t=T2;n=N2;      SET(4,-4) POKE2(u->ram + t, n) break;
83 
-			case 0x16: /* DEI  */ t=T;         SET(1, 0) DEI(0, t) break;                               case 0x36: t=T;            SET(1, 1) DEI(1, t) DEI(0, t + 1) break;
84 
-			case 0x17: /* DEO  */ t=T;n=N;     SET(2,-2) DEO(t, n) break;                               case 0x37: t=T;n=N;l=L;    SET(3,-3) DEO(t, l) DEO(t + 1, n) break;
85 
-			case 0x18: /* ADD  */ t=T;n=N;     SET(2,-1) PUT(0, n + t) break;                           case 0x38: t=T2;n=N2;      SET(4,-2) PUT2(0, n + t) break;
86 
-			case 0x19: /* SUB  */ t=T;n=N;     SET(2,-1) PUT(0, n - t) break;                           case 0x39: t=T2;n=N2;      SET(4,-2) PUT2(0, n - t) break;
87 
-			case 0x1a: /* MUL  */ t=T;n=N;     SET(2,-1) PUT(0, n * t) break;                           case 0x3a: t=T2;n=N2;      SET(4,-2) PUT2(0, n * t) break;
88 
-			case 0x1b: /* DIV  */ t=T;n=N;     SET(2,-1) PUT(0, n / t) break;                           case 0x3b: t=T2;n=N2;      SET(4,-2) PUT2(0, n / t) break;
89 
-			case 0x1c: /* AND  */ t=T;n=N;     SET(2,-1) PUT(0, n & t) break;                           case 0x3c: t=T2;n=N2;      SET(4,-2) PUT2(0, n & t) break;
90 
-			case 0x1d: /* ORA  */ t=T;n=N;     SET(2,-1) PUT(0, n | t) break;                           case 0x3d: t=T2;n=N2;      SET(4,-2) PUT2(0, n | t) break;
91 
-			case 0x1e: /* EOR  */ t=T;n=N;     SET(2,-1) PUT(0, n ^ t) break;                           case 0x3e: t=T2;n=N2;      SET(4,-2) PUT2(0, n ^ t) break;
92 
-			case 0x1f: /* SFT  */ t=T;n=N;     SET(2,-1) PUT(0, n >> (t & 0xf) << (t >> 4)) break;      case 0x3f: t=T;n=H2;       SET(3,-1) PUT2(0, n >> (t & 0xf) << (t >> 4)) break;
62 
+			case 0x01: /* INC  */ t=T;            SET(1, 0) PUT(0, t + 1) break;
63 
+			case 0x21:            t=T2;           SET(2, 0) PUT2(0, t + 1) break;
64 
+			case 0x02: /* POP  */                 SET(1,-1) break;
65 
+			case 0x22:                            SET(2,-2) break;
66 
+			case 0x03: /* NIP  */ t=T;            SET(2,-1) PUT(0, t) break;
67 
+			case 0x23:            t=T2;           SET(4,-2) PUT2(0, t) break;
68 
+			case 0x04: /* SWP  */ t=T;n=N;        SET(2, 0) PUT(0, n) PUT(1, t) break;
69 
+			case 0x24:            t=T2;n=N2;      SET(4, 0) PUT2(0, n) PUT2(2, t) break;
70 
+			case 0x05: /* ROT  */ t=T;n=N;l=L;    SET(3, 0) PUT(0, l) PUT(1, t) PUT(2, n) break;
71 
+			case 0x25:            t=T2;n=N2;l=L2; SET(6, 0) PUT2(0, l) PUT2(2, t) PUT2(4, n) break;
72 
+			case 0x06: /* DUP  */ t=T;            SET(1, 1) PUT(0, t) PUT(1, t) break;
73 
+			case 0x26:            t=T2;           SET(2, 2) PUT2(0, t) PUT2(2, t) break;
74 
+			case 0x07: /* OVR  */ t=T;n=N;        SET(2, 1) PUT(0, n) PUT(1, t) PUT(2, n) break;
75 
+			case 0x27:            t=T2;n=N2;      SET(4, 2) PUT2(0, n) PUT2(2, t) PUT2(4, n) break;
76 
+			case 0x08: /* EQU  */ t=T;n=N;        SET(2,-1) PUT(0, n == t) break;
77 
+			case 0x28:            t=T2;n=N2;      SET(4,-3) PUT(0, n == t) break;
78 
+			case 0x09: /* NEQ  */ t=T;n=N;        SET(2,-1) PUT(0, n != t) break;
79 
+			case 0x29:            t=T2;n=N2;      SET(4,-3) PUT(0, n != t) break;
80 
+			case 0x0a: /* GTH  */ t=T;n=N;        SET(2,-1) PUT(0, n > t) break;
81 
+			case 0x2a:            t=T2;n=N2;      SET(4,-3) PUT(0, n > t) break;
82 
+			case 0x0b: /* LTH  */ t=T;n=N;        SET(2,-1) PUT(0, n < t) break;
83 
+			case 0x2b:            t=T2;n=N2;      SET(4,-3) PUT(0, n < t) break;
84 
+			case 0x0c: /* JMP  */ t=T;            SET(1,-1) pc += (Sint8)t; break;
85 
+			case 0x2c:            t=T2;           SET(2,-2) pc = t; break;
86 
+			case 0x0d: /* JCN  */ t=T;n=N;        SET(2,-2) pc += !!n * (Sint8)t; break;
87 
+			case 0x2d:            t=T2;n=L;       SET(3,-3) if(n) pc = t; break;
88 
+			case 0x0e: /* JSR  */ t=T;            SET(1,-1) PUSH2(&u->rst, pc) pc += (Sint8)t; break;
89 
+			case 0x2e:            t=T2;           SET(2,-2) PUSH2(&u->rst, pc) pc = t; break;
90 
+			case 0x0f: /* STH  */ t=T;            SET(1,-1) PUSH((ins & 0x40 ? &u->wst : &u->rst), t) break;
91 
+			case 0x2f:            t=T2;           SET(2,-2) PUSH2((ins & 0x40 ? &u->wst : &u->rst), t) break;
92 
+			case 0x10: /* LDZ  */ t=T;            SET(1, 0) PUT(0, u->ram[t]) break;
93 
+			case 0x30:            t=T;            SET(1, 1) PUT2(0, PEEK2(u->ram + t)) break;
94 
+			case 0x11: /* STZ  */ t=T;n=N;        SET(2,-2) u->ram[t] = n; break;
95 
+			case 0x31:            t=T;n=H2;       SET(3,-3) POKE2(u->ram + t, n) break;
96 
+			case 0x12: /* LDR  */ t=T;            SET(1, 0) PUT(0, u->ram[pc + (Sint8)t]) break;
97 
+			case 0x32:            t=T;            SET(1, 1) PUT2(0, PEEK2(u->ram + pc + (Sint8)t)) break;
98 
+			case 0x13: /* STR  */ t=T;n=N;        SET(2,-2) u->ram[pc + (Sint8)t] = n; break;
99 
+			case 0x33:            t=T;n=H2;       SET(3,-3) POKE2(u->ram + pc + (Sint8)t, n) break;
100 
+			case 0x14: /* LDA  */ t=T2;           SET(2,-1) PUT(0, u->ram[t]) break;
101 
+			case 0x34:            t=T2;           SET(2, 0) PUT2(0, PEEK2(u->ram + t)) break;
102 
+			case 0x15: /* STA  */ t=T2;n=L;       SET(3,-3) u->ram[t] = n; break;
103 
+			case 0x35:            t=T2;n=N2;      SET(4,-4) POKE2(u->ram + t, n) break;
104 
+			case 0x16: /* DEI  */ t=T;            SET(1, 0) DEI(0, t) break;
105 
+			case 0x36:            t=T;            SET(1, 1) DEI(1, t) DEI(0, t + 1) break;
106 
+			case 0x17: /* DEO  */ t=T;n=N;        SET(2,-2) DEO(t, n) break;
107 
+			case 0x37:            t=T;n=N;l=L;    SET(3,-3) DEO(t, l) DEO(t + 1, n) break;
108 
+			case 0x18: /* ADD  */ t=T;n=N;        SET(2,-1) PUT(0, n + t) break;
109 
+			case 0x38:            t=T2;n=N2;      SET(4,-2) PUT2(0, n + t) break;
110 
+			case 0x19: /* SUB  */ t=T;n=N;        SET(2,-1) PUT(0, n - t) break;
111 
+			case 0x39:            t=T2;n=N2;      SET(4,-2) PUT2(0, n - t) break;
112 
+			case 0x1a: /* MUL  */ t=T;n=N;        SET(2,-1) PUT(0, n * t) break;
113 
+			case 0x3a:            t=T2;n=N2;      SET(4,-2) PUT2(0, n * t) break;
114 
+			case 0x1b: /* DIV  */ t=T;n=N;        SET(2,-1) PUT(0, n / t) break;
115 
+			case 0x3b:            t=T2;n=N2;      SET(4,-2) PUT2(0, n / t) break;
116 
+			case 0x1c: /* AND  */ t=T;n=N;        SET(2,-1) PUT(0, n & t) break;
117 
+			case 0x3c:            t=T2;n=N2;      SET(4,-2) PUT2(0, n & t) break;
118 
+			case 0x1d: /* ORA  */ t=T;n=N;        SET(2,-1) PUT(0, n | t) break;
119 
+			case 0x3d:            t=T2;n=N2;      SET(4,-2) PUT2(0, n | t) break;
120 
+			case 0x1e: /* EOR  */ t=T;n=N;        SET(2,-1) PUT(0, n ^ t) break;
121 
+			case 0x3e:            t=T2;n=N2;      SET(4,-2) PUT2(0, n ^ t) break;
122 
+			case 0x1f: /* SFT  */ t=T;n=N;        SET(2,-1) PUT(0, n >> (t & 0xf) << (t >> 4)) break;
123 
+			case 0x3f:            t=T;n=H2;       SET(3,-1) PUT2(0, n >> (t & 0xf) << (t >> 4)) break;
93 124 
 		}
94 125 
 	}
95 126 
 }