# HG changeset patch
# User Michael Pavone <pavone@retrodev.com>
# Date 1420233249 28800
# Node ID d0943769353b1aea36f509b4dc64dca670abc7bf
# Parent  bca748422bf0c37ad61c854516f90cf84c0f9ffd
Added functions to gen_x86 for saving and restoring callee save registers to better abstract over ABI differences between x86 and x86-64

diff -r bca748422bf0 -r d0943769353b gen.h
--- a/gen.h	Fri Jan 02 12:04:58 2015 -0800
+++ b/gen.h	Fri Jan 02 13:14:09 2015 -0800
@@ -27,5 +27,7 @@
 void call_args(code_info *code, code_ptr fun, uint32_t num_args, ...);
 //like the above, but follows other aspects of the ABI like stack alignment
 void call_args_abi(code_info *code, code_ptr fun, uint32_t num_args, ...);
+void save_callee_save_regs(code_info *code);
+void restore_callee_save_regs(code_info *code);
 
 #endif //GEN_H_
diff -r bca748422bf0 -r d0943769353b gen_x86.c
--- a/gen_x86.c	Fri Jan 02 12:04:58 2015 -0800
+++ b/gen_x86.c	Fri Jan 02 13:14:09 2015 -0800
@@ -2039,3 +2039,33 @@
 	*no_adjust_rsp = code->cur - (no_adjust_rsp+1);
 #endif
 }
+
+void save_callee_save_regs(code_info *code)
+{
+	push_r(code, RBX);
+	push_r(code, RBP);
+#ifdef X86_64
+	push_r(code, R12);
+	push_r(code, R13);
+	push_r(code, R14);
+	push_r(code, R15);
+#else
+	push_r(code, RDI);
+	push_r(code, RSI);
+#endif
+}
+
+void restore_callee_save_regs(code_info *code)
+{
+#ifdef X86_64
+	pop_r(code, R15);
+	pop_r(code, R14);
+	pop_r(code, R13);
+	pop_r(code, R12);
+#else
+	pop_r(code, RSI);
+	pop_r(code, RDI);
+#endif
+	pop_r(code, RBP);
+	pop_r(code, RBX);
+}
diff -r bca748422bf0 -r d0943769353b m68k_core_x86.c
--- a/m68k_core_x86.c	Fri Jan 02 12:04:58 2015 -0800
+++ b/m68k_core_x86.c	Fri Jan 02 13:14:09 2015 -0800
@@ -2281,42 +2281,19 @@
 	retn(code);
 
 	opts->start_context = (start_fun)code->cur;
+	save_callee_save_regs(code);
 #ifdef X86_64
 	if (opts->gen.scratch2 != RDI) {
 		mov_rr(code, RDI, opts->gen.scratch2, SZ_PTR);
 	}
-	//save callee save registers
-	push_r(code, RBP);
-	push_r(code, R12);
-	push_r(code, R13);
-	push_r(code, R14);
-	push_r(code, R15);
 #else
-	//save callee save registers
-	push_r(code, RBP);
-	push_r(code, RBX);
-	push_r(code, RSI);
-	push_r(code, RDI);
-
 	mov_rdispr(code, RSP, 20, opts->gen.scratch2, SZ_D);
 	mov_rdispr(code, RSP, 24, opts->gen.context_reg, SZ_D);
 #endif
 	call(code, opts->gen.load_context);
 	call_r(code, opts->gen.scratch2);
 	call(code, opts->gen.save_context);
-#ifdef X86_64
-	//restore callee save registers
-	pop_r(code, R15);
-	pop_r(code, R14);
-	pop_r(code, R13);
-	pop_r(code, R12);
-	pop_r(code, RBP);
-#else
-	pop_r(code, RDI);
-	pop_r(code, RSI);
-	pop_r(code, RBX);
-	pop_r(code, RBP);
-#endif
+	restore_callee_save_regs(code);
 	retn(code);
 
 	opts->native_addr = code->cur;
diff -r bca748422bf0 -r d0943769353b z80_to_x86.c
--- a/z80_to_x86.c	Fri Jan 02 12:04:58 2015 -0800
+++ b/z80_to_x86.c	Fri Jan 02 13:14:09 2015 -0800
@@ -2052,13 +2052,7 @@
 	sub_ir(code, 5, RAX, SZ_PTR); //adjust return address to point to the call that got us here
 	mov_rrdisp(code, RBX, options->gen.context_reg, offsetof(z80_context, extra_pc), SZ_PTR);
 	mov_rrind(code, RAX, options->gen.context_reg, SZ_PTR);
-	//restore callee saved registers
-	pop_r(code, R15);
-	pop_r(code, R14);
-	pop_r(code, R13);
-	pop_r(code, R12);
-	pop_r(code, RBP);
-	pop_r(code, RBX);
+	restore_callee_save_regs(code);
 	*no_sync = code->cur - (no_sync + 1);
 	//return to caller of z80_run
 	retn(code);
@@ -2104,13 +2098,7 @@
 	mov_ir(code, 0x38, options->gen.scratch1, SZ_W);
 	call(code, options->native_addr);
 	mov_rrind(code, options->gen.scratch1, options->gen.context_reg, SZ_PTR);
-	//restore callee saved registers
-	pop_r(code, R15);
-	pop_r(code, R14);
-	pop_r(code, R13);
-	pop_r(code, R12);
-	pop_r(code, RBP);
-	pop_r(code, RBX);
+	restore_callee_save_regs(code);
 	//return to caller of z80_run to sync
 	retn(code);
 	*skip_int = code->cur - (skip_int+1);
@@ -2121,12 +2109,7 @@
 	call(code, options->gen.save_context);
 	pop_rind(code, options->gen.context_reg);
 	//restore callee saved registers
-	pop_r(code, R15);
-	pop_r(code, R14);
-	pop_r(code, R13);
-	pop_r(code, R12);
-	pop_r(code, RBP);
-	pop_r(code, RBX);
+	restore_callee_save_regs(code);
 	//return to caller of z80_run
 	*skip_sync = code->cur - (skip_sync+1);
 	retn(code);
@@ -2207,13 +2190,7 @@
 	jmp_r(code, options->gen.scratch1);
 
 	options->run = (z80_run_fun)code->cur;
-	//save callee save registers
-	push_r(code, RBX);
-	push_r(code, RBP);
-	push_r(code, R12);
-	push_r(code, R13);
-	push_r(code, R14);
-	push_r(code, R15);
+	save_callee_save_regs(code);
 	mov_rr(code, RDI, options->gen.context_reg, SZ_PTR);
 	call(code, options->load_context_scratch);
 	cmp_irdisp(code, 0, options->gen.context_reg, offsetof(z80_context, extra_pc), SZ_PTR);