# HG changeset patch # User Michael Pavone # Date 1446185521 25200 # Node ID 58606d16d35c9555fe5e2e40918e15d0bc0f0b2f # Parent 5822c6e5642f609297ed07d7df0f047c0d958ba4 Fix timing of certain variants of LD diff -r 5822c6e5642f -r 58606d16d35c z80_to_x86.c --- a/z80_to_x86.c Thu Oct 29 21:42:10 2015 -0700 +++ b/z80_to_x86.c Thu Oct 29 23:12:01 2015 -0700 @@ -355,10 +355,10 @@ case Z80_REG: case Z80_REG_INDIRECT: num_cycles = size == SZ_B ? 4 : 6; - if (inst->ea_reg == Z80_IX || inst->ea_reg == Z80_IY) { + if (inst->ea_reg == Z80_IX || inst->ea_reg == Z80_IY || (inst->ea_reg >= Z80_IXL && inst->ea_reg <= Z80_IYH)) { num_cycles += 4; } - if (inst->reg == Z80_I || inst->ea_reg == Z80_I) { + if (inst->reg == Z80_I || inst->ea_reg == Z80_I || inst->reg == Z80_R || inst->ea_reg == Z80_R) { num_cycles += 5; } break;