[PATCH] x86: Print {bad} on invalid broadcast in OP_E_memory
H.J. Lu
hjl.tools@gmail.com
Tue Sep 28 02:45:10 GMT 2021
On Mon, Sep 27, 2021 at 7:40 PM Cui, Lili <lili.cui@intel.com> wrote:
>
> > On Mon, Sep 27, 2021 at 4:28 AM Cui, Lili <lili.cui@intel.com> wrote:
> > >
> > > > I've indicated so in the past already (perhaps not to you, but in
> > > > general): I consider it wrong to add test cases with bogus expectations.
> > > > In the case here it's not only the broadcast that's invalid, but also the {%k7}.
> > > > For your purpose you don't need the masking part, so I'd like to ask
> > > > that you drop it. If and when we properly mark such bad uses of
> > > > masking, a separate test case covering that aspect will want adding,
> > > > but the one you add now would then better not require adjusting.
> > > >
> > > Yes, we don’t need masking part here, I dropped it. Thanks.
> > >
> > > > Jan
> > >
> > > # Invalid 16-bit broadcast with EVEX.W == 1.
> > > .byte 0x62, 0xc3, 0x8c, 0x1d, 0x66, 0x90, 0x66, 0x90, 0x66,
> > > 0x90
> > > +# Invalid vcvtsi2sd with EVEX.b == 1.
> > > + .byte 0x62,0xc1,0xff,0x38,0x2a,0x20
> >
> > The bug report is for -Mintel. But there are no tests for it. Please add -Mintel
> > tests for bad casts.
> >
> Done, Thanks.
>
> > H.J.
>
> Subject: [PATCH] x86: Print {bad} on invalid broadcast in OP_E_memory
>
> Don't print broadcast for scalar_mode, and print {bad} for invalid broadcast.
>
> gas/
>
> PR binutils/28381
> * testsuite/gas/i386/bad-bcast.s: Add a new testcase.
> * testsuite/gas/i386/bad-bcast.d: Likewise.
> * testsuite/gas/i386/bad-bcast-intel.d: New.
>
> opcodes/
>
> PR binutils/28381
> * i386-dis.c (static struct): Add no_broadcast.
> (OP_E_memory): Mark invalid broadcast with no_broadcast=1 and Print "{bad}"for it.
> (intel_operand_size): mark invalid broadcast with no_broadcast=1.
> (OP_XMM): Mark scalar_mode with no_broadcast=1.
> ---
> gas/testsuite/gas/i386/bad-bcast-intel.d | 15 +++
> gas/testsuite/gas/i386/bad-bcast.d | 10 +-
> gas/testsuite/gas/i386/bad-bcast.s | 2 +
> gas/testsuite/gas/i386/i386.exp | 1 +
> opcodes/i386-dis.c | 155 ++++++++++++-----------
> 5 files changed, 104 insertions(+), 79 deletions(-)
> create mode 100644 gas/testsuite/gas/i386/bad-bcast-intel.d
>
> diff --git a/gas/testsuite/gas/i386/bad-bcast-intel.d b/gas/testsuite/gas/i386/bad-bcast-intel.d
> new file mode 100644
> index 0000000000..29de3de299
> --- /dev/null
> +++ b/gas/testsuite/gas/i386/bad-bcast-intel.d
> @@ -0,0 +1,15 @@
> +#source: bad-bcast.s
> +#objdump: -dw -Mintel
> +#name: Disassemble bad broadcast (Intel mode)
> +
> +.*: +file format .*
> +
> +Disassembly of section .text:
> +
> +0+ <.text>:
> +[ ]*[a-f0-9]+:[ ]*62 c3 8c 1d 66\s*\(bad\)
> +[ ]*[a-f0-9]+:[ ]*90\s*nop
> +[ ]*[a-f0-9]+:[ ]*66 90\s*xchg ax,ax
> +[ ]*[a-f0-9]+:[ ]*66 90\s*xchg ax,ax
> +[ ]*[a-f0-9]+:[ ]*62 c1 ff 38 2a 20\s*vcvtsi2sd xmm4,xmm0,\[eax\]{bad}
> +#pass
> diff --git a/gas/testsuite/gas/i386/bad-bcast.d b/gas/testsuite/gas/i386/bad-bcast.d
> index 9fc474a42f..4f82925999 100644
> --- a/gas/testsuite/gas/i386/bad-bcast.d
> +++ b/gas/testsuite/gas/i386/bad-bcast.d
> @@ -7,8 +7,8 @@
> Disassembly of section .text:
>
> 0+ <.text>:
> - +[a-f0-9]+: 62 .byte 0x62
> - +[a-f0-9]+: c3 ret
> - +[a-f0-9]+: 8c 1d 66 90 66 90 mov %ds,0x90669066
> - +[a-f0-9]+: 66 90 xchg %ax,%ax
> -#pass
> + +[a-f0-9]+: 62 c3 8c 1d 66\s+\(bad\)
> + +[a-f0-9]+: 90\s+nop
> + +[a-f0-9]+: 66 90\s+xchg %ax,%ax
> + +[a-f0-9]+: 66 90\s+xchg %ax,%ax
> + +[a-f0-9]+: 62 c1 ff 38 2a 20\s+vcvtsi2sd \(%eax\){bad},%xmm0,%xmm4
> diff --git a/gas/testsuite/gas/i386/bad-bcast.s b/gas/testsuite/gas/i386/bad-bcast.s
> index 3e49b2238e..6c55dcbbbd 100644
> --- a/gas/testsuite/gas/i386/bad-bcast.s
> +++ b/gas/testsuite/gas/i386/bad-bcast.s
> @@ -1,3 +1,5 @@
> .text
> # Invalid 16-bit broadcast with EVEX.W == 1.
> .byte 0x62, 0xc3, 0x8c, 0x1d, 0x66, 0x90, 0x66, 0x90, 0x66, 0x90
> +# Invalid vcvtsi2sd with EVEX.b == 1.
> + .byte 0x62,0xc1,0xff,0x38,0x2a,0x20
> diff --git a/gas/testsuite/gas/i386/i386.exp b/gas/testsuite/gas/i386/i386.exp
> index 80959726d0..680259b1c4 100644
> --- a/gas/testsuite/gas/i386/i386.exp
> +++ b/gas/testsuite/gas/i386/i386.exp
> @@ -646,6 +646,7 @@ if [gas_32_check] then {
> run_dump_test "dw2-compress-2"
> run_dump_test "dw2-compressed-2"
>
> + run_dump_test "bad-bcast-intel"
> run_dump_test "bad-bcast"
> run_dump_test "bad-size"
>
> diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c
> index aa292233d4..926f776de8 100644
> --- a/opcodes/i386-dis.c
> +++ b/opcodes/i386-dis.c
> @@ -2422,6 +2422,7 @@ static struct
> int zeroing;
> int ll;
> int b;
> + int no_broadcast;
> }
> vex;
> static unsigned char need_vex;
> @@ -11059,23 +11060,25 @@ intel_operand_size (int bytemode, int sizeflag)
> {
> if (vex.b)
> {
> - switch (bytemode)
> - {
> - case x_mode:
> - case evex_half_bcst_xmmq_mode:
> - if (vex.w)
> - oappend ("QWORD PTR ");
> - else
> - oappend ("DWORD PTR ");
> - break;
> - case xh_mode:
> - case evex_half_bcst_xmmqh_mode:
> - case evex_half_bcst_xmmqdh_mode:
> - oappend ("WORD PTR ");
> - break;
> - default:
> - abort ();
> - }
> + if (!vex.no_broadcast)
> + switch (bytemode)
> + {
> + case x_mode:
> + case evex_half_bcst_xmmq_mode:
> + if (vex.w)
> + oappend ("QWORD PTR ");
> + else
> + oappend ("DWORD PTR ");
> + break;
> + case xh_mode:
> + case evex_half_bcst_xmmqh_mode:
> + case evex_half_bcst_xmmqdh_mode:
> + oappend ("WORD PTR ");
> + break;
> + default:
> + vex.no_broadcast = 1;
> + break;
> + }
> return;
> }
> switch (bytemode)
> @@ -11908,69 +11911,71 @@ OP_E_memory (int bytemode, int sizeflag)
> if (vex.b)
> {
> evex_used |= EVEX_b_used;
> - if (bytemode == xh_mode)
> - {
> - if (vex.w)
> - {
> - oappend ("{bad}");
> - }
> - else
> - {
> - switch (vex.length)
> - {
> - case 128:
> - oappend ("{1to8}");
> - break;
> - case 256:
> - oappend ("{1to16}");
> - break;
> - case 512:
> - oappend ("{1to32}");
> - break;
> - default:
> - abort ();
> - }
> - }
> - }
> - else if (vex.w
> - || bytemode == evex_half_bcst_xmmqdh_mode
> - || bytemode == evex_half_bcst_xmmq_mode)
> + if (!vex.no_broadcast)
> {
> - switch (vex.length)
> + if (bytemode == xh_mode)
> {
> - case 128:
> - oappend ("{1to2}");
> - break;
> - case 256:
> - oappend ("{1to4}");
> - break;
> - case 512:
> - oappend ("{1to8}");
> - break;
> - default:
> - abort ();
> + if (vex.w)
> + oappend ("{bad}");
> + else
> + {
> + switch (vex.length)
> + {
> + case 128:
> + oappend ("{1to8}");
> + break;
> + case 256:
> + oappend ("{1to16}");
> + break;
> + case 512:
> + oappend ("{1to32}");
> + break;
> + default:
> + abort ();
> + }
> + }
> }
> - }
> - else if (bytemode == x_mode
> - || bytemode == evex_half_bcst_xmmqh_mode)
> - {
> - switch (vex.length)
> + else if (vex.w
> + || bytemode == evex_half_bcst_xmmqdh_mode
> + || bytemode == evex_half_bcst_xmmq_mode)
> {
> - case 128:
> - oappend ("{1to4}");
> - break;
> - case 256:
> - oappend ("{1to8}");
> - break;
> - case 512:
> - oappend ("{1to16}");
> - break;
> - default:
> - abort ();
> + switch (vex.length)
> + {
> + case 128:
> + oappend ("{1to2}");
> + break;
> + case 256:
> + oappend ("{1to4}");
> + break;
> + case 512:
> + oappend ("{1to8}");
> + break;
> + default:
> + abort ();
> + }
> + }
> + else if (bytemode == x_mode
> + || bytemode == evex_half_bcst_xmmqh_mode)
> + {
> + switch (vex.length)
> + {
> + case 128:
> + oappend ("{1to4}");
> + break;
> + case 256:
> + oappend ("{1to8}");
> + break;
> + case 512:
> + oappend ("{1to16}");
> + break;
> + default:
> + abort ();
> + }
> }
> + else
> + vex.no_broadcast = 1;
> }
> - else
> - /* If operand doesn't allow broadcast, vex.b should be 0. */
> + if (vex.no_broadcast)
> oappend ("{bad}");
> }
> }
> @@ -12685,6 +12690,8 @@ OP_XMM (int bytemode, int sizeflag ATTRIBUTE_UNUSED)
>
> if (bytemode == tmm_mode)
> modrm.reg = reg;
> + else if (bytemode == scalar_mode)
> + vex.no_broadcast = 1;
>
> print_vector_reg (reg, bytemode);
> }
> --
> 2.17.1
>
> Lili.
OK.
Thanks.
--
H.J.
More information about the Binutils
mailing list