General push for x86-64 support, dubbed 0.99.00.

1 files changed, 11 insertions, 8 deletions

diff --git a/insns.h b/insns.h
index 8de7d97a..79363e56 100644
--- a/insns.h
+++ b/insns.h
@@ -22,9 +22,9 @@
 struct itemplate {
     int opcode;                 /* the token, passed from "parser.c" */
     int operands;               /* number of operands */
-    long opd[3];                /* bit flags for operand types */
-    const char *code;           /* the code it assembles to */
-    unsigned long flags;        /* some flags */
+    int32_t opd[3];                /* bit flags for operand types */
+    const int8_t *code;           /* the code it assembles to */
+    uint32_t flags;        /* some flags */
 };
 
 /*
@@ -63,14 +63,16 @@ struct itemplate {
 #define IF_SM2    0x00000002UL  /* size match first two operands */
 #define IF_SB     0x00000004UL  /* unsized operands can't be non-byte */
 #define IF_SW     0x00000008UL  /* unsized operands can't be non-word */
-#define IF_SD     0x00000010UL  /* unsized operands can't be nondword */
-#define IF_AR0	  0x00000020UL  /* SB, SW, SD applies to argument 0 */
-#define IF_AR1	  0x00000040UL  /* SB, SW, SD applies to argument 1 */
-#define IF_AR2	  0x00000060UL  /* SB, SW, SD applies to argument 2 */
-#define IF_ARMASK 0x00000060UL  /* mask for unsized argument spec */
+#define IF_SD     0x00000010UL  /* unsized operands can't be non-dword */
+#define IF_SQ     0x00000020UL  /* unsized operands can't be non-qword */
+#define IF_AR0	  0x00000040UL  /* SB, SW, SD applies to argument 0 */
+#define IF_AR1	  0x00000080UL  /* SB, SW, SD applies to argument 1 */
+#define IF_AR2	  0x000000C0UL  /* SB, SW, SD applies to argument 2 */
+#define IF_ARMASK 0x000000C0UL  /* mask for unsized argument spec */
 #define IF_PRIV   0x00000100UL  /* it's a privileged instruction */
 #define IF_SMM    0x00000200UL  /* it's only valid in SMM */
 #define IF_PROT   0x00000400UL  /* it's protected mode only */
+#define IF_NOLONG 0x00000800UL  /* it's not available in long mode */
 #define IF_UNDOC  0x00001000UL  /* it's an undocumented instruction */
 #define IF_FPU    0x00002000UL  /* it's an FPU instruction */
 #define IF_MMX    0x00004000UL  /* it's an MMX instruction */
@@ -93,6 +95,7 @@ struct itemplate {
 #define IF_KATMAI 0x07000000UL  /* Katmai instructions */
 #define IF_WILLAMETTE 0x08000000UL      /* Willamette instructions */
 #define IF_PRESCOTT   0x09000000UL      /* Prescott instructions */
+#define IF_X64    0x0A000000UL	/* x86-64 instructions */
 #define IF_IA64   0x0F000000UL  /* IA64 instructions */
 #define IF_CYRIX  0x10000000UL  /* Cyrix-specific instruction */
 #define IF_AMD    0x20000000UL  /* AMD-specific instruction */