# HG changeset patch
# User Mike Pavone <pavone@retrodev.com>
# Date 1355725529 28800
# Node ID 44e661913a5152c14f61afbc42dbf1556c87ee40
# Parent  f02ba380875799c09b9c2ac300df7c23007bdcf2
Add preliminary support for JMP

diff -r f02ba3808757 -r 44e661913a51 m68k_to_x86.c
--- a/m68k_to_x86.c	Sun Dec 16 21:57:52 2012 -0800
+++ b/m68k_to_x86.c	Sun Dec 16 22:25:29 2012 -0800
@@ -36,6 +36,7 @@
 void m68k_write_byte();
 void m68k_save_context();
 void m68k_modified_ret_addr();
+void m68k_native_addr();
 void m68k_start_context(uint8_t * addr, m68k_context * context);
 
 uint8_t * cycles(uint8_t * dst, uint32_t num)
@@ -618,6 +619,39 @@
 	return dst;
 }
 
+uint8_t * translate_m68k_jmp(uint8_t * dst, m68kinst * inst, x86_68k_options * opts)
+{
+	uint8_t * dest_addr;
+    switch(inst->src.addr_mode)
+    {
+    case MODE_AREG_INDIRECT:
+        dst = cycles(dst, BUS);
+        if (opts->aregs[inst->src.params.regs.pri] >= 0) {
+            dst = mov_rr(dst, opts->aregs[inst->src.params.regs.pri], SCRATCH1, SZ_D);
+        } else {
+            dst = mov_rdisp8r(dst, CONTEXT, offsetof(m68k_context, aregs) + 4 * inst->src.params.regs.pri, SCRATCH1, SZ_D);
+        }
+        dst = check_cycles(dst);
+        dst = call(dst, (uint8_t *)m68k_native_addr);
+        //TODO: Finish me
+        //TODO: Fix timing
+        break;
+    case MODE_ABSOLUTE:
+    case MODE_ABSOLUTE_SHORT:
+        dst = cycles(dst, inst->src.addr_mode == MODE_ABSOLUTE ? 12 : 10);
+        dst = check_cycles(dst);
+        dest_addr = get_native_address(opts->native_code_map, inst->src.params.immed);
+        if (!dest_addr) {
+        	opts->deferred = defer_address(opts->deferred, inst->src.params.immed, dst + 1);
+			//dummy address to be replaced later, make sure it generates a 4-byte displacement
+			dest_addr = dst + 256;
+        }
+        dst = jmp(dst, dest_addr);
+        break;
+    }
+	return dst;
+}
+
 uint8_t * translate_m68k_rts(uint8_t * dst, m68kinst * inst, x86_68k_options * opts)
 {
 	//TODO: Add cycles
@@ -829,6 +863,8 @@
 		return translate_m68k_bsr(dst, inst, opts);
 	} else if(inst->op == M68K_BCC) {
 		return translate_m68k_bcc(dst, inst, opts);
+	} else if(inst->op == M68K_JMP) {
+		return translate_m68k_jmp(dst, inst, opts);
 	} else if(inst->op == M68K_RTS) {
 		return translate_m68k_rts(dst, inst, opts);
 	} else if(inst->op == M68K_DBCC) {
diff -r f02ba3808757 -r 44e661913a51 runtime.S
--- a/runtime.S	Sun Dec 16 21:57:52 2012 -0800
+++ b/runtime.S	Sun Dec 16 22:25:29 2012 -0800
@@ -124,6 +124,16 @@
 	mov $1, %rdi
 	call exit
 
+dyn_addr_msg:
+	.asciz "Program needs dynamically calculated native address\n"
+	
+	.global m68k_native_addr
+m68k_native_addr:
+	lea dyn_addr_msg(%rip), %rdi
+	call puts
+	mov $1, %rdi
+	call exit
+
 	.global m68k_save_context
 m68k_save_context:
 	mov %bl, 1(%rsi) /* N Flag */