X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=opcodes%2Fi386-gen.c;h=e82954ee8a8a44fd88f0b24748f8e14bd84548f9;hb=742e5034ef645112e4ef204e84e28cf312c1b1c5;hp=74cb71b6afc39af0513cd3918e20409cc9686370;hpb=115c7c25fec67e650084943e7e7282d2ad4a3d63;p=deliverable%2Fbinutils-gdb.git diff --git a/opcodes/i386-gen.c b/opcodes/i386-gen.c index 74cb71b6af..e82954ee8a 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-2016 Free Software Foundation, Inc. This file is part of the GNU opcodes library. @@ -22,6 +22,7 @@ #include #include "getopt.h" #include "libiberty.h" +#include "hashtab.h" #include "safe-ctype.h" #include "i386-opc.h" @@ -38,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" }, + { "CPU_GENERIC64_FLAGS", + "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuClflush|Cpu387|Cpu687|CpuNop|CpuMMX|CpuSSE|CpuSSE2|CpuLM" }, { "CPU_NONE_FLAGS", "0" }, { "CPU_I186_FLAGS", @@ -57,31 +58,63 @@ 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|CpuMWAITX" }, + { "CPU_ZNVER1_FLAGS", + "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuSYSCALL|CpuRdtscp|Cpu387|Cpu687|CpuFISTTP|CpuNop|CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuSSE4a|CpuABM|CpuLM|CpuFMA|CpuBMI|CpuF16C|CpuCX16|CpuClflush|CpuSSSE3|CpuSVME|CpuSSE4_1|CpuSSE4_2|CpuAES|CpuAVX|CpuPCLMUL|CpuLZCNT|CpuPRFCHW|CpuXsave|CpuXsaveopt|CpuFSGSBase|CpuAVX2|CpuMovbe|CpuBMI2|CpuRdRnd|CpuADX|CpuRdSeed|CpuSMAP|CpuSHA|CpuXSAVEC|CpuXSAVES|CpuClflushOpt|CpuCLZERO|CpuMWAITX" }, + { "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", @@ -96,10 +129,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", @@ -112,11 +193,73 @@ 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_IAMCU_FLAGS", + "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586" }, + { "CPU_IAMCU_COMPAT_FLAGS", + "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuNo64|CpuNop" }, + { "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" }, + { "CPU_CLZERO_FLAGS", + "CpuCLZERO" }, + { "CPU_MWAITX_FLAGS", + "CpuMWAITX" }, + { "CPU_OSPKE_FLAGS", + "CpuOSPKE" }, }; -static initializer operand_type_init [] = +static initializer operand_type_init[] = { { "OPERAND_TYPE_NONE", "0" }, @@ -180,12 +323,20 @@ static initializer operand_type_init [] = "RegMMX" }, { "OPERAND_TYPE_REGXMM", "RegXMM" }, + { "OPERAND_TYPE_REGYMM", + "RegYMM" }, + { "OPERAND_TYPE_REGZMM", + "RegZMM" }, + { "OPERAND_TYPE_REGMASK", + "RegMask" }, { "OPERAND_TYPE_ESSEG", "EsSeg" }, { "OPERAND_TYPE_ACC32", "Reg32|Acc|Dword" }, { "OPERAND_TYPE_ACC64", "Reg64|Acc|Qword" }, + { "OPERAND_TYPE_INOUTPORTREG", + "InOutPortReg" }, { "OPERAND_TYPE_REG16_INOUTPORTREG", "Reg16|InOutPortReg" }, { "OPERAND_TYPE_DISP16_32", @@ -198,6 +349,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", @@ -206,6 +359,12 @@ static initializer operand_type_init [] = "Imm32|Imm32S|Imm64|Disp32" }, { "OPERAND_TYPE_IMM32_32S_64_DISP32_64", "Imm32|Imm32S|Imm64|Disp32|Disp64" }, + { "OPERAND_TYPE_VEC_IMM4", + "Vec_Imm4" }, + { "OPERAND_TYPE_REGBND", + "RegBND" }, + { "OPERAND_TYPE_VEC_DISP8", + "Vec_Disp8" }, }; typedef struct bitfield @@ -225,9 +384,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), @@ -235,8 +399,19 @@ static bitfield cpu_flags[] = BITFIELD (CpuSSSE3), 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 (CpuIAMCU), BITFIELD (CpuSSE4a), - BITFIELD (CpuSSE5), BITFIELD (Cpu3dnow), BITFIELD (Cpu3dnowA), BITFIELD (CpuPadLock), @@ -244,9 +419,53 @@ static bitfield cpu_flags[] = BITFIELD (CpuVMX), 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), + BITFIELD (CpuMWAITX), + BITFIELD (CpuCLZERO), + BITFIELD (CpuOSPKE), + BITFIELD (CpuAMD64), + BITFIELD (CpuIntel64), #ifdef CpuUnused BITFIELD (CpuUnused), #endif @@ -256,6 +475,7 @@ static bitfield opcode_modifiers[] = { BITFIELD (D), BITFIELD (W), + BITFIELD (S), BITFIELD (Modrm), BITFIELD (ShortForm), BITFIELD (Jump), @@ -268,6 +488,7 @@ static bitfield opcode_modifiers[] = BITFIELD (Size16), BITFIELD (Size32), BITFIELD (Size64), + BITFIELD (CheckRegSize), BITFIELD (IgnoreSize), BITFIELD (DefaultSize), BITFIELD (No_bSuf), @@ -278,9 +499,13 @@ static bitfield opcode_modifiers[] = BITFIELD (No_ldSuf), BITFIELD (FWait), BITFIELD (IsString), + BITFIELD (BNDPrefixOk), + BITFIELD (IsLockable), BITFIELD (RegKludge), BITFIELD (FirstXmm0), - BITFIELD (ByteOkIntel), + BITFIELD (Implicit1stXmm0), + BITFIELD (RepPrefixOk), + BITFIELD (HLEPrefixOk), BITFIELD (ToDword), BITFIELD (ToQword), BITFIELD (AddrPrefixOp0), @@ -289,9 +514,23 @@ static bitfield opcode_modifiers[] = BITFIELD (NoRex64), BITFIELD (Rex64), BITFIELD (Ugh), - BITFIELD (Drex), - BITFIELD (Drexv), - BITFIELD (Drexc), + BITFIELD (Vex), + 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), @@ -307,13 +546,16 @@ static bitfield operand_types[] = BITFIELD (FloatReg), 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), @@ -340,14 +582,18 @@ static bitfield operand_types[] = BITFIELD (Qword), BITFIELD (Tbyte), BITFIELD (Xmmword), + BITFIELD (Ymmword), + BITFIELD (Zmmword), BITFIELD (Unspecified), BITFIELD (Anysize), + BITFIELD (Vec_Imm4), + BITFIELD (RegBND), + BITFIELD (Vec_Disp8), #ifdef OTUnused BITFIELD (OTUnused), #endif }; -static int lineno; static const char *filename; static int @@ -362,7 +608,7 @@ static void fail (const char *message, ...) { va_list args; - + va_start (args, message); fprintf (stderr, _("%s: Error: "), program_name); vfprintf (stderr, message, args); @@ -374,7 +620,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-2016 Free Software Foundation, Inc.\n\ \n\ This file is part of the GNU opcodes library.\n\ \n\ @@ -429,7 +675,7 @@ remove_trailing_whitespaces (char *str) pointer to the one after it. */ static char * -next_field (char *str, char sep, char **next) +next_field (char *str, char sep, char **next, char *last) { char *p; @@ -439,18 +685,26 @@ next_field (char *str, char sep, char **next) *str = '\0'; remove_trailing_whitespaces (p); - *next = str + 1; + *next = str + 1; + + if (p >= last) + abort (); return p; } 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) @@ -459,11 +713,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 @@ -476,7 +756,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. */ @@ -492,9 +775,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. */ @@ -502,22 +787,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); + str = next_field (next, '|', &next, last); if (str) - set_bitfield (str, flags, ARRAY_SIZE (flags)); + set_bitfield (str, flags, 1, ARRAY_SIZE (flags), lineno); } } @@ -534,7 +847,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 "); } @@ -543,7 +859,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)]; @@ -556,9 +872,10 @@ process_i386_opcode_modifier (FILE *table, char *mod) last = mod + strlen (mod); for (next = mod; next && next < last; ) { - str = next_field (next, '|', &next); + 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)); @@ -574,12 +891,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); } @@ -590,7 +910,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)]; @@ -603,25 +923,151 @@ process_i386_operand_type (FILE *table, char *op, int macro, last = op + strlen (op); for (next = op; next && next < last; ) { - str = next_field (next, '|', &next); + 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, indent); } +static void +output_i386_opcode (FILE *table, const char *name, char *str, + char *last, int lineno) +{ + unsigned int i; + char *operands, *base_opcode, *extension_opcode, *opcode_length; + char *cpu_flags, *opcode_modifier, *operand_types [MAX_OPERANDS]; + + /* Find number of operands. */ + operands = next_field (str, ',', &str, last); + + /* Find base_opcode. */ + base_opcode = next_field (str, ',', &str, last); + + /* Find extension_opcode. */ + extension_opcode = next_field (str, ',', &str, last); + + /* Find opcode_length. */ + opcode_length = next_field (str, ',', &str, last); + + /* Find cpu_flags. */ + cpu_flags = next_field (str, ',', &str, last); + + /* Find opcode_modifier. */ + opcode_modifier = next_field (str, ',', &str, last); + + /* Remove the first {. */ + str = remove_leading_whitespaces (str); + if (*str != '{') + abort (); + str = remove_leading_whitespaces (str + 1); + + i = strlen (str); + + /* There are at least "X}". */ + if (i < 2) + abort (); + + /* Remove trailing white spaces and }. */ + do + { + i--; + if (ISSPACE (str[i]) || str[i] == '}') + str[i] = '\0'; + else + break; + } + while (i != 0); + + last = str + i; + + /* Find operand_types. */ + for (i = 0; i < ARRAY_SIZE (operand_types); i++) + { + if (str >= last) + { + operand_types [i] = NULL; + break; + } + + operand_types [i] = next_field (str, ',', &str, last); + if (*operand_types[i] == '0') + { + if (i != 0) + operand_types[i] = NULL; + break; + } + } + + fprintf (table, " { \"%s\", %s, %s, %s, %s,\n", + name, operands, base_opcode, extension_opcode, + opcode_length); + + process_i386_cpu_flag (table, cpu_flags, 0, ",", " ", lineno); + + process_i386_opcode_modifier (table, opcode_modifier, lineno); + + fprintf (table, " { "); + + for (i = 0; i < ARRAY_SIZE (operand_types); i++) + { + if (operand_types[i] == NULL || *operand_types[i] == '0') + { + if (i == 0) + process_i386_operand_type (table, "0", 0, "\t ", lineno); + break; + } + + if (i != 0) + fprintf (table, ",\n "); + + process_i386_operand_type (table, operand_types[i], 0, + "\t ", lineno); + } + fprintf (table, " } },\n"); +} + +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. */ + +static hashval_t +opcode_hash_hash (const void *p) +{ + struct opcode_hash_entry *entry = (struct opcode_hash_entry *) p; + return htab_hash_string (entry->name); +} + +/* Compare a string Q against an opcode hash entry P. */ + +static int +opcode_hash_eq (const void *p, const void *q) +{ + struct opcode_hash_entry *entry = (struct opcode_hash_entry *) p; + const char *name = (const char *) q; + return strcmp (name, entry->name) == 0; +} + static void process_i386_opcodes (FILE *table) { FILE *fp; char buf[2048]; - unsigned int i; - char *str, *p, *last; - char *name, *operands, *base_opcode, *extension_opcode; - char *opcode_length; - char *cpu_flags, *opcode_modifier, *operand_types [MAX_OPERANDS]; + unsigned int i, j; + char *str, *p, *last, *name; + struct opcode_hash_entry **hash_slot, **entry, *next; + 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"); @@ -630,9 +1076,18 @@ process_i386_opcodes (FILE *table) fail (_("can't find i386-opc.tbl for reading, errno = %s\n"), xstrerror (errno)); + i = 0; + opcode_array = (struct opcode_hash_entry **) + xmalloc (sizeof (*opcode_array) * opcode_array_size); + + opcode_hash_table = htab_create_alloc (16, opcode_hash_hash, + opcode_hash_eq, NULL, + 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)) { if (fgets (buf, sizeof (buf), fp) == NULL) @@ -653,7 +1108,7 @@ process_i386_opcodes (FILE *table) switch (p[0]) { case '#': - fprintf (table, "%s\n", p); + /* Ignore comments. */ case '\0': continue; break; @@ -664,129 +1119,73 @@ process_i386_opcodes (FILE *table) last = p + strlen (p); /* Find name. */ - name = next_field (p, ',', &str); - - if (str >= last) - abort (); - - /* Find number of operands. */ - operands = next_field (str, ',', &str); - - if (str >= last) - abort (); - - /* Find base_opcode. */ - base_opcode = next_field (str, ',', &str); - - if (str >= last) - abort (); - - /* Find extension_opcode. */ - extension_opcode = next_field (str, ',', &str); - - if (str >= last) - abort (); - - /* Find opcode_length. */ - opcode_length = next_field (str, ',', &str); - - if (str >= last) - abort (); + name = next_field (p, ',', &str, last); - /* Find cpu_flags. */ - cpu_flags = next_field (str, ',', &str); + /* Get the slot in hash table. */ + hash_slot = (struct opcode_hash_entry **) + htab_find_slot_with_hash (opcode_hash_table, name, + htab_hash_string (name), + INSERT); - if (str >= last) - abort (); - - /* Find opcode_modifier. */ - opcode_modifier = next_field (str, ',', &str); - - if (str >= last) - abort (); - - /* Remove the first {. */ - str = remove_leading_whitespaces (str); - if (*str != '{') - abort (); - str = remove_leading_whitespaces (str + 1); - - i = strlen (str); - - /* There are at least "X}". */ - if (i < 2) - abort (); - - /* Remove trailing white spaces and }. */ - do - { - i--; - if (ISSPACE (str[i]) || str[i] == '}') - str[i] = '\0'; - else - break; - } - while (i != 0); - - last = str + i; - - /* Find operand_types. */ - for (i = 0; i < ARRAY_SIZE (operand_types); i++) + if (*hash_slot == NULL) { - if (str >= last) + /* It is the new one. Put it on opcode array. */ + if (i >= opcode_array_size) { - operand_types [i] = NULL; - break; + /* Grow the opcode array when needed. */ + opcode_array_size += 1024; + opcode_array = (struct opcode_hash_entry **) + xrealloc (opcode_array, + sizeof (*opcode_array) * opcode_array_size); } - operand_types [i] = next_field (str, ',', &str); - if (*operand_types[i] == '0') - { - if (i != 0) - operand_types[i] = NULL; - break; - } + opcode_array[i] = (struct opcode_hash_entry *) + xmalloc (sizeof (struct opcode_hash_entry)); + 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++; } - - fprintf (table, " { \"%s\", %s, %s, %s, %s,\n", - name, operands, base_opcode, extension_opcode, - opcode_length); - - process_i386_cpu_flag (table, cpu_flags, 0, ",", " "); - - process_i386_opcode_modifier (table, opcode_modifier); - - fprintf (table, " { "); - - for (i = 0; i < ARRAY_SIZE (operand_types); i++) + else { - if (operand_types[i] == NULL - || *operand_types[i] == '0') - { - if (i == 0) - process_i386_operand_type (table, "0", 0, "\t "); - break; - } - - if (i != 0) - fprintf (table, ",\n "); + /* Append it to the existing one. */ + entry = hash_slot; + while ((*entry) != NULL) + entry = &(*entry)->next; + *entry = (struct opcode_hash_entry *) + xmalloc (sizeof (struct opcode_hash_entry)); + (*entry)->next = NULL; + (*entry)->name = (*hash_slot)->name; + (*entry)->opcode = xstrdup (str); + (*entry)->lineno = lineno; + } + } - process_i386_operand_type (table, operand_types[i], 0, - "\t "); + /* Process opcode array. */ + for (j = 0; j < i; j++) + { + for (next = opcode_array[j]; next; next = next->next) + { + name = next->name; + str = next->opcode; + lineno = next->lineno; + last = str + strlen (str); + output_i386_opcode (table, name, str, last, lineno); } - fprintf (table, " } },\n"); } fclose (fp); 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"); @@ -799,6 +1198,8 @@ process_i386_registers (FILE *table) char buf[2048]; 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"); @@ -840,31 +1241,29 @@ process_i386_registers (FILE *table) last = p + strlen (p); /* Find reg_name. */ - reg_name = next_field (p, ',', &str); - - if (str >= last) - abort (); + reg_name = next_field (p, ',', &str, last); /* Find reg_type. */ - reg_type = next_field (str, ',', &str); - - if (str >= last) - abort (); + reg_type = next_field (str, ',', &str, last); /* Find reg_flags. */ - reg_flags = next_field (str, ',', &str); - - if (str >= last) - abort (); + reg_flags = next_field (str, ',', &str, last); /* Find reg_num. */ - reg_num = next_field (str, ',', &str); + reg_num = next_field (str, ',', &str, last); 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); - fprintf (table, ",\n %s, %s },\n", reg_flags, reg_num); + /* Find 64-bit Dwarf2 register number. */ + dw2_64_num = next_field (str, ',', &str, last); + + fprintf (table, ",\n %s, %s, { %s, %s } },\n", + reg_flags, reg_num, dw2_32_num, dw2_64_num); } fclose (fp); @@ -891,7 +1290,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); } @@ -899,7 +1298,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"); @@ -910,7 +1309,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'}, @@ -941,7 +1340,7 @@ main (int argc, char **argv) char *srcdir = NULL; int c; FILE *table; - + program_name = *argv; xmalloc_set_program_name (program_name); @@ -969,7 +1368,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));