diff m68k_core_x86.c @ 653:a18e3923481e

Remove some of the hard coded assumptions about the memory map from the CPU cores
author Michael Pavone <pavone@retrodev.com>
date Thu, 01 Jan 2015 14:36:55 -0800
parents 9d6fed6501ba
children 98927f1b005b
line wrap: on
line diff
--- a/m68k_core_x86.c	Tue Dec 30 19:11:34 2014 -0800
+++ b/m68k_core_x86.c	Thu Jan 01 14:36:55 2015 -0800
@@ -1464,7 +1464,7 @@
 	set_flag_cond(opts, CC_O, FLAG_V);
 	*no_adjust = code->cur - (no_adjust+1);
 	flag_to_flag(opts, FLAG_C, FLAG_X);
-	
+
 	cmp_ir(code, 0, opts->gen.scratch1, SZ_B);
 	set_flag_cond(opts, CC_S, FLAG_N);
 	jcc(code, CC_Z, code->cur + 4);
@@ -1664,7 +1664,7 @@
 	case MODE_ABSOLUTE_SHORT:
 	case MODE_PC_INDEX_DISP8:
 	case MODE_IMMEDIATE:
-		isize = 4;		
+		isize = 4;
 		break;
 	case MODE_ABSOLUTE:
 		isize = 6;
@@ -2230,6 +2230,8 @@
 void init_m68k_opts(m68k_options * opts, memmap_chunk * memmap, uint32_t num_chunks)
 {
 	memset(opts, 0, sizeof(*opts));
+	opts->gen.memmap = memmap;
+	opts->gen.memmap_chunks = num_chunks;
 	opts->gen.address_size = SZ_D;
 	opts->gen.address_mask = 0xFFFFFF;
 	opts->gen.byte_swap = 1;