(uxnmin) Housekeeping

This commit is contained in:
Devine Lu Linvega 2024-08-17 20:35:36 -07:00
parent aead0cdca9
commit fceb65f16f
1 changed files with 39 additions and 42 deletions

View File

@ -36,77 +36,74 @@ emu_deo(Uint8 addr, Uint8 value)
/* Unroll */ /* Unroll */
#define OPC(opc, init, body) {\ #define OPC(opc, init, body) {\
case 0x00|opc: {enum{_2=0,_r=0};init;body;} break;\ case 0x00|opc: {enum{_2=0,_r=0};init body;} break;\
case 0x20|opc: {enum{_2=1,_r=0};init;body;} break;\ case 0x20|opc: {enum{_2=1,_r=0};init body;} break;\
case 0x40|opc: {enum{_2=0,_r=1};init;body;} break;\ case 0x40|opc: {enum{_2=0,_r=1};init body;} break;\
case 0x60|opc: {enum{_2=1,_r=1};init;body;} break;\ case 0x60|opc: {enum{_2=1,_r=1};init body;} break;\
case 0x80|opc: {enum{_2=0,_r=0};k=uxn.wst.ptr;init;uxn.wst.ptr= k;body;} break;\ case 0x80|opc: {enum{_2=0,_r=0};int k=uxn.wst.ptr;init uxn.wst.ptr= k;body;} break;\
case 0xa0|opc: {enum{_2=1,_r=0};k=uxn.wst.ptr;init;uxn.wst.ptr= k;body;} break;\ case 0xa0|opc: {enum{_2=1,_r=0};int k=uxn.wst.ptr;init uxn.wst.ptr= k;body;} break;\
case 0xc0|opc: {enum{_2=0,_r=1};k=uxn.rst.ptr;init;uxn.rst.ptr= k;body;} break;\ case 0xc0|opc: {enum{_2=0,_r=1};int k=uxn.rst.ptr;init uxn.rst.ptr= k;body;} break;\
case 0xe0|opc: {enum{_2=1,_r=1};k=uxn.rst.ptr;init;uxn.rst.ptr= k;body;} break;\ case 0xe0|opc: {enum{_2=1,_r=1};int k=uxn.rst.ptr;init uxn.rst.ptr= k;body;} break;\
} }
/* Microcode */ /* Microcode */
#define REM if(_r) uxn.rst.ptr -= 1 + _2; else uxn.wst.ptr -= 1 + _2;
#define JMI pc += uxn.ram[pc++] << 8 | uxn.ram[pc++]; #define JMI pc += uxn.ram[pc++] << 8 | uxn.ram[pc++];
#define JMP(j) if(_2) pc = (j); else pc += (Sint8)(j); #define JMP(i) if(_2) pc = i; else pc += (Sint8)i;
#define REM if(_r) uxn.rst.ptr -= 1 + _2; else uxn.wst.ptr -= 1 + _2;
#define INC(s) uxn.s.dat[uxn.s.ptr++] #define INC(s) uxn.s.dat[uxn.s.ptr++]
#define DEC(s) uxn.s.dat[--uxn.s.ptr] #define DEC(s) uxn.s.dat[--uxn.s.ptr]
#define POx(o) if(_2) { PO2(o) } else PO1(o) #define POx(o) if(_2) { PO2(o) } else PO1(o)
#define PO2(o) if(_r) o = DEC(rst) | (DEC(rst) << 8); else o = DEC(wst) | (DEC(wst) << 8);
#define PO1(o) if(_r) o = DEC(rst); else o = DEC(wst); #define PO1(o) if(_r) o = DEC(rst); else o = DEC(wst);
#define PUx(y) if(_2) { PU2(y) } else PU1(y) #define PO2(o) if(_r) o = DEC(rst) | (DEC(rst) << 8); else o = DEC(wst) | (DEC(wst) << 8);
#define PU2(y) tt = (y); PU1(tt >> 8) PU1(tt) #define PUx(i) if(_2) { c = (i); PU1(c >> 8) PU1(c) } else PU1(i)
#define PU1(y) if(_r) INC(rst) = y; else INC(wst) = y; #define PU1(i) if(_r) INC(rst) = i; else INC(wst) = i;
#define PUR(y) if(_r) INC(wst) = y; else INC(rst) = y; #define RP1(i) if(_r) INC(wst) = i; else INC(rst) = i;
#define GET(o,p) if(_2) PO1(p) PO1(o) #define GET(o) if(_2) PO1(o[1]) PO1(o[0])
#define PUT(y,z) PU1(y) if(_2) PU1(z) #define PUT(i) PU1(i[0]) if(_2) PU1(i[1])
#define DEI(i,o,p) o =emu_dei(i); if(_2) p =emu_dei(i + 1); #define DEI(i,o) o[0] = emu_dei(i); if(_2) o[1] = emu_dei(i + 1); PUT(o)
#define DEO(i,y,z) emu_deo(i, y); if(_2) emu_deo(i + 1, z); #define DEO(i,j) emu_deo(i, j[0]); if(_2) emu_deo(i + 1, j[1]);
#define PEK(i,o,p,r) o = uxn.ram[i]; if(_2) r = i + 1, p = uxn.ram[r]; #define PEK(i,o,m) o[0] = uxn.ram[i]; if(_2) o[1] = uxn.ram[(i + 1) & m]; PUT(o)
#define POK(i,y,z,r) uxn.ram[i] = y; if(_2) r = i + 1, uxn.ram[r] = z; #define POK(i,j,m) uxn.ram[i] = j[0]; if(_2) uxn.ram[(i + 1) & m] = j[1];
int int
uxn_eval(Uint16 pc) uxn_eval(Uint16 pc)
{ {
int a,b,c,d,e,f,k; int a, b, c, x[2], y[2], z[2];
Uint8 t;
Uint16 tt;
if(!pc || uxn.dev[0x0f]) return 0; if(!pc || uxn.dev[0x0f]) return 0;
for(;;) { for(;;) {
switch(uxn.ram[pc++]) { switch(uxn.ram[pc++]) {
/* BRK */ case 0x00: return 1; /* BRK */ case 0x00: return 1;
/* JCI */ case 0x20: if(DEC(wst)) { JMI break; } pc += 2; break; /* JCI */ case 0x20: if(DEC(wst)) { JMI break; } pc += 2; break;
/* JMI */ case 0x40: JMI break; /* JMI */ case 0x40: JMI break;
/* JSI */ case 0x60: tt = pc + 2; INC(rst) = tt >> 8; INC(rst) = tt; JMI break; /* JSI */ case 0x60: c = pc + 2; INC(rst) = c >> 8; INC(rst) = c; JMI break;
/* LI2 */ case 0xa0: INC(wst) = uxn.ram[pc++]; /* LI2 */ case 0xa0: INC(wst) = uxn.ram[pc++];
/* LIT */ case 0x80: INC(wst) = uxn.ram[pc++]; break; /* LIT */ case 0x80: INC(wst) = uxn.ram[pc++]; break;
/* L2r */ case 0xe0: INC(rst) = uxn.ram[pc++]; /* L2r */ case 0xe0: INC(rst) = uxn.ram[pc++];
/* LIr */ case 0xc0: INC(rst) = uxn.ram[pc++]; break; /* LIr */ case 0xc0: INC(rst) = uxn.ram[pc++]; break;
/* INC */ OPC(0x01, POx(a),PUx(a + 1)) /* INC */ OPC(0x01, POx(a), PUx(a + 1))
/* POP */ OPC(0x02, REM,0) /* POP */ OPC(0x02, REM, 0)
/* NIP */ OPC(0x03, GET(a,b) REM,PUT(a,b)) /* NIP */ OPC(0x03, GET(x) REM,PUT(x))
/* SWP */ OPC(0x04, GET(a,b) GET(c,d),PUT(a,b) PUT(c,d)) /* SWP */ OPC(0x04, GET(x) GET(y),PUT(x) PUT(y))
/* ROT */ OPC(0x05, GET(a,b) GET(c,d) GET(e,f),PUT(c,d) PUT(a,b) PUT(e,f)) /* ROT */ OPC(0x05, GET(x) GET(y) GET(z),PUT(y) PUT(x) PUT(z))
/* DUP */ OPC(0x06, GET(a,b),PUT(a,b) PUT(a,b)) /* DUP */ OPC(0x06, GET(x),PUT(x) PUT(x))
/* OVR */ OPC(0x07, GET(a,b) GET(c,d),PUT(c,d) PUT(a,b) PUT(c,d)) /* OVR */ OPC(0x07, GET(x) GET(y),PUT(y) PUT(x) PUT(y))
/* EQU */ OPC(0x08, POx(a) POx(b),PU1(b == a)) /* EQU */ OPC(0x08, POx(a) POx(b),PU1(b == a))
/* NEQ */ OPC(0x09, POx(a) POx(b),PU1(b != a)) /* NEQ */ OPC(0x09, POx(a) POx(b),PU1(b != a))
/* GTH */ OPC(0x0a, POx(a) POx(b),PU1(b > a)) /* GTH */ OPC(0x0a, POx(a) POx(b),PU1(b > a))
/* LTH */ OPC(0x0b, POx(a) POx(b),PU1(b < a)) /* LTH */ OPC(0x0b, POx(a) POx(b),PU1(b < a))
/* JMP */ OPC(0x0c, POx(a),JMP(a)) /* JMP */ OPC(0x0c, POx(a),JMP(a))
/* JCN */ OPC(0x0d, POx(a) PO1(b), if(b) JMP(a)) /* JCN */ OPC(0x0d, POx(a) PO1(b), if(b) JMP(a))
/* JSR */ OPC(0x0e, POx(a),PUR(pc >> 8) PUR(pc) JMP(a)) /* JSR */ OPC(0x0e, POx(a),RP1(pc >> 8) RP1(pc) JMP(a))
/* STH */ OPC(0x0f, GET(a,b),PUR(a) if(_2) PUR(b)) /* STH */ OPC(0x0f, GET(x),RP1(x[0]) if(_2) RP1(x[1]))
/* LDZ */ OPC(0x10, PO1(a),PEK(a,b,c,t) PUT(b,c)) /* LDZ */ OPC(0x10, PO1(a),PEK(a, x, 0xff))
/* STZ */ OPC(0x11, PO1(a) GET(b,c),POK(a,b,c,t)) /* STZ */ OPC(0x11, PO1(a) GET(y),POK(a, y, 0xff))
/* LDR */ OPC(0x12, PO1(a),PEK(pc+(Sint8)a,b,c,tt) PUT(b,c)) /* LDR */ OPC(0x12, PO1(a),PEK(pc + (Sint8)a, x, 0xffff))
/* STR */ OPC(0x13, PO1(a) GET(b,c),POK(pc+(Sint8)a,b,c,tt)) /* STR */ OPC(0x13, PO1(a) GET(y),POK(pc + (Sint8)a, y, 0xffff))
/* LDA */ OPC(0x14, PO2(a),PEK(a,b,c,tt) PUT(b,c)) /* LDA */ OPC(0x14, PO2(a),PEK(a, x, 0xffff))
/* STA */ OPC(0x15, PO2(a) GET(b,c),POK(a,b,c,tt)) /* STA */ OPC(0x15, PO2(a) GET(y),POK(a, y, 0xffff))
/* DEI */ OPC(0x16, PO1(a),DEI(a,b,c) PUT(b,c)) /* DEI */ OPC(0x16, PO1(a),DEI(a, x))
/* DEO */ OPC(0x17, PO1(a) GET(b,c),DEO(a,b,c)) /* DEO */ OPC(0x17, PO1(a) GET(y),DEO(a, y))
/* ADD */ OPC(0x18, POx(a) POx(b),PUx(b + a)) /* ADD */ OPC(0x18, POx(a) POx(b),PUx(b + a))
/* SUB */ OPC(0x19, POx(a) POx(b),PUx(b - a)) /* SUB */ OPC(0x19, POx(a) POx(b),PUx(b - a))
/* MUL */ OPC(0x1a, POx(a) POx(b),PUx(b * a)) /* MUL */ OPC(0x1a, POx(a) POx(b),PUx(b * a))