--- np2/i386c/ia32/instructions/bit_byte.c	2004/03/23 15:29:34	1.9
+++ np2/i386c/ia32/instructions/bit_byte.c	2005/03/12 12:33:47	1.11
@@ -1,4 +1,4 @@
-/*	$Id: bit_byte.c,v 1.9 2004/03/23 15:29:34 monaka Exp $	*/
+/*	$Id: bit_byte.c,v 1.11 2005/03/12 12:33:47 monaka Exp $	*/
 
 /*
  * Copyright (c) 2002-2003 NONAKA Kimihiro
@@ -12,8 +12,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
@@ -938,7 +936,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 +953,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 +970,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 +981,7 @@ TEST_ALIb(void)
 	CPU_WORKCLOCK(3);
 	tmp = CPU_AL;
 	GET_PCBYTE(src);
-	AND_BYTE(tmp, src);
+	BYTE_AND(tmp, src);
 }
 
 void
@@ -994,7 +992,7 @@ TEST_AXIw(void)
 	CPU_WORKCLOCK(3);
 	tmp = CPU_AX;
 	GET_PCWORD(src);
-	AND_WORD(tmp, src);
+	WORD_AND(tmp, src);
 }
 
 void
@@ -1005,7 +1003,7 @@ TEST_EAXId(void)
 	CPU_WORKCLOCK(3);
 	tmp = CPU_EAX;
 	GET_PCDWORD(src);
-	AND_DWORD(tmp, src);
+	DWORD_AND(tmp, src);
 }
 
 void
@@ -1022,7 +1020,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 +1037,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 +1054,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);
 }