aboutsummaryrefslogtreecommitdiffstats
path: root/src/uxn.c
diff options
context:
space:
mode:
authorBad Diode <bd@badd10de.dev>2023-04-19 17:58:04 +0200
committerBad Diode <bd@badd10de.dev>2023-04-19 17:58:04 +0200
commitd68d16405b013967e0faa12f9dfc608e3bb3d0d4 (patch)
treef8436d01c6a9aa112cdb6ac6bd042fe2a7c0b046 /src/uxn.c
parent2e8ab813a9e4c2d908d5450e346a81d2a91a75e8 (diff)
downloaduxngba-d68d16405b013967e0faa12f9dfc608e3bb3d0d4.tar.gz
uxngba-d68d16405b013967e0faa12f9dfc608e3bb3d0d4.zip
Update uxn core and fix some new ppu bugs
Diffstat (limited to 'src/uxn.c')
-rw-r--r--src/uxn.c160
1 files changed, 83 insertions, 77 deletions
diff --git a/src/uxn.c b/src/uxn.c
index 5c39803..d525ff1 100644
--- a/src/uxn.c
+++ b/src/uxn.c
@@ -11,87 +11,93 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
11WITH REGARD TO THIS SOFTWARE. 11WITH REGARD TO THIS SOFTWARE.
12*/ 12*/
13 13
14/* a,b,c: general use. bs: byte/short bool. src, dst: stack ptrs, swapped in return mode. 14#define T s->dat[s->ptr - 1]
15 pc: program counter. sp: ptr to src stack ptr. kptr: "keep" mode copy of src stack ptr. 15#define N s->dat[s->ptr - 2]
16 x,y: macro in params. d: macro in device. j: macro temp variables. o: macro out param. */ 16#define L s->dat[s->ptr - 3]
17#define H2 PEEK2(s->dat + s->ptr - 3)
18#define T2 PEEK2(s->dat + s->ptr - 2)
19#define N2 PEEK2(s->dat + s->ptr - 4)
20#define L2 PEEK2(s->dat + s->ptr - 6)
17 21
18#define HALT(c) { return uxn_halt(u, instr, (c), pc - 1); } 22/* Registers
19#define JUMP(x) { if(bs) pc = (x); else pc += (s8)(x); } 23
20#define PUSH8(s, x) { if(s->ptr == 0xff) HALT(2) s->dat[s->ptr++] = (x); } 24[ . ][ . ][ . ][ L ][ N ][ T ] <
21#define PUSH16(s, x) { if((j = s->ptr) >= 0xfe) HALT(2) k = (x); s->dat[j] = k >> 8; s->dat[j + 1] = k; s->ptr = j + 2; } 25[ . ][ . ][ . ][ H2 ][ T ] <
22#define PUSH(s, x) { if(bs) { PUSH16(s, (x)) } else { PUSH8(s, (x)) } } 26[ L2 ][ N2 ][ T2 ] <
23#define POP8(o) { if(!(j = *sp)) HALT(1) o = (u16)src->dat[--j]; *sp = j; } 27
24#define POP16(o) { if((j = *sp) <= 1) HALT(1) o = (src->dat[j - 2] << 8) + src->dat[j - 1]; *sp = j - 2; } 28*/
25#define POP(o) { if(bs) { POP16(o) } else { POP8(o) } } 29
26#define POKE(x, y) { if(bs) { u->ram[(x)] = (y) >> 8; u->ram[(x) + 1] = (y); } else { u->ram[(x)] = y; } } 30
27#define PEEK16(o, x) { o = (u->ram[(x)] << 8) + u->ram[(x) + 1]; } 31u16 deo_mask[] = {0xff08, 0x0300, 0xc028, 0x8000, 0x8000, 0x8000, 0x8000, 0x0000, 0x0000, 0x0000, 0xa260, 0xa260, 0x0000, 0x0000, 0x0000, 0x0000};
28#define PEEK(o, x) { if(bs) PEEK16(o, x) else o = u->ram[(x)]; } 32u16 dei_mask[] = {0x0000, 0x0000, 0x003c, 0x0014, 0x0014, 0x0014, 0x0014, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x07ff, 0x0000, 0x0000, 0x0000};
29#define DEVR(o, x) { o = u->dei(u, x); if (bs) o = (o << 8) + u->dei(u, (x) + 1); } 33
30#define DEVW(x, y) { if (bs) { u->deo(u, (x), (y) >> 8); u->deo(u, (x) + 1, (y)); } else { u->deo(u, x, (y)); } } 34#define POKE2(d, v) { (d)[0] = (v) >> 8; (d)[1] = (v); }
35#define PEEK2(d) ((d)[0] << 8 | (d)[1])
36#define HALT(c) { return uxn_halt(u, ins, (c), pc - 1); }
37#define SET(mul, add) { if(mul > s->ptr) HALT(1) tmp = s->ptr + k * mul + add; if(tmp > 254) HALT(2) s->ptr = tmp; }
38#define PUT(o, v) { s->dat[(u8)(s->ptr - 1 - (o))] = (v); }
39#define PUT2(o, v) { tmp = (v); s->dat[(u8)(s->ptr - o - 2)] = tmp >> 8; s->dat[(u8)(s->ptr - o - 1)] = tmp; }
40#define PUSH(stack, v) { if(s->ptr > 254) HALT(2) stack->dat[stack->ptr++] = (v); }
41#define PUSH2(stack, v) { if(s->ptr > 253) HALT(2) tmp = (v); stack->dat[stack->ptr] = tmp >> 8; stack->dat[stack->ptr + 1] = tmp; stack->ptr += 2; }
42#define DEO(a, b) { u->dev[(a)] = (b); if((deo_mask[(a) >> 4] >> ((a) & 0xf)) & 0x1) uxn_deo(u, (a)); }
43#define DEI(a, b) { PUT((a), ((dei_mask[(b) >> 4] >> ((b) & 0xf)) & 0x1) ? uxn_dei(u, (b)) : u->dev[(b)]) }
31 44
32IWRAM_CODE 45IWRAM_CODE
33int 46int
34uxn_eval(Uxn *u, u16 pc) 47uxn_eval(Uxn *u, u16 pc) {
35{ 48 u8 ins, opc, k;
36 u8 kptr, *sp; 49 u16 t, n, l, tmp;
37 u16 a, b, c, j, k, bs, instr, opcode; 50 Stack *s;
38 Stack *src, *dst; 51 if(!pc || u->dev[0x0f]) return 0;
39 if(!pc || u->dev[0x0f]) return 0; 52 for(;;) {
40 for(;;) { 53 ins = u->ram[pc++];
41 instr = u->ram[pc++]; 54 k = !!(ins & 0x80);
42 /* Return Mode */ 55 s = ins & 0x40 ? u->rst : u->wst;
43 if(instr & 0x40) { src = u->rst; dst = u->wst; } 56 opc = !(ins & 0x1f) ? 0 - (ins >> 5) : ins & 0x3f;
44 else { src = u->wst; dst = u->rst; } 57 switch(opc) {
45 /* Keep Mode */ 58 /* IMM */
46 if(instr & 0x80) { kptr = src->ptr; sp = &kptr; } 59 case 0x00: /* BRK */ return 1;
47 else sp = &src->ptr; 60 case 0xff: /* JCI */ pc += !!s->dat[--s->ptr] * PEEK2(u->ram + pc) + 2; break;
48 /* Short Mode */ 61 case 0xfe: /* JMI */ pc += PEEK2(u->ram + pc) + 2; break;
49 bs = instr & 0x20; 62 case 0xfd: /* JSI */ PUSH2(u->rst, pc + 2) pc += PEEK2(u->ram + pc) + 2; break;
50 opcode = instr & 0x1f; 63 case 0xfc: /* LIT */ PUSH(s, u->ram[pc++]) break;
51 switch(opcode - (!opcode * (instr >> 5))) { 64 case 0xfb: /* LIT2 */ PUSH2(s, PEEK2(u->ram + pc)) pc += 2; break;
52 /* Literals/Calls */ 65 case 0xfa: /* LITr */ PUSH(s, u->ram[pc++]) break;
53 case -0x0: /* BRK */ return 1; 66 case 0xf9: /* LIT2r */ PUSH2(s, PEEK2(u->ram + pc)) pc += 2; break;
54 case -0x1: /* JCI */ POP8(b) if(!b) { pc += 2; break; } // fallthrough 67 /* ALU */
55 case -0x2: /* JMI */ PEEK16(a, pc) pc += a + 2; break; 68 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;
56 case -0x3: /* JSI */ PUSH16(u->rst, pc + 2) PEEK16(a, pc) pc += a + 2; break; 69 case 0x02: /* POP */ SET(1,-1) break; case 0x22: SET(2,-2) break;
57 case -0x4: /* LIT */ 70 case 0x03: /* NIP */ t=T; SET(2,-1) PUT(0, t) break; case 0x23: t=T2; SET(4,-2) PUT2(0, t) break;
58 case -0x6: /* LITr */ a = u->ram[pc++]; PUSH8(src, a) break; 71 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;
59 case -0x5: /* LIT2 */ 72 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;
60 case -0x7: /* LIT2r */ PEEK16(a, pc) PUSH16(src, a) pc += 2; break; 73 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;
61 /* ALU */ 74 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;
62 case 0x01: /* INC */ POP(a) PUSH(src, a + 1) break; 75 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;
63 case 0x02: /* POP */ POP(a) break; 76 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;
64 case 0x03: /* NIP */ POP(a) POP(b) PUSH(src, a) break; 77 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;
65 case 0x04: /* SWP */ POP(a) POP(b) PUSH(src, a) PUSH(src, b) break; 78 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;
66 case 0x05: /* ROT */ POP(a) POP(b) POP(c) PUSH(src, b) PUSH(src, a) PUSH(src, c) break; 79 case 0x0c: /* JMP */ t=T; SET(1,-1) pc += (s8)t; break; case 0x2c: t=T2; SET(2,-2) pc = t; break;
67 case 0x06: /* DUP */ POP(a) PUSH(src, a) PUSH(src, a) break; 80 case 0x0d: /* JCN */ t=T;n=N; SET(2,-2) pc += !!n * (s8)t; break; case 0x2d: t=T2;n=L; SET(3,-3) if(n) pc = t; break;
68 case 0x07: /* OVR */ POP(a) POP(b) PUSH(src, b) PUSH(src, a) PUSH(src, b) break; 81 case 0x0e: /* JSR */ t=T; SET(1,-1) PUSH2(u->rst, pc) pc += (s8)t; break; case 0x2e: t=T2; SET(2,-2) PUSH2(u->rst, pc) pc = t; break;
69 case 0x08: /* EQU */ POP(a) POP(b) PUSH8(src, b == a) break; 82 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;
70 case 0x09: /* NEQ */ POP(a) POP(b) PUSH8(src, b != a) break; 83 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;
71 case 0x0a: /* GTH */ POP(a) POP(b) PUSH8(src, b > a) break; 84 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;
72 case 0x0b: /* LTH */ POP(a) POP(b) PUSH8(src, b < a) break; 85 case 0x12: /* LDR */ t=T; SET(1, 0) PUT(0, u->ram[pc + (s8)t]) break; case 0x32: t=T; SET(1, 1) PUT2(0, PEEK2(u->ram + pc + (s8)t)) break;
73 case 0x0c: /* JMP */ POP(a) JUMP(a) break; 86 case 0x13: /* STR */ t=T;n=N; SET(2,-2) u->ram[pc + (s8)t] = n; break; case 0x33: t=T;n=H2; SET(3,-3) POKE2(u->ram + pc + (s8)t, n) break;
74 case 0x0d: /* JCN */ POP(a) POP8(b) if(b) JUMP(a) break; 87 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;
75 case 0x0e: /* JSR */ POP(a) PUSH16(dst, pc) JUMP(a) break; 88 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;
76 case 0x0f: /* STH */ POP(a) PUSH(dst, a) break; 89 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;
77 case 0x10: /* LDZ */ POP8(a) PEEK(b, a) PUSH(src, b) break; 90 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;
78 case 0x11: /* STZ */ POP8(a) POP(b) POKE(a, b) break; 91 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;
79 case 0x12: /* LDR */ POP8(a) b = pc + (s8)a; PEEK(c, b) PUSH(src, c) break; 92 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;
80 case 0x13: /* STR */ POP8(a) POP(b) c = pc + (s8)a; POKE(c, b) break; 93 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;
81 case 0x14: /* LDA */ POP16(a) PEEK(b, a) PUSH(src, b) break; 94 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;
82 case 0x15: /* STA */ POP16(a) POP(b) POKE(a, b) break; 95 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;
83 case 0x16: /* DEI */ POP8(a) DEVR(b, a) PUSH(src, b) break; 96 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;
84 case 0x17: /* DEO */ POP8(a) POP(b) DEVW(a, b) break; 97 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;
85 case 0x18: /* ADD */ POP(a) POP(b) PUSH(src, b + a) break; 98 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;
86 case 0x19: /* SUB */ POP(a) POP(b) PUSH(src, b - a) break; 99 }
87 case 0x1a: /* MUL */ POP(a) POP(b) PUSH(src, (u32)b * a) break; 100 }
88 case 0x1b: /* DIV */ POP(a) POP(b) if(!a) HALT(3) PUSH(src, b / a) break;
89 case 0x1c: /* AND */ POP(a) POP(b) PUSH(src, b & a) break;
90 case 0x1d: /* ORA */ POP(a) POP(b) PUSH(src, b | a) break;
91 case 0x1e: /* EOR */ POP(a) POP(b) PUSH(src, b ^ a) break;
92 case 0x1f: /* SFT */ POP8(a) POP(b) PUSH(src, b >> (a & 0x0f) << ((a & 0xf0) >> 4)) break;
93 }
94 }
95} 101}
96 102
97int 103int
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-04 16:24:02 +0000