diff options
author | 2009-08-19 15:42:35 +0000 | |
---|---|---|
committer | 2009-08-19 15:42:35 +0000 | |
commit | 93d7716c87887d68976a04ca3ee385277d470d22 (patch) | |
tree | dad2d1f2e79458099338b7329f3576be2113bd1f /src/emu/cpu/i8085/i8085cpu.h | |
parent | 8a74f58d3b05a04394cdadecbe91711fdf28a39a (diff) |
- fixed cycle deduction on unconditional CALL / RET, it took about half too many cycles
- added cycle tables and cleaned up source layout. This was done very carefully, it should be errorfree.
- removed HLT cycle eating (earlier, HLT after EI could theoretically fail)
- fixed parity flag on add/sub/cmp. Bug was caused by z80 overflow detection accidentally left in
- renamed temp register XX to official name WZ
- renamed flags from Z80 style S Z Y H X V N C to S Z X5 H X3 P V C, and fixed X5 / V flags where accidentally broken due to flag names confusion
Diffstat (limited to 'src/emu/cpu/i8085/i8085cpu.h')
-rw-r--r-- | src/emu/cpu/i8085/i8085cpu.h | 243 |
1 files changed, 122 insertions, 121 deletions
diff --git a/src/emu/cpu/i8085/i8085cpu.h b/src/emu/cpu/i8085/i8085cpu.h index 4ac11dc5fef..850a1a44923 100644 --- a/src/emu/cpu/i8085/i8085cpu.h +++ b/src/emu/cpu/i8085/i8085cpu.h @@ -13,11 +13,11 @@ #define SF 0x80 #define ZF 0x40 -#define YF 0x20 +#define X5F 0x20 #define HF 0x10 -#define XF 0x08 -#define VF 0x04 -#define NF 0x02 +#define X3F 0x08 +#define PF 0x04 +#define VF 0x02 #define CF 0x01 #define IM_SID 0x80 @@ -35,153 +35,154 @@ #define ADDR_RST75 0x003c #define ADDR_INTR 0x0038 -#define M_INR(R) {UINT8 hc = ((R & 0x0f) == 0x0f) ? HF : 0; ++R; cpustate->AF.b.l= (cpustate->AF.b.l & CF ) | ZSP[R] | hc; } -#define M_DCR(R) {UINT8 hc = ((R & 0x0f) == 0x00) ? HF : 0; --R; cpustate->AF.b.l= (cpustate->AF.b.l & CF ) | ZSP[R] | hc | NF; } -#define M_MVI(R) R=ARG(cpustate) -#define M_ANA(R) {UINT8 hc = ((cpustate->AF.b.h | R)<<1) & HF; cpustate->AF.b.h&=R; cpustate->AF.b.l=ZSP[cpustate->AF.b.h]; if( cpustate->cputype ) { cpustate->AF.b.l |= HF; } else {cpustate->AF.b.l |= hc; } } -#define M_ORA(R) cpustate->AF.b.h|=R; cpustate->AF.b.l=ZSP[cpustate->AF.b.h] -#define M_XRA(R) cpustate->AF.b.h^=R; cpustate->AF.b.l=ZSP[cpustate->AF.b.h] +#define M_MVI(R) R=ARG(cpustate) -#define M_RLC { \ - cpustate->AF.b.h = (cpustate->AF.b.h << 1) | (cpustate->AF.b.h >> 7); \ - cpustate->AF.b.l = (cpustate->AF.b.l & 0xfe) | (cpustate->AF.b.h & CF); \ +/* rotate */ +#define M_RLC { \ + cpustate->AF.b.h = (cpustate->AF.b.h << 1) | (cpustate->AF.b.h >> 7); \ + cpustate->AF.b.l = (cpustate->AF.b.l & 0xfe) | (cpustate->AF.b.h & CF); \ } -#define M_RRC { \ - cpustate->AF.b.l = (cpustate->AF.b.l & 0xfe) | (cpustate->AF.b.h & CF); \ - cpustate->AF.b.h = (cpustate->AF.b.h >> 1) | (cpustate->AF.b.h << 7); \ +#define M_RRC { \ + cpustate->AF.b.l = (cpustate->AF.b.l & 0xfe) | (cpustate->AF.b.h & CF); \ + cpustate->AF.b.h = (cpustate->AF.b.h >> 1) | (cpustate->AF.b.h << 7); \ } -#define M_RAL { \ - int c = cpustate->AF.b.l&CF; \ - cpustate->AF.b.l = (cpustate->AF.b.l & 0xfe) | (cpustate->AF.b.h >> 7); \ - cpustate->AF.b.h = (cpustate->AF.b.h << 1) | c; \ +#define M_RAL { \ + int c = cpustate->AF.b.l&CF; \ + cpustate->AF.b.l = (cpustate->AF.b.l & 0xfe) | (cpustate->AF.b.h >> 7); \ + cpustate->AF.b.h = (cpustate->AF.b.h << 1) | c; \ } -#define M_RAR { \ - int c = (cpustate->AF.b.l&CF) << 7; \ - cpustate->AF.b.l = (cpustate->AF.b.l & 0xfe) | (cpustate->AF.b.h & CF); \ - cpustate->AF.b.h = (cpustate->AF.b.h >> 1) | c; \ +#define M_RAR { \ + int c = (cpustate->AF.b.l&CF) << 7; \ + cpustate->AF.b.l = (cpustate->AF.b.l & 0xfe) | (cpustate->AF.b.h & CF); \ + cpustate->AF.b.h = (cpustate->AF.b.h >> 1) | c; \ } -#define M_ADD(R) { \ - int q = cpustate->AF.b.h+R; \ - cpustate->AF.b.l=ZSP[q&255]|((q>>8)&CF)| \ - ((cpustate->AF.b.h^q^R)&HF)| \ - (((R^cpustate->AF.b.h^SF)&(R^q)&SF)>>5); \ - cpustate->AF.b.h=q; \ -} +/* logical */ +#define M_ORA(R) cpustate->AF.b.h|=R; cpustate->AF.b.l=ZSP[cpustate->AF.b.h] +#define M_XRA(R) cpustate->AF.b.h^=R; cpustate->AF.b.l=ZSP[cpustate->AF.b.h] +#define M_ANA(R) {UINT8 hc = ((cpustate->AF.b.h | R)<<1) & HF; cpustate->AF.b.h&=R; cpustate->AF.b.l=ZSP[cpustate->AF.b.h]; if(IS_8085(cpustate)) { cpustate->AF.b.l |= HF; } else {cpustate->AF.b.l |= hc; } } -#define M_ADC(R) { \ - int q = cpustate->AF.b.h+R+(cpustate->AF.b.l&CF); \ - cpustate->AF.b.l=ZSP[q&255]|((q>>8)&CF)| \ - ((cpustate->AF.b.h^q^R)&HF)| \ - (((R^cpustate->AF.b.h^SF)&(R^q)&SF)>>5); \ - cpustate->AF.b.h=q; \ -} +/* increase / decrease */ +#define M_INR(R) {UINT8 hc = ((R & 0x0f) == 0x0f) ? HF : 0; ++R; cpustate->AF.b.l= (cpustate->AF.b.l & CF ) | ZSP[R] | hc; } +#define M_DCR(R) {UINT8 hc = ((R & 0x0f) == 0x00) ? HF : 0; --R; cpustate->AF.b.l= (cpustate->AF.b.l & CF ) | ZSP[R] | hc | VF; } -#define M_SUB(R) { \ - int q = cpustate->AF.b.h-R; \ - cpustate->AF.b.l=ZSP[q&255]|((q>>8)&CF)|NF| \ - ((cpustate->AF.b.h^q^R)&HF)| \ - (((R^cpustate->AF.b.h)&(cpustate->AF.b.h^q)&SF)>>5); \ - cpustate->AF.b.h=q; \ +/* arithmetic */ +#define M_ADD(R) { \ + int q = cpustate->AF.b.h+R; \ + cpustate->AF.b.l=ZSP[q&255]|((q>>8)&CF)|((cpustate->AF.b.h^q^R)&HF); \ + cpustate->AF.b.h=q; \ } -#define M_SBB(R) { \ - int q = cpustate->AF.b.h-R-(cpustate->AF.b.l&CF); \ - cpustate->AF.b.l=ZSP[q&255]|((q>>8)&CF)|NF| \ - ((cpustate->AF.b.h^q^R)&HF)| \ - (((R^cpustate->AF.b.h)&(cpustate->AF.b.h^q)&SF)>>5); \ - cpustate->AF.b.h=q; \ +#define M_ADC(R) { \ + int q = cpustate->AF.b.h+R+(cpustate->AF.b.l&CF); \ + cpustate->AF.b.l=ZSP[q&255]|((q>>8)&CF)|((cpustate->AF.b.h^q^R)&HF); \ + cpustate->AF.b.h=q; \ } -#define M_CMP(R) { \ - int q = cpustate->AF.b.h-R; \ - cpustate->AF.b.l=ZSP[q&255]|((q>>8)&CF)|NF| \ - ((cpustate->AF.b.h^q^R)&HF)| \ - (((R^cpustate->AF.b.h)&(cpustate->AF.b.h^q)&SF)>>5); \ +#define M_SUB(R) { \ + int q = cpustate->AF.b.h-R; \ + cpustate->AF.b.l=ZSP[q&255]|((q>>8)&CF)|((cpustate->AF.b.h^q^R)&HF)|VF; \ + cpustate->AF.b.h=q; \ } -#define M_IN \ - cpustate->STATUS = 0x42; \ - cpustate->XX.d=ARG(cpustate); \ - cpustate->AF.b.h=memory_read_byte_8le(cpustate->io, cpustate->XX.d); +#define M_SBB(R) { \ + int q = cpustate->AF.b.h-R-(cpustate->AF.b.l&CF); \ + cpustate->AF.b.l=ZSP[q&255]|((q>>8)&CF)|((cpustate->AF.b.h^q^R)&HF)|VF; \ + cpustate->AF.b.h=q; \ +} -#define M_OUT \ - cpustate->STATUS = 0x10; \ - cpustate->XX.d=ARG(cpustate); \ - memory_write_byte_8le(cpustate->io, cpustate->XX.d,cpustate->AF.b.h) +#define M_CMP(R) { \ + int q = cpustate->AF.b.h-R; \ + cpustate->AF.b.l=ZSP[q&255]|((q>>8)&CF)|((cpustate->AF.b.h^q^R)&HF)|VF; \ +} -#define M_DAD(R) { \ - int q = cpustate->HL.d + cpustate->R.d; \ - cpustate->AF.b.l = ( cpustate->AF.b.l & ~(HF+CF) ) | \ - ( ((cpustate->HL.d^q^cpustate->R.d) >> 8) & HF ) | \ - ( (q>>16) & CF ); \ - cpustate->HL.w.l = q; \ +#define M_DAD(R) { \ + int q = cpustate->HL.d + cpustate->R.d; \ + cpustate->AF.b.l = ( cpustate->AF.b.l & ~(HF+CF) ) | \ + ( ((cpustate->HL.d^q^cpustate->R.d) >> 8) & HF ) | \ + ( (q>>16) & CF ); \ + cpustate->HL.w.l = q; \ } -#define M_PUSH(R) { \ - cpustate->STATUS = 0x04; \ - memory_write_byte_8le(cpustate->program, --cpustate->SP.w.l, cpustate->R.b.h); \ - memory_write_byte_8le(cpustate->program, --cpustate->SP.w.l, cpustate->R.b.l); \ +#define M_DSUB(cpustate) { \ + int q = cpustate->HL.b.l-cpustate->BC.b.l; \ + cpustate->AF.b.l=ZS[q&255]|((q>>8)&CF)|VF| \ + ((cpustate->HL.b.l^q^cpustate->BC.b.l)&HF)| \ + (((cpustate->BC.b.l^cpustate->HL.b.l)&(cpustate->HL.b.l^q)&SF)>>5); \ + cpustate->HL.b.l=q; \ + q = cpustate->HL.b.h-cpustate->BC.b.h-(cpustate->AF.b.l&CF); \ + cpustate->AF.b.l=ZS[q&255]|((q>>8)&CF)|VF| \ + ((cpustate->HL.b.h^q^cpustate->BC.b.h)&HF)| \ + (((cpustate->BC.b.h^cpustate->HL.b.h)&(cpustate->HL.b.h^q)&SF)>>5); \ + if (cpustate->HL.b.l!=0) cpustate->AF.b.l&=~ZF; \ } -#define M_POP(R) { \ - cpustate->STATUS = 0x86; \ - cpustate->R.b.l = memory_read_byte_8le(cpustate->program, cpustate->SP.w.l++); \ - cpustate->R.b.h = memory_read_byte_8le(cpustate->program, cpustate->SP.w.l++); \ +/* i/o */ +#define M_IN \ + cpustate->STATUS = 0x42; \ + cpustate->WZ.d=ARG(cpustate); \ + cpustate->AF.b.h=memory_read_byte_8le(cpustate->io, cpustate->WZ.d); + +#define M_OUT \ + cpustate->STATUS = 0x10; \ + cpustate->WZ.d=ARG(cpustate); \ + memory_write_byte_8le(cpustate->io, cpustate->WZ.d,cpustate->AF.b.h) + +/* stack */ +#define M_PUSH(R) { \ + cpustate->STATUS = 0x04; \ + memory_write_byte_8le(cpustate->program, --cpustate->SP.w.l, cpustate->R.b.h); \ + memory_write_byte_8le(cpustate->program, --cpustate->SP.w.l, cpustate->R.b.l); \ } -#define M_RET(cc) \ -{ \ - if (cc) \ - { \ - cpustate->icount -= 6; \ - M_POP(PC); \ - } \ +#define M_POP(R) { \ + cpustate->STATUS = 0x86; \ + cpustate->R.b.l = memory_read_byte_8le(cpustate->program, cpustate->SP.w.l++); \ + cpustate->R.b.h = memory_read_byte_8le(cpustate->program, cpustate->SP.w.l++); \ } +/* jumps */ // On 8085 jump if condition is not satisfied is shorter -#define M_JMP(cc) { \ - if (cc) { \ - cpustate->PC.w.l = ARG16(cpustate); \ - } else { \ - cpustate->PC.w.l += 2; \ - cpustate->icount += (cpustate->cputype) ? 3 : 0; \ - } \ +#define M_JMP(cc) { \ + if (cc) { \ + cpustate->PC.w.l = ARG16(cpustate); \ + } else { \ + cpustate->PC.w.l += 2; \ + cpustate->icount += (IS_8085(cpustate)) ? 3 : 0; \ + } \ } // On 8085 call if condition is not satisfied is 9 ticks -#define M_CALL(cc) \ -{ \ - if (cc) \ - { \ - UINT16 a = ARG16(cpustate); \ - cpustate->icount -= (cpustate->cputype) ? 7 : 6 ; \ - M_PUSH(PC); \ - cpustate->PC.d = a; \ - } else { \ - cpustate->PC.w.l += 2; \ - cpustate->icount += (cpustate->cputype) ? 2 : 0; \ - } \ -} - -#define M_RST(nn) { \ - M_PUSH(PC); \ - cpustate->PC.d = 8 * nn; \ -} - -#define M_DSUB(cpustate) { \ - int q = cpustate->HL.b.l-cpustate->BC.b.l; \ - cpustate->AF.b.l=ZS[q&255]|((q>>8)&CF)|NF| \ - ((cpustate->HL.b.l^q^cpustate->BC.b.l)&HF)| \ - (((cpustate->BC.b.l^cpustate->HL.b.l)&(cpustate->HL.b.l^q)&SF)>>5); \ - cpustate->HL.b.l=q; \ - q = cpustate->HL.b.h-cpustate->BC.b.h-(cpustate->AF.b.l&CF); \ - cpustate->AF.b.l=ZS[q&255]|((q>>8)&CF)|NF| \ - ((cpustate->HL.b.h^q^cpustate->BC.b.h)&HF)| \ - (((cpustate->BC.b.h^cpustate->HL.b.h)&(cpustate->HL.b.h^q)&SF)>>5); \ - if (cpustate->HL.b.l!=0) cpustate->AF.b.l&=~ZF; \ +#define M_CALL(cc) \ +{ \ + if (cc) \ + { \ + UINT16 a = ARG16(cpustate); \ + cpustate->icount -= (IS_8085(cpustate)) ? 7 : 6 ; \ + M_PUSH(PC); \ + cpustate->PC.d = a; \ + } else { \ + cpustate->PC.w.l += 2; \ + cpustate->icount += (IS_8085(cpustate)) ? 2 : 0; \ + } \ +} + +// conditional RET only +#define M_RET(cc) \ +{ \ + if (cc) \ + { \ + cpustate->icount -= 6; \ + M_POP(PC); \ + } \ +} + +#define M_RST(nn) { \ + M_PUSH(PC); \ + cpustate->PC.d = 8 * nn; \ } + |