(uxnmin)Use new macros
This commit is contained in:
parent
17689ef64b
commit
d3e89bfe04
80
ref/uxnmin.c
80
ref/uxnmin.c
|
@ -48,28 +48,28 @@ emu_deo(Uint8 addr, Uint8 value)
|
||||||
|
|
||||||
/* Microcode */
|
/* Microcode */
|
||||||
|
|
||||||
|
#define JMI pc += uxn.ram[pc++] << 8 | uxn.ram[pc++];
|
||||||
|
#define JMP(j) if(_2) pc = (j); else pc += (Sint8)(j);
|
||||||
#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 JMI pc += uxn.ram[pc++] << 8 | uxn.ram[pc++];
|
|
||||||
#define JMP(x) if(_2) pc = (x); else pc += (Sint8)(x);
|
|
||||||
#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 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 PUx(y) if(_2) { PU2(y) } else PU1(y)
|
||||||
#define PU2(y) tt = (y); PU1(tt >> 8) PU1(tt)
|
#define PU2(y) tt = (y); PU1(tt >> 8) PU1(tt)
|
||||||
#define PU1(y) if(_r) INC(rst) = y; else INC(wst) = y;
|
#define PU1(y) if(_r) INC(rst) = y; else INC(wst) = y;
|
||||||
#define PFx(y) if(_2) { PF2(y) } else PF1(y)
|
#define PUR(y) if(_r) INC(wst) = y; else INC(rst) = y;
|
||||||
#define PF2(y) tt = (y); PF1(tt >> 8) PF1(tt)
|
#define GET(o,p) if(_2) PO1(p) PO1(o)
|
||||||
#define PF1(y) if(_r) INC(wst) = y; else INC(rst) = y;
|
#define PUT(y,z) PU1(y) if(_2) PU1(z)
|
||||||
#define DEI(p, o) if(_2) { o = (emu_dei(p) << 8) | emu_dei(p + 1); } else o = emu_dei(p);
|
#define DEI(i,o,p) o =emu_dei(i); if(_2) p =emu_dei(i + 1);
|
||||||
#define DEO(p, y) if(_2) { emu_deo(p, y >> 8), emu_deo(p + 1, y); } else emu_deo(p, y);
|
#define DEO(i,y,z) emu_deo(i, y); if(_2) emu_deo(i + 1, z);
|
||||||
#define PEK(o, x, r) if(_2) { r = (x); o = uxn.ram[r++] << 8 | uxn.ram[r]; } else o = uxn.ram[(x)];
|
#define PEK(i,o,p,r) o = uxn.ram[i]; if(_2) r = i + 1, p = uxn.ram[r];
|
||||||
#define POK(x, y, r) if(_2) { r = (x); uxn.ram[r++] = y >> 8, uxn.ram[r] = y; } else uxn.ram[(x)] = (y);
|
#define POK(i,y,z,r) uxn.ram[i] = y; if(_2) r = i + 1, uxn.ram[r] = z;
|
||||||
|
|
||||||
int
|
int
|
||||||
uxn_eval(Uint16 pc)
|
uxn_eval(Uint16 pc)
|
||||||
{
|
{
|
||||||
int a,b,c,k;
|
int a,b,c,d,e,f,k;
|
||||||
Uint8 t;
|
Uint8 t;
|
||||||
Uint16 tt;
|
Uint16 tt;
|
||||||
if(!pc || uxn.dev[0x0f]) return 0;
|
if(!pc || uxn.dev[0x0f]) return 0;
|
||||||
|
@ -83,37 +83,37 @@ uxn_eval(Uint16 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, POx(a), 0)
|
/* POP */ OPC(0x02, GET(a,b),0)
|
||||||
/* NIP */ OPC(0x03, POx(a) POx(b), PUx(a))
|
/* NIP */ OPC(0x03, GET(a,b) GET(c,d),PUT(a,b))
|
||||||
/* SWP */ OPC(0x04, POx(a) POx(b), PUx(a) PUx(b))
|
/* SWP */ OPC(0x04, GET(a,b) GET(c,d),PUT(a,b) PUT(c,d))
|
||||||
/* ROT */ OPC(0x05, POx(a) POx(b) POx(c), PUx(b) PUx(a) PUx(c))
|
/* ROT */ OPC(0x05, GET(a,b) GET(c,d) GET(e,f),PUT(c,d) PUT(a,b) PUT(e,f))
|
||||||
/* DUP */ OPC(0x06, POx(a), PUx(a) PUx(a))
|
/* DUP */ OPC(0x06, GET(a,b),PUT(a,b) PUT(a,b))
|
||||||
/* OVR */ OPC(0x07, POx(a) POx(b), PUx(b) PUx(a) PUx(b))
|
/* OVR */ OPC(0x07, GET(a,b) GET(c,d),PUT(c,d) PUT(a,b) PUT(c,d))
|
||||||
/* 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), PF2(pc) JMP(a))
|
/* JSR */ OPC(0x0e, POx(a),PUR(pc >> 8) PUR(pc) JMP(a))
|
||||||
/* STH */ OPC(0x0f, POx(a), PFx(a))
|
/* STH */ OPC(0x0f, GET(a,b),PUR(a) if(_2) PUR(b))
|
||||||
/* LDZ */ OPC(0x10, PO1(a), PEK(b, a, t) PUx(b))
|
/* LDZ */ OPC(0x10, PO1(a),PEK(a,b,c,t) PUT(b,c))
|
||||||
/* STZ */ OPC(0x11, PO1(a) POx(b), POK(a, b, t))
|
/* STZ */ OPC(0x11, PO1(a) GET(b,c),POK(a,b,c,t))
|
||||||
/* LDR */ OPC(0x12, PO1(a), PEK(b, pc + (Sint8)a, tt) PUx(b))
|
/* LDR */ OPC(0x12, PO1(a),PEK(pc+(Sint8)a,b,c,tt) PUT(b,c))
|
||||||
/* STR */ OPC(0x13, PO1(a) POx(b), POK(pc + (Sint8)a, b, tt))
|
/* STR */ OPC(0x13, PO1(a) GET(b,c),POK(pc+(Sint8)a,b,c,tt))
|
||||||
/* LDA */ OPC(0x14, PO2(a), PEK(b, a, tt) PUx(b))
|
/* LDA */ OPC(0x14, PO2(a),PEK(a,b,c,tt) PUT(b,c))
|
||||||
/* STA */ OPC(0x15, PO2(a) POx(b), POK(a, b, tt))
|
/* STA */ OPC(0x15, PO2(a) GET(b,c),POK(a,b,c,tt))
|
||||||
/* DEI */ OPC(0x16, PO1(a), DEI(a, b) PUx(b))
|
/* DEI */ OPC(0x16, PO1(a),DEI(a,b,c) PUT(b,c))
|
||||||
/* DEO */ OPC(0x17, PO1(a) POx(b), DEO(a, b))
|
/* DEO */ OPC(0x17, PO1(a) GET(b,c),DEO(a,b,c))
|
||||||
/* 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))
|
||||||
/* DIV */ OPC(0x1b, POx(a) POx(b), PUx(a ? b / a : 0))
|
/* DIV */ OPC(0x1b, POx(a) POx(b),PUx(a ? b / a : 0))
|
||||||
/* AND */ OPC(0x1c, POx(a) POx(b), PUx(b & a))
|
/* AND */ OPC(0x1c, POx(a) POx(b),PUx(b & a))
|
||||||
/* ORA */ OPC(0x1d, POx(a) POx(b), PUx(b | a))
|
/* ORA */ OPC(0x1d, POx(a) POx(b),PUx(b | a))
|
||||||
/* EOR */ OPC(0x1e, POx(a) POx(b), PUx(b ^ a))
|
/* EOR */ OPC(0x1e, POx(a) POx(b),PUx(b ^ a))
|
||||||
/* SFT */ OPC(0x1f, PO1(a) POx(b), PUx(b >> (a & 0xf) << (a >> 4)))
|
/* SFT */ OPC(0x1f, PO1(a) POx(b),PUx(b >> (a & 0xf) << (a >> 4)))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue