# HG changeset patch # User Michael Pavone # Date 1523215578 25200 # Node ID 5a6339e4691730c464127dddeeacf1d80631cfe7 # Parent 18ffa9caa00cacdb0d2e4c25350c8852db2fd73d Fix timing for Z80 JP cc, nn instruction diff -r 18ffa9caa00c -r 5a6339e46917 z80_to_x86.c --- a/z80_to_x86.c Thu Apr 05 00:06:19 2018 -0700 +++ b/z80_to_x86.c Sun Apr 08 12:26:18 2018 -0700 @@ -2075,7 +2075,7 @@ break; } case Z80_JPCC: { - cycles(&opts->gen, num_cycles + 3);//T States: 4,3 + cycles(&opts->gen, num_cycles + 6);//T States: 4,3,3 uint8_t cond = CC_Z; switch (inst->reg) { @@ -2102,7 +2102,6 @@ } uint8_t *no_jump_off = code->cur+1; jcc(code, cond, code->cur+2); - cycles(&opts->gen, 5);//T States: 5 uint16_t dest_addr = inst->immed; code_ptr call_dst = z80_get_native_address(context, dest_addr); if (!call_dst) {