--- xmil/z80x/z80x_if.x86	2004/08/11 13:53:54	1.6
+++ xmil/z80x/z80x_if.x86	2005/02/04 06:42:14	1.9
@@ -12,19 +12,14 @@ section .text
 	global	_z80x_step
 
 	extern	_z80core
-	extern	_z80dmap
 	extern	memfetch
 	extern	memrd16_ecx_ax
 	extern	memwr16_ecx_dx
 	extern	_cycles_main
 	extern	opcode_main
 
-
-				align	16
-_z80x_ableinterrupt:
-				test	byte [_z80core + R_Z80IFF], ((1 << IFF_IFLAG) | (1 << IFF_IRQ) | (1 << IFF_NMI))
-				setz	al
-				ret
+	extern	_z80dmap
+	extern	_dma
 
 
 				align	16
@@ -35,7 +30,7 @@ _z80x_ableinterrupt:
 				je		short .setintr
 				inc		word [edx + R_Z80PC]
 				and		al, ~(1 << IFF_HALT)
-.setintr:		or		al, ((1 << IFF_IRQ) | (1 << IFF_IFLAG))
+.setintr:		or		al, (1 << IFF_IFLAG)
 				cmp		byte [edx + R_Z80IM], 1
 				mov		[edx + R_Z80IFF], al
 				je		short .im1
@@ -95,6 +90,8 @@ _z80x_nonmaskedinterrupt:
 _z80x_execute	push	ebx
 				push	edi
 				mov		edi, _z80core
+				test	byte [_dma], 1
+				jne		short .dmalp
 .lp:			inc		byte [edi + R_Z80R]
 				movzx	ecx, word [edi + R_Z80PC]
 				inc		word [edi + R_Z80PC]
@@ -102,13 +99,25 @@ _z80x_execute	push	ebx
 				movzx	edx, byte [_cycles_main + eax]
 				Z80WORK	edx
 				call	dword [opcode_main + eax*4]
-				call	_z80dmap
 				mov		eax, [edi + z80core_t.remainclock]
 				cmp		eax, byte 0
 				jg		short .lp
-				pop		edi
+.ed:			pop		edi
 				pop		ebx
 				ret
+.dmalp:			inc		byte [edi + R_Z80R]
+				movzx	ecx, word [edi + R_Z80PC]
+				inc		word [edi + R_Z80PC]
+				call	memfetch
+				movzx	edx, byte [_cycles_main + eax]
+				Z80WORK	edx
+				call	dword [opcode_main + eax*4]
+				call	_z80dmap
+				mov		eax, [edi + z80core_t.remainclock]
+				cmp		eax, byte 0
+				jg		short .dmalp
+				jmp		short .ed
+
 
 				align	16
 _z80x_step:		push	ebx