--- np2/i386c/ia32/instructions/bit_byte.c	2004/02/20 16:09:05	1.6
+++ np2/i386c/ia32/instructions/bit_byte.c	2011/01/15 17:17:23	1.12
@@ -1,5 +1,3 @@
-/*	$Id: bit_byte.c,v 1.6 2004/02/20 16:09:05 monaka Exp $	*/
-
 /*
  * Copyright (c) 2002-2003 NONAKA Kimihiro
  * All rights reserved.
@@ -12,8 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -33,11 +29,11 @@
 
 #include "bit_byte.h"
 
-#define	BIT_OFFSET16(v)		(2 * (((SINT16)(v)) / 16))
+#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)) / 32))
+#define	BIT_OFFSET32(v)		(4 * (((SINT32)(v)) >> 5))
 #define	BIT_INDEX32(v)		((v) & 0x1f)
 #define	BIT_MAKEBIT32(v)	(1 << BIT_INDEX32(v))
 
@@ -653,7 +649,7 @@ void
 SETO_Eb(void)
 {
 	UINT32 op, madr;
-	UINT8 v = CPU_OV ? 1 : 0;
+	UINT8 v = CC_O?1:0;
 
 	GET_PCBYTE(op);
 	if (op >= 0xc0) {
@@ -670,7 +666,7 @@ void
 SETNO_Eb(void)
 {
 	UINT32 op, madr;
-	UINT8 v = CPU_OV ? 0 : 1;
+	UINT8 v = CC_NO?1:0;
 
 	GET_PCBYTE(op);
 	if (op >= 0xc0) {
@@ -687,7 +683,7 @@ void
 SETC_Eb(void)
 {
 	UINT32 op, madr;
-	UINT8 v = (UINT8)(CPU_FLAGL & C_FLAG);
+	UINT8 v = CC_C?1:0;
 
 	GET_PCBYTE(op);
 	if (op >= 0xc0) {
@@ -704,7 +700,7 @@ void
 SETNC_Eb(void)
 {
 	UINT32 op, madr;
-	UINT8 v = (CPU_FLAGL & C_FLAG) ? 0 : 1;
+	UINT8 v = CC_NC?1:0;
 
 	GET_PCBYTE(op);
 	if (op >= 0xc0) {
@@ -721,7 +717,7 @@ void
 SETZ_Eb(void)
 {
 	UINT32 op, madr;
-	UINT8 v = (CPU_FLAGL & Z_FLAG) ? 1 : 0;
+	UINT8 v = CC_Z?1:0;
 
 	GET_PCBYTE(op);
 	if (op >= 0xc0) {
@@ -738,7 +734,7 @@ void
 SETNZ_Eb(void)
 {
 	UINT32 op, madr;
-	UINT8 v = (CPU_FLAGL & Z_FLAG) ? 0 : 1;
+	UINT8 v = CC_NZ?1:0;
 
 	GET_PCBYTE(op);
 	if (op >= 0xc0) {
@@ -755,7 +751,7 @@ void
 SETA_Eb(void)
 {
 	UINT32 op, madr;
-	UINT8 v = (CPU_FLAGL & (Z_FLAG|C_FLAG)) ? 0 : 1;
+	UINT8 v = CC_A?1:0;
 
 	GET_PCBYTE(op);
 	if (op >= 0xc0) {
@@ -772,7 +768,7 @@ void
 SETNA_Eb(void)
 {
 	UINT32 op, madr;
-	UINT8 v = (CPU_FLAGL & (Z_FLAG|C_FLAG)) ? 1 : 0;
+	UINT8 v = CC_NA?1:0;
 
 	GET_PCBYTE(op);
 	if (op >= 0xc0) {
@@ -789,7 +785,7 @@ void
 SETS_Eb(void)
 {
 	UINT32 op, madr;
-	UINT8 v = (CPU_FLAGL & S_FLAG) ? 1 : 0;
+	UINT8 v = CC_S?1:0;
 
 	GET_PCBYTE(op);
 	if (op >= 0xc0) {
@@ -806,7 +802,7 @@ void
 SETNS_Eb(void)
 {
 	UINT32 op, madr;
-	UINT8 v = (CPU_FLAGL & S_FLAG) ? 0 : 1;
+	UINT8 v = CC_NS?1:0;
 
 	GET_PCBYTE(op);
 	if (op >= 0xc0) {
@@ -823,7 +819,7 @@ void
 SETP_Eb(void)
 {
 	UINT32 op, madr;
-	UINT8 v = (CPU_FLAGL & P_FLAG) ? 1 : 0;
+	UINT8 v = CC_P?1:0;
 
 	GET_PCBYTE(op);
 	if (op >= 0xc0) {
@@ -840,7 +836,7 @@ void
 SETNP_Eb(void)
 {
 	UINT32 op, madr;
-	UINT8 v = (CPU_FLAGL & P_FLAG) ? 0 : 1;
+	UINT8 v = CC_NP?1:0;
 
 	GET_PCBYTE(op);
 	if (op >= 0xc0) {
@@ -857,7 +853,7 @@ void
 SETL_Eb(void)
 {
 	UINT32 op, madr;
-	UINT8 v = (!CPU_OV == !(CPU_FLAGL & S_FLAG)) ? 1 : 0;
+	UINT8 v = CC_L?1:0;
 
 	GET_PCBYTE(op);
 	if (op >= 0xc0) {
@@ -874,7 +870,7 @@ void
 SETNL_Eb(void)
 {
 	UINT32 op, madr;
-	UINT8 v = (!CPU_OV == !(CPU_FLAGL & S_FLAG)) ? 0 : 1;
+	UINT8 v = CC_NL?1:0;
 
 	GET_PCBYTE(op);
 	if (op >= 0xc0) {
@@ -891,7 +887,7 @@ void
 SETLE_Eb(void)
 {
 	UINT32 op, madr;
-	UINT8 v = ((CPU_FLAGL & Z_FLAG) || (!CPU_OV == !(CPU_FLAGL & S_FLAG))) ? 1 : 0;
+	UINT8 v = CC_LE?1:0;
 
 	GET_PCBYTE(op);
 	if (op >= 0xc0) {
@@ -908,7 +904,7 @@ void
 SETNLE_Eb(void)
 {
 	UINT32 op, madr;
-	UINT8 v = ((CPU_FLAGL & Z_FLAG) || (!CPU_OV == !(CPU_FLAGL & S_FLAG))) ? 0 : 1;
+	UINT8 v = CC_NLE?1:0;
 
 	GET_PCBYTE(op);
 	if (op >= 0xc0) {
@@ -938,7 +934,7 @@ TEST_EbGb(void)
 		madr = calc_ea_dst(op);
 		tmp = cpu_vmemoryread(CPU_INST_SEGREG_INDEX, madr);
 	}
-	AND_BYTE(tmp, src);
+	BYTE_AND(tmp, src);
 }
 
 void
@@ -955,7 +951,7 @@ TEST_EwGw(void)
 		madr = calc_ea_dst(op);
 		tmp = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr);
 	}
-	AND_WORD(tmp, src);
+	WORD_AND(tmp, src);
 }
 
 void
@@ -972,7 +968,7 @@ TEST_EdGd(void)
 		madr = calc_ea_dst(op);
 		tmp = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr);
 	}
-	AND_DWORD(tmp, src);
+	DWORD_AND(tmp, src);
 }
 
 void
@@ -983,7 +979,7 @@ TEST_ALIb(void)
 	CPU_WORKCLOCK(3);
 	tmp = CPU_AL;
 	GET_PCBYTE(src);
-	AND_BYTE(tmp, src);
+	BYTE_AND(tmp, src);
 }
 
 void
@@ -994,7 +990,7 @@ TEST_AXIw(void)
 	CPU_WORKCLOCK(3);
 	tmp = CPU_AX;
 	GET_PCWORD(src);
-	AND_WORD(tmp, src);
+	WORD_AND(tmp, src);
 }
 
 void
@@ -1005,7 +1001,7 @@ TEST_EAXId(void)
 	CPU_WORKCLOCK(3);
 	tmp = CPU_EAX;
 	GET_PCDWORD(src);
-	AND_DWORD(tmp, src);
+	DWORD_AND(tmp, src);
 }
 
 void
@@ -1022,7 +1018,7 @@ TEST_EbIb(UINT32 op)
 		tmp = cpu_vmemoryread(CPU_INST_SEGREG_INDEX, madr);
 	}
 	GET_PCBYTE(src);
-	AND_BYTE(tmp, src);
+	BYTE_AND(tmp, src);
 }
 
 void
@@ -1039,7 +1035,7 @@ TEST_EwIw(UINT32 op)
 		tmp = cpu_vmemoryread_w(CPU_INST_SEGREG_INDEX, madr);
 	}
 	GET_PCWORD(src);
-	AND_WORD(tmp, src);
+	WORD_AND(tmp, src);
 }
 
 void
@@ -1056,5 +1052,5 @@ TEST_EdId(UINT32 op)
 		tmp = cpu_vmemoryread_d(CPU_INST_SEGREG_INDEX, madr);
 	}
 	GET_PCDWORD(src);
-	AND_DWORD(tmp, src);
+	DWORD_AND(tmp, src);
 }