X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=opcodes%2Fi386-gen.c;h=e38277567bb1cbdefa693c35c43df746230a24f2;hb=005cb1192ac986f689938e91c4702dbd49635982;hp=bdd4ae65d234720ceef1ddcd499c0080c2ea9584;hpb=035475035d51f094631e426a04bfb08abc86d5c0;p=platform%2Fupstream%2Fbinutils.git diff --git a/opcodes/i386-gen.c b/opcodes/i386-gen.c index bdd4ae6..e382775 100644 --- a/opcodes/i386-gen.c +++ b/opcodes/i386-gen.c @@ -1,4 +1,4 @@ -/* Copyright 2007, 2008 Free Software Foundation, Inc. +/* Copyright (C) 2007-2014 Free Software Foundation, Inc. This file is part of the GNU opcodes library. @@ -39,14 +39,14 @@ typedef struct initializer const char *init; } initializer; -static initializer cpu_flag_init [] = +static initializer cpu_flag_init[] = { { "CPU_UNKNOWN_FLAGS", - "unknown" }, + "~(CpuL1OM|CpuK1OM)" }, { "CPU_GENERIC32_FLAGS", "Cpu186|Cpu286|Cpu386" }, - { "CPU_GENERIC64_FLAGS", - "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuP4|CpuMMX|CpuSSE|CpuSSE2|CpuLM" }, + { "CPU_GENERIC64_FLAGS", + "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuClflush|Cpu387|Cpu687|CpuNop|CpuMMX|CpuSSE|CpuSSE2|CpuLM" }, { "CPU_NONE_FLAGS", "0" }, { "CPU_I186_FLAGS", @@ -58,31 +58,61 @@ static initializer cpu_flag_init [] = { "CPU_I486_FLAGS", "Cpu186|Cpu286|Cpu386|Cpu486" }, { "CPU_I586_FLAGS", - "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586" }, + "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu387" }, { "CPU_I686_FLAGS", - "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686" }, + "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|Cpu387|Cpu687" }, + { "CPU_PENTIUMPRO_FLAGS", + "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|Cpu387|Cpu687|CpuNop" }, { "CPU_P2_FLAGS", - "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuMMX" }, + "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|Cpu387|Cpu687|CpuNop|CpuMMX" }, { "CPU_P3_FLAGS", - "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuMMX|CpuSSE" }, + "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|Cpu387|Cpu687|CpuNop|CpuMMX|CpuSSE" }, { "CPU_P4_FLAGS", - "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuP4|CpuMMX|CpuSSE|CpuSSE2" }, + "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuClflush|Cpu387|Cpu687|CpuNop|CpuMMX|CpuSSE|CpuSSE2" }, { "CPU_NOCONA_FLAGS", - "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuP4|CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuLM" }, + "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuClflush|Cpu387|Cpu687|CpuFISTTP|CpuNop|CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuLM|CpuCX16" }, { "CPU_CORE_FLAGS", - "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuP4|CpuMMX|CpuSSE|CpuSSE2|CpuSSE3" }, + "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuClflush|Cpu387|Cpu687|CpuFISTTP|CpuNop|CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuCX16" }, { "CPU_CORE2_FLAGS", - "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuP4|CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuSSSE3|CpuLM" }, + "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuClflush|Cpu387|Cpu687|CpuFISTTP|CpuNop|CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuSSSE3|CpuLM|CpuCX16" }, + { "CPU_COREI7_FLAGS", + "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuClflush|Cpu387|Cpu687|CpuFISTTP|CpuNop|CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuSSSE3|CpuSSE4_1|CpuSSE4_2|CpuRdtscp|CpuLM|CpuCX16" }, { "CPU_K6_FLAGS", - "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|CpuK6|CpuMMX" }, + "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|CpuSYSCALL|Cpu387|CpuMMX" }, { "CPU_K6_2_FLAGS", - "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|CpuK6|CpuMMX|Cpu3dnow" }, + "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|CpuSYSCALL|Cpu387|CpuMMX|Cpu3dnow" }, { "CPU_ATHLON_FLAGS", - "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuK6|CpuMMX|Cpu3dnow|Cpu3dnowA" }, + "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuSYSCALL|Cpu387|Cpu687|CpuNop|CpuMMX|Cpu3dnow|Cpu3dnowA" }, { "CPU_K8_FLAGS", - "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuK6|CpuK8|CpuMMX|Cpu3dnow|Cpu3dnowA|CpuSSE|CpuSSE2|CpuLM" }, + "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuSYSCALL|CpuRdtscp|Cpu387|Cpu687|CpuNop|CpuMMX|Cpu3dnow|Cpu3dnowA|CpuSSE|CpuSSE2|CpuLM" }, { "CPU_AMDFAM10_FLAGS", - "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuK6|CpuK8|CpuMMX|Cpu3dnow|Cpu3dnowA|CpuSSE|CpuSSE2|CpuSSE3|CpuSSE4a|CpuABM|CpuLM" }, + "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuSYSCALL|CpuRdtscp|Cpu387|Cpu687|CpuFISTTP|CpuNop|CpuMMX|Cpu3dnow|Cpu3dnowA|CpuSSE|CpuSSE2|CpuSSE3|CpuSSE4a|CpuABM|CpuLM" }, + { "CPU_BDVER1_FLAGS", + "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuSYSCALL|CpuRdtscp|Cpu387|Cpu687|CpuFISTTP|CpuNop|CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuSSE4a|CpuABM|CpuLM|CpuFMA4|CpuXOP|CpuLWP|CpuCX16|CpuClflush|CpuSSSE3|CpuSVME|CpuSSE4_1|CpuSSE4_2|CpuXsave|CpuAES|CpuAVX|CpuPCLMUL|CpuLZCNT|CpuPRFCHW" }, + { "CPU_BDVER2_FLAGS", + "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuSYSCALL|CpuRdtscp|Cpu387|Cpu687|CpuFISTTP|CpuNop|CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuSSE4a|CpuABM|CpuLM|CpuFMA|CpuFMA4|CpuXOP|CpuLWP|CpuBMI|CpuTBM|CpuF16C|CpuCX16|CpuClflush|CpuSSSE3|CpuSVME|CpuSSE4_1|CpuSSE4_2|CpuXsave|CpuAES|CpuAVX|CpuPCLMUL|CpuLZCNT|CpuPRFCHW" }, + { "CPU_BDVER3_FLAGS", + "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuSYSCALL|CpuRdtscp|Cpu387|Cpu687|CpuFISTTP|CpuNop|CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuSSE4a|CpuABM|CpuLM|CpuFMA|CpuFMA4|CpuXOP|CpuLWP|CpuBMI|CpuTBM|CpuF16C|CpuCX16|CpuClflush|CpuSSSE3|CpuSVME|CpuSSE4_1|CpuSSE4_2|CpuAES|CpuAVX|CpuPCLMUL|CpuLZCNT|CpuPRFCHW|CpuXsave|CpuXsaveopt|CpuFSGSBase" }, + { "CPU_BDVER4_FLAGS", + "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuSYSCALL|CpuRdtscp|Cpu387|Cpu687|CpuFISTTP|CpuNop|CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuSSE4a|CpuABM|CpuLM|CpuFMA|CpuFMA4|CpuXOP|CpuLWP|CpuBMI|CpuTBM|CpuF16C|CpuCX16|CpuClflush|CpuSSSE3|CpuSVME|CpuSSE4_1|CpuSSE4_2|CpuAES|CpuAVX|CpuPCLMUL|CpuLZCNT|CpuPRFCHW|CpuXsave|CpuXsaveopt|CpuFSGSBase|CpuAVX2|CpuMovbe|CpuBMI2|CpuRdRnd" }, + { "CPU_BTVER1_FLAGS", + "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuSYSCALL|CpuRdtscp|Cpu387|Cpu687|CpuNop|CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuSSSE3|CpuSSE4a|CpuABM|CpuLM|CpuPRFCHW|CpuCX16|CpuClflush|CpuFISTTP|CpuSVME|CpuLZCNT" }, + { "CPU_BTVER2_FLAGS", + "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuSYSCALL|CpuRdtscp|Cpu387|Cpu687|CpuNop|CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuSSSE3|CpuSSE4a|CpuSSE4_1|CpuSSE4_2|CpuABM|CpuLM|CpuBMI|CpuF16C|CpuAES|CpuPCLMUL|CpuAVX|CpuMovbe|CpuXsave|CpuXsaveopt|CpuPRFCHW|CpuCX16|CpuClflush|CpuFISTTP|CpuSVME|CpuLZCNT" }, + { "CPU_8087_FLAGS", + "Cpu8087" }, + { "CPU_287_FLAGS", + "Cpu287" }, + { "CPU_387_FLAGS", + "Cpu387" }, + { "CPU_ANY87_FLAGS", + "Cpu8087|Cpu287|Cpu387|Cpu687|CpuFISTTP" }, + { "CPU_CLFLUSH_FLAGS", + "CpuClflush" }, + { "CPU_NOP_FLAGS", + "CpuNop" }, + { "CPU_SYSCALL_FLAGS", + "CpuSYSCALL" }, { "CPU_MMX_FLAGS", "CpuMMX" }, { "CPU_SSE_FLAGS", @@ -97,22 +127,58 @@ static initializer cpu_flag_init [] = "CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuSSSE3|CpuSSE4_1" }, { "CPU_SSE4_2_FLAGS", "CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuSSSE3|CpuSSE4_1|CpuSSE4_2" }, + { "CPU_ANY_SSE_FLAGS", + "CpuSSE|CpuSSE2|CpuSSE3|CpuSSSE3|CpuSSE4_1|CpuSSE4_2|CpuSSE4a|CpuAVX|CpuAVX2|CpuAVX512F|CpuAVX512CD|CpuAVX512ER|CpuAVX512PF" }, { "CPU_VMX_FLAGS", "CpuVMX" }, { "CPU_SMX_FLAGS", "CpuSMX" }, { "CPU_XSAVE_FLAGS", "CpuXsave" }, + { "CPU_XSAVEOPT_FLAGS", + "CpuXsaveopt" }, { "CPU_AES_FLAGS", "CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuSSSE3|CpuSSE4_1|CpuSSE4_2|CpuAES" }, { "CPU_PCLMUL_FLAGS", "CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuSSSE3|CpuSSE4_1|CpuSSE4_2|CpuPCLMUL" }, { "CPU_FMA_FLAGS", "CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuSSSE3|CpuSSE4_1|CpuSSE4_2|CpuAVX|CpuFMA" }, + { "CPU_FMA4_FLAGS", + "CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuSSSE3|CpuSSE4_1|CpuSSE4_2|CpuAVX|CpuFMA4" }, + { "CPU_XOP_FLAGS", + "CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuSSSE3|CpuSSE4_1|CpuSSE4_2|CpuSSE4a|CpuABM|CpuAVX|CpuFMA4|CpuXOP" }, + { "CPU_LWP_FLAGS", + "CpuLWP" }, + { "CPU_BMI_FLAGS", + "CpuBMI" }, + { "CPU_TBM_FLAGS", + "CpuTBM" }, { "CPU_MOVBE_FLAGS", "CpuMovbe" }, + { "CPU_CX16_FLAGS", + "CpuCX16" }, + { "CPU_RDTSCP_FLAGS", + "CpuRdtscp" }, { "CPU_EPT_FLAGS", "CpuEPT" }, + { "CPU_FSGSBASE_FLAGS", + "CpuFSGSBase" }, + { "CPU_RDRND_FLAGS", + "CpuRdRnd" }, + { "CPU_F16C_FLAGS", + "CpuF16C" }, + { "CPU_BMI2_FLAGS", + "CpuBMI2" }, + { "CPU_LZCNT_FLAGS", + "CpuLZCNT" }, + { "CPU_HLE_FLAGS", + "CpuHLE" }, + { "CPU_RTM_FLAGS", + "CpuRTM" }, + { "CPU_INVPCID_FLAGS", + "CpuINVPCID" }, + { "CPU_VMFUNC_FLAGS", + "CpuVMFUNC" }, { "CPU_3DNOW_FLAGS", "CpuMMX|Cpu3dnow" }, { "CPU_3DNOWA_FLAGS", @@ -125,13 +191,63 @@ static initializer cpu_flag_init [] = "CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuSSE4a" }, { "CPU_ABM_FLAGS", "CpuABM" }, - { "CPU_SSE5_FLAGS", - "CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuSSE4a|CpuABM|CpuSSE5"}, { "CPU_AVX_FLAGS", "CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuSSSE3|CpuSSE4_1|CpuSSE4_2|CpuAVX" }, + { "CPU_AVX2_FLAGS", + "CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuSSSE3|CpuSSE4_1|CpuSSE4_2|CpuAVX|CpuAVX2" }, + { "CPU_AVX512F_FLAGS", + "CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuSSSE3|CpuSSE4_1|CpuSSE4_2|CpuAVX|CpuAVX2|CpuAVX512F" }, + { "CPU_AVX512CD_FLAGS", + "CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuSSSE3|CpuSSE4_1|CpuSSE4_2|CpuAVX|CpuAVX2|CpuAVX512F|CpuAVX512CD" }, + { "CPU_AVX512ER_FLAGS", + "CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuSSSE3|CpuSSE4_1|CpuSSE4_2|CpuAVX|CpuAVX2|CpuAVX512F|CpuAVX512ER" }, + { "CPU_AVX512PF_FLAGS", + "CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuSSSE3|CpuSSE4_1|CpuSSE4_2|CpuAVX|CpuAVX2|CpuAVX512F|CpuAVX512PF" }, + { "CPU_ANY_AVX_FLAGS", + "CpuAVX|CpuAVX2|CpuAVX512F|CpuAVX512CD|CpuAVX512ER|CpuAVX512PF" }, + { "CPU_L1OM_FLAGS", + "unknown" }, + { "CPU_K1OM_FLAGS", + "unknown" }, + { "CPU_ADX_FLAGS", + "CpuADX" }, + { "CPU_RDSEED_FLAGS", + "CpuRdSeed" }, + { "CPU_PRFCHW_FLAGS", + "CpuPRFCHW" }, + { "CPU_SMAP_FLAGS", + "CpuSMAP" }, + { "CPU_MPX_FLAGS", + "CpuMPX" }, + { "CPU_SHA_FLAGS", + "CpuSHA" }, + { "CPU_CLFLUSHOPT_FLAGS", + "CpuClflushOpt" }, + { "CPU_XSAVES_FLAGS", + "CpuXSAVES" }, + { "CPU_XSAVEC_FLAGS", + "CpuXSAVEC" }, + { "CPU_PREFETCHWT1_FLAGS", + "CpuPREFETCHWT1" }, + { "CPU_SE1_FLAGS", + "CpuSE1" }, + { "CPU_AVX512DQ_FLAGS", + "CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuSSSE3|CpuSSE4_1|CpuSSE4_2|CpuAVX|CpuAVX2|CpuAVX512F|CpuAVX512DQ" }, + { "CPU_AVX512BW_FLAGS", + "CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuSSSE3|CpuSSE4_1|CpuSSE4_2|CpuAVX|CpuAVX2|CpuAVX512F|CpuAVX512BW" }, + { "CPU_AVX512VL_FLAGS", + "CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuSSSE3|CpuSSE4_1|CpuSSE4_2|CpuAVX|CpuAVX2|CpuAVX512F|CpuAVX512VL" }, + { "CPU_CLWB_FLAGS", + "CpuCLWB" }, + { "CPU_PCOMMIT_FLAGS", + "CpuPCOMMIT" }, + { "CPU_AVX512IFMA_FLAGS", + "CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuSSSE3|CpuSSE4_1|CpuSSE4_2|CpuAVX|CpuAVX2|CpuAVX512F|CpuAVX512IFMA" }, + { "CPU_AVX512VBMI_FLAGS", + "CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuSSSE3|CpuSSE4_1|CpuSSE4_2|CpuAVX|CpuAVX2|CpuAVX512F|CpuAVX512VBMI" }, }; -static initializer operand_type_init [] = +static initializer operand_type_init[] = { { "OPERAND_TYPE_NONE", "0" }, @@ -197,6 +313,10 @@ static initializer operand_type_init [] = "RegXMM" }, { "OPERAND_TYPE_REGYMM", "RegYMM" }, + { "OPERAND_TYPE_REGZMM", + "RegZMM" }, + { "OPERAND_TYPE_REGMASK", + "RegMask" }, { "OPERAND_TYPE_ESSEG", "EsSeg" }, { "OPERAND_TYPE_ACC32", @@ -217,6 +337,8 @@ static initializer operand_type_init [] = "Imm16|Imm32S" }, { "OPERAND_TYPE_IMM16_32_32S", "Imm16|Imm32|Imm32S" }, + { "OPERAND_TYPE_IMM32_64", + "Imm32|Imm64" }, { "OPERAND_TYPE_IMM32_32S_DISP32", "Imm32|Imm32S|Disp32" }, { "OPERAND_TYPE_IMM64_DISP64", @@ -225,8 +347,12 @@ static initializer operand_type_init [] = "Imm32|Imm32S|Imm64|Disp32" }, { "OPERAND_TYPE_IMM32_32S_64_DISP32_64", "Imm32|Imm32S|Imm64|Disp32|Disp64" }, - { "OPERAND_TYPE_VEX_IMM4", - "VEX_Imm4" }, + { "OPERAND_TYPE_VEC_IMM4", + "Vec_Imm4" }, + { "OPERAND_TYPE_REGBND", + "RegBND" }, + { "OPERAND_TYPE_VEC_DISP8", + "Vec_Disp8" }, }; typedef struct bitfield @@ -246,9 +372,14 @@ static bitfield cpu_flags[] = BITFIELD (Cpu486), BITFIELD (Cpu586), BITFIELD (Cpu686), - BITFIELD (CpuP4), - BITFIELD (CpuK6), - BITFIELD (CpuK8), + BITFIELD (CpuClflush), + BITFIELD (CpuNop), + BITFIELD (CpuSYSCALL), + BITFIELD (Cpu8087), + BITFIELD (Cpu287), + BITFIELD (Cpu387), + BITFIELD (Cpu687), + BITFIELD (CpuFISTTP), BITFIELD (CpuMMX), BITFIELD (CpuSSE), BITFIELD (CpuSSE2), @@ -257,8 +388,17 @@ static bitfield cpu_flags[] = BITFIELD (CpuSSE4_1), BITFIELD (CpuSSE4_2), BITFIELD (CpuAVX), + BITFIELD (CpuAVX2), + BITFIELD (CpuAVX512F), + BITFIELD (CpuAVX512CD), + BITFIELD (CpuAVX512ER), + BITFIELD (CpuAVX512PF), + BITFIELD (CpuAVX512VL), + BITFIELD (CpuAVX512DQ), + BITFIELD (CpuAVX512BW), + BITFIELD (CpuL1OM), + BITFIELD (CpuK1OM), BITFIELD (CpuSSE4a), - BITFIELD (CpuSSE5), BITFIELD (Cpu3dnow), BITFIELD (Cpu3dnowA), BITFIELD (CpuPadLock), @@ -267,14 +407,47 @@ static bitfield cpu_flags[] = BITFIELD (CpuSMX), BITFIELD (CpuABM), BITFIELD (CpuXsave), + BITFIELD (CpuXsaveopt), BITFIELD (CpuAES), BITFIELD (CpuPCLMUL), BITFIELD (CpuFMA), + BITFIELD (CpuFMA4), + BITFIELD (CpuXOP), + BITFIELD (CpuLWP), + BITFIELD (CpuBMI), + BITFIELD (CpuTBM), BITFIELD (CpuLM), BITFIELD (CpuMovbe), + BITFIELD (CpuCX16), BITFIELD (CpuEPT), + BITFIELD (CpuRdtscp), + BITFIELD (CpuFSGSBase), + BITFIELD (CpuRdRnd), + BITFIELD (CpuF16C), + BITFIELD (CpuBMI2), + BITFIELD (CpuLZCNT), + BITFIELD (CpuHLE), + BITFIELD (CpuRTM), + BITFIELD (CpuINVPCID), + BITFIELD (CpuVMFUNC), + BITFIELD (CpuRDSEED), + BITFIELD (CpuADX), + BITFIELD (CpuPRFCHW), + BITFIELD (CpuSMAP), + BITFIELD (CpuSHA), + BITFIELD (CpuVREX), + BITFIELD (CpuClflushOpt), + BITFIELD (CpuXSAVES), + BITFIELD (CpuXSAVEC), + BITFIELD (CpuPREFETCHWT1), + BITFIELD (CpuSE1), + BITFIELD (CpuCLWB), + BITFIELD (CpuPCOMMIT), BITFIELD (Cpu64), BITFIELD (CpuNo64), + BITFIELD (CpuMPX), + BITFIELD (CpuAVX512IFMA), + BITFIELD (CpuAVX512VBMI), #ifdef CpuUnused BITFIELD (CpuUnused), #endif @@ -284,6 +457,7 @@ static bitfield opcode_modifiers[] = { BITFIELD (D), BITFIELD (W), + BITFIELD (S), BITFIELD (Modrm), BITFIELD (ShortForm), BITFIELD (Jump), @@ -296,6 +470,7 @@ static bitfield opcode_modifiers[] = BITFIELD (Size16), BITFIELD (Size32), BITFIELD (Size64), + BITFIELD (CheckRegSize), BITFIELD (IgnoreSize), BITFIELD (DefaultSize), BITFIELD (No_bSuf), @@ -306,10 +481,13 @@ static bitfield opcode_modifiers[] = BITFIELD (No_ldSuf), BITFIELD (FWait), BITFIELD (IsString), + BITFIELD (BNDPrefixOk), + BITFIELD (IsLockable), BITFIELD (RegKludge), BITFIELD (FirstXmm0), BITFIELD (Implicit1stXmm0), - BITFIELD (ByteOkIntel), + BITFIELD (RepPrefixOk), + BITFIELD (HLEPrefixOk), BITFIELD (ToDword), BITFIELD (ToQword), BITFIELD (AddrPrefixOp0), @@ -318,22 +496,23 @@ static bitfield opcode_modifiers[] = BITFIELD (NoRex64), BITFIELD (Rex64), BITFIELD (Ugh), - BITFIELD (Drex), - BITFIELD (Drexv), - BITFIELD (Drexc), BITFIELD (Vex), - BITFIELD (Vex256), - BITFIELD (VexNDS), - BITFIELD (VexNDD), - BITFIELD (VexW0), - BITFIELD (VexW1), - BITFIELD (Vex0F), - BITFIELD (Vex0F38), - BITFIELD (Vex0F3A), - BITFIELD (Vex3Sources), + BITFIELD (VexVVVV), + BITFIELD (VexW), + BITFIELD (VexOpcode), + BITFIELD (VexSources), BITFIELD (VexImmExt), + BITFIELD (VecSIB), BITFIELD (SSE2AVX), BITFIELD (NoAVX), + BITFIELD (EVex), + BITFIELD (Masking), + BITFIELD (VecESize), + BITFIELD (Broadcast), + BITFIELD (StaticRounding), + BITFIELD (SAE), + BITFIELD (Disp8MemShift), + BITFIELD (NoDefMask), BITFIELD (OldGcc), BITFIELD (ATTMnemonic), BITFIELD (ATTSyntax), @@ -350,13 +529,15 @@ static bitfield operand_types[] = BITFIELD (RegMMX), BITFIELD (RegXMM), BITFIELD (RegYMM), + BITFIELD (RegZMM), + BITFIELD (RegMask), + BITFIELD (Imm1), BITFIELD (Imm8), BITFIELD (Imm8S), BITFIELD (Imm16), BITFIELD (Imm32), BITFIELD (Imm32S), BITFIELD (Imm64), - BITFIELD (Imm1), BITFIELD (BaseIndex), BITFIELD (Disp8), BITFIELD (Disp16), @@ -384,15 +565,17 @@ static bitfield operand_types[] = BITFIELD (Tbyte), BITFIELD (Xmmword), BITFIELD (Ymmword), + BITFIELD (Zmmword), BITFIELD (Unspecified), BITFIELD (Anysize), - BITFIELD (Vex_Imm4), + BITFIELD (Vec_Imm4), + BITFIELD (RegBND), + BITFIELD (Vec_Disp8), #ifdef OTUnused BITFIELD (OTUnused), #endif }; -static int lineno; static const char *filename; static int @@ -407,7 +590,7 @@ static void fail (const char *message, ...) { va_list args; - + va_start (args, message); fprintf (stderr, _("%s: Error: "), program_name); vfprintf (stderr, message, args); @@ -419,7 +602,7 @@ static void process_copyright (FILE *fp) { fprintf (fp, "/* This file is automatically generated by i386-gen. Do not edit! */\n\ -/* Copyright 2007, 2008 Free Software Foundation, Inc.\n\ +/* Copyright (C) 2007-2014 Free Software Foundation, Inc.\n\ \n\ This file is part of the GNU opcodes library.\n\ \n\ @@ -484,7 +667,7 @@ next_field (char *str, char sep, char **next, char *last) *str = '\0'; remove_trailing_whitespaces (p); - *next = str + 1; + *next = str + 1; if (p >= last) abort (); @@ -493,12 +676,17 @@ next_field (char *str, char sep, char **next, char *last) } static void -set_bitfield (const char *f, bitfield *array, unsigned int size) +set_bitfield (const char *f, bitfield *array, int value, + unsigned int size, int lineno) { unsigned int i; - if (strcmp (f, "CpuSledgehammer") == 0) - f= "CpuK8"; + if (strcmp (f, "CpuFP") == 0) + { + set_bitfield("Cpu387", array, value, size, lineno); + set_bitfield("Cpu287", array, value, size, lineno); + f = "Cpu8087"; + } else if (strcmp (f, "Mmword") == 0) f= "Qword"; else if (strcmp (f, "Oword") == 0) @@ -507,11 +695,37 @@ set_bitfield (const char *f, bitfield *array, unsigned int size) for (i = 0; i < size; i++) if (strcasecmp (array[i].name, f) == 0) { - array[i].value = 1; + array[i].value = value; return; } - fail (_("%s: %d: Unknown bitfield: %s\n"), filename, lineno, f); + if (value) + { + const char *v = strchr (f, '='); + + if (v) + { + size_t n = v - f; + char *end; + + for (i = 0; i < size; i++) + if (strncasecmp (array[i].name, f, n) == 0) + { + value = strtol (v + 1, &end, 0); + if (*end == '\0') + { + array[i].value = value; + return; + } + break; + } + } + } + + if (lineno != -1) + fail (_("%s: %d: Unknown bitfield: %s\n"), filename, lineno, f); + else + fail (_("Unknown bitfield: %s\n"), f); } static void @@ -524,7 +738,10 @@ output_cpu_flags (FILE *table, bitfield *flags, unsigned int size, for (i = 0; i < size - 1; i++) { - fprintf (table, "%d, ", flags[i].value); + if (((i + 1) % 20) != 0) + fprintf (table, "%d, ", flags[i].value); + else + fprintf (table, "%d,", flags[i].value); if (((i + 1) % 20) == 0) { /* We need \\ for macro. */ @@ -540,9 +757,11 @@ output_cpu_flags (FILE *table, bitfield *flags, unsigned int size, static void process_i386_cpu_flag (FILE *table, char *flag, int macro, - const char *comma, const char *indent) + const char *comma, const char *indent, + int lineno) { char *str, *next, *last; + unsigned int i; bitfield flags [ARRAY_SIZE (cpu_flags)]; /* Copy the default cpu flags. */ @@ -550,22 +769,50 @@ process_i386_cpu_flag (FILE *table, char *flag, int macro, if (strcasecmp (flag, "unknown") == 0) { - unsigned int i; - /* We turn on everything except for cpu64 in case of - CPU_UNKNOWN_FLAGS. */ + CPU_UNKNOWN_FLAGS. */ for (i = 0; i < ARRAY_SIZE (flags); i++) if (flags[i].position != Cpu64) flags[i].value = 1; } + else if (flag[0] == '~') + { + last = flag + strlen (flag); + + if (flag[1] == '(') + { + last -= 1; + next = flag + 2; + if (*last != ')') + fail (_("%s: %d: Missing `)' in bitfield: %s\n"), filename, + lineno, flag); + *last = '\0'; + } + else + next = flag + 1; + + /* First we turn on everything except for cpu64. */ + for (i = 0; i < ARRAY_SIZE (flags); i++) + if (flags[i].position != Cpu64) + flags[i].value = 1; + + /* Turn off selective bits. */ + for (; next && next < last; ) + { + str = next_field (next, '|', &next, last); + if (str) + set_bitfield (str, flags, 0, ARRAY_SIZE (flags), lineno); + } + } else if (strcmp (flag, "0")) { + /* Turn on selective bits. */ last = flag + strlen (flag); for (next = flag; next && next < last; ) { str = next_field (next, '|', &next, last); if (str) - set_bitfield (str, flags, ARRAY_SIZE (flags)); + set_bitfield (str, flags, 1, ARRAY_SIZE (flags), lineno); } } @@ -582,7 +829,10 @@ output_opcode_modifier (FILE *table, bitfield *modifier, unsigned int size) for (i = 0; i < size - 1; i++) { - fprintf (table, "%d, ", modifier[i].value); + if (((i + 1) % 20) != 0) + fprintf (table, "%d, ", modifier[i].value); + else + fprintf (table, "%d,", modifier[i].value); if (((i + 1) % 20) == 0) fprintf (table, "\n "); } @@ -591,7 +841,7 @@ output_opcode_modifier (FILE *table, bitfield *modifier, unsigned int size) } static void -process_i386_opcode_modifier (FILE *table, char *mod) +process_i386_opcode_modifier (FILE *table, char *mod, int lineno) { char *str, *next, *last; bitfield modifiers [ARRAY_SIZE (opcode_modifiers)]; @@ -606,7 +856,8 @@ process_i386_opcode_modifier (FILE *table, char *mod) { str = next_field (next, '|', &next, last); if (str) - set_bitfield (str, modifiers, ARRAY_SIZE (modifiers)); + set_bitfield (str, modifiers, 1, ARRAY_SIZE (modifiers), + lineno); } } output_opcode_modifier (table, modifiers, ARRAY_SIZE (modifiers)); @@ -622,12 +873,15 @@ output_operand_type (FILE *table, bitfield *types, unsigned int size, for (i = 0; i < size - 1; i++) { - fprintf (table, "%d, ", types[i].value); + if (((i + 1) % 20) != 0) + fprintf (table, "%d, ", types[i].value); + else + fprintf (table, "%d,", types[i].value); if (((i + 1) % 20) == 0) { /* We need \\ for macro. */ if (macro) - fprintf (table, "\\\n%s", indent); + fprintf (table, " \\\n%s", indent); else fprintf (table, "\n%s", indent); } @@ -638,7 +892,7 @@ output_operand_type (FILE *table, bitfield *types, unsigned int size, static void process_i386_operand_type (FILE *table, char *op, int macro, - const char *indent) + const char *indent, int lineno) { char *str, *next, *last; bitfield types [ARRAY_SIZE (operand_types)]; @@ -653,7 +907,7 @@ process_i386_operand_type (FILE *table, char *op, int macro, { str = next_field (next, '|', &next, last); if (str) - set_bitfield (str, types, ARRAY_SIZE (types)); + set_bitfield (str, types, 1, ARRAY_SIZE (types), lineno); } } output_operand_type (table, types, ARRAY_SIZE (types), macro, @@ -662,7 +916,7 @@ process_i386_operand_type (FILE *table, char *op, int macro, static void output_i386_opcode (FILE *table, const char *name, char *str, - char *last) + char *last, int lineno) { unsigned int i; char *operands, *base_opcode, *extension_opcode, *opcode_length; @@ -733,9 +987,9 @@ output_i386_opcode (FILE *table, const char *name, char *str, name, operands, base_opcode, extension_opcode, opcode_length); - process_i386_cpu_flag (table, cpu_flags, 0, ",", " "); + process_i386_cpu_flag (table, cpu_flags, 0, ",", " ", lineno); - process_i386_opcode_modifier (table, opcode_modifier); + process_i386_opcode_modifier (table, opcode_modifier, lineno); fprintf (table, " { "); @@ -744,7 +998,7 @@ output_i386_opcode (FILE *table, const char *name, char *str, if (operand_types[i] == NULL || *operand_types[i] == '0') { if (i == 0) - process_i386_operand_type (table, "0", 0, "\t "); + process_i386_operand_type (table, "0", 0, "\t ", lineno); break; } @@ -752,7 +1006,7 @@ output_i386_opcode (FILE *table, const char *name, char *str, fprintf (table, ",\n "); process_i386_operand_type (table, operand_types[i], 0, - "\t "); + "\t ", lineno); } fprintf (table, " } },\n"); } @@ -762,6 +1016,7 @@ struct opcode_hash_entry struct opcode_hash_entry *next; char *name; char *opcode; + int lineno; }; /* Calculate the hash value of an opcode hash entry P. */ @@ -794,6 +1049,7 @@ process_i386_opcodes (FILE *table) htab_t opcode_hash_table; struct opcode_hash_entry **opcode_array; unsigned int opcode_array_size = 1024; + int lineno = 0; filename = "i386-opc.tbl"; fp = fopen (filename, "r"); @@ -811,7 +1067,7 @@ process_i386_opcodes (FILE *table) xcalloc, free); fprintf (table, "\n/* i386 opcode table. */\n\n"); - fprintf (table, "const template i386_optab[] =\n{\n"); + fprintf (table, "const insn_template i386_optab[] =\n{\n"); /* Put everything on opcode array. */ while (!feof (fp)) @@ -870,6 +1126,7 @@ process_i386_opcodes (FILE *table) opcode_array[i]->next = NULL; opcode_array[i]->name = xstrdup (name); opcode_array[i]->opcode = xstrdup (str); + opcode_array[i]->lineno = lineno; *hash_slot = opcode_array[i]; i++; } @@ -884,6 +1141,7 @@ process_i386_opcodes (FILE *table) (*entry)->next = NULL; (*entry)->name = (*hash_slot)->name; (*entry)->opcode = xstrdup (str); + (*entry)->lineno = lineno; } } @@ -894,8 +1152,9 @@ process_i386_opcodes (FILE *table) { name = next->name; str = next->opcode; + lineno = next->lineno; last = str + strlen (str); - output_i386_opcode (table, name, str, last); + output_i386_opcode (table, name, str, last, lineno); } } @@ -903,12 +1162,12 @@ process_i386_opcodes (FILE *table) fprintf (table, " { NULL, 0, 0, 0, 0,\n"); - process_i386_cpu_flag (table, "0", 0, ",", " "); + process_i386_cpu_flag (table, "0", 0, ",", " ", -1); + + process_i386_opcode_modifier (table, "0", -1); - process_i386_opcode_modifier (table, "0"); - fprintf (table, " { "); - process_i386_operand_type (table, "0", 0, "\t "); + process_i386_operand_type (table, "0", 0, "\t ", -1); fprintf (table, " } }\n"); fprintf (table, "};\n"); @@ -922,6 +1181,7 @@ process_i386_registers (FILE *table) char *str, *p, *last; char *reg_name, *reg_type, *reg_flags, *reg_num; char *dw2_32_num, *dw2_64_num; + int lineno = 0; filename = "i386-reg.tbl"; fp = fopen (filename, "r"); @@ -976,7 +1236,7 @@ process_i386_registers (FILE *table) fprintf (table, " { \"%s\",\n ", reg_name); - process_i386_operand_type (table, reg_type, 0, "\t"); + process_i386_operand_type (table, reg_type, 0, "\t", lineno); /* Find 32-bit Dwarf2 register number. */ dw2_32_num = next_field (str, ',', &str, last); @@ -1012,7 +1272,7 @@ process_i386_initializers (void) { fprintf (fp, "\n#define %s \\\n", cpu_flag_init[i].name); init = xstrdup (cpu_flag_init[i].init); - process_i386_cpu_flag (fp, init, 1, "", " "); + process_i386_cpu_flag (fp, init, 1, "", " ", -1); free (init); } @@ -1020,7 +1280,7 @@ process_i386_initializers (void) { fprintf (fp, "\n\n#define %s \\\n ", operand_type_init[i].name); init = xstrdup (operand_type_init[i].init); - process_i386_operand_type (fp, init, 1, " "); + process_i386_operand_type (fp, init, 1, " ", -1); free (init); } fprintf (fp, "\n"); @@ -1031,7 +1291,7 @@ process_i386_initializers (void) /* Program options. */ #define OPTION_SRCDIR 200 -struct option long_options[] = +struct option long_options[] = { {"srcdir", required_argument, NULL, OPTION_SRCDIR}, {"debug", no_argument, NULL, 'd'}, @@ -1062,7 +1322,7 @@ main (int argc, char **argv) char *srcdir = NULL; int c; FILE *table; - + program_name = *argv; xmalloc_set_program_name (program_name); @@ -1090,7 +1350,7 @@ main (int argc, char **argv) if (optind != argc) usage (stdout, 1); - if (srcdir != NULL) + if (srcdir != NULL) if (chdir (srcdir) != 0) fail (_("unable to change directory to \"%s\", errno = %s\n"), srcdir, xstrerror (errno));