Mercurial > repos > blastem

changeset 113:d260996eea55

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Defer the correct address for pc relative jsr/jmp
author Mike Pavone <pavone@retrodev.com>
date Fri, 28 Dec 2012 17:59:41 -0800
parents e3594572fb98
children e821b6fde0e4
files m68k_to_x86.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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;
 		}