--- np2/i386c/ia32/instructions/bit_byte.c	2004/01/23 14:33:27	1.3
+++ np2/i386c/ia32/instructions/bit_byte.c	2004/03/21 21:30:49	1.8
@@ -1,4 +1,4 @@
-/*	$Id: bit_byte.c,v 1.3 2004/01/23 14:33:27 monaka Exp $	*/
+/*	$Id: bit_byte.c,v 1.8 2004/03/21 21:30:49 yui Exp $	*/
 
 /*
  * Copyright (c) 2002-2003 NONAKA Kimihiro
@@ -33,11 +33,23 @@
 
 #include "bit_byte.h"
 
-#define	BIT_OFFSET16(v)		(2 * (((SWORD)(v)) / 16))
-#define	BIT_MAKEBIT16(v)	(1 << ((v) & 0x0000000f))
-
-#define	BIT_OFFSET32(v)		(4 * (((SDWORD)(v)) / 32))
-#define	BIT_MAKEBIT32(v)	(1 << ((v) & 0x0000001f))
+#if 1
+#define	BIT_OFFSET16(v)		(2 * (((SINT16)(v)) >> 4))
+#define	BIT_INDEX16(v)		((v) & 0xf)
+#define	BIT_MAKEBIT16(v)	(1 << BIT_INDEX16(v))
+
+#define	BIT_OFFSET32(v)		(4 * (((SINT32)(v)) >> 5))
+#define	BIT_INDEX32(v)		((v) & 0x1f)
+#define	BIT_MAKEBIT32(v)	(1 << BIT_INDEX32(v))
+#else
+#define	BIT_OFFSET16(v)		(2 * (((SINT16)(v)) / 16))
+#define	BIT_INDEX16(v)		((v) & 0xf)
+#define	BIT_MAKEBIT16(v)	(1 << BIT_INDEX16(v))
+
+#define	BIT_OFFSET32(v)		(4 * (((SINT32)(v)) / 32))
+#define	BIT_INDEX32(v)		((v) & 0x1f)
+#define	BIT_MAKEBIT32(v)	(1 << BIT_INDEX32(v))
+#endif
 
 
 /*
@@ -46,8 +58,7 @@
 void
 BT_EwGw(void)
 {
-	DWORD op, src, dst, madr;
-	WORD bit;
+	UINT32 op, src, dst, madr;
 
 	PREPART_EA_REG16(op, src);
 	if (op >= 0xc0) {
@@ -59,19 +70,14 @@ BT_EwGw(void)
 		madr += BIT_OFFSET16(src);
 		dst = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr);
 	}
-	bit = BIT_MAKEBIT16(src);
-	if (dst & bit) {
-		CPU_FLAGL |= C_FLAG;
-	} else {
-		CPU_FLAGL &= ~C_FLAG;
-	}
+	CPU_FLAGL &= ~C_FLAG;
+	CPU_FLAGL |= (dst >> BIT_INDEX16(src)) & 1;
 }
 
 void
 BT_EdGd(void)
 {
-	DWORD op, src, dst, madr;
-	DWORD bit;
+	UINT32 op, src, dst, madr;
 
 	PREPART_EA_REG32(op, src);
 	if (op >= 0xc0) {
@@ -83,19 +89,14 @@ BT_EdGd(void)
 		madr += BIT_OFFSET32(src);
 		dst = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr);
 	}
-	bit = BIT_MAKEBIT32(src);
-	if (dst & bit) {
-		CPU_FLAGL |= C_FLAG;
-	} else {
-		CPU_FLAGL &= ~C_FLAG;
-	}
+	CPU_FLAGL &= ~C_FLAG;
+	CPU_FLAGL |= (dst >> BIT_INDEX32(src)) & 1;
 }
 
 void
-BT_EwIb(DWORD op)
+BT_EwIb(UINT32 op)
 {
-	DWORD src, dst, madr;
-	WORD bit;
+	UINT32 src, dst, madr;
 
 	if (op >= 0xc0) {
 		CPU_WORKCLOCK(2);
@@ -105,22 +106,16 @@ BT_EwIb(DWORD op)
 		CPU_WORKCLOCK(6);
 		madr = calc_ea_dst(op);
 		GET_PCBYTE(src);
-		madr += BIT_OFFSET16(src);
 		dst = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr);
 	}
-	bit = BIT_MAKEBIT16(src);
-	if (dst & bit) {
-		CPU_FLAGL |= C_FLAG;
-	} else {
-		CPU_FLAGL &= ~C_FLAG;
-	}
+	CPU_FLAGL &= ~C_FLAG;
+	CPU_FLAGL |= (dst >> BIT_INDEX16(src)) & 1;
 }
 
 void
-BT_EdIb(DWORD op)
+BT_EdIb(UINT32 op)
 {
-	DWORD src, dst, madr;
-	DWORD bit;
+	UINT32 src, dst, madr;
 
 	if (op >= 0xc0) {
 		CPU_WORKCLOCK(2);
@@ -130,15 +125,10 @@ BT_EdIb(DWORD op)
 		CPU_WORKCLOCK(6);
 		madr = calc_ea_dst(op);
 		GET_PCBYTE(src);
-		madr += BIT_OFFSET32(src);
 		dst = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr);
 	}
-	bit = BIT_MAKEBIT32(src);
-	if (dst & bit) {
-		CPU_FLAGL |= C_FLAG;
-	} else {
-		CPU_FLAGL &= ~C_FLAG;
-	}
+	CPU_FLAGL &= ~C_FLAG;
+	CPU_FLAGL |= (dst >> BIT_INDEX32(src)) & 1;
 }
 
 /*
@@ -147,9 +137,9 @@ BT_EdIb(DWORD op)
 void
 BTS_EwGw(void)
 {
-	WORD *out;
-	DWORD op, src, dst, res, madr;
-	WORD bit;
+	UINT16 *out;
+	UINT32 op, src, dst, res, madr;
+	UINT16 bit;
 
 	PREPART_EA_REG16(op, src);
 	bit = BIT_MAKEBIT16(src);
@@ -162,7 +152,7 @@ BTS_EwGw(void)
 		} else {
 			CPU_FLAGL &= ~C_FLAG;
 			res = dst | bit;
-			*out = res;
+			*out = (UINT16)res;
 		}
 	} else {
 		CPU_WORKCLOCK(7);
@@ -175,16 +165,16 @@ BTS_EwGw(void)
 			CPU_FLAGL &= ~C_FLAG;
 		}
 		res = dst | bit;
-		cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (WORD)res);
+		cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)res);
 	}
 }
 
 void
 BTS_EdGd(void)
 {
-	DWORD *out;
-	DWORD op, src, dst, res, madr;
-	DWORD bit;
+	UINT32 *out;
+	UINT32 op, src, dst, res, madr;
+	UINT32 bit;
 
 	PREPART_EA_REG32(op, src);
 	bit = BIT_MAKEBIT32(src);
@@ -215,11 +205,11 @@ BTS_EdGd(void)
 }
 
 void
-BTS_EwIb(DWORD op)
+BTS_EwIb(UINT32 op)
 {
-	WORD *out;
-	DWORD src, dst, res, madr;
-	WORD bit;
+	UINT16 *out;
+	UINT32 src, dst, res, madr;
+	UINT16 bit;
 
 	if (op >= 0xc0) {
 		CPU_WORKCLOCK(2);
@@ -232,13 +222,12 @@ BTS_EwIb(DWORD op)
 		} else {
 			CPU_FLAGL &= ~C_FLAG;
 			res = dst | bit;
-			*out = res;
+			*out = (UINT16)res;
 		}
 	} else {
 		CPU_WORKCLOCK(6);
 		madr = calc_ea_dst(op);
 		GET_PCBYTE(src);
-		madr += BIT_OFFSET16(src);
 		dst = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr);
 		bit = BIT_MAKEBIT16(src);
 		if (dst & bit) {
@@ -247,16 +236,16 @@ BTS_EwIb(DWORD op)
 			CPU_FLAGL &= ~C_FLAG;
 		}
 		res = dst | bit;
-		cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (WORD)res);
+		cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)res);
 	}
 }
 
 void
-BTS_EdIb(DWORD op)
+BTS_EdIb(UINT32 op)
 {
-	DWORD *out;
-	DWORD src, dst, res, madr;
-	DWORD bit;
+	UINT32 *out;
+	UINT32 src, dst, res, madr;
+	UINT32 bit;
 
 	if (op >= 0xc0) {
 		CPU_WORKCLOCK(2);
@@ -275,7 +264,6 @@ BTS_EdIb(DWORD op)
 		CPU_WORKCLOCK(6);
 		madr = calc_ea_dst(op);
 		GET_PCBYTE(src);
-		madr += BIT_OFFSET32(src);
 		dst = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr);
 		bit = BIT_MAKEBIT32(src);
 		if (dst & bit) {
@@ -294,9 +282,9 @@ BTS_EdIb(DWORD op)
 void
 BTR_EwGw(void)
 {
-	WORD *out;
-	DWORD op, src, dst, res, madr;
-	WORD bit;
+	UINT16 *out;
+	UINT32 op, src, dst, res, madr;
+	UINT16 bit;
 
 	PREPART_EA_REG16(op, src);
 	bit = BIT_MAKEBIT16(src);
@@ -307,7 +295,7 @@ BTR_EwGw(void)
 		if (dst & bit) {
 			CPU_FLAGL |= C_FLAG;
 			res = dst & ~bit;
-			*out = res;
+			*out = (UINT16)res;
 		} else {
 			CPU_FLAGL &= ~C_FLAG;
 		}
@@ -322,16 +310,16 @@ BTR_EwGw(void)
 			CPU_FLAGL &= ~C_FLAG;
 		}
 		res = dst & ~bit;
-		cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (WORD)res);
+		cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)res);
 	}
 }
 
 void
 BTR_EdGd(void)
 {
-	DWORD *out;
-	DWORD op, src, dst, res, madr;
-	DWORD bit;
+	UINT32 *out;
+	UINT32 op, src, dst, res, madr;
+	UINT32 bit;
 
 	PREPART_EA_REG32(op, src);
 	bit = BIT_MAKEBIT32(src);
@@ -362,11 +350,11 @@ BTR_EdGd(void)
 }
 
 void
-BTR_EwIb(DWORD op)
+BTR_EwIb(UINT32 op)
 {
-	WORD *out;
-	DWORD src, dst, res, madr;
-	WORD bit;
+	UINT16 *out;
+	UINT32 src, dst, res, madr;
+	UINT16 bit;
 
 	if (op >= 0xc0) {
 		CPU_WORKCLOCK(2);
@@ -377,7 +365,7 @@ BTR_EwIb(DWORD op)
 		if (dst & bit) {
 			CPU_FLAGL |= C_FLAG;
 			res = dst & ~bit;
-			*out = res;
+			*out = (UINT16)res;
 		} else {
 			CPU_FLAGL &= ~C_FLAG;
 		}
@@ -385,7 +373,6 @@ BTR_EwIb(DWORD op)
 		CPU_WORKCLOCK(6);
 		madr = calc_ea_dst(op);
 		GET_PCBYTE(src);
-		madr += BIT_OFFSET16(src);
 		dst = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr);
 		bit = BIT_MAKEBIT16(src);
 		if (dst & bit) {
@@ -394,16 +381,16 @@ BTR_EwIb(DWORD op)
 			CPU_FLAGL &= ~C_FLAG;
 		}
 		res = dst & ~bit;
-		cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (WORD)res);
+		cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)res);
 	}
 }
 
 void
-BTR_EdIb(DWORD op)
+BTR_EdIb(UINT32 op)
 {
-	DWORD *out;
-	DWORD src, dst, res, madr;
-	DWORD bit;
+	UINT32 *out;
+	UINT32 src, dst, res, madr;
+	UINT32 bit;
 
 	if (op >= 0xc0) {
 		CPU_WORKCLOCK(2);
@@ -422,7 +409,6 @@ BTR_EdIb(DWORD op)
 		CPU_WORKCLOCK(6);
 		madr = calc_ea_dst(op);
 		GET_PCBYTE(src);
-		madr += BIT_OFFSET32(src);
 		dst = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr);
 		bit = BIT_MAKEBIT32(src);
 		if (dst & bit) {
@@ -441,9 +427,9 @@ BTR_EdIb(DWORD op)
 void
 BTC_EwGw(void)
 {
-	WORD *out;
-	DWORD op, src, dst, res, madr;
-	WORD bit;
+	UINT16 *out;
+	UINT32 op, src, dst, res, madr;
+	UINT16 bit;
 
 	PREPART_EA_REG16(op, src);
 	bit = BIT_MAKEBIT16(src);
@@ -457,7 +443,7 @@ BTC_EwGw(void)
 			CPU_FLAGL &= ~C_FLAG;
 		}
 		res = dst ^ bit;
-		*out = res;
+		*out = (UINT16)res;
 	} else {
 		CPU_WORKCLOCK(7);
 		madr = calc_ea_dst(op);
@@ -469,16 +455,16 @@ BTC_EwGw(void)
 			CPU_FLAGL &= ~C_FLAG;
 		}
 		res = dst ^ bit;
-		cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (WORD)res);
+		cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)res);
 	}
 }
 
 void
 BTC_EdGd(void)
 {
-	DWORD *out;
-	DWORD op, src, dst, res, madr;
-	DWORD bit;
+	UINT32 *out;
+	UINT32 op, src, dst, res, madr;
+	UINT32 bit;
 
 	PREPART_EA_REG32(op, src);
 	bit = BIT_MAKEBIT32(src);
@@ -509,11 +495,11 @@ BTC_EdGd(void)
 }
 
 void
-BTC_EwIb(DWORD op)
+BTC_EwIb(UINT32 op)
 {
-	WORD *out;
-	DWORD src, dst, res, madr;
-	WORD bit;
+	UINT16 *out;
+	UINT32 src, dst, res, madr;
+	UINT16 bit;
 
 	if (op >= 0xc0) {
 		CPU_WORKCLOCK(2);
@@ -527,12 +513,11 @@ BTC_EwIb(DWORD op)
 			CPU_FLAGL &= ~C_FLAG;
 		}
 		res = dst ^ bit;
-		*out = res;
+		*out = (UINT16)res;
 	} else {
 		CPU_WORKCLOCK(6);
 		madr = calc_ea_dst(op);
 		GET_PCBYTE(src);
-		madr += BIT_OFFSET16(src);
 		dst = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr);
 		bit = BIT_MAKEBIT16(src);
 		if (dst & bit) {
@@ -541,16 +526,16 @@ BTC_EwIb(DWORD op)
 			CPU_FLAGL &= ~C_FLAG;
 		}
 		res = dst ^ bit;
-		cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (WORD)res);
+		cpu_vmemorywrite_w(CPU_INST_SEGREG_INDEX, madr, (UINT16)res);
 	}
 }
 
 void
-BTC_EdIb(DWORD op)
+BTC_EdIb(UINT32 op)
 {
-	DWORD *out;
-	DWORD src, dst, res, madr;
-	DWORD bit;
+	UINT32 *out;
+	UINT32 src, dst, res, madr;
+	UINT32 bit;
 
 	if (op >= 0xc0) {
 		CPU_WORKCLOCK(2);
@@ -569,7 +554,6 @@ BTC_EdIb(DWORD op)
 		CPU_WORKCLOCK(6);
 		madr = calc_ea_dst(op);
 		GET_PCBYTE(src);
-		madr += BIT_OFFSET32(src);
 		dst = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr);
 		bit = BIT_MAKEBIT32(src);
 		if (dst & bit) {
@@ -588,8 +572,8 @@ BTC_EdIb(DWORD op)
 void
 BSF_GwEw(void)
 {
-	WORD *out;
-	DWORD op, src;
+	UINT16 *out;
+	UINT32 op, src;
 	int bit;
 
 	PREPART_REG16_EA(op, src, out, 2, 7);
@@ -597,18 +581,20 @@ BSF_GwEw(void)
 		CPU_FLAGL |= Z_FLAG;
 		/* dest reg is undefined */
 	} else {
-		for (bit = 0; (bit < 16) && !(src & (1 << bit)); bit++)
-			continue;
-		*out = (WORD)bit;
 		CPU_FLAGL &= ~Z_FLAG;
+		for (bit = 0; bit < 15; bit++) {
+			if (src & (1 << bit))
+				break;
+		}
+		*out = (UINT16)bit;
 	}
 }
 
 void
 BSF_GdEd(void)
 {
-	DWORD *out;
-	DWORD op, src;
+	UINT32 *out;
+	UINT32 op, src;
 	int bit;
 
 	PREPART_REG32_EA(op, src, out, 2, 7);
@@ -616,10 +602,12 @@ BSF_GdEd(void)
 		CPU_FLAGL |= Z_FLAG;
 		/* dest reg is undefined */
 	} else {
-		for (bit = 0; (bit < 32) && !(src & (1 << bit)); bit++)
-			continue;
-		*out = (DWORD)bit;
 		CPU_FLAGL &= ~Z_FLAG;
+		for (bit = 0; bit < 31; bit++) {
+			if (src & (1 << bit))
+				break;
+		}
+		*out = (UINT32)bit;
 	}
 }
 
@@ -629,8 +617,8 @@ BSF_GdEd(void)
 void
 BSR_GwEw(void)
 {
-	WORD *out;
-	DWORD op, src;
+	UINT16 *out;
+	UINT32 op, src;
 	int bit;
 
 	PREPART_REG16_EA(op, src, out, 2, 7);
@@ -638,18 +626,20 @@ BSR_GwEw(void)
 		CPU_FLAGL |= Z_FLAG;
 		/* dest reg is undefined */
 	} else {
-		for (bit = 15; (bit >= 0) && !(src & (1 << bit)); bit--)
-			continue;
-		*out = (WORD)bit;
 		CPU_FLAGL &= ~Z_FLAG;
+		for (bit = 15; bit > 0; bit--) {
+			if (src & (1 << bit))
+				break;
+		}
+		*out = (UINT16)bit;
 	}
 }
 
 void
 BSR_GdEd(void)
 {
-	DWORD *out;
-	DWORD op, src;
+	UINT32 *out;
+	UINT32 op, src;
 	int bit;
 
 	PREPART_REG32_EA(op, src, out, 2, 7);
@@ -657,10 +647,12 @@ BSR_GdEd(void)
 		CPU_FLAGL |= Z_FLAG;
 		/* dest reg is undefined */
 	} else {
-		for (bit = 31; (bit >= 0) && !(src & (1 << bit)); bit--)
-			continue;
-		*out = (DWORD)bit;
 		CPU_FLAGL &= ~Z_FLAG;
+		for (bit = 31; bit > 0; bit--) {
+			if (src & (1 << bit))
+				break;
+		}
+		*out = (UINT32)bit;
 	}
 }
 
@@ -670,8 +662,8 @@ BSR_GdEd(void)
 void
 SETO_Eb(void)
 {
-	DWORD op, madr;
-	BYTE v = CPU_OV ? 1 : 0;
+	UINT32 op, madr;
+	UINT8 v = CC_O?1:0;
 
 	GET_PCBYTE(op);
 	if (op >= 0xc0) {
@@ -687,8 +679,8 @@ SETO_Eb(void)
 void
 SETNO_Eb(void)
 {
-	DWORD op, madr;
-	BYTE v = CPU_OV ? 0 : 1;
+	UINT32 op, madr;
+	UINT8 v = CC_NO?1:0;
 
 	GET_PCBYTE(op);
 	if (op >= 0xc0) {
@@ -704,8 +696,8 @@ SETNO_Eb(void)
 void
 SETC_Eb(void)
 {
-	DWORD op, madr;
-	BYTE v = CPU_FLAGL & C_FLAG;
+	UINT32 op, madr;
+	UINT8 v = CC_C?1:0;
 
 	GET_PCBYTE(op);
 	if (op >= 0xc0) {
@@ -721,8 +713,8 @@ SETC_Eb(void)
 void
 SETNC_Eb(void)
 {
-	DWORD op, madr;
-	BYTE v = (CPU_FLAGL & C_FLAG) ? 0 : 1;
+	UINT32 op, madr;
+	UINT8 v = CC_NC?1:0;
 
 	GET_PCBYTE(op);
 	if (op >= 0xc0) {
@@ -738,8 +730,8 @@ SETNC_Eb(void)
 void
 SETZ_Eb(void)
 {
-	DWORD op, madr;
-	BYTE v = (CPU_FLAGL & Z_FLAG) ? 1 : 0;
+	UINT32 op, madr;
+	UINT8 v = CC_Z?1:0;
 
 	GET_PCBYTE(op);
 	if (op >= 0xc0) {
@@ -755,8 +747,8 @@ SETZ_Eb(void)
 void
 SETNZ_Eb(void)
 {
-	DWORD op, madr;
-	BYTE v = (CPU_FLAGL & Z_FLAG) ? 0 : 1;
+	UINT32 op, madr;
+	UINT8 v = CC_NZ?1:0;
 
 	GET_PCBYTE(op);
 	if (op >= 0xc0) {
@@ -772,8 +764,8 @@ SETNZ_Eb(void)
 void
 SETA_Eb(void)
 {
-	DWORD op, madr;
-	BYTE v = (CPU_FLAGL & (Z_FLAG|C_FLAG)) ? 0 : 1;
+	UINT32 op, madr;
+	UINT8 v = CC_A?1:0;
 
 	GET_PCBYTE(op);
 	if (op >= 0xc0) {
@@ -789,8 +781,8 @@ SETA_Eb(void)
 void
 SETNA_Eb(void)
 {
-	DWORD op, madr;
-	BYTE v = (CPU_FLAGL & (Z_FLAG|C_FLAG)) ? 1 : 0;
+	UINT32 op, madr;
+	UINT8 v = CC_NA?1:0;
 
 	GET_PCBYTE(op);
 	if (op >= 0xc0) {
@@ -806,8 +798,8 @@ SETNA_Eb(void)
 void
 SETS_Eb(void)
 {
-	DWORD op, madr;
-	BYTE v = (CPU_FLAGL & S_FLAG) ? 1 : 0;
+	UINT32 op, madr;
+	UINT8 v = CC_S?1:0;
 
 	GET_PCBYTE(op);
 	if (op >= 0xc0) {
@@ -823,8 +815,8 @@ SETS_Eb(void)
 void
 SETNS_Eb(void)
 {
-	DWORD op, madr;
-	BYTE v = (CPU_FLAGL & S_FLAG) ? 0 : 1;
+	UINT32 op, madr;
+	UINT8 v = CC_NS?1:0;
 
 	GET_PCBYTE(op);
 	if (op >= 0xc0) {
@@ -840,8 +832,8 @@ SETNS_Eb(void)
 void
 SETP_Eb(void)
 {
-	DWORD op, madr;
-	BYTE v = (CPU_FLAGL & P_FLAG) ? 1 : 0;
+	UINT32 op, madr;
+	UINT8 v = CC_P?1:0;
 
 	GET_PCBYTE(op);
 	if (op >= 0xc0) {
@@ -857,8 +849,8 @@ SETP_Eb(void)
 void
 SETNP_Eb(void)
 {
-	DWORD op, madr;
-	BYTE v = (CPU_FLAGL & P_FLAG) ? 0 : 1;
+	UINT32 op, madr;
+	UINT8 v = CC_NP?1:0;
 
 	GET_PCBYTE(op);
 	if (op >= 0xc0) {
@@ -874,8 +866,8 @@ SETNP_Eb(void)
 void
 SETL_Eb(void)
 {
-	DWORD op, madr;
-	BYTE v = (!CPU_OV == !(CPU_FLAGL & S_FLAG)) ? 1 : 0;
+	UINT32 op, madr;
+	UINT8 v = CC_L?1:0;
 
 	GET_PCBYTE(op);
 	if (op >= 0xc0) {
@@ -891,8 +883,8 @@ SETL_Eb(void)
 void
 SETNL_Eb(void)
 {
-	DWORD op, madr;
-	BYTE v = (!CPU_OV == !(CPU_FLAGL & S_FLAG)) ? 0 : 1;
+	UINT32 op, madr;
+	UINT8 v = CC_NL?1:0;
 
 	GET_PCBYTE(op);
 	if (op >= 0xc0) {
@@ -908,8 +900,8 @@ SETNL_Eb(void)
 void
 SETLE_Eb(void)
 {
-	DWORD op, madr;
-	BYTE v = ((CPU_FLAGL & Z_FLAG) || (!CPU_OV == !(CPU_FLAGL & S_FLAG))) ? 1 : 0;
+	UINT32 op, madr;
+	UINT8 v = CC_LE?1:0;
 
 	GET_PCBYTE(op);
 	if (op >= 0xc0) {
@@ -925,8 +917,8 @@ SETLE_Eb(void)
 void
 SETNLE_Eb(void)
 {
-	DWORD op, madr;
-	BYTE v = ((CPU_FLAGL & Z_FLAG) || (!CPU_OV == !(CPU_FLAGL & S_FLAG))) ? 0 : 1;
+	UINT32 op, madr;
+	UINT8 v = CC_NLE?1:0;
 
 	GET_PCBYTE(op);
 	if (op >= 0xc0) {
@@ -945,7 +937,7 @@ SETNLE_Eb(void)
 void
 TEST_EbGb(void)
 {
-	DWORD op, src, tmp, madr;
+	UINT32 op, src, tmp, madr;
 
 	PREPART_EA_REG8(op, src);
 	if (op >= 0xc0) {
@@ -956,13 +948,13 @@ TEST_EbGb(void)
 		madr = calc_ea_dst(op);
 		tmp = cpu_vmemoryread(CPU_INST_SEGREG_INDEX, madr);
 	}
-	ANDBYTE(tmp, src);
+	AND_BYTE(tmp, src);
 }
 
 void
 TEST_EwGw(void)
 {
-	DWORD op, src, tmp, madr;
+	UINT32 op, src, tmp, madr;
 
 	PREPART_EA_REG16(op, src);
 	if (op >= 0xc0) {
@@ -973,13 +965,13 @@ TEST_EwGw(void)
 		madr = calc_ea_dst(op);
 		tmp = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr);
 	}
-	ANDWORD(tmp, src);
+	AND_WORD(tmp, src);
 }
 
 void
 TEST_EdGd(void)
 {
-	DWORD op, src, tmp, madr;
+	UINT32 op, src, tmp, madr;
 
 	PREPART_EA_REG32(op, src);
 	if (op >= 0xc0) {
@@ -990,46 +982,46 @@ TEST_EdGd(void)
 		madr = calc_ea_dst(op);
 		tmp = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr);
 	}
-	ANDDWORD(tmp, src);
+	AND_DWORD(tmp, src);
 }
 
 void
 TEST_ALIb(void)
 {
-	DWORD src, tmp;
+	UINT32 src, tmp;
 
 	CPU_WORKCLOCK(3);
 	tmp = CPU_AL;
 	GET_PCBYTE(src);
-	ANDBYTE(tmp, src);
+	AND_BYTE(tmp, src);
 }
 
 void
 TEST_AXIw(void)
 {
-	DWORD src, tmp;
+	UINT32 src, tmp;
 
 	CPU_WORKCLOCK(3);
 	tmp = CPU_AX;
 	GET_PCWORD(src);
-	ANDWORD(tmp, src);
+	AND_WORD(tmp, src);
 }
 
 void
 TEST_EAXId(void)
 {
-	DWORD src, tmp;
+	UINT32 src, tmp;
 
 	CPU_WORKCLOCK(3);
 	tmp = CPU_EAX;
 	GET_PCDWORD(src);
-	ANDDWORD(tmp, src);
+	AND_DWORD(tmp, src);
 }
 
 void
-TEST_EbIb(DWORD op)
+TEST_EbIb(UINT32 op)
 {
-	DWORD src, tmp, madr;
+	UINT32 src, tmp, madr;
 
 	if (op >= 0xc0) {
 		CPU_WORKCLOCK(2);
@@ -1040,13 +1032,13 @@ TEST_EbIb(DWORD op)
 		tmp = cpu_vmemoryread(CPU_INST_SEGREG_INDEX, madr);
 	}
 	GET_PCBYTE(src);
-	ANDBYTE(tmp, src);
+	AND_BYTE(tmp, src);
 }
 
 void
-TEST_EwIw(DWORD op)
+TEST_EwIw(UINT32 op)
 {
-	DWORD src, tmp, madr;
+	UINT32 src, tmp, madr;
 
 	if (op >= 0xc0) {
 		CPU_WORKCLOCK(2);
@@ -1057,13 +1049,13 @@ TEST_EwIw(DWORD op)
 		tmp = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr);
 	}
 	GET_PCWORD(src);
-	ANDWORD(tmp, src);
+	AND_WORD(tmp, src);
 }
 
 void
-TEST_EdId(DWORD op)
+TEST_EdId(UINT32 op)
 {
-	DWORD src, tmp, madr;
+	UINT32 src, tmp, madr;
 
 	if (op >= 0xc0) {
 		CPU_WORKCLOCK(2);
@@ -1074,5 +1066,5 @@ TEST_EdId(DWORD op)
 		tmp = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr);
 	}
 	GET_PCDWORD(src);
-	ANDDWORD(tmp, src);
+	AND_DWORD(tmp, src);
 }