--- xmil/z80c/z80c_s.mcr	2004/08/14 12:16:18	1.5
+++ xmil/z80c/z80c_s.mcr	2004/08/18 17:15:35	1.7
@@ -58,16 +58,11 @@
 		}																\
 		R_Z80F |= (((tmp ^ (reg)) & (tmp ^ R_Z80HL)) >> 13) & V_FLAG;	\
 		R_Z80F |= ((R_Z80HL ^ tmp ^ (reg)) >> 8) & H_FLAG;				\
-		(reg) = (UINT16)tmp;											\
+		R_Z80HL = (UINT16)tmp;											\
 	}
 
 #define MCR_RETI {														\
-		CPU_IRQ = CPU_IRQ & (CPU_IRQ - 1);								\
-		if ((!(Z80_IFF & ((1 << IFF_IFLAG) | (1 << IFF_NMI)))) &&		\
-			(CPU_REQIRQ != 0)) {										\
-			CPU_BASECLOCK -= CPU_REMCLOCK;								\
-			CPU_REMCLOCK = 0;											\
-		}																\
+		ievent_eoi();													\
 		MCR_RET															\
 	}