Dariaceli's Git
Browse code

Completed new uxn core

neauoire authored on 30/08/2021 01:18:52
Showing 2 changed files
src/uxn.c
History View file @ 91df7ab
... ... 
@@ -30,71 +30,25 @@ static void   (*devw)(Device *d, Uint8 a, Uint16 b);
30 30 
 static Uint16 (*devr)(Device *d, Uint8 a);
31 31 
 static void   (*warp)(Uxn *u, Uint16 a);
32 32 
 static void   (*pull)(Uxn *u);
33 
-
33 
+/* byte mode */
34 34 
 static void   push8(Stack *s, Uint16 a) { if(s->ptr == 0xff) { s->error = 2; return; } s->dat[s->ptr++] = a; }
35 
-static Uint16  pop8_keep(Stack *s) { if(s->kptr == 0) { s->error = 1; return 0; } return s->dat[--s->kptr]; }
36 
-static Uint16  pop8_nokeep(Stack *s) { if(s->ptr == 0) { s->error = 1; return 0; } return s->dat[--s->ptr]; }
35 
+static Uint16 pop8k(Stack *s) { if(s->kptr == 0) { s->error = 1; return 0; } return s->dat[--s->kptr]; }
36 
+static Uint16 pop8d(Stack *s) { if(s->ptr == 0) { s->error = 1; return 0; } return s->dat[--s->ptr]; }
37 37 
 static void   poke8(Uint8 *m, Uint16 a, Uint16 b) { m[a] = b; }
38 38 
 static Uint16 peek8(Uint8 *m, Uint16 a) { return m[a]; }
39 39 
 static void   devw8(Device *d, Uint8 a, Uint16 b) { d->dat[a & 0xf] = b; d->talk(d, a & 0x0f, 1); }
40 40 
 static Uint16 devr8(Device *d, Uint8 a) { d->talk(d, a & 0x0f, 0); return d->dat[a & 0xf];  }
41 
-static void warp8(Uxn *u, Uint16 a){ u->ram.ptr += (Sint8)a; }
42 
-static void pull8(Uxn *u){ push8(u->src, peek8(u->ram.dat, u->ram.ptr++)); }
43 
-
44 
-void   poke16(Uint8 *m, Uint16 a, Uint16 b) { poke8(m, a, b >> 8); poke8(m, a + 1, b); }
45 
-Uint16 peek16(Uint8 *m, Uint16 a) { return (peek8(m, a) << 8) + peek8(m, a + 1); }
41 
+static void   warp8(Uxn *u, Uint16 a){ u->ram.ptr += (Sint8)a; }
42 
+static void   pull8(Uxn *u){ push8(u->src, peek8(u->ram.dat, u->ram.ptr++)); }
43 
+/* short mode */
44 
+void          poke16(Uint8 *m, Uint16 a, Uint16 b) { poke8(m, a, b >> 8); poke8(m, a + 1, b); }
45 
+Uint16        peek16(Uint8 *m, Uint16 a) { return (peek8(m, a) << 8) + peek8(m, a + 1); }
46 46 
 static void   push16(Stack *s, Uint16 a) { push8(s, a >> 8); push8(s, a); }
47 47 
 static Uint16 pop16(Stack *s) { Uint8 a = pop8(s), b = pop8(s); return a + (b << 8); }
48 48 
 static void   devw16(Device *d, Uint8 a, Uint16 b) { devw8(d, a, b >> 8); devw8(d, a + 1, b); }
49 49 
 static Uint16 devr16(Device *d, Uint8 a) { return (devr8(d, a) << 8) + devr8(d, a + 1); }
50 
-static void warp16(Uxn *u, Uint16 a){ u->ram.ptr = a; }
51 
-static void pull16(Uxn *u){ push16(u->src, peek16(u->ram.dat, u->ram.ptr++)); u->ram.ptr++; }
52 
-
53 
-/* Stack */
54 
-static void op_lit(Uxn *u) { pull(u); }
55 
-static void op_inc(Uxn *u) { Uint16 a = pop(u->src); push(u->src, a + 1); }
56 
-static void op_pop(Uxn *u) { pop(u->src); }
57 
-static void op_dup(Uxn *u) { Uint16 a = pop(u->src); push(u->src, a); push(u->src, a); }
58 
-static void op_nip(Uxn *u) { Uint16 a = pop(u->src); pop(u->src); push(u->src, a); }
59 
-static void op_swp(Uxn *u) { Uint16 a = pop(u->src), b = pop(u->src); push(u->src, a); push(u->src, b); }
60 
-static void op_ovr(Uxn *u) { Uint16 a = pop(u->src), b = pop(u->src); push(u->src, b); push(u->src, a); push(u->src, b); }
61 
-static void op_rot(Uxn *u) { Uint16 a = pop(u->src), b = pop(u->src), c = pop(u->src); push(u->src, b); push(u->src, a); push(u->src, c); }
62 
-/* Logic */
63 
-static void op_equ(Uxn *u) { Uint16 a = pop(u->src), b = pop(u->src); push8(u->src, b == a); }
64 
-static void op_neq(Uxn *u) { Uint16 a = pop(u->src), b = pop(u->src); push8(u->src, b != a); }
65 
-static void op_gth(Uxn *u) { Uint16 a = pop(u->src), b = pop(u->src); push8(u->src, b > a); }
66 
-static void op_lth(Uxn *u) { Uint16 a = pop(u->src), b = pop(u->src); push8(u->src, b < a); }
67 
-static void op_jmp(Uxn *u) { Uint16 a = pop(u->src); warp(u, a); }
68 
-static void op_jnz(Uxn *u) { Uint16 a = pop(u->src); if(pop8(u->src)) warp(u, a); }
69 
-static void op_jsr(Uxn *u) { Uint16 a = pop(u->src); push16(u->dst, u->ram.ptr); warp(u, a); }
70 
-static void op_sth(Uxn *u) { Uint16 a = pop(u->src); push(u->dst, a); }
71 
-/* Memory */
72 
-static void op_ldz(Uxn *u) { Uint8 a = pop8(u->src); push(u->src, peek(u->ram.dat, a)); }
73 
-static void op_stz(Uxn *u) { Uint8 a = pop8(u->src); Uint16 b = pop(u->src); poke(u->ram.dat, a, b); }
74 
-static void op_ldr(Uxn *u) { Uint8 a = pop8(u->src); push(u->src, peek(u->ram.dat, u->ram.ptr + (Sint8)a)); }
75 
-static void op_str(Uxn *u) { Uint8 a = pop8(u->src); Uint8 b = pop(u->src); poke(u->ram.dat, u->ram.ptr + (Sint8)a, b); }
76 
-static void op_lda(Uxn *u) { Uint16 a = pop16(u->src); push(u->src, peek(u->ram.dat, a)); }
77 
-static void op_sta(Uxn *u) { Uint16 a = pop16(u->src); Uint16 b = pop(u->src); poke(u->ram.dat, a, b); }
78 
-static void op_dei(Uxn *u) { Uint8 a = pop8(u->src); push(u->src, devr(&u->dev[a >> 4], a)); }
79 
-static void op_deo(Uxn *u) { Uint8 a = pop8(u->src); Uint16 b = pop(u->src); devw(&u->dev[a >> 4], a, b); }
80 
-/* Arithmetic */
81 
-static void op_add(Uxn *u) { Uint16 a = pop(u->src), b = pop(u->src); push(u->src, b + a); }
82 
-static void op_sub(Uxn *u) { Uint16 a = pop(u->src), b = pop(u->src); push(u->src, b - a); }
83 
-static void op_mul(Uxn *u) { Uint16 a = pop(u->src), b = pop(u->src); push(u->src, b * a); }
84 
-static void op_div(Uxn *u) { Uint16 a = pop(u->src), b = pop(u->src); if(a == 0) { u->src->error = 3; a = 1; } push(u->src, b / a); }
85 
-static void op_and(Uxn *u) { Uint16 a = pop(u->src), b = pop(u->src); push(u->src, b & a); }
86 
-static void op_ora(Uxn *u) { Uint16 a = pop(u->src), b = pop(u->src); push(u->src, b | a); }
87 
-static void op_eor(Uxn *u) { Uint16 a = pop(u->src), b = pop(u->src); push(u->src, b ^ a); }
88 
-static void op_sft(Uxn *u) { Uint16 a = pop8(u->src), b = pop(u->src); push(u->src, b >> (a & 0x07) << ((a & 0x70) >> 4)); }
89 
-
90 
-static void (*ops[])(Uxn *u) = {
91 
-	op_lit, op_inc, op_pop, op_dup, op_nip, op_swp, op_ovr, op_rot,
92 
-	op_equ, op_neq, op_gth, op_lth, op_jmp, op_jnz, op_jsr, op_sth,
93 
-	op_ldz, op_stz, op_ldr, op_str, op_lda, op_sta, op_dei, op_deo,
94 
-	op_add, op_sub, op_mul, op_div, op_and, op_ora, op_eor, op_sft,
95 
-};
96 
-
97 
-/* clang-format on */
50 
+static void   warp16(Uxn *u, Uint16 a){ u->ram.ptr = a; }
51 
+static void   pull16(Uxn *u){ push16(u->src, peek16(u->ram.dat, u->ram.ptr++)); u->ram.ptr++; }
98 52
99 53 
 #pragma mark - Core
100 54
... ... 
@@ -102,6 +56,7 @@ int
102 56 
 uxn_eval(Uxn *u, Uint16 vec)
103 57 
 {
104 58 
 	Uint8 instr;
59 
+	Uint16 a,b,c;
105 60 
 	if(!vec || u->dev[0].dat[0xf])
106 61 
 		return 0;
107 62 
 	u->ram.ptr = vec;
... ... 
@@ -109,40 +64,69 @@ uxn_eval(Uxn *u, Uint16 vec)
109 64 
 	while((instr = u->ram.dat[u->ram.ptr++])) {
110 65 
 		/* Return Mode */
111 66 
 		if(instr & MODE_RETURN) {
112 
-			u->src = &u->rst;
67 
+			u->src = &u->rst;
113 68 
 			u->dst = &u->wst;
114 69 
 		} else {
115 
-			u->src = &u->wst;
70 
+			u->src = &u->wst;
116 71 
 			u->dst = &u->rst;
117 72 
 		}
118 73 
 		/* Keep Mode */
119 74 
 		if(instr & MODE_KEEP) {
120 
-			pop8 = pop8_keep;
75 
+			pop8 = pop8k;
121 76 
 			u->src->kptr = u->src->ptr;
122 77 
 		} else {
123 
-			pop8 = pop8_nokeep;
78 
+			pop8 = pop8d;
124 79 
 		}
125 80 
 		/* Short Mode */
126 81 
 		if(instr & MODE_SHORT) {
127 
-			pop = pop16;
128 
-			push = push16;
129 
-			peek = peek16;
130 
-			poke = poke16;
131 
-			devr = devr16;
132 
-			devw = devw16;
133 
-			warp = warp16;
134 
-			pull = pull16;
82 
+			push = push16; pop = pop16;
83 
+			poke = poke16; peek = peek16;
84 
+			devw = devw16; devr = devr16;
85 
+			warp = warp16; pull = pull16;
135 86 
 		} else {
136 
-			pop = pop8;
137 
-			push = push8;
138 
-			peek = peek8;
139 
-			poke = poke8;
140 
-			devr = devr8;
141 
-			devw = devw8;
142 
-			warp = warp8;
143 
-			pull = pull8;
87 
+			push = push8; pop = pop8;
88 
+			poke = poke8; peek = peek8;
89 
+			devw = devw8; devr = devr8;
90 
+			warp = warp8; pull = pull8;
91 
+		}
92 
+		switch(instr & 0x1f){
93 
+			/* Stack */
94 
+			case 0x00: /* LIT */ pull(u); break;
95 
+			case 0x01: /* INC */ a = pop(u->src); push(u->src, a + 1); break;
96 
+			case 0x02: /* POP */ pop(u->src); break;
97 
+			case 0x03: /* DUP */ a = pop(u->src); push(u->src, a); push(u->src, a); break;
98 
+			case 0x04: /* NIP */ a = pop(u->src); pop(u->src); push(u->src, a); break;
99 
+			case 0x05: /* SWP */ a = pop(u->src), b = pop(u->src); push(u->src, a); push(u->src, b); break;
100 
+			case 0x06: /* OVR */ a = pop(u->src), b = pop(u->src); push(u->src, b); push(u->src, a); push(u->src, b); break;
101 
+			case 0x07: /* ROT */ a = pop(u->src), b = pop(u->src), c = pop(u->src); push(u->src, b); push(u->src, a); push(u->src, c); break;
102 
+			/* Logic */
103 
+			case 0x08: /* EQU */ a = pop(u->src), b = pop(u->src); push8(u->src, b == a); break;
104 
+			case 0x09: /* NEQ */ a = pop(u->src), b = pop(u->src); push8(u->src, b != a); break;
105 
+			case 0x0a: /* GTH */ a = pop(u->src), b = pop(u->src); push8(u->src, b > a); break;
106 
+			case 0x0b: /* LTH */ a = pop(u->src), b = pop(u->src); push8(u->src, b < a); break;
107 
+			case 0x0c: /* JMP */ a = pop(u->src); warp(u, a); break;
108 
+			case 0x0d: /* JNZ */ a = pop(u->src); if(pop8(u->src)) warp(u, a); break;
109 
+			case 0x0e: /* JSR */ a = pop(u->src); push16(u->dst, u->ram.ptr); warp(u, a); break;
110 
+			case 0x0f: /* STH */ a = pop(u->src); push(u->dst, a); break;
111 
+			/* Memory */
112 
+			case 0x10: /* LDZ */ a = pop8(u->src); push(u->src, peek(u->ram.dat, a)); break;
113 
+			case 0x11: /* STZ */ a = pop8(u->src); b = pop(u->src); poke(u->ram.dat, a, b); break;
114 
+			case 0x12: /* LDR */ a = pop8(u->src); push(u->src, peek(u->ram.dat, u->ram.ptr + (Sint8)a)); break;
115 
+			case 0x13: /* STR */ a = pop8(u->src); b = pop(u->src); poke(u->ram.dat, u->ram.ptr + (Sint8)a, b); break;
116 
+			case 0x14: /* LDA */ a = pop16(u->src); push(u->src, peek(u->ram.dat, a)); break;
117 
+			case 0x15: /* STA */ a = pop16(u->src); b = pop(u->src); poke(u->ram.dat, a, b); break;
118 
+			case 0x16: /* DEI */ a = pop8(u->src); push(u->src, devr(&u->dev[a >> 4], a)); break;
119 
+			case 0x17: /* DEO */ a = pop8(u->src); b = pop(u->src); devw(&u->dev[a >> 4], a, b); break;
120 
+			/* Arithmetic */
121 
+			case 0x18: /* ADD */ a = pop(u->src), b = pop(u->src); push(u->src, b + a); break;
122 
+			case 0x19: /* SUB */ a = pop(u->src), b = pop(u->src); push(u->src, b - a); break;
123 
+			case 0x1a: /* MUL */ a = pop(u->src), b = pop(u->src); push(u->src, b * a); break;
124 
+			case 0x1b: /* DIV */ a = pop(u->src), b = pop(u->src); if(a == 0) { u->src->error = 3; a = 1; } push(u->src, b / a); break;
125 
+			case 0x1c: /* AND */ a = pop(u->src), b = pop(u->src); push(u->src, b & a); break;
126 
+			case 0x1d: /* ORA */ a = pop(u->src), b = pop(u->src); push(u->src, b | a); break;
127 
+			case 0x1e: /* EOR */ a = pop(u->src), b = pop(u->src); push(u->src, b ^ a); break;
128 
+			case 0x1f: /* SFT */ a = pop8(u->src), b = pop(u->src); push(u->src, b >> (a & 0x07) << ((a & 0x70) >> 4)); break;
144 129 
 		}
145 
-		(*ops[instr & 0x1f])(u);
146 130 
 		if(u->wst.error)
147 131 
 			return uxn_halt(u, u->wst.error, "Working-stack", instr);
148 132 
 		if(u->rst.error)
... ... 
@@ -151,6 +135,8 @@ uxn_eval(Uxn *u, Uint16 vec)
151 135 
 	return 1;
152 136 
 }
153 137
138 
+/* clang-format on */
139 
+
154 140 
 int
155 141 
 uxn_boot(Uxn *u)
156 142 
 {
src/uxnemu.c
History View file @ 91df7ab
... ... 
@@ -257,7 +257,6 @@ doctrl(Uxn *u, SDL_Event *event, int z)
257 257 
 	case SDLK_F2: if(z) toggledebug(u); break;
258 258 
 	case SDLK_F3: if(z) screencapture(); break;
259 259 
 	}
260 
-
261 260 
 	/* clang-format on */
262 261 
 	if(z) {
263 262 
 		devctrl->dat[2] |= flag;