RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 23:37:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

z80, some cz80 cleanup

Browse source
This commit is contained in:
kub 2021-10-08 18:40:06 +02:00
parent 80bf9bcce9
commit 47ea630f6d
1 changed files with 12 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

36
cpu/cz80/cz80_opED.c
View file

@ -491,27 +491,23 @@ OP_LDX:
-----------------------------------------*/ -----------------------------------------*/
OPED(0xb0): // LDIR OPED(0xb0): // LDIR
if (zBC != 1)
PC -= 2;
do do
{ {
val = READ_MEM8(zHL++); val = READ_MEM8(zHL++);
WRITE_MEM8(zDE++, val); WRITE_MEM8(zDE++, val);
zBC--; zBC--;
USE_CYCLES(21) USE_CYCLES(21)
} while (zBC > 1 && (CPU->ICount > 0) && !CPU->Status); } while (zBC && (CPU->ICount > -4) && !CPU->Status);
goto OP_LDXR; goto OP_LDXR;
OPED(0xb8): // LDDR OPED(0xb8): // LDDR
if (zBC != 1)
PC -= 2;
do do
{ {
val = READ_MEM8(zHL--); val = READ_MEM8(zHL--);
WRITE_MEM8(zDE--, val); WRITE_MEM8(zDE--, val);
zBC--; zBC--;
USE_CYCLES(21) USE_CYCLES(21)
} while (zBC > 1 && (CPU->ICount > 0) && !CPU->Status); } while (zBC && (CPU->ICount > -4) && !CPU->Status);
OP_LDXR: OP_LDXR:
F = zF & (SF | ZF | CF); F = zF & (SF | ZF | CF);
@ -520,6 +516,7 @@ OP_LDXR:
if (zBC) if (zBC)
{ {
zF = F | VF; zF = F | VF;
PC -= 2;
#if CZ80_EMULATE_R_EXACTLY #if CZ80_EMULATE_R_EXACTLY
zR--; zR--;
#endif #endif
@ -556,8 +553,6 @@ OP_CPX:
-----------------------------------------*/ -----------------------------------------*/
OPED(0xb1): // CPIR OPED(0xb1): // CPIR
if (zBC != 1)
PC -= 2;
do do
{ {
val = READ_MEM8(zHL++); val = READ_MEM8(zHL++);
@ -570,12 +565,10 @@ OP_CPX:
if (zBC) F |= VF; if (zBC) F |= VF;
zF = F; zF = F;
USE_CYCLES(21) USE_CYCLES(21)
} while (zBC > 1 && !(F & ZF) && (CPU->ICount > 0) && !CPU->Status); } while (zBC && !(F & ZF) && (CPU->ICount > -4) && !CPU->Status);
goto OP_CPXR; goto OP_CPXR;
OPED(0xb9): // CPDR OPED(0xb9): // CPDR
if (zBC != 1)
PC -= 2;
do do
{ {
val = READ_MEM8(zHL--); val = READ_MEM8(zHL--);
@ -588,11 +581,12 @@ OP_CPX:
if (zBC) F |= VF; if (zBC) F |= VF;
zF = F; zF = F;
USE_CYCLES(21) USE_CYCLES(21)
} while (zBC > 1 && !(F & ZF) && (CPU->ICount > 0) && !CPU->Status); } while (zBC && !(F & ZF) && (CPU->ICount > -4) && !CPU->Status);
OP_CPXR: OP_CPXR:
if (zBC && !(F & ZF)) if (zBC && !(F & ZF))
{ {
PC -= 2;
#if CZ80_EMULATE_R_EXACTLY #if CZ80_EMULATE_R_EXACTLY
zR--; zR--;
#endif #endif
@ -631,27 +625,23 @@ OP_INX:
-----------------------------------------*/ -----------------------------------------*/
OPED(0xb2): // INIR OPED(0xb2): // INIR
if (zB != 1)
PC -= 2;
do do
{ {
val = IN(zBC); val = IN(zBC);
zB--; zB--;
WRITE_MEM8(zHL++, val); WRITE_MEM8(zHL++, val);
USE_CYCLES(21) USE_CYCLES(21)
} while (zB > 1 && (CPU->ICount > 0) && !CPU->Status); } while (zB && (CPU->ICount > -4) && !CPU->Status);
goto OP_INXR; goto OP_INXR;
OPED(0xba): // INDR OPED(0xba): // INDR
if (zB != 1)
PC -= 2;
do do
{ {
val = IN(zBC); val = IN(zBC);
zB--; zB--;
WRITE_MEM8(zHL--, val); WRITE_MEM8(zHL--, val);
USE_CYCLES(21) USE_CYCLES(21)
} while (zB > 1 && (CPU->ICount > 0) && !CPU->Status); } while (zB && (CPU->ICount > -4) && !CPU->Status);
OP_INXR: OP_INXR:
F = SZ[zB]; F = SZ[zB];
@ -662,6 +652,7 @@ OP_INXR:
zF = F; zF = F;
if (zB) if (zB)
{ {
PC -= 2;
#if CZ80_EMULATE_R_EXACTLY #if CZ80_EMULATE_R_EXACTLY
zR--; zR--;
#endif #endif
@ -700,27 +691,23 @@ OP_OUTX:
-----------------------------------------*/ -----------------------------------------*/
OPED(0xb3): // OTIR OPED(0xb3): // OTIR
if (zB != 1)
PC -= 2;
do do
{ {
val = READ_MEM8(zHL++); val = READ_MEM8(zHL++);
zB--; zB--;
OUT(zBC, val); OUT(zBC, val);
USE_CYCLES(21) USE_CYCLES(21)
} while (zB > 1 && (CPU->ICount > 0) && !CPU->Status); } while (zB && (CPU->ICount > -4) && !CPU->Status);
goto OP_OTXR; goto OP_OTXR;
OPED(0xbb): // OTDR OPED(0xbb): // OTDR
if (zB != 1)
PC -= 2;
do do
{ {
val = READ_MEM8(zHL--); val = READ_MEM8(zHL--);
zB--; zB--;
OUT(zBC, val); OUT(zBC, val);
USE_CYCLES(21) USE_CYCLES(21)
} while (zB > 1 && (CPU->ICount > 0) && !CPU->Status); } while (zB && (CPU->ICount > -4) && !CPU->Status);
OP_OTXR: OP_OTXR:
F = SZ[zB]; F = SZ[zB];
@ -731,6 +718,7 @@ OP_OTXR:
zF = F; zF = F;
if (zB) if (zB)
{ {
PC -= 2;
#if CZ80_EMULATE_R_EXACTLY #if CZ80_EMULATE_R_EXACTLY
zR--; zR--;
#endif #endif