espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-21 18:39:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

x86: simplify expressions in update_imm()

Browse Source 
Comparing the sum of the relevant .imm<N> fields against a constant imo
makes more obvious what is actually meant. It allows dropping of two
static variables, with a 3rd drop requiring two more minor adjustments
elsewhere, utilizing that "i" is zeroed first thing in md_assemble().
This also increases the chances of the compiler doing the calculations
all in registers.
This commit is contained in:
Jan Beulich
2022-11-02 08:18:24 +01:00
parent d918451a04
commit be1643ff05
1 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
gas/config/tc-i386.c
View File

@ -1930,12 +1930,9 @@ operand_type_xor (i386_operand_type x, i386_operand_type y)
static const i386_operand_type disp16_32 = OPERAND_TYPE_DISP16_32; static const i386_operand_type disp16_32 = OPERAND_TYPE_DISP16_32;
static const i386_operand_type anydisp = OPERAND_TYPE_ANYDISP; static const i386_operand_type anydisp = OPERAND_TYPE_ANYDISP;
static const i386_operand_type regxmm = OPERAND_TYPE_REGXMM; static const i386_operand_type regxmm = OPERAND_TYPE_REGXMM;
static const i386_operand_type imm8 = OPERAND_TYPE_IMM8;
static const i386_operand_type imm8s = OPERAND_TYPE_IMM8S;
static const i386_operand_type imm16 = OPERAND_TYPE_IMM16; static const i386_operand_type imm16 = OPERAND_TYPE_IMM16;
static const i386_operand_type imm32 = OPERAND_TYPE_IMM32; static const i386_operand_type imm32 = OPERAND_TYPE_IMM32;
static const i386_operand_type imm32s = OPERAND_TYPE_IMM32S; static const i386_operand_type imm32s = OPERAND_TYPE_IMM32S;
static const i386_operand_type imm64 = OPERAND_TYPE_IMM64;
static const i386_operand_type imm16_32 = OPERAND_TYPE_IMM16_32; static const i386_operand_type imm16_32 = OPERAND_TYPE_IMM16_32;
static const i386_operand_type imm16_32s = OPERAND_TYPE_IMM16_32S; static const i386_operand_type imm16_32s = OPERAND_TYPE_IMM16_32S;
static const i386_operand_type imm16_32_32s = OPERAND_TYPE_IMM16_32_32S; static const i386_operand_type imm16_32_32s = OPERAND_TYPE_IMM16_32_32S;
@ -3998,7 +3995,7 @@ process_immext (void)
exp = &im_expressions[i.imm_operands++]; exp = &im_expressions[i.imm_operands++];
i.op[i.operands].imms = exp; i.op[i.operands].imms = exp;
i.types[i.operands] = imm8; i.types[i.operands].bitfield.imm8 = 1;
i.operands++; i.operands++;
exp->X_op = O_constant; exp->X_op = O_constant;
exp->X_add_number = i.tm.extension_opcode; exp->X_add_number = i.tm.extension_opcode;
@ -7674,18 +7671,12 @@ static int
update_imm (unsigned int j) update_imm (unsigned int j)
{ {
i386_operand_type overlap = i.types[j]; i386_operand_type overlap = i.types[j];
if ((overlap.bitfield.imm8 if (overlap.bitfield.imm8
|| overlap.bitfield.imm8s + overlap.bitfield.imm8s
|| overlap.bitfield.imm16 + overlap.bitfield.imm16
|| overlap.bitfield.imm32 + overlap.bitfield.imm32
|| overlap.bitfield.imm32s + overlap.bitfield.imm32s
|| overlap.bitfield.imm64) + overlap.bitfield.imm64 > 1)
&& !operand_type_equal (&overlap, &imm8)
&& !operand_type_equal (&overlap, &imm8s)
&& !operand_type_equal (&overlap, &imm16)
&& !operand_type_equal (&overlap, &imm32)
&& !operand_type_equal (&overlap, &imm32s)
&& !operand_type_equal (&overlap, &imm64))
{ {
if (i.suffix) if (i.suffix)
{ {
@ -7722,12 +7713,12 @@ update_imm (unsigned int j)
else if (i.prefix[DATA_PREFIX]) else if (i.prefix[DATA_PREFIX])
overlap = operand_type_and (overlap, overlap = operand_type_and (overlap,
flag_code != CODE_16BIT ? imm16 : imm32); flag_code != CODE_16BIT ? imm16 : imm32);
if (!operand_type_equal (&overlap, &imm8) if (overlap.bitfield.imm8
&& !operand_type_equal (&overlap, &imm8s) + overlap.bitfield.imm8s
&& !operand_type_equal (&overlap, &imm16) + overlap.bitfield.imm16
&& !operand_type_equal (&overlap, &imm32) + overlap.bitfield.imm32
&& !operand_type_equal (&overlap, &imm32s) + overlap.bitfield.imm32s
&& !operand_type_equal (&overlap, &imm64)) + overlap.bitfield.imm64 != 1)
{ {
as_bad (_("no instruction mnemonic suffix given; " as_bad (_("no instruction mnemonic suffix given; "
"can't determine immediate size")); "can't determine immediate size"));
@ -8086,7 +8077,7 @@ build_modrm_byte (void)
immediate operand to encode the first operand. */ immediate operand to encode the first operand. */
exp = &im_expressions[i.imm_operands++]; exp = &im_expressions[i.imm_operands++];
i.op[i.operands].imms = exp; i.op[i.operands].imms = exp;
i.types[i.operands] = imm8; i.types[i.operands].bitfield.imm8 = 1;
i.operands++; i.operands++;
gas_assert (i.tm.operand_types[reg_slot].bitfield.class == RegSIMD); gas_assert (i.tm.operand_types[reg_slot].bitfield.class == RegSIMD);