summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJin Kyu Song <jin.kyu.song@intel.com>2013-10-15 19:59:10 -0700
committerJin Kyu Song <jin.kyu.song@intel.com>2013-11-20 11:29:42 -0800
commit47e7389fdfd446cf9ff6f8a7535346b93fd3e586 (patch)
tree3876ca5f26f25a645a08a9e555dc5695018ae050
parentc7fcf6d5161d698f8ad14ed99b691ecb6af83f08 (diff)
downloadnasm-47e7389fdfd446cf9ff6f8a7535346b93fd3e586.tar.gz
iflags: Use UINT64_C() for 64bit values
UINT64_C() macro is used for iflags as it becomes 64bit. Signed-off-by: Jin Kyu Song <jin.kyu.song@intel.com>
-rw-r--r--insns.h158
1 files changed, 79 insertions, 79 deletions
diff --git a/insns.h b/insns.h
index 8b725ae3..a1705334 100644
--- a/insns.h
+++ b/insns.h
@@ -76,88 +76,88 @@ extern const uint8_t nasm_bytecodes[];
* iflags_t is defined to store these flags.
*/
-#define IF_SM 0x00000001UL /* size match */
-#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 0x0000000CUL /* unsized operands can't be non-dword */
-#define IF_SQ 0x00000010UL /* unsized operands can't be non-qword */
-#define IF_SO 0x00000014UL /* unsized operands can't be non-oword */
-#define IF_SY 0x00000018UL /* unsized operands can't be non-yword */
-#define IF_SZ 0x0000001CUL /* unsized operands can't be non-zword */
-#define IF_SIZE 0x00000038UL /* unsized operands must match the bitsize */
-#define IF_SX 0x0000003CUL /* unsized operands not allowed */
-#define IF_SMASK 0x0000003CUL /* mask for unsized argument size */
-#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_AR3 0x00000100UL /* SB, SW, SD applies to argument 3 */
-#define IF_AR4 0x00000140UL /* SB, SW, SD applies to argument 4 */
-#define IF_ARMASK 0x000001C0UL /* mask for unsized argument spec */
-#define IF_ARSHFT 6 /* LSB in IF_ARMASK */
-#define IF_OPT 0x00000200UL /* optimizing assembly only */
+#define IF_SM UINT64_C(0x00000001) /* size match */
+#define IF_SM2 UINT64_C(0x00000002) /* size match first two operands */
+#define IF_SB UINT64_C(0x00000004) /* unsized operands can't be non-byte */
+#define IF_SW UINT64_C(0x00000008) /* unsized operands can't be non-word */
+#define IF_SD UINT64_C(0x0000000C) /* unsized operands can't be non-dword */
+#define IF_SQ UINT64_C(0x00000010) /* unsized operands can't be non-qword */
+#define IF_SO UINT64_C(0x00000014) /* unsized operands can't be non-oword */
+#define IF_SY UINT64_C(0x00000018) /* unsized operands can't be non-yword */
+#define IF_SZ UINT64_C(0x0000001C) /* unsized operands can't be non-zword */
+#define IF_SIZE UINT64_C(0x00000038) /* unsized operands must match the bitsize */
+#define IF_SX UINT64_C(0x0000003C) /* unsized operands not allowed */
+#define IF_SMASK UINT64_C(0x0000003C) /* mask for unsized argument size */
+#define IF_AR0 UINT64_C(0x00000040) /* SB, SW, SD applies to argument 0 */
+#define IF_AR1 UINT64_C(0x00000080) /* SB, SW, SD applies to argument 1 */
+#define IF_AR2 UINT64_C(0x000000C0) /* SB, SW, SD applies to argument 2 */
+#define IF_AR3 UINT64_C(0x00000100) /* SB, SW, SD applies to argument 3 */
+#define IF_AR4 UINT64_C(0x00000140) /* SB, SW, SD applies to argument 4 */
+#define IF_ARMASK UINT64_C(0x000001C0) /* mask for unsized argument spec */
+#define IF_ARSHFT 6 /* LSB in IF_ARMASK */
+#define IF_OPT UINT64_C(0x00000200) /* optimizing assembly only */
/* The next 3 bits aren't actually used for anything */
-#define IF_PRIV 0x00000000UL /* it's a privileged instruction */
-#define IF_SMM 0x00000000UL /* it's only valid in SMM */
-#define IF_PROT 0x00000000UL /* it's protected mode only */
-#define IF_LOCK 0x00000400UL /* lockable if operand 0 is memory */
-#define IF_NOLONG 0x00000800UL /* it's not available in long mode */
-#define IF_LONG 0x00001000UL /* long mode instruction */
-#define IF_NOHLE 0x00002000UL /* HLE prefixes forbidden */
-#define IF_MIB 0x00004000UL /* Disassemble with split EA */
+#define IF_PRIV UINT64_C(0x00000000) /* it's a privileged instruction */
+#define IF_SMM UINT64_C(0x00000000) /* it's only valid in SMM */
+#define IF_PROT UINT64_C(0x00000000) /* it's protected mode only */
+#define IF_LOCK UINT64_C(0x00000400) /* lockable if operand 0 is memory */
+#define IF_NOLONG UINT64_C(0x00000800) /* it's not available in long mode */
+#define IF_LONG UINT64_C(0x00001000) /* long mode instruction */
+#define IF_NOHLE UINT64_C(0x00002000) /* HLE prefixes forbidden */
+#define IF_MIB UINT64_C(0x00004000) /* Disassemble with split EA */
/* These flags are currently not used for anything - intended for insn set */
-#define IF_UNDOC 0x8000000000UL /* it's an undocumented instruction */
-#define IF_HLE 0x4000000000UL /* HACK NEED TO REORGANIZE THESE BITS */
-#define IF_AVX512 0x2000000000UL /* it's an AVX-512F (512b) instruction */
-#define IF_FPU 0x0100000000UL /* it's an FPU instruction */
-#define IF_MMX 0x0200000000UL /* it's an MMX instruction */
-#define IF_3DNOW 0x0300000000UL /* it's a 3DNow! instruction */
-#define IF_SSE 0x0400000000UL /* it's a SSE (KNI, MMX2) instruction */
-#define IF_SSE2 0x0500000000UL /* it's a SSE2 instruction */
-#define IF_SSE3 0x0600000000UL /* it's a SSE3 (PNI) instruction */
-#define IF_VMX 0x0700000000UL /* it's a VMX instruction */
-#define IF_SSSE3 0x0800000000UL /* it's an SSSE3 instruction */
-#define IF_SSE4A 0x0900000000UL /* AMD SSE4a */
-#define IF_SSE41 0x0A00000000UL /* it's an SSE4.1 instruction */
-#define IF_SSE42 0x0B00000000UL /* HACK NEED TO REORGANIZE THESE BITS */
-#define IF_SSE5 0x0C00000000UL /* HACK NEED TO REORGANIZE THESE BITS */
-#define IF_AVX 0x0D00000000UL /* it's an AVX (128b) instruction */
-#define IF_AVX2 0x0E00000000UL /* it's an AVX2 (256b) instruction */
-#define IF_FMA 0x1000000000UL /* HACK NEED TO REORGANIZE THESE BITS */
-#define IF_BMI1 0x1100000000UL /* HACK NEED TO REORGANIZE THESE BITS */
-#define IF_BMI2 0x1200000000UL /* HACK NEED TO REORGANIZE THESE BITS */
-#define IF_TBM 0x1300000000UL /* HACK NEED TO REORGANIZE THESE BITS */
-#define IF_RTM 0x1400000000UL /* HACK NEED TO REORGANIZE THESE BITS */
-#define IF_INVPCID 0x1500000000UL /* HACK NEED TO REORGANIZE THESE BITS */
-#define IF_AVX512CD (0x1600000000UL|IF_AVX512) /* AVX-512 Conflict Detection insns */
-#define IF_AVX512ER (0x1700000000UL|IF_AVX512) /* AVX-512 Exponential and Reciprocal */
-#define IF_AVX512PF (0x1800000000UL|IF_AVX512) /* AVX-512 Prefetch instructions */
-#define IF_MPX 0x1900000000UL /* MPX instructions */
-#define IF_SHA 0x1A00000000UL /* SHA instructions */
-#define IF_INSMASK 0xFF00000000UL /* the mask for instruction set types */
-#define IF_PMASK 0xFF000000UL /* the mask for processor types */
-#define IF_PLEVEL 0x0F000000UL /* the mask for processor instr. level */
- /* also the highest possible processor */
-#define IF_8086 0x00000000UL /* 8086 instruction */
-#define IF_186 0x01000000UL /* 186+ instruction */
-#define IF_286 0x02000000UL /* 286+ instruction */
-#define IF_386 0x03000000UL /* 386+ instruction */
-#define IF_486 0x04000000UL /* 486+ instruction */
-#define IF_PENT 0x05000000UL /* Pentium instruction */
-#define IF_P6 0x06000000UL /* P6 instruction */
-#define IF_KATMAI 0x07000000UL /* Katmai instructions */
-#define IF_WILLAMETTE 0x08000000UL /* Willamette instructions */
-#define IF_PRESCOTT 0x09000000UL /* Prescott instructions */
-#define IF_X86_64 0x0A000000UL /* x86-64 instruction (long or legacy mode) */
-#define IF_NEHALEM 0x0B000000UL /* Nehalem instruction */
-#define IF_WESTMERE 0x0C000000UL /* Westmere instruction */
-#define IF_SANDYBRIDGE 0x0D000000UL /* Sandy Bridge instruction */
-#define IF_FUTURE 0x0E000000UL /* Future processor (not yet disclosed) */
+#define IF_UNDOC UINT64_C(0x8000000000) /* it's an undocumented instruction */
+#define IF_HLE UINT64_C(0x4000000000) /* HACK NEED TO REORGANIZE THESE BITS */
+#define IF_AVX512 UINT64_C(0x2000000000) /* it's an AVX-512F (512b) instruction */
+#define IF_FPU UINT64_C(0x0100000000) /* it's an FPU instruction */
+#define IF_MMX UINT64_C(0x0200000000) /* it's an MMX instruction */
+#define IF_3DNOW UINT64_C(0x0300000000) /* it's a 3DNow! instruction */
+#define IF_SSE UINT64_C(0x0400000000) /* it's a SSE (KNI, MMX2) instruction */
+#define IF_SSE2 UINT64_C(0x0500000000) /* it's a SSE2 instruction */
+#define IF_SSE3 UINT64_C(0x0600000000) /* it's a SSE3 (PNI) instruction */
+#define IF_VMX UINT64_C(0x0700000000) /* it's a VMX instruction */
+#define IF_SSSE3 UINT64_C(0x0800000000) /* it's an SSSE3 instruction */
+#define IF_SSE4A UINT64_C(0x0900000000) /* AMD SSE4a */
+#define IF_SSE41 UINT64_C(0x0A00000000) /* it's an SSE4.1 instruction */
+#define IF_SSE42 UINT64_C(0x0B00000000) /* HACK NEED TO REORGANIZE THESE BITS */
+#define IF_SSE5 UINT64_C(0x0C00000000) /* HACK NEED TO REORGANIZE THESE BITS */
+#define IF_AVX UINT64_C(0x0D00000000) /* it's an AVX (128b) instruction */
+#define IF_AVX2 UINT64_C(0x0E00000000) /* it's an AVX2 (256b) instruction */
+#define IF_FMA UINT64_C(0x1000000000) /* HACK NEED TO REORGANIZE THESE BITS */
+#define IF_BMI1 UINT64_C(0x1100000000) /* HACK NEED TO REORGANIZE THESE BITS */
+#define IF_BMI2 UINT64_C(0x1200000000) /* HACK NEED TO REORGANIZE THESE BITS */
+#define IF_TBM UINT64_C(0x1300000000) /* HACK NEED TO REORGANIZE THESE BITS */
+#define IF_RTM UINT64_C(0x1400000000) /* HACK NEED TO REORGANIZE THESE BITS */
+#define IF_INVPCID UINT64_C(0x1500000000) /* HACK NEED TO REORGANIZE THESE BITS */
+#define IF_AVX512CD (UINT64_C(0x1600000000)|IF_AVX512) /* AVX-512 Conflict Detection insns */
+#define IF_AVX512ER (UINT64_C(0x1700000000)|IF_AVX512) /* AVX-512 Exponential and Reciprocal */
+#define IF_AVX512PF (UINT64_C(0x1800000000)|IF_AVX512) /* AVX-512 Prefetch instructions */
+#define IF_MPX UINT64_C(0x1900000000) /* MPX instructions */
+#define IF_SHA UINT64_C(0x1A00000000) /* SHA instructions */
+#define IF_INSMASK UINT64_C(0xFF00000000) /* the mask for instruction set types */
+#define IF_PMASK UINT64_C(0xFF000000) /* the mask for processor types */
+#define IF_PLEVEL UINT64_C(0x0F000000) /* the mask for processor instr. level */
+ /* also the highest possible processor */
+#define IF_8086 UINT64_C(0x00000000) /* 8086 instruction */
+#define IF_186 UINT64_C(0x01000000) /* 186+ instruction */
+#define IF_286 UINT64_C(0x02000000) /* 286+ instruction */
+#define IF_386 UINT64_C(0x03000000) /* 386+ instruction */
+#define IF_486 UINT64_C(0x04000000) /* 486+ instruction */
+#define IF_PENT UINT64_C(0x05000000) /* Pentium instruction */
+#define IF_P6 UINT64_C(0x06000000) /* P6 instruction */
+#define IF_KATMAI UINT64_C(0x07000000) /* Katmai instructions */
+#define IF_WILLAMETTE UINT64_C(0x08000000) /* Willamette instructions */
+#define IF_PRESCOTT UINT64_C(0x09000000) /* Prescott instructions */
+#define IF_X86_64 UINT64_C(0x0A000000) /* x86-64 instruction (long or legacy mode) */
+#define IF_NEHALEM UINT64_C(0x0B000000) /* Nehalem instruction */
+#define IF_WESTMERE UINT64_C(0x0C000000) /* Westmere instruction */
+#define IF_SANDYBRIDGE UINT64_C(0x0D000000) /* Sandy Bridge instruction */
+#define IF_FUTURE UINT64_C(0x0E000000) /* Future processor (not yet disclosed) */
#define IF_X64 (IF_LONG|IF_X86_64)
-#define IF_IA64 0x0F000000UL /* IA64 instructions (in x86 mode) */
-#define IF_CYRIX 0x10000000UL /* Cyrix-specific instruction */
-#define IF_AMD 0x20000000UL /* AMD-specific instruction */
-#define IF_SPMASK 0x30000000UL /* specific processor types mask */
+#define IF_IA64 UINT64_C(0x0F000000) /* IA64 instructions (in x86 mode) */
+#define IF_CYRIX UINT64_C(0x10000000) /* Cyrix-specific instruction */
+#define IF_AMD UINT64_C(0x20000000) /* AMD-specific instruction */
+#define IF_SPMASK UINT64_C(0x30000000) /* specific processor types mask */
#define IF_PFMASK (IF_INSMASK|IF_SPMASK) /* disassembly "prefer" mask */
#endif /* NASM_INSNS_H */