--- xmil/z80x/z80x_mn.x86	2004/08/11 12:08:17	1.3
+++ xmil/z80x/z80x_mn.x86	2005/02/04 06:42:14	1.5
@@ -137,6 +137,7 @@ _scf:			and		byte [edi + R_Z80F], ~(H_FL
 				align	16
 _halt:			dec		word [edi + R_Z80PC]
 				or		byte [edi + R_Z80IFF], (1 << IFF_HALT)
+				mov		dword [edi + z80core_t.remainclock], 0
 				ret
 
 				align	16
@@ -150,9 +151,9 @@ _ei:			mov		al, [edi + R_Z80IFF]
 				and		al, ~(1 << IFF_IFLAG)
 				mov		edx, [edi + z80core_t.remainclock]
 				mov		[edi + R_Z80IFF], al
-				test	al, ((1 << IFF_IRQ) | (1 << IFF_NMI))
+				test	al, (1 << IFF_NMI)
 				jne		short .nextop
-				cmp		dword [edi + z80core_t.reqirq], byte 0
+				cmp		dword [edi + R_Z80REQIRQ], byte 0
 				jne		short .eventexit
 .nextop:		cmp		edx, byte 1
 				jge		short .ed