Mercurial > repos > blastem

diff m68k_to_x86.c @ 559:6b248602ab84

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
blastem builds and almost works on OS X now
author Mike Pavone <pavone@retrodev.com>
date Tue, 17 Jun 2014 01:50:29 -0400
parents dc9f178085a0
children f9431cb3a39c
line wrap: on
line diff
--- a/m68k_to_x86.c	Mon Feb 24 01:30:16 2014 -0800
+++ b/m68k_to_x86.c	Tue Jun 17 01:50:29 2014 -0400
@@ -39,9 +39,14 @@
 
 m68k_context * sync_components(m68k_context * context, uint32_t address);
 
-void m68k_invalid();
-void bcd_add();
-void bcd_sub();
+extern void bcd_add() asm("bcd_add");
+extern void bcd_sub() asm("bcd_sub");
+
+void m68k_invalid(uint32_t address, m68k_context * context)
+{
+	printf("Invalid instruction at %X\n", address);
+	exit(1);
+}
 
 code_ptr cycles(code_ptr dst, uint32_t num)
 {
@@ -2864,7 +2869,11 @@
 		if (inst->src.params.immed == 0x7100) {
 			return retn(dst);
 		}
-		dst = mov_ir(dst, inst->address, SCRATCH1, SZ_D);
+		dst = mov_ir(dst, inst->address, SCRATCH2, SZ_D);
+#ifdef X86_32
+		dst = push_r(dst, CONTEXT);
+		dst = push_r(dst, SCRATCH2);
+#endif
 		return call(dst, (code_ptr)m68k_invalid);
 	} else if(inst->op == M68K_CMP) {
 		return translate_m68k_cmp(dst, inst, opts);