# HG changeset patch # User Michael Pavone # Date 1484753346 28800 # Node ID 2a799f24563f42c69152dedc4fa0092be9f63a3c # Parent 0928b68fef2ac0b48b73a91850f72a6bb59f87f5 Fix regression in tracking of 3+ byte instructions in Z80 core diff -r 0928b68fef2a -r 2a799f24563f z80_to_x86.c --- a/z80_to_x86.c Tue Jan 17 19:01:13 2017 -0800 +++ b/z80_to_x86.c Wed Jan 18 07:29:06 2017 -0800 @@ -2915,8 +2915,6 @@ void z80_map_native_address(z80_context * context, uint32_t address, uint8_t * native_address, uint8_t size, uint8_t native_size) { - uint32_t orig_address = address; - z80_options * opts = context->options; uint32_t meta_off; memmap_chunk const *mem_chunk = find_map_chunk(address, &opts->gen, MMAP_CODE, &meta_off); @@ -2950,7 +2948,7 @@ memset(map->offsets, 0xFF, sizeof(int32_t) * NATIVE_CHUNK_SIZE); } map->offsets[address % NATIVE_CHUNK_SIZE] = native_address - map->base; - for(--size, address++; size; --size, orig_address++) { + for(--size, address++; size; --size, address++) { address &= opts->gen.address_mask; map = opts->gen.native_code_map + address / NATIVE_CHUNK_SIZE; if (!map->base) {