diff mbox series

x86: simplify expressions in update_imm()

Message ID c8d25b29-37fe-9623-a799-e67e1f991743@suse.com
State Accepted
Headers
Series x86: simplify expressions in update_imm() |

Checks

Context Check Description
snail/binutils-gdb-check success Github commit url

Commit Message

Jan Beulich Oct. 31, 2022, 5 p.m. UTC 
  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.

Comments

H.J. Lu Oct. 31, 2022, 6:58 p.m. UTC | #1 
On Mon, Oct 31, 2022 at 10:01 AM Jan Beulich <jbeulich@suse.com> wrote:
>
> 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.
>
> --- a/gas/config/tc-i386.c
> +++ b/gas/config/tc-i386.c
> @@ -1908,12 +1908,9 @@ operand_type_xor (i386_operand_type x, i
>  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 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 imm32 = OPERAND_TYPE_IMM32;
>  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_32s = OPERAND_TYPE_IMM16_32S;
>  static const i386_operand_type imm16_32_32s = OPERAND_TYPE_IMM16_32_32S;
> @@ -3976,7 +3973,7 @@ process_immext (void)
>
>    exp = &im_expressions[i.imm_operands++];
>    i.op[i.operands].imms = exp;
> -  i.types[i.operands] = imm8;
> +  i.types[i.operands].bitfield.imm8 = 1;
>    i.operands++;
>    exp->X_op = O_constant;
>    exp->X_add_number = i.tm.extension_opcode;
> @@ -7652,18 +7649,12 @@ static int
>  update_imm (unsigned int j)
>  {
>    i386_operand_type overlap = i.types[j];
> -  if ((overlap.bitfield.imm8
> -       || overlap.bitfield.imm8s
> -       || overlap.bitfield.imm16
> -       || overlap.bitfield.imm32
> -       || overlap.bitfield.imm32s
> -       || overlap.bitfield.imm64)
> -      && !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 (overlap.bitfield.imm8
> +      + overlap.bitfield.imm8s
> +      + overlap.bitfield.imm16
> +      + overlap.bitfield.imm32
> +      + overlap.bitfield.imm32s
> +      + overlap.bitfield.imm64 > 1)
>      {
>        if (i.suffix)
>         {
> @@ -7700,12 +7691,12 @@ update_imm (unsigned int j)
>        else if (i.prefix[DATA_PREFIX])
>         overlap = operand_type_and (overlap,
>                                     flag_code != CODE_16BIT ? imm16 : imm32);
> -      if (!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 (overlap.bitfield.imm8
> +         + overlap.bitfield.imm8s
> +         + overlap.bitfield.imm16
> +         + overlap.bitfield.imm32
> +         + overlap.bitfield.imm32s
> +         + overlap.bitfield.imm64 != 1)
>         {
>           as_bad (_("no instruction mnemonic suffix given; "
>                     "can't determine immediate size"));
> @@ -8064,7 +8055,7 @@ build_modrm_byte (void)
>              immediate operand to encode the first operand.  */
>           exp = &im_expressions[i.imm_operands++];
>           i.op[i.operands].imms = exp;
> -         i.types[i.operands] = imm8;
> +         i.types[i.operands].bitfield.imm8 = 1;
>           i.operands++;
>
>           gas_assert (i.tm.operand_types[reg_slot].bitfield.class == RegSIMD);

OK.

Thanks.
diff mbox series

Patch

--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -1908,12 +1908,9 @@  operand_type_xor (i386_operand_type x, i
 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 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 imm32 = OPERAND_TYPE_IMM32;
 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_32s = OPERAND_TYPE_IMM16_32S;
 static const i386_operand_type imm16_32_32s = OPERAND_TYPE_IMM16_32_32S;
@@ -3976,7 +3973,7 @@  process_immext (void)
 
   exp = &im_expressions[i.imm_operands++];
   i.op[i.operands].imms = exp;
-  i.types[i.operands] = imm8;
+  i.types[i.operands].bitfield.imm8 = 1;
   i.operands++;
   exp->X_op = O_constant;
   exp->X_add_number = i.tm.extension_opcode;
@@ -7652,18 +7649,12 @@  static int
 update_imm (unsigned int j)
 {
   i386_operand_type overlap = i.types[j];
-  if ((overlap.bitfield.imm8
-       || overlap.bitfield.imm8s
-       || overlap.bitfield.imm16
-       || overlap.bitfield.imm32
-       || overlap.bitfield.imm32s
-       || overlap.bitfield.imm64)
-      && !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 (overlap.bitfield.imm8
+      + overlap.bitfield.imm8s
+      + overlap.bitfield.imm16
+      + overlap.bitfield.imm32
+      + overlap.bitfield.imm32s
+      + overlap.bitfield.imm64 > 1)
     {
       if (i.suffix)
 	{
@@ -7700,12 +7691,12 @@  update_imm (unsigned int j)
       else if (i.prefix[DATA_PREFIX])
 	overlap = operand_type_and (overlap,
 				    flag_code != CODE_16BIT ? imm16 : imm32);
-      if (!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 (overlap.bitfield.imm8
+	  + overlap.bitfield.imm8s
+	  + overlap.bitfield.imm16
+	  + overlap.bitfield.imm32
+	  + overlap.bitfield.imm32s
+	  + overlap.bitfield.imm64 != 1)
 	{
 	  as_bad (_("no instruction mnemonic suffix given; "
 		    "can't determine immediate size"));
@@ -8064,7 +8055,7 @@  build_modrm_byte (void)
 	     immediate operand to encode the first operand.  */
 	  exp = &im_expressions[i.imm_operands++];
 	  i.op[i.operands].imms = exp;
-	  i.types[i.operands] = imm8;
+	  i.types[i.operands].bitfield.imm8 = 1;
 	  i.operands++;
 
 	  gas_assert (i.tm.operand_types[reg_slot].bitfield.class == RegSIMD);