--- np2/i386c/ia32/cpu.c	2004/03/30 07:12:03	1.17
+++ np2/i386c/ia32/cpu.c	2005/02/07 14:46:11	1.22
@@ -1,4 +1,4 @@
-/*	$Id: cpu.c,v 1.17 2004/03/30 07:12:03 yui Exp $	*/
+/*	$Id: cpu.c,v 1.22 2005/02/07 14:46:11 yui Exp $	*/
 
 /*
  * Copyright (c) 2002-2003 NONAKA Kimihiro
@@ -55,7 +55,7 @@ int cpu_inst_trace = 0;
 #endif
 
 
-#define	IPTRACE			(1 << 14)
+// #define	IPTRACE			(1 << 14)
 
 #if defined(TRACE) && IPTRACE
 static	UINT	trpos = 0;
@@ -205,38 +205,74 @@ exec_1step(void)
 		if (CPU_CX != 0) {
 			if (!(insttable_info[op] & REP_CHECKZF)) {
 				/* rep */
-				do {
+				for (;;) {
 					(*insttable_1byte[CPU_INST_OP32][op])();
-				} while (--CPU_CX);
+					if (--CPU_CX == 0)
+						break;
+					if (CPU_REMCLOCK <= 0) {
+						CPU_EIP = CPU_PREV_EIP;
+						break;
+					}
+				}
 			} else if (CPU_INST_REPUSE != 0xf2) {
 				/* repe */
-				do {
+				for (;;) {
 					(*insttable_1byte[CPU_INST_OP32][op])();
-				} while (--CPU_CX && (CPU_FLAGL & Z_FLAG));
+					if (--CPU_CX == 0 || CC_NZ)
+						break;
+					if (CPU_REMCLOCK <= 0) {
+						CPU_EIP = CPU_PREV_EIP;
+						break;
+					}
+				}
 			} else {
 				/* repne */
-				do {
+				for (;;) {
 					(*insttable_1byte[CPU_INST_OP32][op])();
-				} while (--CPU_CX && !(CPU_FLAGL & Z_FLAG));
+					if (--CPU_CX == 0 || CC_Z)
+						break;
+					if (CPU_REMCLOCK <= 0) {
+						CPU_EIP = CPU_PREV_EIP;
+						break;
+					}
+				}
 			}
 		}
 	} else {
 		if (CPU_ECX != 0) {
 			if (!(insttable_info[op] & REP_CHECKZF)) {
 				/* rep */
-				do {
+				for (;;) {
 					(*insttable_1byte[CPU_INST_OP32][op])();
-				} while (--CPU_ECX);
+					if (--CPU_ECX == 0)
+						break;
+					if (CPU_REMCLOCK <= 0) {
+						CPU_EIP = CPU_PREV_EIP;
+						break;
+					}
+				}
 			} else if (CPU_INST_REPUSE != 0xf2) {
 				/* repe */
-				do {
+				for (;;) {
 					(*insttable_1byte[CPU_INST_OP32][op])();
-				} while (--CPU_ECX && (CPU_FLAGL & Z_FLAG));
+					if (--CPU_ECX == 0 || CC_NZ)
+						break;
+					if (CPU_REMCLOCK <= 0) {
+						CPU_EIP = CPU_PREV_EIP;
+						break;
+					}
+				}
 			} else {
 				/* repne */
-				do {
+				for (;;) {
 					(*insttable_1byte[CPU_INST_OP32][op])();
-				} while (--CPU_ECX && !(CPU_FLAGL & Z_FLAG));
+					if (--CPU_ECX == 0 || CC_Z)
+						break;
+					if (CPU_REMCLOCK <= 0) {
+						CPU_EIP = CPU_PREV_EIP;
+						break;
+					}
+				}
 			}
 		}
 	}