# HG changeset patch # User Mike Pavone # Date 1356746381 28800 # Node ID d260996eea557c244ef9d79e549520272583d5ac # Parent e3594572fb98c6a5f9e5b4f87aa63094b127400c Defer the correct address for pc relative jsr/jmp diff -r e3594572fb98 -r d260996eea55 m68k_to_x86.c --- a/m68k_to_x86.c Fri Dec 28 17:57:43 2012 -0800 +++ b/m68k_to_x86.c Fri Dec 28 17:59:41 2012 -0800 @@ -1449,7 +1449,7 @@ dst = cycles(dst, 10); dest_addr = get_native_address(opts->native_code_map, inst->src.params.regs.displacement + inst->address + 2); if (!dest_addr) { - opts->deferred = defer_address(opts->deferred, inst->src.params.immed, dst + 1); + opts->deferred = defer_address(opts->deferred, inst->src.params.regs.displacement + inst->address + 2, dst + 1); //dummy address to be replaced later, make sure it generates a 4-byte displacement dest_addr = dst + 256; } @@ -1557,7 +1557,7 @@ dst = call(dst, (char *)m68k_write_long_highfirst); dest_addr = get_native_address(opts->native_code_map, inst->src.params.regs.displacement + inst->address + 2); if (!dest_addr) { - opts->deferred = defer_address(opts->deferred, inst->src.params.immed, dst + 1); + opts->deferred = defer_address(opts->deferred, inst->src.params.regs.displacement + inst->address + 2, dst + 1); //dummy address to be replaced later, make sure it generates a 4-byte displacement dest_addr = dst + 5; }