MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

x86: infer operand count of templates

Browse Source 
Having this count explicitly in the table is redundant and (even if just
slightly) disturbs clarity. Infer the count from the number of operands
actually found.

Also convert the "no operands" indicator from "{ 0 }" to just "{}", as
that (now) ends up being easier to parse.
This commit is contained in:
Jan Beulich 2021-03-03 12:57:08 +01:00
parent 8233378104
commit 75363b6d60
3 changed files with 3337 additions and 3343 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
opcodes/ChangeLog
View File

@ -1,3 +1,10 @@
2021-03-03 Jan Beulich <jbeulich@suse.com>
* i386-gen.c (output_i386_opcode): Don't get operand count. Look
for {} instead of {0}. Don't look for '0'.
* i386-opc.tbl: Drop operand count field. Drop redundant operand
size specifiers.
2021-02-19 Nelson Chu <nelson.chu@sifive.com>
PR 27158

55
opcodes/i386-gen.c
View File

@ -1359,12 +1359,9 @@ 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 *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);
@ -1385,46 +1382,36 @@ output_i386_opcode (FILE *table, const char *name, char *str,
if (*str != '{')
abort ();
str = remove_leading_whitespaces (str + 1);
remove_trailing_whitespaces (str);
/* Remove } and trailing white space. */
i = strlen (str);
/* There are at least "X}". */
if (i < 2)
if (!i || str[i - 1] != '}')
abort ();
str[--i] = '\0';
remove_trailing_whitespaces (str);
/* Remove trailing white spaces and }. */
do
if (!*str)
operand_types [i = 0] = NULL;
else
{
i--;
if (ISSPACE (str[i]) || str[i] == '}')
str[i] = '\0';
else
break;
}
while (i != 0);
last = str + strlen (str);
last = str + i;
/* Find operand_types. */
for (i = 0; i < ARRAY_SIZE (operand_types); i++)
{
if (str >= last)
/* Find operand_types. */
for (i = 0; i < ARRAY_SIZE (operand_types); i++)
{
operand_types [i] = NULL;
break;
}
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;
operand_types [i] = next_field (str, ',', &str, last);
}
}
fprintf (table, " { \"%s\", %s, %s, %s, %s,\n",
name, base_opcode, extension_opcode, opcode_length, operands);
fprintf (table, " { \"%s\", %s, %s, %s, %u,\n",
name, base_opcode, extension_opcode, opcode_length, i);
process_i386_cpu_flag (table, cpu_flags, 0, ",", " ", lineno);
@ -1469,7 +1456,7 @@ output_i386_opcode (FILE *table, const char *name, char *str,
for (i = 0; i < ARRAY_SIZE (operand_types); i++)
{
if (operand_types[i] == NULL || *operand_types[i] == '0')
if (!operand_types[i])
{
if (i == 0)
process_i386_operand_type (table, "0", stage_opcodes, "\t ",

6618
opcodes/i386-opc.tbl
View File

File diff suppressed because it is too large Load Diff