--- np2/i386c/ia32/instructions/logic_arith.h	2003/12/08 00:55:32	1.1
+++ np2/i386c/ia32/instructions/logic_arith.h	2005/03/12 12:33:48	1.4
@@ -1,4 +1,4 @@
-/*	$Id: logic_arith.h,v 1.1 2003/12/08 00:55:32 yui Exp $	*/
+/*	$Id: logic_arith.h,v 1.4 2005/03/12 12:33:48 monaka Exp $	*/
 
 /*
  * Copyright (c) 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
@@ -46,12 +44,12 @@ void AND_GdEd(void);
 void AND_ALIb(void);
 void AND_AXIw(void);
 void AND_EAXId(void);
-void AND_EbIb(BYTE *);
-void AND_EwIx(WORD *, DWORD);
-void AND_EdIx(DWORD *, DWORD);
-void AND_EbIb_ext(DWORD);
-void AND_EwIx_ext(DWORD, DWORD);
-void AND_EdIx_ext(DWORD, DWORD);
+void AND_EbIb(UINT8 *, UINT32);
+void AND_EwIx(UINT16 *, UINT32);
+void AND_EdIx(UINT32 *, UINT32);
+void AND_EbIb_ext(UINT32, UINT32);
+void AND_EwIx_ext(UINT32, UINT32);
+void AND_EdIx_ext(UINT32, UINT32);
 
 /*
  * OR
@@ -65,12 +63,12 @@ void OR_GdEd(void);
 void OR_ALIb(void);
 void OR_AXIw(void);
 void OR_EAXId(void);
-void OR_EbIb(BYTE *);
-void OR_EwIx(WORD *, DWORD);
-void OR_EdIx(DWORD *, DWORD);
-void OR_EbIb_ext(DWORD);
-void OR_EwIx_ext(DWORD, DWORD);
-void OR_EdIx_ext(DWORD, DWORD);
+void OR_EbIb(UINT8 *, UINT32);
+void OR_EwIx(UINT16 *, UINT32);
+void OR_EdIx(UINT32 *, UINT32);
+void OR_EbIb_ext(UINT32, UINT32);
+void OR_EwIx_ext(UINT32, UINT32);
+void OR_EdIx_ext(UINT32, UINT32);
 
 /*
  * XOR
@@ -84,19 +82,19 @@ void XOR_GdEd(void);
 void XOR_ALIb(void);
 void XOR_AXIw(void);
 void XOR_EAXId(void);
-void XOR_EbIb(BYTE *);
-void XOR_EwIx(WORD *, DWORD);
-void XOR_EdIx(DWORD *, DWORD);
-void XOR_EbIb_ext(DWORD);
-void XOR_EwIx_ext(DWORD, DWORD);
-void XOR_EdIx_ext(DWORD, DWORD);
+void XOR_EbIb(UINT8 *, UINT32);
+void XOR_EwIx(UINT16 *, UINT32);
+void XOR_EdIx(UINT32 *, UINT32);
+void XOR_EbIb_ext(UINT32, UINT32);
+void XOR_EwIx_ext(UINT32, UINT32);
+void XOR_EdIx_ext(UINT32, UINT32);
 
 /*
  * NOT
  */
-void NOT_Eb(DWORD op);
-void NOT_Ew(DWORD op);
-void NOT_Ed(DWORD op);
+void NOT_Eb(UINT32);
+void NOT_Ew(UINT32);
+void NOT_Ed(UINT32);
 
 #ifdef __cplusplus
 }