--- a/z80_to_x86.h	Tue Mar 11 09:44:47 2014 -0700
+++ b/z80_to_x86.h	Sun Dec 14 16:45:23 2014 -0800
@@ -22,13 +22,14 @@
 };
 
 typedef struct {
-	uint8_t *       cur_code;
-	uint8_t *       code_end;
-	uint8_t         *ram_inst_sizes;
-	deferred_addr * deferred;
+	cpu_options     gen;
+	code_ptr        save_context_scratch;
+	code_ptr        load_context_scratch;
+	code_ptr        write_8_noinc;
+
 	uint32_t        flags;
 	int8_t          regs[Z80_UNUSED];
-} x86_z80_options;
+} z80_options;
 
 typedef struct {
 	void *            native_pc;
@@ -51,7 +52,7 @@
 	uint32_t          int_cycle;
 	native_map_slot * static_code_map;
 	native_map_slot * banked_code_map;
-	void *            options;
+	z80_options *     options;
 	void *            system;
 	uint8_t           ram_code_flags[(8 * 1024)/128/8];
 	uint32_t          int_enable_cycle;
@@ -59,8 +60,8 @@
 } z80_context;
 
 void translate_z80_stream(z80_context * context, uint32_t address);
-void init_x86_z80_opts(x86_z80_options * options);
-void init_z80_context(z80_context * context, x86_z80_options * options);
+void init_x86_z80_opts(z80_options * options, memmap_chunk * chunks, uint32_t num_chunks);
+void init_z80_context(z80_context * context, z80_options * options);
 uint8_t * z80_get_native_address(z80_context * context, uint32_t address);
 uint8_t * z80_get_native_address_trans(z80_context * context, uint32_t address);
 z80_context * z80_handle_code_write(uint32_t address, z80_context * context);