# HG changeset patch
# User Michael Pavone <pavone@retrodev.com>
# Date 1551457077 28800
# Node ID 63256371046fa742a34b2c42b524006b6b44984a
# Parent  95e387e1d63c6a0b3d2db35b552db94684b7941a
Couple of fixes for using MAME Z80 core

diff -r 95e387e1d63c -r 63256371046f mame_z80/z80.c
--- a/mame_z80/z80.c	Tue Feb 19 07:03:57 2019 +0000
+++ b/mame_z80/z80.c	Fri Mar 01 08:17:57 2019 -0800
@@ -423,11 +423,14 @@
 {
 	memmap_chunk const *map_tmp = z80->options->gen.memmap;
 	uint32_t chunks_tmp = z80->options->gen.memmap_chunks;
+	uint32_t mask_tmp = z80->options->gen.address_mask;
 	z80->options->gen.memmap = z80->options->iomap;
 	z80->options->gen.memmap_chunks = z80->options->io_chunks;
+	z80->options->gen.address_mask = z80->options->io_address_mask;
 	uint8_t value = read_byte(port, (void **)z80->mem_pointers, &z80->options->gen, z80);
 	z80->options->gen.memmap = map_tmp;
 	z80->options->gen.memmap_chunks = chunks_tmp;
+	z80->options->gen.address_mask = mask_tmp;
 	return value;
 }
 
@@ -3549,7 +3552,9 @@
 		if (z80->m_icount <= int_icount && z80->m_iff1 && !z80->m_after_ei) {
 			take_interrupt(z80);
 			z80->current_cycle = target_cycle - z80->m_icount * z80->options->gen.clock_divider;
-			z80->next_int_pulse(z80);
+			if (z80->next_int_pulse) {
+				z80->next_int_pulse(z80);
+			}
 			if (z80->int_pulse_start < target_cycle) {
 				int_icount = (z80->int_pulse_start < z80->current_cycle) ? z80->m_icount
 					: ((z80->int_pulse_start - z80->current_cycle) + z80->options->gen.clock_divider - 1) / z80->options->gen.clock_divider;
@@ -3560,6 +3565,8 @@
 		z80->m_after_ldair = 0;
 
 		PRVPC = PCD;
+		/*printf("Z80: %X - A: %X, B: %X, C: %X D: %X, E: %X, H: %X, L: %X, SP: %X, IX: %X, IY: %X @ %d\n",
+			PCD, A, B, C, D, E, H, L, SPD, IXD, IYD, target_cycle - z80->m_icount * z80->options->gen.clock_divider);*/
 		//debugger_instruction_hook(this, PCD);
 		z80->m_r++;
 		EXEC(op,rop(z80));