X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=opcodes%2Fi386-gen.c;h=6e33fc56df2287ca97213b0979741b40688138c6;hb=50d036364fb2a71b3ac9a0b0cdbe58296832a1b2;hp=74cb71b6afc39af0513cd3918e20409cc9686370;hpb=115c7c25fec67e650084943e7e7282d2ad4a3d63;p=deliverable%2Fbinutils-gdb.git diff --git a/opcodes/i386-gen.c b/opcodes/i386-gen.c index 74cb71b6af..6e33fc56df 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-2020 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" @@ -29,6 +30,10 @@ #include #define _(String) gettext (String) +/* Build-time checks are preferrable over runtime ones. Use this construct + in preference where possible. */ +#define static_assert(e) ((void)sizeof (struct { int _:1 - 2 * !(e); })) + static const char *program_name = NULL; static int debug = 0; @@ -38,96 +43,372 @@ 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", + "CPU_PENTIUMPRO_FLAGS|CpuClflush|CpuSYSCALL|CPU_MMX_FLAGS|CPU_SSE2_FLAGS|CpuLM" }, { "CPU_NONE_FLAGS", "0" }, { "CPU_I186_FLAGS", "Cpu186" }, { "CPU_I286_FLAGS", - "Cpu186|Cpu286" }, + "CPU_I186_FLAGS|Cpu286" }, { "CPU_I386_FLAGS", - "Cpu186|Cpu286|Cpu386" }, + "CPU_I286_FLAGS|Cpu386" }, { "CPU_I486_FLAGS", - "Cpu186|Cpu286|Cpu386|Cpu486" }, + "CPU_I386_FLAGS|Cpu486" }, { "CPU_I586_FLAGS", - "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586" }, + "CPU_I486_FLAGS|Cpu387|Cpu586" }, { "CPU_I686_FLAGS", - "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686" }, + "CPU_I586_FLAGS|Cpu686|Cpu687|CpuCMOV|CpuFXSR" }, + { "CPU_PENTIUMPRO_FLAGS", + "CPU_I686_FLAGS|CpuNop" }, { "CPU_P2_FLAGS", - "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuMMX" }, + "CPU_PENTIUMPRO_FLAGS|CPU_MMX_FLAGS" }, { "CPU_P3_FLAGS", - "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuMMX|CpuSSE" }, + "CPU_P2_FLAGS|CPU_SSE_FLAGS" }, { "CPU_P4_FLAGS", - "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuP4|CpuMMX|CpuSSE|CpuSSE2" }, + "CPU_P3_FLAGS|CpuClflush|CPU_SSE2_FLAGS" }, { "CPU_NOCONA_FLAGS", - "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuP4|CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuLM" }, + "CPU_GENERIC64_FLAGS|CpuFISTTP|CPU_SSE3_FLAGS|CpuCX16" }, { "CPU_CORE_FLAGS", - "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuP4|CpuMMX|CpuSSE|CpuSSE2|CpuSSE3" }, + "CPU_P4_FLAGS|CpuFISTTP|CPU_SSE3_FLAGS|CpuCX16" }, { "CPU_CORE2_FLAGS", - "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuP4|CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuSSSE3|CpuLM" }, + "CPU_NOCONA_FLAGS|CPU_SSSE3_FLAGS" }, + { "CPU_COREI7_FLAGS", + "CPU_CORE2_FLAGS|CPU_SSE4_2_FLAGS|CpuRdtscp" }, { "CPU_K6_FLAGS", - "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|CpuK6|CpuMMX" }, + "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|CpuSYSCALL|Cpu387|CPU_MMX_FLAGS" }, { "CPU_K6_2_FLAGS", - "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|CpuK6|CpuMMX|Cpu3dnow" }, + "CPU_K6_FLAGS|Cpu3dnow" }, { "CPU_ATHLON_FLAGS", - "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuK6|CpuMMX|Cpu3dnow|Cpu3dnowA" }, + "CPU_K6_2_FLAGS|Cpu686|Cpu687|CpuNop|Cpu3dnowA" }, { "CPU_K8_FLAGS", - "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuK6|CpuK8|CpuMMX|Cpu3dnow|Cpu3dnowA|CpuSSE|CpuSSE2|CpuLM" }, + "CPU_ATHLON_FLAGS|CpuRdtscp|CPU_SSE2_FLAGS|CpuLM" }, { "CPU_AMDFAM10_FLAGS", - "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuK6|CpuK8|CpuMMX|Cpu3dnow|Cpu3dnowA|CpuSSE|CpuSSE2|CpuSSE3|CpuSSE4a|CpuABM|CpuLM" }, + "CPU_K8_FLAGS|CpuFISTTP|CPU_SSE4A_FLAGS|CpuLZCNT|CpuPOPCNT" }, + { "CPU_BDVER1_FLAGS", + "CPU_GENERIC64_FLAGS|CpuFISTTP|CpuRdtscp|CpuCX16|CPU_XOP_FLAGS|CpuLZCNT|CpuPOPCNT|CpuLWP|CpuSVME|CpuAES|CpuPCLMUL|CpuPRFCHW" }, + { "CPU_BDVER2_FLAGS", + "CPU_BDVER1_FLAGS|CpuFMA|CpuBMI|CpuTBM|CpuF16C" }, + { "CPU_BDVER3_FLAGS", + "CPU_BDVER2_FLAGS|CpuXsaveopt|CpuFSGSBase" }, + { "CPU_BDVER4_FLAGS", + "CPU_BDVER3_FLAGS|CpuAVX2|CpuMovbe|CpuBMI2|CpuRdRnd|CpuMWAITX" }, + { "CPU_ZNVER1_FLAGS", + "CPU_GENERIC64_FLAGS|CpuFISTTP|CpuRdtscp|CpuCX16|CPU_AVX2_FLAGS|CpuSSE4A|CpuLZCNT|CpuPOPCNT|CpuSVME|CpuAES|CpuPCLMUL|CpuPRFCHW|CpuFMA|CpuBMI|CpuF16C|CpuXsaveopt|CpuFSGSBase|CpuMovbe|CpuBMI2|CpuRdRnd|CpuADX|CpuRdSeed|CpuSMAP|CpuSHA|CpuXSAVEC|CpuXSAVES|CpuClflushOpt|CpuCLZERO|CpuMWAITX" }, + { "CPU_ZNVER2_FLAGS", + "CPU_ZNVER1_FLAGS|CpuCLWB|CpuRDPID|CpuRDPRU|CpuMCOMMIT|CpuWBNOINVD" }, + { "CPU_BTVER1_FLAGS", + "CPU_GENERIC64_FLAGS|CpuFISTTP|CpuCX16|CpuRdtscp|CPU_SSSE3_FLAGS|CpuSSE4A|CpuLZCNT|CpuPOPCNT|CpuPRFCHW|CpuCX16|CpuClflush|CpuFISTTP|CpuSVME" }, + { "CPU_BTVER2_FLAGS", + "CPU_BTVER1_FLAGS|CPU_AVX_FLAGS|CpuBMI|CpuF16C|CpuAES|CpuPCLMUL|CpuMovbe|CpuXsaveopt|CpuPRFCHW" }, + { "CPU_8087_FLAGS", + "Cpu8087" }, + { "CPU_287_FLAGS", + "Cpu287" }, + { "CPU_387_FLAGS", + "Cpu387" }, + { "CPU_687_FLAGS", + "CPU_387_FLAGS|Cpu687" }, + { "CPU_CMOV_FLAGS", + "CpuCMOV" }, + { "CPU_FXSR_FLAGS", + "CpuFXSR" }, + { "CPU_CLFLUSH_FLAGS", + "CpuClflush" }, + { "CPU_NOP_FLAGS", + "CpuNop" }, + { "CPU_SYSCALL_FLAGS", + "CpuSYSCALL" }, { "CPU_MMX_FLAGS", "CpuMMX" }, { "CPU_SSE_FLAGS", - "CpuMMX|CpuSSE" }, + "CpuSSE" }, { "CPU_SSE2_FLAGS", - "CpuMMX|CpuSSE|CpuSSE2" }, + "CPU_SSE_FLAGS|CpuSSE2" }, { "CPU_SSE3_FLAGS", - "CpuMMX|CpuSSE|CpuSSE2|CpuSSE3" }, + "CPU_SSE2_FLAGS|CpuSSE3" }, { "CPU_SSSE3_FLAGS", - "CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuSSSE3" }, + "CPU_SSE3_FLAGS|CpuSSSE3" }, { "CPU_SSE4_1_FLAGS", - "CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuSSSE3|CpuSSE4_1" }, + "CPU_SSSE3_FLAGS|CpuSSE4_1" }, { "CPU_SSE4_2_FLAGS", - "CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuSSSE3|CpuSSE4_1|CpuSSE4_2" }, + "CPU_SSE4_1_FLAGS|CpuSSE4_2|CpuPOPCNT" }, { "CPU_VMX_FLAGS", "CpuVMX" }, { "CPU_SMX_FLAGS", "CpuSMX" }, + { "CPU_XSAVE_FLAGS", + "CpuXsave" }, + { "CPU_XSAVEOPT_FLAGS", + "CPU_XSAVE_FLAGS|CpuXsaveopt" }, + { "CPU_AES_FLAGS", + "CPU_SSE2_FLAGS|CpuAES" }, + { "CPU_PCLMUL_FLAGS", + "CPU_SSE2_FLAGS|CpuPCLMUL" }, + { "CPU_FMA_FLAGS", + "CPU_AVX_FLAGS|CpuFMA" }, + { "CPU_FMA4_FLAGS", + "CPU_AVX_FLAGS|CpuFMA4" }, + { "CPU_XOP_FLAGS", + "CPU_SSE4A_FLAGS|CPU_FMA4_FLAGS|CpuXOP" }, + { "CPU_LWP_FLAGS", + "CPU_XSAVE_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", + "CPU_AVX_FLAGS|CpuF16C" }, + { "CPU_BMI2_FLAGS", + "CpuBMI2" }, + { "CPU_LZCNT_FLAGS", + "CpuLZCNT" }, + { "CPU_POPCNT_FLAGS", + "CpuPOPCNT" }, + { "CPU_HLE_FLAGS", + "CpuHLE" }, + { "CPU_RTM_FLAGS", + "CpuRTM" }, + { "CPU_INVPCID_FLAGS", + "CpuINVPCID" }, + { "CPU_VMFUNC_FLAGS", + "CpuVMFUNC" }, { "CPU_3DNOW_FLAGS", - "CpuMMX|Cpu3dnow" }, + "CPU_MMX_FLAGS|Cpu3dnow" }, { "CPU_3DNOWA_FLAGS", - "CpuMMX|Cpu3dnow|Cpu3dnowA" }, + "CPU_3DNOW_FLAGS|Cpu3dnowA" }, { "CPU_PADLOCK_FLAGS", "CpuPadLock" }, { "CPU_SVME_FLAGS", "CpuSVME" }, { "CPU_SSE4A_FLAGS", - "CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuSSE4a" }, + "CPU_SSE3_FLAGS|CpuSSE4a" }, { "CPU_ABM_FLAGS", - "CpuABM" }, - { "CPU_SSE5_FLAGS", - "CpuMMX|CpuSSE|CpuSSE2|CpuSSE3|CpuSSE4a|CpuABM|CpuSSE5"}, + "CpuLZCNT|CpuPOPCNT" }, + { "CPU_AVX_FLAGS", + "CPU_SSE4_2_FLAGS|CPU_XSAVE_FLAGS|CpuAVX" }, + { "CPU_AVX2_FLAGS", + "CPU_AVX_FLAGS|CpuAVX2" }, + { "CPU_AVX512F_FLAGS", + "CPU_AVX2_FLAGS|CpuAVX512F" }, + { "CPU_AVX512CD_FLAGS", + "CPU_AVX512F_FLAGS|CpuAVX512CD" }, + { "CPU_AVX512ER_FLAGS", + "CPU_AVX512F_FLAGS|CpuAVX512ER" }, + { "CPU_AVX512PF_FLAGS", + "CPU_AVX512F_FLAGS|CpuAVX512PF" }, + { "CPU_AVX512DQ_FLAGS", + "CPU_AVX512F_FLAGS|CpuAVX512DQ" }, + { "CPU_AVX512BW_FLAGS", + "CPU_AVX512F_FLAGS|CpuAVX512BW" }, + { "CPU_AVX512VL_FLAGS", + "CPU_AVX512F_FLAGS|CpuAVX512VL" }, + { "CPU_AVX512IFMA_FLAGS", + "CPU_AVX512F_FLAGS|CpuAVX512IFMA" }, + { "CPU_AVX512VBMI_FLAGS", + "CPU_AVX512F_FLAGS|CpuAVX512VBMI" }, + { "CPU_AVX512_4FMAPS_FLAGS", + "CPU_AVX512F_FLAGS|CpuAVX512_4FMAPS" }, + { "CPU_AVX512_4VNNIW_FLAGS", + "CPU_AVX512F_FLAGS|CpuAVX512_4VNNIW" }, + { "CPU_AVX512_VPOPCNTDQ_FLAGS", + "CPU_AVX512F_FLAGS|CpuAVX512_VPOPCNTDQ" }, + { "CPU_AVX512_VBMI2_FLAGS", + "CPU_AVX512F_FLAGS|CpuAVX512_VBMI2" }, + { "CPU_AVX512_VNNI_FLAGS", + "CPU_AVX512F_FLAGS|CpuAVX512_VNNI" }, + { "CPU_AVX512_BITALG_FLAGS", + "CPU_AVX512F_FLAGS|CpuAVX512_BITALG" }, + { "CPU_AVX512_BF16_FLAGS", + "CPU_AVX512F_FLAGS|CpuAVX512_BF16" }, + { "CPU_L1OM_FLAGS", + "unknown" }, + { "CPU_K1OM_FLAGS", + "unknown" }, + { "CPU_IAMCU_FLAGS", + "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586" }, + { "CPU_ADX_FLAGS", + "CpuADX" }, + { "CPU_RDSEED_FLAGS", + "CpuRdSeed" }, + { "CPU_PRFCHW_FLAGS", + "CpuPRFCHW" }, + { "CPU_SMAP_FLAGS", + "CpuSMAP" }, + { "CPU_MPX_FLAGS", + "CPU_XSAVE_FLAGS|CpuMPX" }, + { "CPU_SHA_FLAGS", + "CPU_SSE2_FLAGS|CpuSHA" }, + { "CPU_CLFLUSHOPT_FLAGS", + "CpuClflushOpt" }, + { "CPU_XSAVES_FLAGS", + "CPU_XSAVE_FLAGS|CpuXSAVES" }, + { "CPU_XSAVEC_FLAGS", + "CPU_XSAVE_FLAGS|CpuXSAVEC" }, + { "CPU_PREFETCHWT1_FLAGS", + "CpuPREFETCHWT1" }, + { "CPU_SE1_FLAGS", + "CpuSE1" }, + { "CPU_CLWB_FLAGS", + "CpuCLWB" }, + { "CPU_CLZERO_FLAGS", + "CpuCLZERO" }, + { "CPU_MWAITX_FLAGS", + "CpuMWAITX" }, + { "CPU_OSPKE_FLAGS", + "CPU_XSAVE_FLAGS|CpuOSPKE" }, + { "CPU_RDPID_FLAGS", + "CpuRDPID" }, + { "CPU_PTWRITE_FLAGS", + "CpuPTWRITE" }, + { "CPU_IBT_FLAGS", + "CpuIBT" }, + { "CPU_SHSTK_FLAGS", + "CpuSHSTK" }, + { "CPU_GFNI_FLAGS", + "CpuGFNI" }, + { "CPU_VAES_FLAGS", + "CpuVAES" }, + { "CPU_VPCLMULQDQ_FLAGS", + "CpuVPCLMULQDQ" }, + { "CPU_WBNOINVD_FLAGS", + "CpuWBNOINVD" }, + { "CPU_PCONFIG_FLAGS", + "CpuPCONFIG" }, + { "CPU_WAITPKG_FLAGS", + "CpuWAITPKG" }, + { "CPU_CLDEMOTE_FLAGS", + "CpuCLDEMOTE" }, + { "CPU_MOVDIRI_FLAGS", + "CpuMOVDIRI" }, + { "CPU_MOVDIR64B_FLAGS", + "CpuMOVDIR64B" }, + { "CPU_ENQCMD_FLAGS", + "CpuENQCMD" }, + { "CPU_SERIALIZE_FLAGS", + "CpuSERIALIZE" }, + { "CPU_AVX512_VP2INTERSECT_FLAGS", + "CpuAVX512_VP2INTERSECT" }, + { "CPU_RDPRU_FLAGS", + "CpuRDPRU" }, + { "CPU_MCOMMIT_FLAGS", + "CpuMCOMMIT" }, + { "CPU_SEV_ES_FLAGS", + "CpuSEV_ES" }, + { "CPU_TSXLDTRK_FLAGS", + "CpuTSXLDTRK"}, + { "CPU_ANY_X87_FLAGS", + "CPU_ANY_287_FLAGS|Cpu8087" }, + { "CPU_ANY_287_FLAGS", + "CPU_ANY_387_FLAGS|Cpu287" }, + { "CPU_ANY_387_FLAGS", + "CPU_ANY_687_FLAGS|Cpu387" }, + { "CPU_ANY_687_FLAGS", + "Cpu687|CpuFISTTP" }, + { "CPU_ANY_CMOV_FLAGS", + "CpuCMOV" }, + { "CPU_ANY_FXSR_FLAGS", + "CpuFXSR" }, + { "CPU_ANY_MMX_FLAGS", + "CPU_3DNOWA_FLAGS" }, + { "CPU_ANY_SSE_FLAGS", + "CPU_ANY_SSE2_FLAGS|CpuSSE" }, + { "CPU_ANY_SSE2_FLAGS", + "CPU_ANY_SSE3_FLAGS|CpuSSE2" }, + { "CPU_ANY_SSE3_FLAGS", + "CPU_ANY_SSSE3_FLAGS|CpuSSE3|CpuSSE4a" }, + { "CPU_ANY_SSSE3_FLAGS", + "CPU_ANY_SSE4_1_FLAGS|CpuSSSE3" }, + { "CPU_ANY_SSE4_1_FLAGS", + "CPU_ANY_SSE4_2_FLAGS|CpuSSE4_1" }, + { "CPU_ANY_SSE4_2_FLAGS", + "CpuSSE4_2" }, + { "CPU_ANY_SSE4A_FLAGS", + "CpuSSE4a" }, + { "CPU_ANY_AVX_FLAGS", + "CPU_ANY_AVX2_FLAGS|CpuF16C|CpuFMA|CpuFMA4|CpuXOP|CpuAVX" }, + { "CPU_ANY_AVX2_FLAGS", + "CPU_ANY_AVX512F_FLAGS|CpuAVX2" }, + { "CPU_ANY_AVX512F_FLAGS", + "CpuAVX512F|CpuAVX512CD|CpuAVX512ER|CpuAVX512PF|CpuAVX512DQ|CpuAVX512BW|CpuAVX512VL|CpuAVX512IFMA|CpuAVX512VBMI|CpuAVX512_4FMAPS|CpuAVX512_4VNNIW|CpuAVX512_VPOPCNTDQ|CpuAVX512_VBMI2|CpuAVX512_VNNI|CpuAVX512_BITALG|CpuAVX512_BF16|CpuAVX512_VP2INTERSECT" }, + { "CPU_ANY_AVX512CD_FLAGS", + "CpuAVX512CD" }, + { "CPU_ANY_AVX512ER_FLAGS", + "CpuAVX512ER" }, + { "CPU_ANY_AVX512PF_FLAGS", + "CpuAVX512PF" }, + { "CPU_ANY_AVX512DQ_FLAGS", + "CpuAVX512DQ" }, + { "CPU_ANY_AVX512BW_FLAGS", + "CpuAVX512BW" }, + { "CPU_ANY_AVX512VL_FLAGS", + "CpuAVX512VL" }, + { "CPU_ANY_AVX512IFMA_FLAGS", + "CpuAVX512IFMA" }, + { "CPU_ANY_AVX512VBMI_FLAGS", + "CpuAVX512VBMI" }, + { "CPU_ANY_AVX512_4FMAPS_FLAGS", + "CpuAVX512_4FMAPS" }, + { "CPU_ANY_AVX512_4VNNIW_FLAGS", + "CpuAVX512_4VNNIW" }, + { "CPU_ANY_AVX512_VPOPCNTDQ_FLAGS", + "CpuAVX512_VPOPCNTDQ" }, + { "CPU_ANY_IBT_FLAGS", + "CpuIBT" }, + { "CPU_ANY_SHSTK_FLAGS", + "CpuSHSTK" }, + { "CPU_ANY_AVX512_VBMI2_FLAGS", + "CpuAVX512_VBMI2" }, + { "CPU_ANY_AVX512_VNNI_FLAGS", + "CpuAVX512_VNNI" }, + { "CPU_ANY_AVX512_BITALG_FLAGS", + "CpuAVX512_BITALG" }, + { "CPU_ANY_AVX512_BF16_FLAGS", + "CpuAVX512_BF16" }, + { "CPU_ANY_MOVDIRI_FLAGS", + "CpuMOVDIRI" }, + { "CPU_ANY_MOVDIR64B_FLAGS", + "CpuMOVDIR64B" }, + { "CPU_ANY_ENQCMD_FLAGS", + "CpuENQCMD" }, + { "CPU_ANY_SERIALIZE_FLAGS", + "CpuSERIALIZE" }, + { "CPU_ANY_AVX512_VP2INTERSECT_FLAGS", + "CpuAVX512_VP2INTERSECT" }, + { "CPU_ANY_TSXLDTRK_FLAGS", + "CpuTSXLDTRK" }, }; -static initializer operand_type_init [] = +static initializer operand_type_init[] = { { "OPERAND_TYPE_NONE", "0" }, { "OPERAND_TYPE_REG8", - "Reg8" }, + "Class=Reg|Byte" }, { "OPERAND_TYPE_REG16", - "Reg16" }, + "Class=Reg|Word" }, { "OPERAND_TYPE_REG32", - "Reg32" }, + "Class=Reg|Dword" }, { "OPERAND_TYPE_REG64", - "Reg64" }, + "Class=Reg|Qword" }, { "OPERAND_TYPE_IMM1", "Imm1" }, { "OPERAND_TYPE_IMM8", @@ -155,39 +436,41 @@ static initializer operand_type_init [] = { "OPERAND_TYPE_DISP64", "Disp64" }, { "OPERAND_TYPE_INOUTPORTREG", - "InOutPortReg" }, + "Instance=RegD|Word" }, { "OPERAND_TYPE_SHIFTCOUNT", - "ShiftCount" }, + "Instance=RegC|Byte" }, { "OPERAND_TYPE_CONTROL", - "Control" }, + "Class=RegCR" }, { "OPERAND_TYPE_TEST", - "Test" }, + "Class=RegTR" }, { "OPERAND_TYPE_DEBUG", - "FloatReg" }, + "Class=RegDR" }, { "OPERAND_TYPE_FLOATREG", - "FloatReg" }, + "Class=Reg|Tbyte" }, { "OPERAND_TYPE_FLOATACC", - "FloatAcc" }, - { "OPERAND_TYPE_SREG2", - "SReg2" }, - { "OPERAND_TYPE_SREG3", - "SReg3" }, - { "OPERAND_TYPE_ACC", - "Acc" }, - { "OPERAND_TYPE_JUMPABSOLUTE", - "JumpAbsolute" }, + "Instance=Accum|Tbyte" }, + { "OPERAND_TYPE_SREG", + "Class=SReg" }, { "OPERAND_TYPE_REGMMX", - "RegMMX" }, + "Class=RegMMX" }, { "OPERAND_TYPE_REGXMM", - "RegXMM" }, - { "OPERAND_TYPE_ESSEG", - "EsSeg" }, + "Class=RegSIMD|Xmmword" }, + { "OPERAND_TYPE_REGYMM", + "Class=RegSIMD|Ymmword" }, + { "OPERAND_TYPE_REGZMM", + "Class=RegSIMD|Zmmword" }, + { "OPERAND_TYPE_REGMASK", + "Class=RegMask" }, + { "OPERAND_TYPE_REGBND", + "Class=RegBND" }, + { "OPERAND_TYPE_ACC8", + "Instance=Accum|Byte" }, + { "OPERAND_TYPE_ACC16", + "Instance=Accum|Word" }, { "OPERAND_TYPE_ACC32", - "Reg32|Acc|Dword" }, + "Instance=Accum|Dword" }, { "OPERAND_TYPE_ACC64", - "Reg64|Acc|Qword" }, - { "OPERAND_TYPE_REG16_INOUTPORTREG", - "Reg16|InOutPortReg" }, + "Instance=Accum|Qword" }, { "OPERAND_TYPE_DISP16_32", "Disp16|Disp32" }, { "OPERAND_TYPE_ANYDISP", @@ -198,6 +481,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 +491,8 @@ static initializer operand_type_init [] = "Imm32|Imm32S|Imm64|Disp32" }, { "OPERAND_TYPE_IMM32_32S_64_DISP32_64", "Imm32|Imm32S|Imm64|Disp32|Disp64" }, + { "OPERAND_TYPE_ANYIMM", + "Imm1|Imm8|Imm8S|Imm16|Imm32|Imm32S|Imm64" }, }; typedef struct bitfield @@ -225,9 +512,16 @@ static bitfield cpu_flags[] = BITFIELD (Cpu486), BITFIELD (Cpu586), BITFIELD (Cpu686), - BITFIELD (CpuP4), - BITFIELD (CpuK6), - BITFIELD (CpuK8), + BITFIELD (CpuCMOV), + BITFIELD (CpuFXSR), + BITFIELD (CpuClflush), + BITFIELD (CpuNop), + BITFIELD (CpuSYSCALL), + BITFIELD (Cpu8087), + BITFIELD (Cpu287), + BITFIELD (Cpu387), + BITFIELD (Cpu687), + BITFIELD (CpuFISTTP), BITFIELD (CpuMMX), BITFIELD (CpuSSE), BITFIELD (CpuSSE2), @@ -235,18 +529,96 @@ 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), BITFIELD (CpuSVME), 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 (CpuPOPCNT), + BITFIELD (CpuHLE), + BITFIELD (CpuRTM), + BITFIELD (CpuINVPCID), + BITFIELD (CpuVMFUNC), + BITFIELD (CpuRDSEED), + BITFIELD (CpuADX), + BITFIELD (CpuPRFCHW), + BITFIELD (CpuSMAP), + BITFIELD (CpuSHA), + BITFIELD (CpuClflushOpt), + BITFIELD (CpuXSAVES), + BITFIELD (CpuXSAVEC), + BITFIELD (CpuPREFETCHWT1), + BITFIELD (CpuSE1), + BITFIELD (CpuCLWB), BITFIELD (Cpu64), BITFIELD (CpuNo64), + BITFIELD (CpuMPX), + BITFIELD (CpuAVX512IFMA), + BITFIELD (CpuAVX512VBMI), + BITFIELD (CpuAVX512_4FMAPS), + BITFIELD (CpuAVX512_4VNNIW), + BITFIELD (CpuAVX512_VPOPCNTDQ), + BITFIELD (CpuAVX512_VBMI2), + BITFIELD (CpuAVX512_VNNI), + BITFIELD (CpuAVX512_BITALG), + BITFIELD (CpuAVX512_BF16), + BITFIELD (CpuAVX512_VP2INTERSECT), + BITFIELD (CpuMWAITX), + BITFIELD (CpuCLZERO), + BITFIELD (CpuOSPKE), + BITFIELD (CpuRDPID), + BITFIELD (CpuPTWRITE), + BITFIELD (CpuIBT), + BITFIELD (CpuSHSTK), + BITFIELD (CpuGFNI), + BITFIELD (CpuVAES), + BITFIELD (CpuVPCLMULQDQ), + BITFIELD (CpuWBNOINVD), + BITFIELD (CpuPCONFIG), + BITFIELD (CpuWAITPKG), + BITFIELD (CpuCLDEMOTE), + BITFIELD (CpuMOVDIRI), + BITFIELD (CpuMOVDIR64B), + BITFIELD (CpuENQCMD), + BITFIELD (CpuSERIALIZE), + BITFIELD (CpuRDPRU), + BITFIELD (CpuMCOMMIT), + BITFIELD (CpuSEV_ES), + BITFIELD (CpuTSXLDTRK), #ifdef CpuUnused BITFIELD (CpuUnused), #endif @@ -256,20 +628,15 @@ static bitfield opcode_modifiers[] = { BITFIELD (D), BITFIELD (W), + BITFIELD (Load), BITFIELD (Modrm), - BITFIELD (ShortForm), BITFIELD (Jump), - BITFIELD (JumpDword), - BITFIELD (JumpByte), - BITFIELD (JumpInterSegment), BITFIELD (FloatMF), BITFIELD (FloatR), - BITFIELD (FloatD), - BITFIELD (Size16), - BITFIELD (Size32), - BITFIELD (Size64), - BITFIELD (IgnoreSize), - BITFIELD (DefaultSize), + BITFIELD (Size), + BITFIELD (CheckRegSize), + BITFIELD (MnemonicSize), + BITFIELD (Anysize), BITFIELD (No_bSuf), BITFIELD (No_wSuf), BITFIELD (No_lSuf), @@ -278,61 +645,92 @@ static bitfield opcode_modifiers[] = BITFIELD (No_ldSuf), BITFIELD (FWait), BITFIELD (IsString), + BITFIELD (RegMem), + BITFIELD (BNDPrefixOk), + BITFIELD (NoTrackPrefixOk), + BITFIELD (IsLockable), BITFIELD (RegKludge), - BITFIELD (FirstXmm0), - BITFIELD (ByteOkIntel), + BITFIELD (Implicit1stXmm0), + BITFIELD (RepPrefixOk), + BITFIELD (HLEPrefixOk), BITFIELD (ToDword), BITFIELD (ToQword), - BITFIELD (AddrPrefixOp0), + BITFIELD (AddrPrefixOpReg), BITFIELD (IsPrefix), BITFIELD (ImmExt), BITFIELD (NoRex64), - BITFIELD (Rex64), BITFIELD (Ugh), - BITFIELD (Drex), - BITFIELD (Drexv), - BITFIELD (Drexc), - BITFIELD (OldGcc), + BITFIELD (Vex), + BITFIELD (VexVVVV), + BITFIELD (VexW), + BITFIELD (VexOpcode), + BITFIELD (VexSources), + BITFIELD (VecSIB), + BITFIELD (SSE2AVX), + BITFIELD (NoAVX), + BITFIELD (EVex), + BITFIELD (Masking), + BITFIELD (Broadcast), + BITFIELD (StaticRounding), + BITFIELD (SAE), + BITFIELD (Disp8MemShift), + BITFIELD (NoDefMask), + BITFIELD (ImplicitQuadGroup), + BITFIELD (Optimize), BITFIELD (ATTMnemonic), BITFIELD (ATTSyntax), BITFIELD (IntelSyntax), + BITFIELD (ISA64), +}; + +#define CLASS(n) #n, n + +static const struct { + const char *name; + enum operand_class value; +} operand_classes[] = { + CLASS (Reg), + CLASS (SReg), + CLASS (RegCR), + CLASS (RegDR), + CLASS (RegTR), + CLASS (RegMMX), + CLASS (RegSIMD), + CLASS (RegMask), + CLASS (RegBND), +}; + +#undef CLASS + +#define INSTANCE(n) #n, n + +static const struct { + const char *name; + enum operand_instance value; +} operand_instances[] = { + INSTANCE (Accum), + INSTANCE (RegC), + INSTANCE (RegD), + INSTANCE (RegB), }; +#undef INSTANCE + static bitfield operand_types[] = { - BITFIELD (Reg8), - BITFIELD (Reg16), - BITFIELD (Reg32), - BITFIELD (Reg64), - BITFIELD (FloatReg), - BITFIELD (RegMMX), - BITFIELD (RegXMM), + BITFIELD (Imm1), BITFIELD (Imm8), BITFIELD (Imm8S), BITFIELD (Imm16), BITFIELD (Imm32), BITFIELD (Imm32S), BITFIELD (Imm64), - BITFIELD (Imm1), BITFIELD (BaseIndex), BITFIELD (Disp8), BITFIELD (Disp16), BITFIELD (Disp32), BITFIELD (Disp32S), BITFIELD (Disp64), - BITFIELD (InOutPortReg), - BITFIELD (ShiftCount), - BITFIELD (Control), - BITFIELD (Debug), - BITFIELD (Test), - BITFIELD (SReg2), - BITFIELD (SReg3), - BITFIELD (Acc), - BITFIELD (FloatAcc), - BITFIELD (JumpAbsolute), - BITFIELD (EsSeg), - BITFIELD (RegMem), - BITFIELD (Mem), BITFIELD (Byte), BITFIELD (Word), BITFIELD (Dword), @@ -340,15 +738,42 @@ static bitfield operand_types[] = BITFIELD (Qword), BITFIELD (Tbyte), BITFIELD (Xmmword), + BITFIELD (Ymmword), + BITFIELD (Zmmword), BITFIELD (Unspecified), - BITFIELD (Anysize), #ifdef OTUnused BITFIELD (OTUnused), #endif }; -static int lineno; static const char *filename; +static i386_cpu_flags active_cpu_flags; +static int active_isstring; + +struct template_arg { + const struct template_arg *next; + const char *val; +}; + +struct template_instance { + const struct template_instance *next; + const char *name; + const struct template_arg *args; +}; + +struct template_param { + const struct template_param *next; + const char *name; +}; + +struct template { + const struct template *next; + const char *name; + const struct template_instance *instances; + const struct template_param *params; +}; + +static const struct template *templates; static int compare (const void *x, const void *y) @@ -362,9 +787,9 @@ static void fail (const char *message, ...) { va_list args; - + va_start (args, message); - fprintf (stderr, _("%s: Error: "), program_name); + fprintf (stderr, _("%s: error: "), program_name); vfprintf (stderr, message, args); va_end (args); xexit (1); @@ -374,7 +799,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-2020 Free Software Foundation, Inc.\n\ \n\ This file is part of the GNU opcodes library.\n\ \n\ @@ -429,7 +854,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 +864,58 @@ 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 (char *, bitfield *, int, unsigned int, int); + +static int +set_bitfield_from_cpu_flag_init (char *f, bitfield *array, unsigned int size, + int lineno) +{ + char *str, *next, *last; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE (cpu_flag_init); i++) + if (strcmp (cpu_flag_init[i].name, f) == 0) + { + /* Turn on selective bits. */ + char *init = xstrdup (cpu_flag_init[i].init); + last = init + strlen (init); + for (next = init; next && next < last; ) + { + str = next_field (next, '|', &next, last); + if (str) + set_bitfield (str, array, 1, size, lineno); + } + free (init); + return 0; + } + + return -1; +} + static void -set_bitfield (const char *f, bitfield *array, unsigned int size) +set_bitfield (char *f, bitfield *array, int value, + unsigned int size, int lineno) { unsigned int i; - if (strcmp (f, "CpuSledgehammer") == 0) - f= "CpuK8"; + /* Ignore empty fields; they may result from template expansions. */ + if (*f == '\0') + return; + + 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 +924,41 @@ 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; + } + } + } + + /* Handle CPU_XXX_FLAGS. */ + if (value == 1 && !set_bitfield_from_cpu_flag_init (f, array, size, lineno)) + return; + + if (lineno != -1) + fail (_("%s: %d: unknown bitfield: %s\n"), filename, lineno, f); + else + fail (_("unknown bitfield: %s\n"), f); } static void @@ -472,11 +967,16 @@ output_cpu_flags (FILE *table, bitfield *flags, unsigned int size, { unsigned int i; + memset (&active_cpu_flags, 0, sizeof(active_cpu_flags)); + fprintf (table, "%s{ { ", indent); 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. */ @@ -485,6 +985,8 @@ output_cpu_flags (FILE *table, bitfield *flags, unsigned int size, else fprintf (table, "\n %s", indent); } + if (flags[i].value) + active_cpu_flags.array[i / 32] |= 1U << (i % 32); } fprintf (table, "%d } }%s\n", flags[i].value, comma); @@ -492,9 +994,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 +1006,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 +1066,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 "); } @@ -542,44 +1077,139 @@ output_opcode_modifier (FILE *table, bitfield *modifier, unsigned int size) fprintf (table, "%d },\n", modifier[i].value); } +static int +adjust_broadcast_modifier (char **opnd) +{ + char *str, *next, *last, *op; + int bcst_type = INT_MAX; + + /* Skip the immediate operand. */ + op = opnd[0]; + if (strcasecmp(op, "Imm8") == 0) + op = opnd[1]; + + op = xstrdup (op); + last = op + strlen (op); + for (next = op; next && next < last; ) + { + str = next_field (next, '|', &next, last); + if (str) + { + if (strcasecmp(str, "Byte") == 0) + { + /* The smalest broadcast type, no need to check + further. */ + bcst_type = BYTE_BROADCAST; + break; + } + else if (strcasecmp(str, "Word") == 0) + { + if (bcst_type > WORD_BROADCAST) + bcst_type = WORD_BROADCAST; + } + else if (strcasecmp(str, "Dword") == 0) + { + if (bcst_type > DWORD_BROADCAST) + bcst_type = DWORD_BROADCAST; + } + else if (strcasecmp(str, "Qword") == 0) + { + if (bcst_type > QWORD_BROADCAST) + bcst_type = QWORD_BROADCAST; + } + } + } + free (op); + + if (bcst_type == INT_MAX) + fail (_("unknown broadcast operand: %s\n"), op); + + return bcst_type; +} + static void -process_i386_opcode_modifier (FILE *table, char *mod) +process_i386_opcode_modifier (FILE *table, char *mod, char **opnd, int lineno) { char *str, *next, *last; bitfield modifiers [ARRAY_SIZE (opcode_modifiers)]; + active_isstring = 0; + /* Copy the default opcode modifier. */ memcpy (modifiers, opcode_modifiers, sizeof (modifiers)); if (strcmp (mod, "0")) { + unsigned int have_w = 0, bwlq_suf = 0xf; + 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)); + { + int val = 1; + if (strcasecmp(str, "Broadcast") == 0) + val = adjust_broadcast_modifier (opnd); + set_bitfield (str, modifiers, val, ARRAY_SIZE (modifiers), + lineno); + if (strcasecmp(str, "IsString") == 0) + active_isstring = 1; + + if (strcasecmp(str, "W") == 0) + have_w = 1; + + if (strcasecmp(str, "No_bSuf") == 0) + bwlq_suf &= ~1; + if (strcasecmp(str, "No_wSuf") == 0) + bwlq_suf &= ~2; + if (strcasecmp(str, "No_lSuf") == 0) + bwlq_suf &= ~4; + if (strcasecmp(str, "No_qSuf") == 0) + bwlq_suf &= ~8; + } } + + if (have_w && !bwlq_suf) + fail ("%s: %d: stray W modifier\n", filename, lineno); + if (have_w && !(bwlq_suf & 1)) + fprintf (stderr, "%s: %d: W modifier without Byte operand(s)\n", + filename, lineno); + if (have_w && !(bwlq_suf & ~1)) + fprintf (stderr, + "%s: %d: W modifier without Word/Dword/Qword operand(s)\n", + filename, lineno); } output_opcode_modifier (table, modifiers, ARRAY_SIZE (modifiers)); } +enum stage { + stage_macros, + stage_opcodes, + stage_registers, +}; + static void -output_operand_type (FILE *table, bitfield *types, unsigned int size, - int macro, const char *indent) +output_operand_type (FILE *table, enum operand_class class, + enum operand_instance instance, + const bitfield *types, unsigned int size, + enum stage stage, const char *indent) { unsigned int i; - fprintf (table, "{ { "); + fprintf (table, "{ { %d, %d, ", class, instance); for (i = 0; i < size - 1; i++) { - fprintf (table, "%d, ", types[i].value); - if (((i + 1) % 20) == 0) + if (((i + 3) % 20) != 0) + fprintf (table, "%d, ", types[i].value); + else + fprintf (table, "%d,", types[i].value); + if (((i + 3) % 20) == 0) { /* We need \\ for macro. */ - if (macro) - fprintf (table, "\\\n%s", indent); + if (stage == stage_macros) + fprintf (table, " \\\n%s", indent); else fprintf (table, "\n%s", indent); } @@ -589,10 +1219,12 @@ 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) +process_i386_operand_type (FILE *table, char *op, enum stage stage, + const char *indent, int lineno) { char *str, *next, *last; + enum operand_class class = ClassNone; + enum operand_instance instance = InstanceNone; bitfield types [ARRAY_SIZE (operand_types)]; /* Copy the default operand type. */ @@ -600,193 +1232,529 @@ process_i386_operand_type (FILE *table, char *op, int macro, if (strcmp (op, "0")) { + int baseindex = 0; + last = op + strlen (op); for (next = op; next && next < last; ) { - str = next_field (next, '|', &next); + str = next_field (next, '|', &next, last); + if (str) + { + unsigned int i; + + if (!strncmp(str, "Class=", 6)) + { + for (i = 0; i < ARRAY_SIZE(operand_classes); ++i) + if (!strcmp(str + 6, operand_classes[i].name)) + { + class = operand_classes[i].value; + str = NULL; + break; + } + } + + if (str && !strncmp(str, "Instance=", 9)) + { + for (i = 0; i < ARRAY_SIZE(operand_instances); ++i) + if (!strcmp(str + 9, operand_instances[i].name)) + { + instance = operand_instances[i].value; + str = NULL; + break; + } + } + } if (str) - set_bitfield (str, types, ARRAY_SIZE (types)); + { + set_bitfield (str, types, 1, ARRAY_SIZE (types), lineno); + if (strcasecmp(str, "BaseIndex") == 0) + baseindex = 1; + } + } + + if (stage == stage_opcodes && baseindex && !active_isstring) + { + set_bitfield("Disp8", types, 1, ARRAY_SIZE (types), lineno); + if (!active_cpu_flags.bitfield.cpu64 + && !active_cpu_flags.bitfield.cpumpx) + set_bitfield("Disp16", types, 1, ARRAY_SIZE (types), lineno); + if (!active_cpu_flags.bitfield.cpu64) + set_bitfield("Disp32", types, 1, ARRAY_SIZE (types), lineno); + if (!active_cpu_flags.bitfield.cpuno64) + set_bitfield("Disp32S", types, 1, ARRAY_SIZE (types), lineno); } } - output_operand_type (table, types, ARRAY_SIZE (types), macro, - indent); + output_operand_type (table, class, instance, types, ARRAY_SIZE (types), + stage, indent); } static void -process_i386_opcodes (FILE *table) +output_i386_opcode (FILE *table, const char *name, char *str, + char *last, int lineno) { - FILE *fp; - char buf[2048]; unsigned int i; - char *str, *p, *last; - char *name, *operands, *base_opcode, *extension_opcode; - char *opcode_length; + char *operands, *base_opcode, *extension_opcode, *opcode_length; char *cpu_flags, *opcode_modifier, *operand_types [MAX_OPERANDS]; - filename = "i386-opc.tbl"; - fp = fopen (filename, "r"); + /* Find number of operands. */ + operands = next_field (str, ',', &str, last); - if (fp == NULL) - fail (_("can't find i386-opc.tbl for reading, errno = %s\n"), - xstrerror (errno)); + /* Find base_opcode. */ + base_opcode = next_field (str, ',', &str, last); - fprintf (table, "\n/* i386 opcode table. */\n\n"); - fprintf (table, "const template i386_optab[] =\n{\n"); + /* Find extension_opcode. */ + extension_opcode = next_field (str, ',', &str, last); - while (!feof (fp)) - { - if (fgets (buf, sizeof (buf), fp) == NULL) - break; + /* Find opcode_length. */ + opcode_length = next_field (str, ',', &str, last); - lineno++; + /* Find cpu_flags. */ + cpu_flags = next_field (str, ',', &str, last); - p = remove_leading_whitespaces (buf); + /* Find opcode_modifier. */ + opcode_modifier = next_field (str, ',', &str, last); - /* Skip comments. */ - str = strstr (p, "//"); - if (str != NULL) - str[0] = '\0'; + /* Remove the first {. */ + str = remove_leading_whitespaces (str); + if (*str != '{') + abort (); + str = remove_leading_whitespaces (str + 1); - /* Remove trailing white spaces. */ - remove_trailing_whitespaces (p); + i = strlen (str); - switch (p[0]) + /* 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) { - case '#': - fprintf (table, "%s\n", p); - case '\0': - continue; + operand_types [i] = NULL; break; - default: + } + + operand_types [i] = next_field (str, ',', &str, last); + if (*operand_types[i] == '0') + { + if (i != 0) + operand_types[i] = NULL; break; } + } - last = p + strlen (p); + fprintf (table, " { \"%s\", %s, %s, %s, %s,\n", + name, base_opcode, extension_opcode, opcode_length, operands); - /* Find name. */ - name = next_field (p, ',', &str); + process_i386_cpu_flag (table, cpu_flags, 0, ",", " ", lineno); - if (str >= last) - abort (); + process_i386_opcode_modifier (table, opcode_modifier, operand_types, lineno); - /* Find number of operands. */ - operands = next_field (str, ',', &str); + fprintf (table, " { "); - if (str >= last) - abort (); + 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", stage_opcodes, "\t ", + lineno); + break; + } - /* Find base_opcode. */ - base_opcode = next_field (str, ',', &str); + if (i != 0) + fprintf (table, ",\n "); - if (str >= last) - abort (); + process_i386_operand_type (table, operand_types[i], stage_opcodes, + "\t ", lineno); + } + fprintf (table, " } },\n"); +} - /* Find extension_opcode. */ - extension_opcode = next_field (str, ',', &str); +struct opcode_hash_entry +{ + struct opcode_hash_entry *next; + char *name; + char *opcode; + int lineno; +}; - if (str >= last) - abort (); +/* Calculate the hash value of an opcode hash entry P. */ - /* Find opcode_length. */ - opcode_length = next_field (str, ',', &str); +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); +} - if (str >= last) - abort (); +/* Compare a string Q against an opcode hash entry P. */ - /* Find cpu_flags. */ - cpu_flags = next_field (str, ',', &str); +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; +} - if (str >= last) - abort (); +static void +parse_template (char *buf, int lineno) +{ + char sep, *end, *name; + struct template *tmpl = xmalloc (sizeof (*tmpl)); + struct template_instance *last_inst = NULL; + + buf = remove_leading_whitespaces (buf + 1); + end = strchr (buf, ':'); + if (end == NULL) + fail ("%s: %d: missing ':'\n", filename, lineno); + *end++ = '\0'; + remove_trailing_whitespaces (buf); + + if (*buf == '\0') + fail ("%s: %d: missing template identifier\n", filename, lineno); + tmpl->name = xstrdup (buf); + + tmpl->params = NULL; + do { + struct template_param *param; + + buf = remove_leading_whitespaces (end); + end = strpbrk (buf, ":,"); + if (end == NULL) + fail ("%s: %d: missing ':' or ','\n", filename, lineno); + + sep = *end; + *end++ = '\0'; + remove_trailing_whitespaces (buf); + + param = xmalloc (sizeof (*param)); + param->name = xstrdup (buf); + param->next = tmpl->params; + tmpl->params = param; + } while (sep == ':'); + + tmpl->instances = NULL; + do { + struct template_instance *inst; + char *cur, *next; + const struct template_param *param; + + buf = remove_leading_whitespaces (end); + end = strpbrk (buf, ",>"); + if (end == NULL) + fail ("%s: %d: missing ',' or '>'\n", filename, lineno); + + sep = *end; + *end++ = '\0'; + + inst = xmalloc (sizeof (*inst)); + + cur = next_field (buf, ':', &next, end); + inst->name = xstrdup (cur); + + for (param = tmpl->params; param; param = param->next) + { + struct template_arg *arg = xmalloc (sizeof (*arg)); + + cur = next_field (next, ':', &next, end); + if (next > end) + fail ("%s: %d: missing argument for '%s'\n", filename, lineno, param->name); + arg->val = xstrdup (cur); + arg->next = inst->args; + inst->args = arg; + } - /* Find opcode_modifier. */ - opcode_modifier = next_field (str, ',', &str); + if (tmpl->instances) + last_inst->next = inst; + else + tmpl->instances = inst; + last_inst = inst; + } while (sep == ','); - if (str >= last) - abort (); + buf = remove_leading_whitespaces (end); + if (*buf) + fprintf(stderr, "%s: %d: excess characters '%s'\n", + filename, lineno, buf); - /* Remove the first {. */ - str = remove_leading_whitespaces (str); - if (*str != '{') - abort (); - str = remove_leading_whitespaces (str + 1); + tmpl->next = templates; + templates = tmpl; +} - i = strlen (str); +static unsigned int +expand_templates (char *name, const char *str, htab_t opcode_hash_table, + struct opcode_hash_entry ***opcode_array_p, int lineno) +{ + static unsigned int idx, opcode_array_size; + struct opcode_hash_entry **opcode_array = *opcode_array_p; + struct opcode_hash_entry **hash_slot, **entry; + char *ptr1 = strchr(name, '<'), *ptr2; - /* There are at least "X}". */ - if (i < 2) - abort (); + if (ptr1 == NULL) + { + /* 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); - /* Remove trailing white spaces and }. */ - do + if (*hash_slot == NULL) { - i--; - if (ISSPACE (str[i]) || str[i] == '}') - str[i] = '\0'; - else - break; + /* It is the new one. Put it on opcode array. */ + if (idx >= opcode_array_size) + { + /* 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); + *opcode_array_p = opcode_array; + } + + opcode_array[idx] = (struct opcode_hash_entry *) + xmalloc (sizeof (struct opcode_hash_entry)); + opcode_array[idx]->next = NULL; + opcode_array[idx]->name = xstrdup (name); + opcode_array[idx]->opcode = xstrdup (str); + opcode_array[idx]->lineno = lineno; + *hash_slot = opcode_array[idx]; + idx++; } - while (i != 0); + else + { + /* 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; + } + } + else if ((ptr2 = strchr(ptr1 + 1, '>')) == NULL) + fail ("%s: %d: missing '>'\n", filename, lineno); + else + { + const struct template *tmpl; + const struct template_instance *inst; + + *ptr1 = '\0'; + ptr1 = remove_leading_whitespaces (ptr1 + 1); + remove_trailing_whitespaces (ptr1); - last = str + i; + *ptr2++ = '\0'; + + for ( tmpl = templates; tmpl; tmpl = tmpl->next ) + if (!strcmp(ptr1, tmpl->name)) + break; + if (!tmpl) + fail ("reference to unknown template '%s'\n", ptr1); - /* Find operand_types. */ - for (i = 0; i < ARRAY_SIZE (operand_types); i++) + for (inst = tmpl->instances; inst; inst = inst->next) { - if (str >= last) - { - operand_types [i] = NULL; - break; - } + char *name2 = xmalloc(strlen(name) + strlen(inst->name) + strlen(ptr2) + 1); + char *str2 = xmalloc(2 * strlen(str)); + const char *src; + + strcpy (name2, name); + strcat (name2, inst->name); + strcat (name2, ptr2); - operand_types [i] = next_field (str, ',', &str); - if (*operand_types[i] == '0') + for (ptr1 = str2, src = str; *src; ) { - if (i != 0) - operand_types[i] = NULL; - break; + const char *ident = tmpl->name, *end; + const struct template_param *param; + const struct template_arg *arg; + + if ((*ptr1 = *src++) != '<') + { + ++ptr1; + continue; + } + while (ISSPACE(*src)) + ++src; + while (*ident && *src == *ident) + ++src, ++ident; + while (ISSPACE(*src)) + ++src; + if (*src != ':' || *ident != '\0') + { + memcpy (++ptr1, tmpl->name, ident - tmpl->name); + ptr1 += ident - tmpl->name; + continue; + } + while (ISSPACE(*++src)) + ; + + end = src; + while (*end != '\0' && !ISSPACE(*end) && *end != '>') + ++end; + + for (param = tmpl->params, arg = inst->args; param; + param = param->next, arg = arg->next) + { + if (end - src == strlen (param->name) + && !memcmp (src, param->name, end - src)) + { + src = end; + break; + } + } + + if (param == NULL) + fail ("template '%s' has no parameter '%.*s'\n", + tmpl->name, (int)(end - src), src); + + while (ISSPACE(*src)) + ++src; + if (*src != '>') + fail ("%s: %d: missing '>'\n", filename, lineno); + + memcpy(ptr1, arg->val, strlen(arg->val)); + ptr1 += strlen(arg->val); + ++src; } + + *ptr1 = '\0'; + + expand_templates (name2, str2, opcode_hash_table, opcode_array_p, + lineno); + + free (str2); + free (name2); } + } - fprintf (table, " { \"%s\", %s, %s, %s, %s,\n", - name, operands, base_opcode, extension_opcode, - opcode_length); + return idx; +} + +static void +process_i386_opcodes (FILE *table) +{ + FILE *fp; + char buf[2048]; + unsigned int i, j; + char *str, *p, *last, *name; + htab_t opcode_hash_table; + struct opcode_hash_entry **opcode_array = NULL; + int lineno = 0, marker = 0; - process_i386_cpu_flag (table, cpu_flags, 0, ",", " "); + filename = "i386-opc.tbl"; + fp = stdin; - process_i386_opcode_modifier (table, opcode_modifier); + i = 0; + opcode_hash_table = htab_create_alloc (16, opcode_hash_hash, + opcode_hash_eq, NULL, + xcalloc, free); - fprintf (table, " { "); + fprintf (table, "\n/* i386 opcode table. */\n\n"); + fprintf (table, "const insn_template i386_optab[] =\n{\n"); - for (i = 0; i < ARRAY_SIZE (operand_types); i++) + /* Put everything on opcode array. */ + while (!feof (fp)) + { + if (fgets (buf, sizeof (buf), fp) == NULL) + break; + + lineno++; + + p = remove_leading_whitespaces (buf); + + /* Skip comments. */ + str = strstr (p, "//"); + if (str != NULL) + str[0] = '\0'; + + /* Remove trailing white spaces. */ + remove_trailing_whitespaces (p); + + switch (p[0]) { - if (operand_types[i] == NULL - || *operand_types[i] == '0') + case '#': + if (!strcmp("### MARKER ###", buf)) + marker = 1; + else { - if (i == 0) - process_i386_operand_type (table, "0", 0, "\t "); - break; + /* Since we ignore all included files (we only care about their + #define-s here), we don't need to monitor filenames. The final + line number directive is going to refer to the main source file + again. */ + char *end; + unsigned long ln; + + p = remove_leading_whitespaces (p + 1); + if (!strncmp(p, "line", 4)) + p += 4; + ln = strtoul (p, &end, 10); + if (ln > 1 && ln < INT_MAX + && *remove_leading_whitespaces (end) == '"') + lineno = ln - 1; } + /* Ignore comments. */ + case '\0': + continue; + break; + case '<': + parse_template (p, lineno); + continue; + default: + if (!marker) + continue; + break; + } - if (i != 0) - fprintf (table, ",\n "); + last = p + strlen (p); - process_i386_operand_type (table, operand_types[i], 0, - "\t "); + /* Find name. */ + name = next_field (p, ',', &str, last); + + i = expand_templates (name, str, opcode_hash_table, &opcode_array, + lineno); + } + + /* Process opcode array. */ + for (j = 0; j < i; j++) + { + struct opcode_hash_entry *next; + + 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", NULL, -1); - process_i386_opcode_modifier (table, "0"); - fprintf (table, " { "); - process_i386_operand_type (table, "0", 0, "\t "); + process_i386_operand_type (table, "0", stage_opcodes, "\t ", -1); fprintf (table, " } }\n"); fprintf (table, "};\n"); @@ -799,6 +1767,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 +1810,30 @@ 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, stage_registers, "\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 +1860,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 +1868,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, stage_macros, " ", -1); free (init); } fprintf (fp, "\n"); @@ -910,7 +1879,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'}, @@ -940,8 +1909,9 @@ main (int argc, char **argv) extern int chdir (char *); char *srcdir = NULL; int c; + unsigned int i, cpumax; FILE *table; - + program_name = *argv; xmalloc_set_program_name (program_name); @@ -969,21 +1939,45 @@ 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)); + /* cpu_flags isn't sorted by position. */ + cpumax = 0; + for (i = 0; i < ARRAY_SIZE (cpu_flags); i++) + if (cpu_flags[i].position > cpumax) + cpumax = cpu_flags[i].position; + /* Check the unused bitfield in i386_cpu_flags. */ -#ifndef CpuUnused +#ifdef CpuUnused + static_assert (ARRAY_SIZE (cpu_flags) == CpuMax + 2); + + if ((cpumax - 1) != CpuMax) + fail (_("CpuMax != %d!\n"), cpumax); +#else + static_assert (ARRAY_SIZE (cpu_flags) == CpuMax + 1); + + if (cpumax != CpuMax) + fail (_("CpuMax != %d!\n"), cpumax); + c = CpuNumOfBits - CpuMax - 1; if (c) fail (_("%d unused bits in i386_cpu_flags.\n"), c); #endif + static_assert (ARRAY_SIZE (opcode_modifiers) == Opcode_Modifier_Num); + /* Check the unused bitfield in i386_operand_type. */ -#ifndef OTUnused - c = OTNumOfBits - OTMax - 1; +#ifdef OTUnused + static_assert (ARRAY_SIZE (operand_types) + CLASS_WIDTH + INSTANCE_WIDTH + == OTNum + 1); +#else + static_assert (ARRAY_SIZE (operand_types) + CLASS_WIDTH + INSTANCE_WIDTH + == OTNum); + + c = OTNumOfBits - OTNum; if (c) fail (_("%d unused bits in i386_operand_type.\n"), c); #endif