Housekeeping
This commit is contained in:
parent
3954e7b387
commit
d1268a850e
74
src/uxn.c
74
src/uxn.c
|
@ -16,49 +16,43 @@ WITH REGARD TO THIS SOFTWARE.
|
||||||
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 JMI pc += uxn.ram[pc++] << 8 | uxn.ram[pc++];
|
||||||
|
#define JMP(i) if(_2) pc = (i); else pc += (Sint8)(i);
|
||||||
|
/* stack-registers */
|
||||||
#define REM if(_r) uxn.rst.ptr -= 1 + _2; else uxn.wst.ptr -= 1 + _2;
|
#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 POP(o) if(_r) o = DEC(rst); else o = DEC(wst);
|
#define POP(o) if(_r) o = DEC(rst); else o = DEC(wst);
|
||||||
#define PUx(y) if(_2) { tt = (y); PU1(tt >> 8) PU1(tt) } else PU1(y)
|
#define PUx(i) if(_2) { tt = (i); PU1(tt >> 8) PU1(tt) } 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 PUT(y,z) PU1(y) if(_2) PU1(z)
|
|
||||||
#define JMI pc += uxn.ram[pc++] << 8 | uxn.ram[pc++];
|
|
||||||
#define JMP(j) if(_2) pc = (j); else pc += (Sint8)(j);
|
|
||||||
#define DEI(i,o,p) o =emu_dei(i); if(_2) p =emu_dei(i + 1);
|
|
||||||
#define DEO(i,y,z) emu_deo(i, y); if(_2) emu_deo(i + 1, z);
|
|
||||||
#define PEK(i,o,p,r) o = uxn.ram[i]; if(_2) r = i + 1, p = uxn.ram[r];
|
|
||||||
#define POK(i,y,z,r) uxn.ram[i] = y; if(_2) r = i + 1, uxn.ram[r] = z;
|
|
||||||
|
|
||||||
/* stack-registers */
|
|
||||||
|
|
||||||
#define A if(_2) { A2 } else A1
|
#define A if(_2) { A2 } else A1
|
||||||
#define A1 POP(a)
|
#define A1 POP(a)
|
||||||
#define A2 if(_r) a = DEC(rst) | (DEC(rst) << 8); else a = DEC(wst) | (DEC(wst) << 8);
|
#define A2 if(_r) a = DEC(rst) | (DEC(rst) << 8); else a = DEC(wst) | (DEC(wst) << 8);
|
||||||
#define B if(_2) { B2 } else B1
|
#define B if(_2) { B2 } else B1
|
||||||
#define B1 POP(b)
|
#define B1 POP(b)
|
||||||
#define B2 if(_r) b = DEC(rst) | (DEC(rst) << 8); else b = DEC(wst) | (DEC(wst) << 8);
|
#define B2 if(_r) b = DEC(rst) | (DEC(rst) << 8); else b = DEC(wst) | (DEC(wst) << 8);
|
||||||
|
|
||||||
/* memory-registers */
|
/* memory-registers */
|
||||||
|
#define PUT(i) PU1(i[0]) if(_2) PU1(i[1])
|
||||||
#define X if(_2) POP(xx) POP(x)
|
#define DEI(i,o) o[0] =emu_dei(i); if(_2) o[1] =emu_dei(i + 1);
|
||||||
#define Y if(_2) POP(yy) POP(y)
|
#define DEO(i,j) emu_deo(i, j[0]); if(_2) emu_deo(i + 1, j[1]);
|
||||||
#define Z if(_2) POP(zz) POP(z)
|
#define PEK(i,o,m) o[0] = uxn.ram[i]; if(_2) o[1] = uxn.ram[(i + 1) & m];
|
||||||
|
#define POK(i,j,m) uxn.ram[i] = j[0]; if(_2) uxn.ram[(i + 1) & m] = j[1];
|
||||||
|
#define X if(_2) POP(x[1]) POP(x[0])
|
||||||
|
#define Y if(_2) POP(y[1]) POP(y[0])
|
||||||
|
#define Z if(_2) POP(z[1]) POP(z[0])
|
||||||
|
|
||||||
int
|
int
|
||||||
uxn_eval(Uint16 pc)
|
uxn_eval(Uint16 pc)
|
||||||
{
|
{
|
||||||
int a,b,c,x,xx,y,yy,z,zz,k;
|
int a,b,x[2],y[2],z[2];
|
||||||
Uint8 t;
|
|
||||||
Uint16 tt;
|
Uint16 tt;
|
||||||
if(!pc || uxn.dev[0x0f]) return 0;
|
if(!pc || uxn.dev[0x0f]) return 0;
|
||||||
for(;;) {
|
for(;;) {
|
||||||
|
@ -73,27 +67,27 @@ uxn_eval(Uint16 pc)
|
||||||
/* LIr */ case 0xc0: INC(rst) = uxn.ram[pc++]; break;
|
/* LIr */ case 0xc0: INC(rst) = uxn.ram[pc++]; break;
|
||||||
/* INC */ OPC(0x01, A, PUx(a + 1))
|
/* INC */ OPC(0x01, A, PUx(a + 1))
|
||||||
/* POP */ OPC(0x02, REM, 0)
|
/* POP */ OPC(0x02, REM, 0)
|
||||||
/* NIP */ OPC(0x03, X REM, PUT(x,xx))
|
/* NIP */ OPC(0x03, X REM, PUT(x))
|
||||||
/* SWP */ OPC(0x04, X Y, PUT(x,xx) PUT(y,yy))
|
/* SWP */ OPC(0x04, X Y, PUT(x) PUT(y))
|
||||||
/* ROT */ OPC(0x05, X Y Z, PUT(y,yy) PUT(x,xx) PUT(z,zz))
|
/* ROT */ OPC(0x05, X Y Z, PUT(y) PUT(x) PUT(z))
|
||||||
/* DUP */ OPC(0x06, X, PUT(x,xx) PUT(x,xx))
|
/* DUP */ OPC(0x06, X, PUT(x) PUT(x))
|
||||||
/* OVR */ OPC(0x07, X Y, PUT(y,yy) PUT(x,xx) PUT(y,yy))
|
/* OVR */ OPC(0x07, X Y, PUT(y) PUT(x) PUT(y))
|
||||||
/* EQU */ OPC(0x08, A B, PU1(b == a))
|
/* EQU */ OPC(0x08, A B, PU1(b == a))
|
||||||
/* NEQ */ OPC(0x09, A B, PU1(b != a))
|
/* NEQ */ OPC(0x09, A B, PU1(b != a))
|
||||||
/* GTH */ OPC(0x0a, A B, PU1(b > a))
|
/* GTH */ OPC(0x0a, A B, PU1(b > a))
|
||||||
/* LTH */ OPC(0x0b, A B, PU1(b < a))
|
/* LTH */ OPC(0x0b, A B, PU1(b < a))
|
||||||
/* JMP */ OPC(0x0c, A, JMP(a))
|
/* JMP */ OPC(0x0c, A, JMP(a))
|
||||||
/* JCN */ OPC(0x0d, A B1, if(b) JMP(a))
|
/* JCN */ OPC(0x0d, A B1, if(b) JMP(a))
|
||||||
/* JSR */ OPC(0x0e, A, PUR(pc >> 8) PUR(pc) JMP(a))
|
/* JSR */ OPC(0x0e, A, RP1(pc >> 8) RP1(pc) JMP(a))
|
||||||
/* STH */ OPC(0x0f, X, PUR(x) if(_2) PUR(xx))
|
/* STH */ OPC(0x0f, X, RP1(x[0]) if(_2) RP1(x[1]))
|
||||||
/* LDZ */ OPC(0x10, A1, PEK(a,x,xx,t) PUT(x,xx))
|
/* LDZ */ OPC(0x10, A1, PEK(a, x, 0xff) PUT(x))
|
||||||
/* STZ */ OPC(0x11, A1 Y, POK(a,y,yy,t))
|
/* STZ */ OPC(0x11, A1 Y, POK(a, y, 0xff))
|
||||||
/* LDR */ OPC(0x12, A1, PEK(pc+(Sint8)a,x,xx,tt) PUT(x,xx))
|
/* LDR */ OPC(0x12, A1, PEK(pc+(Sint8)a, x, 0xffff) PUT(x))
|
||||||
/* STR */ OPC(0x13, A1 Y, POK(pc+(Sint8)a,y,yy,tt))
|
/* STR */ OPC(0x13, A1 Y, POK(pc+(Sint8)a, y, 0xffff))
|
||||||
/* LDA */ OPC(0x14, A2, PEK(a,x,xx,tt) PUT(x,xx))
|
/* LDA */ OPC(0x14, A2, PEK(a, x, 0xffff) PUT(x))
|
||||||
/* STA */ OPC(0x15, A2 Y, POK(a,y,yy,tt))
|
/* STA */ OPC(0x15, A2 Y, POK(a, y, 0xffff))
|
||||||
/* DEI */ OPC(0x16, A1, DEI(a,x,xx) PUT(x,xx))
|
/* DEI */ OPC(0x16, A1, DEI(a, x) PUT(x))
|
||||||
/* DEO */ OPC(0x17, A1 Y, DEO(a,y,yy))
|
/* DEO */ OPC(0x17, A1 Y, DEO(a, y))
|
||||||
/* ADD */ OPC(0x18, A B, PUx(b + a))
|
/* ADD */ OPC(0x18, A B, PUx(b + a))
|
||||||
/* SUB */ OPC(0x19, A B, PUx(b - a))
|
/* SUB */ OPC(0x19, A B, PUx(b - a))
|
||||||
/* MUL */ OPC(0x1a, A B, PUx(b * a))
|
/* MUL */ OPC(0x1a, A B, PUx(b * a))
|
||||||
|
|
Loading…
Reference in New Issue