--- np2/i386c/ia32/instructions/bit_byte.c	2004/01/23 14:33:27	1.3
+++ np2/i386c/ia32/instructions/bit_byte.c	2004/02/18 20:11:37	1.5
@@ -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.5 2004/02/18 20:11:37 yui Exp $	*/
 
 /*
  * Copyright (c) 2002-2003 NONAKA Kimihiro
@@ -34,10 +34,12 @@
 #include "bit_byte.h"
 
 #define	BIT_OFFSET16(v)		(2 * (((SWORD)(v)) / 16))
-#define	BIT_MAKEBIT16(v)	(1 << ((v) & 0x0000000f))
+#define	BIT_INDEX16(v)		((v) & 0xf)
+#define	BIT_MAKEBIT16(v)	(1 << BIT_INDEX16(v))
 
 #define	BIT_OFFSET32(v)		(4 * (((SDWORD)(v)) / 32))
-#define	BIT_MAKEBIT32(v)	(1 << ((v) & 0x0000001f))
+#define	BIT_INDEX32(v)		((v) & 0x1f)
+#define	BIT_MAKEBIT32(v)	(1 << BIT_INDEX32(v))
 
 
 /*
@@ -47,7 +49,6 @@ void
 BT_EwGw(void)
 {
 	DWORD op, src, dst, madr;
-	WORD bit;
 
 	PREPART_EA_REG16(op, src);
 	if (op >= 0xc0) {
@@ -59,19 +60,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;
 
 	PREPART_EA_REG32(op, src);
 	if (op >= 0xc0) {
@@ -83,19 +79,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)
 {
 	DWORD src, dst, madr;
-	WORD bit;
 
 	if (op >= 0xc0) {
 		CPU_WORKCLOCK(2);
@@ -105,22 +96,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)
 {
 	DWORD src, dst, madr;
-	DWORD bit;
 
 	if (op >= 0xc0) {
 		CPU_WORKCLOCK(2);
@@ -130,15 +115,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;
 }
 
 /*
@@ -162,7 +142,7 @@ BTS_EwGw(void)
 		} else {
 			CPU_FLAGL &= ~C_FLAG;
 			res = dst | bit;
-			*out = res;
+			*out = (WORD)res;
 		}
 	} else {
 		CPU_WORKCLOCK(7);
@@ -232,13 +212,12 @@ BTS_EwIb(DWORD op)
 		} else {
 			CPU_FLAGL &= ~C_FLAG;
 			res = dst | bit;
-			*out = res;
+			*out = (WORD)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) {
@@ -275,7 +254,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) {
@@ -307,7 +285,7 @@ BTR_EwGw(void)
 		if (dst & bit) {
 			CPU_FLAGL |= C_FLAG;
 			res = dst & ~bit;
-			*out = res;
+			*out = (WORD)res;
 		} else {
 			CPU_FLAGL &= ~C_FLAG;
 		}
@@ -377,7 +355,7 @@ BTR_EwIb(DWORD op)
 		if (dst & bit) {
 			CPU_FLAGL |= C_FLAG;
 			res = dst & ~bit;
-			*out = res;
+			*out = (WORD)res;
 		} else {
 			CPU_FLAGL &= ~C_FLAG;
 		}
@@ -385,7 +363,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) {
@@ -422,7 +399,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) {
@@ -457,7 +433,7 @@ BTC_EwGw(void)
 			CPU_FLAGL &= ~C_FLAG;
 		}
 		res = dst ^ bit;
-		*out = res;
+		*out = (WORD)res;
 	} else {
 		CPU_WORKCLOCK(7);
 		madr = calc_ea_dst(op);
@@ -527,12 +503,11 @@ BTC_EwIb(DWORD op)
 			CPU_FLAGL &= ~C_FLAG;
 		}
 		res = dst ^ bit;
-		*out = res;
+		*out = (WORD)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) {
@@ -569,7 +544,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) {
@@ -597,10 +571,12 @@ 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 = (WORD)bit;
 	}
 }
 
@@ -616,10 +592,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 = (DWORD)bit;
 	}
 }
 
@@ -638,10 +616,12 @@ 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 = (WORD)bit;
 	}
 }
 
@@ -657,10 +637,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 = (DWORD)bit;
 	}
 }
 
@@ -705,7 +687,7 @@ void
 SETC_Eb(void)
 {
 	DWORD op, madr;
-	BYTE v = CPU_FLAGL & C_FLAG;
+	BYTE v = (BYTE)(CPU_FLAGL & C_FLAG);
 
 	GET_PCBYTE(op);
 	if (op >= 0xc0) {