--- np2/i286x/i286xrep.cpp	2003/10/16 17:57:29	1.1.1.1
+++ np2/i286x/i286xrep.cpp	2005/03/24 02:21:21	1.6
@@ -1,9 +1,8 @@
 #include	"compiler.h"
-#include	"i286.h"
+#include	"cpucore.h"
 #include	"i286x.h"
 #include	"i286xs.h"
 #include	"i286xrep.h"
-#include	"memory.h"
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"i286x.mcr"
@@ -15,9 +14,9 @@
 				__asm {	movzx	ebp, I286_SI				}
 
 #define	REPLOOP(a)												\
-				__asm {	cmp		nevent.remainclock, 0		}	\
+				__asm {	cmp		I286_REMCLOCK, 0			}	\
 				__asm {	jg		(a)							}	\
-				__asm {	mov		esi, REPPOSBAK				}
+				__asm {	mov		esi, I286_REPPOSBAK			}
 
 
 // ---------------------------------------------------------------------- ins
@@ -65,7 +64,7 @@ I286EXT rep_xinsw(void) {
 				movzx	ebp, I286_DI
 				align	4
 insw_lp:		I286CLOCK(4)
-				movzx	cx, I286_DX
+				movzx	ecx, I286_DX
 				call	iocore_inp16
 				lea		ecx, [edi + ebp]
 				mov		dx, ax
@@ -131,7 +130,7 @@ I286EXT rep_xoutsw(void) {
 outsw_lp:		I286CLOCK(4)
 				lea		ecx, [edi + ebp]
 				call	i286_memoryread_w
-				movzx	cx, I286_DX
+				movzx	ecx, I286_DX
 				mov		dx, ax
 				call	iocore_out16
 				STRING_DIRx2