X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=opcodes%2Fi386-gen.c;h=b853e425e600ad432e65903ad728dc5cb08b84a6;hb=a848998a758598a339cdd8511335db3544a1f9fb;hp=c0325ed16b90520b956373622c50081b46e95cee;hpb=2c70385689542a4c4cbe160601e54f9f18a4c4c5;p=deliverable%2Fbinutils-gdb.git diff --git a/opcodes/i386-gen.c b/opcodes/i386-gen.c index c0325ed16b..b853e425e6 100644 --- a/opcodes/i386-gen.c +++ b/opcodes/i386-gen.c @@ -30,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; @@ -98,7 +102,7 @@ static initializer cpu_flag_init[] = { "CPU_ZNVER1_FLAGS", "CPU_GENERIC64_FLAGS|CpuFISTTP|CpuRdtscp|CpuCX16|CPU_AVX2_FLAGS|CpuSSE4A|CpuABM|CpuSVME|CpuAES|CpuPCLMUL|CpuLZCNT|CpuPRFCHW|CpuFMA|CpuBMI|CpuF16C|CpuXsaveopt|CpuFSGSBase|CpuMovbe|CpuBMI2|CpuRdRnd|CpuADX|CpuRdSeed|CpuSMAP|CpuSHA|CpuXSAVEC|CpuXSAVES|CpuClflushOpt|CpuCLZERO|CpuMWAITX" }, { "CPU_ZNVER2_FLAGS", - "CPU_ZNVER1_FLAGS|CpuRDPID|CpuWBNOINVD|CpuCLWB" }, + "CPU_ZNVER1_FLAGS|CpuCLWB|CpuRDPID|CpuRDPRU|CpuMCOMMIT|CpuWBNOINVD" }, { "CPU_BTVER1_FLAGS", "CPU_GENERIC64_FLAGS|CpuFISTTP|CpuCX16|CpuRdtscp|CPU_SSSE3_FLAGS|CpuSSE4A|CpuABM|CpuPRFCHW|CpuCX16|CpuClflush|CpuFISTTP|CpuSVME|CpuLZCNT" }, { "CPU_BTVER2_FLAGS", @@ -299,6 +303,10 @@ static initializer cpu_flag_init[] = "CpuENQCMD" }, { "CPU_AVX512_VP2INTERSECT_FLAGS", "CpuAVX512_VP2INTERSECT" }, + { "CPU_RDPRU_FLAGS", + "CpuRDPRU" }, + { "CPU_MCOMMIT_FLAGS", + "CpuMCOMMIT" }, { "CPU_ANY_X87_FLAGS", "CPU_ANY_287_FLAGS|Cpu8087" }, { "CPU_ANY_287_FLAGS", @@ -375,31 +383,18 @@ static initializer cpu_flag_init[] = "CpuAVX512_VP2INTERSECT" }, }; -static const initializer operand_type_shorthands[] = -{ - { "Reg8", "Reg|Byte" }, - { "Reg16", "Reg|Word" }, - { "Reg32", "Reg|Dword" }, - { "Reg64", "Reg|Qword" }, - { "FloatAcc", "Acc|Tbyte" }, - { "FloatReg", "Reg|Tbyte" }, - { "RegXMM", "RegSIMD|Xmmword" }, - { "RegYMM", "RegSIMD|Ymmword" }, - { "RegZMM", "RegSIMD|Zmmword" }, -}; - 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", @@ -427,45 +422,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", - "Debug" }, + "Class=RegDR" }, { "OPERAND_TYPE_FLOATREG", - "FloatReg" }, + "Class=Reg|Tbyte" }, { "OPERAND_TYPE_FLOATACC", - "FloatAcc" }, - { "OPERAND_TYPE_SREG2", - "SReg2" }, - { "OPERAND_TYPE_SREG3", - "SReg3" }, - { "OPERAND_TYPE_JUMPABSOLUTE", - "JumpAbsolute" }, + "Instance=Accum|Tbyte" }, + { "OPERAND_TYPE_SREG", + "Class=SReg" }, { "OPERAND_TYPE_REGMMX", - "RegMMX" }, + "Class=RegMMX" }, { "OPERAND_TYPE_REGXMM", - "RegXMM" }, + "Class=RegSIMD|Xmmword" }, { "OPERAND_TYPE_REGYMM", - "RegYMM" }, + "Class=RegSIMD|Ymmword" }, { "OPERAND_TYPE_REGZMM", - "RegZMM" }, + "Class=RegSIMD|Zmmword" }, { "OPERAND_TYPE_REGMASK", - "RegMask" }, - { "OPERAND_TYPE_ESSEG", - "EsSeg" }, + "Class=RegMask" }, + { "OPERAND_TYPE_REGBND", + "Class=RegBND" }, { "OPERAND_TYPE_ACC8", - "Acc|Byte" }, + "Instance=Accum|Byte" }, { "OPERAND_TYPE_ACC16", - "Acc|Word" }, + "Instance=Accum|Word" }, { "OPERAND_TYPE_ACC32", - "Acc|Dword" }, + "Instance=Accum|Dword" }, { "OPERAND_TYPE_ACC64", - "Acc|Qword" }, + "Instance=Accum|Qword" }, { "OPERAND_TYPE_DISP16_32", "Disp16|Disp32" }, { "OPERAND_TYPE_ANYDISP", @@ -486,10 +477,8 @@ 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_ANYIMM", + "Imm1|Imm8|Imm8S|Imm16|Imm32|Imm32S|Imm64" }, }; typedef struct bitfield @@ -611,6 +600,8 @@ static bitfield cpu_flags[] = BITFIELD (CpuMOVDIRI), BITFIELD (CpuMOVDIR64B), BITFIELD (CpuENQCMD), + BITFIELD (CpuRDPRU), + BITFIELD (CpuMCOMMIT), #ifdef CpuUnused BITFIELD (CpuUnused), #endif @@ -624,15 +615,13 @@ static bitfield opcode_modifiers[] = BITFIELD (Modrm), BITFIELD (ShortForm), BITFIELD (Jump), - BITFIELD (JumpDword), - BITFIELD (JumpByte), - BITFIELD (JumpInterSegment), BITFIELD (FloatMF), BITFIELD (FloatR), BITFIELD (Size), BITFIELD (CheckRegSize), BITFIELD (IgnoreSize), BITFIELD (DefaultSize), + BITFIELD (Anysize), BITFIELD (No_bSuf), BITFIELD (No_wSuf), BITFIELD (No_lSuf), @@ -641,6 +630,7 @@ static bitfield opcode_modifiers[] = BITFIELD (No_ldSuf), BITFIELD (FWait), BITFIELD (IsString), + BITFIELD (RegMem), BITFIELD (BNDPrefixOk), BITFIELD (NoTrackPrefixOk), BITFIELD (IsLockable), @@ -680,12 +670,41 @@ static bitfield opcode_modifiers[] = BITFIELD (Intel64), }; +#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 (Reg), - BITFIELD (RegMMX), - BITFIELD (RegSIMD), - BITFIELD (RegMask), BITFIELD (Imm1), BITFIELD (Imm8), BITFIELD (Imm8S), @@ -699,17 +718,6 @@ static bitfield operand_types[] = BITFIELD (Disp32), BITFIELD (Disp32S), BITFIELD (Disp64), - BITFIELD (InOutPortReg), - BITFIELD (ShiftCount), - BITFIELD (Control), - BITFIELD (Debug), - BITFIELD (Test), - BITFIELD (SReg2), - BITFIELD (SReg3), - BITFIELD (Acc), - BITFIELD (JumpAbsolute), - BITFIELD (EsSeg), - BITFIELD (RegMem), BITFIELD (Byte), BITFIELD (Word), BITFIELD (Dword), @@ -720,9 +728,6 @@ static bitfield operand_types[] = BITFIELD (Ymmword), BITFIELD (Zmmword), BITFIELD (Unspecified), - BITFIELD (Anysize), - BITFIELD (Vec_Imm4), - BITFIELD (RegBND), #ifdef OTUnused BITFIELD (OTUnused), #endif @@ -832,8 +837,8 @@ next_field (char *str, char sep, char **next, char *last) static void set_bitfield (char *, bitfield *, int, unsigned int, int); static int -set_bitfield_from_shorthand (char *f, bitfield *array, unsigned int size, - int lineno) +set_bitfield_from_cpu_flag_init (char *f, bitfield *array, unsigned int size, + int lineno) { char *str, *next, *last; unsigned int i; @@ -854,22 +859,6 @@ set_bitfield_from_shorthand (char *f, bitfield *array, unsigned int size, return 0; } - for (i = 0; i < ARRAY_SIZE (operand_type_shorthands); i++) - if (strcmp (operand_type_shorthands[i].name, f) == 0) - { - /* Turn on selective bits. */ - char *init = xstrdup (operand_type_shorthands[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; } @@ -920,8 +909,8 @@ set_bitfield (char *f, bitfield *array, int value, } } - /* Handle shorthands. */ - if (value == 1 && !set_bitfield_from_shorthand (f, array, size, lineno)) + /* Handle CPU_XXX_FLAGS. */ + if (value == 1 && !set_bitfield_from_cpu_flag_init (f, array, size, lineno)) return; if (lineno != -1) @@ -1109,6 +1098,8 @@ process_i386_opcode_modifier (FILE *table, char *mod, char **opnd, int lineno) if (strcmp (mod, "0")) { + unsigned int have_w = 0, bwlq_suf = 0xf; + last = mod + strlen (mod); for (next = mod; next && next < last; ) { @@ -1122,8 +1113,30 @@ process_i386_opcode_modifier (FILE *table, char *mod, char **opnd, int lineno) 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)); } @@ -1135,20 +1148,22 @@ enum stage { }; static void -output_operand_type (FILE *table, bitfield *types, unsigned int size, +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++) { - 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 + 1) % 20) == 0) + if (((i + 3) % 20) == 0) { /* We need \\ for macro. */ if (stage == stage_macros) @@ -1166,6 +1181,8 @@ 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. */ @@ -1179,6 +1196,32 @@ process_i386_operand_type (FILE *table, char *op, enum stage stage, for (next = op; next && next < last; ) { 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, 1, ARRAY_SIZE (types), lineno); @@ -1198,8 +1241,8 @@ process_i386_operand_type (FILE *table, char *op, enum stage stage, set_bitfield("Disp32S", types, 1, ARRAY_SIZE (types), lineno); } } - output_operand_type (table, types, ARRAY_SIZE (types), stage, - indent); + output_operand_type (table, class, instance, types, ARRAY_SIZE (types), + stage, indent); } static void @@ -1272,8 +1315,7 @@ output_i386_opcode (FILE *table, const char *name, char *str, } fprintf (table, " { \"%s\", %s, %s, %s, %s,\n", - name, operands, base_opcode, extension_opcode, - opcode_length); + name, base_opcode, extension_opcode, opcode_length, operands); process_i386_cpu_flag (table, cpu_flags, 0, ",", " ", lineno); @@ -1671,9 +1713,13 @@ main (int argc, char **argv) /* Check the unused bitfield in i386_cpu_flags. */ #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); @@ -1682,9 +1728,17 @@ main (int argc, char **argv) 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