--- np2/i386c/ia32/inst_table.h	2003/12/11 15:06:50	1.2
+++ np2/i386c/ia32/inst_table.h	2011/01/15 17:17:23	1.6
@@ -1,5 +1,3 @@
-/*	$Id: inst_table.h,v 1.2 2003/12/11 15:06:50 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
@@ -35,11 +31,11 @@ extern "C" {
 #endif
 
 /* info of instruction */
-extern	BYTE insttable_info[256];
+extern UINT8 insttable_info[256];
 
 /* table of instruction */
-extern	void (*insttable_1byte[2][256])(void);
-extern	void (*insttable_2byte[2][256])(void);
+extern void (*insttable_1byte[2][256])(void);
+extern void (*insttable_2byte[2][256])(void);
 
 
 /*
@@ -47,53 +43,51 @@ extern	void (*insttable_2byte[2][256])(v
  */
 
 /* group 1 */
-extern	void (*insttable_G1EbIb[])(BYTE *, DWORD);
-extern	void (*insttable_G1EwIx[])(WORD *, DWORD);
-extern	void (*insttable_G1EdIx[])(DWORD *, DWORD);
-extern	void (*insttable_G1EbIb_ext[])(DWORD, DWORD);
-extern	void (*insttable_G1EwIx_ext[])(DWORD, DWORD);
-extern	void (*insttable_G1EdIx_ext[])(DWORD, DWORD);
+extern void (*insttable_G1EbIb[])(UINT8 *, UINT32);
+extern void (*insttable_G1EwIx[])(UINT16 *, UINT32);
+extern void (*insttable_G1EdIx[])(UINT32 *, UINT32);
+extern void (*insttable_G1EbIb_ext[])(UINT32, UINT32);
+extern void (*insttable_G1EwIx_ext[])(UINT32, UINT32);
+extern void (*insttable_G1EdIx_ext[])(UINT32, UINT32);
 
 /* group 2 */
-extern	void (*insttable_G2Eb[])(BYTE *);
-extern	void (*insttable_G2Ew[])(WORD *);
-extern	void (*insttable_G2Ed[])(DWORD *);
-extern	void (*insttable_G2EbCL[])(BYTE *, BYTE);
-extern	void (*insttable_G2EwCL[])(WORD *, BYTE);
-extern	void (*insttable_G2EdCL[])(DWORD *, BYTE);
-extern	void (*insttable_G2Eb_ext[])(DWORD);
-extern	void (*insttable_G2Ew_ext[])(DWORD);
-extern	void (*insttable_G2Ed_ext[])(DWORD);
-extern	void (*insttable_G2EbCL_ext[])(DWORD, BYTE);
-extern	void (*insttable_G2EwCL_ext[])(DWORD, BYTE);
-extern	void (*insttable_G2EdCL_ext[])(DWORD, BYTE);
+extern void (*insttable_G2Eb[])(UINT8 *);
+extern void (*insttable_G2Ew[])(UINT16 *);
+extern void (*insttable_G2Ed[])(UINT32 *);
+extern void (*insttable_G2EbCL[])(UINT8 *, UINT);
+extern void (*insttable_G2EwCL[])(UINT16 *, UINT);
+extern void (*insttable_G2EdCL[])(UINT32 *, UINT);
+extern void (*insttable_G2Eb_ext[])(UINT32);
+extern void (*insttable_G2Ew_ext[])(UINT32);
+extern void (*insttable_G2Ed_ext[])(UINT32);
+extern void (*insttable_G2EbCL_ext[])(UINT32, UINT);
+extern void (*insttable_G2EwCL_ext[])(UINT32, UINT);
+extern void (*insttable_G2EdCL_ext[])(UINT32, UINT);
 
 /* group 3 */
-extern	void (*insttable_G3Eb[])(DWORD);
-extern	void (*insttable_G3Ew[])(DWORD);
-extern	void (*insttable_G3Ed[])(DWORD);
+extern void (*insttable_G3Eb[])(UINT32);
+extern void (*insttable_G3Ew[])(UINT32);
+extern void (*insttable_G3Ed[])(UINT32);
 
 /* group 4 */
-extern	void (*insttable_G4[])(DWORD);
+extern void (*insttable_G4[])(UINT32);
 
 /* group 5 */
-extern	void (*insttable_G5Ew[])(DWORD);
-extern	void (*insttable_G5Ed[])(DWORD);
+extern void (*insttable_G5Ew[])(UINT32);
+extern void (*insttable_G5Ed[])(UINT32);
 
 /* group 6 */
-extern	void (*insttable_G6_16[])(DWORD);
-extern	void (*insttable_G6_32[])(DWORD);
+extern void (*insttable_G6[])(UINT32);
 
 /* group 7 */
-extern	void (*insttable_G7_16[])(DWORD);
-extern	void (*insttable_G7_32[])(DWORD);
+extern void (*insttable_G7[])(UINT32);
 
 /* group 8 */
-extern	void (*insttable_G8EwIb[])(DWORD);
-extern	void (*insttable_G8EdIb[])(DWORD);
+extern void (*insttable_G8EwIb[])(UINT32);
+extern void (*insttable_G8EdIb[])(UINT32);
 
 /* group 9 */
-extern	void (*insttable_G9[])(DWORD);
+extern void (*insttable_G9[])(UINT32);
 
 #ifdef __cplusplus
 }