public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
* [binutils-gdb] opcodes/i386: remove trailing whitespace from insns with zero operands
@ 2022-05-27 13:13 Andrew Burgess
  0 siblings, 0 replies; only message in thread
From: Andrew Burgess @ 2022-05-27 13:13 UTC (permalink / raw)
  To: bfd-cvs, gdb-cvs

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=202be274a41a912f705141d9fb3574f4b0d415e1

commit 202be274a41a912f705141d9fb3574f4b0d415e1
Author: Andrew Burgess <aburgess@redhat.com>
Date:   Thu May 26 13:11:11 2022 +0100

    opcodes/i386: remove trailing whitespace from insns with zero operands
    
    While working on another patch[1] I had need to touch this code in
    i386-dis.c:
    
      ins->obufp = ins->mnemonicendp;
      for (i = strlen (ins->obuf) + prefix_length; i < 6; i++)
        oappend (ins, " ");
      oappend (ins, " ");
      (*ins->info->fprintf_styled_func)
        (ins->info->stream, dis_style_mnemonic, "%s", ins->obuf);
    
    What this code does is add whitespace after the instruction mnemonic
    and before the instruction operands.
    
    The problem I ran into when working on this code can be seen by
    assembling this input file:
    
        .text
        nop
        retq
    
    Now, when I disassemble, here's the output.  I've replaced trailing
    whitespace with '_' so that the issue is clearer:
    
        Disassembly of section .text:
    
        0000000000000000 <.text>:
           0:       90                      nop
           1:       c3                      retq___
    
    Notice that there's no trailing whitespace after 'nop', but there are
    three spaces after 'retq'!
    
    What happens is that instruction mnemonics are emitted into a buffer
    instr_info::obuf, then instr_info::mnemonicendp is setup to point to
    the '\0' character at the end of the mnemonic.
    
    When we emit the whitespace, this is then added starting at the
    mnemonicendp position.  Lets consider 'retq', first the buffer is
    setup like this:
    
      'r' 'e' 't' 'q' '\0'
    
    Then we add whitespace characters at the '\0', converting the buffer
    to this:
    
      'r' 'e' 't' 'q' ' ' ' ' ' ' '\0'
    
    However, 'nop' is actually an alias for 'xchg %rax,%rax', so,
    initially, the buffer is setup like this:
    
      'x' 'c' 'h' 'g' '\0'
    
    Then in NOP_Fixup we spot that we have an instruction that is an alias
    for 'nop', and adjust the buffer to this:
    
      'n' 'o' 'p' '\0' '\0'
    
    The second '\0' is left over from the original buffer contents.
    However, when we rewrite the buffer, we don't afjust mnemonicendp,
    which still points at the second '\0' character.
    
    Now, when we insert whitespace we get:
    
      'n' 'o' 'p' '\0' ' ' ' ' ' ' ' ' '\0'
    
    Notice the whitespace is inserted after the first '\0', so, when we
    print the buffer, the whitespace is not printed.
    
    The fix for this is pretty easy, I can change NOP_Fixup to adjust
    mnemonicendp, but now a bunch of tests start failing, we now produce
    whitespace after the 'nop', which the tests don't expect.
    
    So, I could update the tests to expect the whitespace....
    
    ...except I'm not a fan of trailing whitespace, so I'd really rather
    not.
    
    Turns out, I can pretty easily update the whitespace emitting code to
    spot instructions that have zero operands and just not emit any
    whitespace in this case.  So this is what I've done.
    
    I've left in the fix for NOP_Fixup, I think updating mnemonicendp is
    probably a good thing, though this is not really required any more.
    
    I've then updated all the tests that I saw failing to adjust the
    expected patterns to account for the change in whitespace.
    
    [1] https://sourceware.org/pipermail/binutils/2022-April/120610.html

Diff:
---
 gas/testsuite/gas/i386/387.d                       |  10 +-
 gas/testsuite/gas/i386/adx-intel.d                 |   4 +-
 gas/testsuite/gas/i386/adx.d                       |   4 +-
 gas/testsuite/gas/i386/align-branch-4a.d           |   2 +-
 gas/testsuite/gas/i386/align-branch-4b.d           |   2 +-
 gas/testsuite/gas/i386/align-branch-6.d            |   2 +-
 gas/testsuite/gas/i386/amd.d                       |  12 +-
 gas/testsuite/gas/i386/arch-10.d                   |  16 +-
 gas/testsuite/gas/i386/arch-13.d                   |  20 +-
 gas/testsuite/gas/i386/arch-14.d                   |  10 +-
 gas/testsuite/gas/i386/arch-4.d                    |   4 +-
 gas/testsuite/gas/i386/arch-9.d                    |   2 +-
 gas/testsuite/gas/i386/avx-16bit.d                 |   4 +-
 gas/testsuite/gas/i386/avx-gather-intel.d          |   2 +-
 gas/testsuite/gas/i386/avx-gather.d                |   2 +-
 gas/testsuite/gas/i386/avx-intel.d                 |   4 +-
 gas/testsuite/gas/i386/avx-wig.d                   |   4 +-
 gas/testsuite/gas/i386/avx.d                       |   4 +-
 gas/testsuite/gas/i386/avx512f-nondef.d            |   4 +-
 gas/testsuite/gas/i386/bmi-intel.d                 |   2 +-
 gas/testsuite/gas/i386/bmi.d                       |   2 +-
 gas/testsuite/gas/i386/bmi2-intel.d                |   2 +-
 gas/testsuite/gas/i386/bmi2.d                      |   2 +-
 gas/testsuite/gas/i386/cet-intel.d                 |  28 +-
 gas/testsuite/gas/i386/cet.d                       |  28 +-
 gas/testsuite/gas/i386/clzero.d                    |   2 +-
 gas/testsuite/gas/i386/disassem.d                  | 442 ++++++++++-----------
 gas/testsuite/gas/i386/fence-as-lock-add-no.d      |   6 +-
 gas/testsuite/gas/i386/fpu-bad.d                   |   2 +-
 gas/testsuite/gas/i386/iamcu-4.d                   |   2 +-
 gas/testsuite/gas/i386/iamcu-5.d                   |   2 +-
 gas/testsuite/gas/i386/ifunc.d                     |   4 +-
 gas/testsuite/gas/i386/ilp32/mixed-mode-reloc64.d  |  12 +-
 gas/testsuite/gas/i386/ilp32/svme64.d              |  52 +--
 gas/testsuite/gas/i386/ilp32/x86-64-branch.d       |   4 +-
 gas/testsuite/gas/i386/ilp32/x86-64-cbw-intel.d    |  24 +-
 gas/testsuite/gas/i386/ilp32/x86-64-cbw.d          |  24 +-
 .../gas/i386/ilp32/x86-64-opcode-inval-intel.d     |  22 +-
 gas/testsuite/gas/i386/ilp32/x86-64-opcode-inval.d |  22 +-
 gas/testsuite/gas/i386/ilp32/x86-64-vmx.d          |   8 +-
 gas/testsuite/gas/i386/ilp32/x86-64-xsave-intel.d  |   4 +-
 gas/testsuite/gas/i386/ilp32/x86-64-xsave.d        |   4 +-
 gas/testsuite/gas/i386/ilp32/x86-64.d              |   4 +-
 gas/testsuite/gas/i386/intel-got32.d               |   2 +-
 gas/testsuite/gas/i386/intel-got64.d               |   2 +-
 gas/testsuite/gas/i386/intel-intel.d               | 106 ++---
 gas/testsuite/gas/i386/intel.d                     | 106 ++---
 gas/testsuite/gas/i386/intelpic.d                  |   2 +-
 gas/testsuite/gas/i386/invlpgb.d                   |  10 +-
 gas/testsuite/gas/i386/invlpgb64.d                 |  10 +-
 gas/testsuite/gas/i386/invpcid-intel.d             |   2 +-
 gas/testsuite/gas/i386/invpcid.d                   |   2 +-
 gas/testsuite/gas/i386/jump16.d                    |  12 +-
 gas/testsuite/gas/i386/katmai.d                    |   2 +-
 gas/testsuite/gas/i386/lfence-byte.d               |  24 +-
 gas/testsuite/gas/i386/lfence-indbr-a.d            |   4 +-
 gas/testsuite/gas/i386/lfence-indbr-b.d            |   4 +-
 gas/testsuite/gas/i386/lfence-load.d               | 102 ++---
 gas/testsuite/gas/i386/lfence-ret-a.d              |  12 +-
 gas/testsuite/gas/i386/lfence-ret-b.d              |  12 +-
 gas/testsuite/gas/i386/lfence-ret-c.d              |  12 +-
 gas/testsuite/gas/i386/lfence-ret-d.d              |  12 +-
 gas/testsuite/gas/i386/mixed-mode-reloc32.d        |  12 +-
 gas/testsuite/gas/i386/mixed-mode-reloc64.d        |  12 +-
 gas/testsuite/gas/i386/mpx-16bit.d                 |   6 +-
 gas/testsuite/gas/i386/mpx-add-bnd-prefix.d        |  10 +-
 gas/testsuite/gas/i386/mpx.d                       |   6 +-
 gas/testsuite/gas/i386/noextreg.d                  |   2 +-
 gas/testsuite/gas/i386/nops-8.d                    |   4 +-
 gas/testsuite/gas/i386/noreg64-data16.d            |   8 +-
 gas/testsuite/gas/i386/noreg64-rex64.d             |   8 +-
 gas/testsuite/gas/i386/noreg64.d                   |   8 +-
 gas/testsuite/gas/i386/opcode-intel.d              | 100 ++---
 gas/testsuite/gas/i386/opcode-suffix.d             |  98 ++---
 gas/testsuite/gas/i386/opcode.d                    |  98 ++---
 gas/testsuite/gas/i386/ospke.d                     |   4 +-
 gas/testsuite/gas/i386/padlock.d                   |  36 +-
 gas/testsuite/gas/i386/pconfig-intel.d             |   2 +-
 gas/testsuite/gas/i386/pconfig.d                   |   2 +-
 gas/testsuite/gas/i386/prefix.d                    |  44 +-
 gas/testsuite/gas/i386/relax-3.d                   |  10 +-
 gas/testsuite/gas/i386/relax-4.d                   |  10 +-
 gas/testsuite/gas/i386/relax-5.d                   |   2 +-
 gas/testsuite/gas/i386/rtm-intel.d                 |   6 +-
 gas/testsuite/gas/i386/rtm.d                       |   6 +-
 gas/testsuite/gas/i386/se1.d                       |   6 +-
 gas/testsuite/gas/i386/secidx.d                    |   2 +-
 gas/testsuite/gas/i386/secrel.d                    |   2 +-
 gas/testsuite/gas/i386/serialize.d                 |   2 +-
 gas/testsuite/gas/i386/size-5a.d                   |   2 +-
 gas/testsuite/gas/i386/smap.d                      |   4 +-
 gas/testsuite/gas/i386/smx.d                       |   2 +-
 gas/testsuite/gas/i386/snp.d                       |  12 +-
 gas/testsuite/gas/i386/snp64.d                     |  48 +--
 gas/testsuite/gas/i386/sse-noavx.d                 |   6 +-
 gas/testsuite/gas/i386/sse2-16bit.d                |   8 +-
 gas/testsuite/gas/i386/sse2.d                      |   8 +-
 gas/testsuite/gas/i386/sse3-intel.d                |  18 +-
 gas/testsuite/gas/i386/suffix-intel.d              |  32 +-
 gas/testsuite/gas/i386/suffix.d                    |  28 +-
 gas/testsuite/gas/i386/svme.d                      |  52 +--
 gas/testsuite/gas/i386/svme64.d                    |  52 +--
 gas/testsuite/gas/i386/tbm-intel.d                 |   2 +-
 gas/testsuite/gas/i386/tdx.d                       |   2 +-
 gas/testsuite/gas/i386/tlbsync.d                   |   2 +-
 gas/testsuite/gas/i386/tlsd.d                      |   4 +-
 gas/testsuite/gas/i386/tlsnopic.d                  |   4 +-
 gas/testsuite/gas/i386/tlspic.d                    |   4 +-
 gas/testsuite/gas/i386/tsxldtrk.d                  |   4 +-
 gas/testsuite/gas/i386/unique.d                    |  12 +-
 gas/testsuite/gas/i386/vmfunc.d                    |   2 +-
 gas/testsuite/gas/i386/vmx.d                       |  16 +-
 gas/testsuite/gas/i386/wbnoinvd-intel.d            |   2 +-
 gas/testsuite/gas/i386/wbnoinvd.d                  |   2 +-
 gas/testsuite/gas/i386/wrap32-text.d               |   2 +-
 gas/testsuite/gas/i386/x86-64-align-branch-1a.d    |   2 +-
 gas/testsuite/gas/i386/x86-64-align-branch-1b.d    |   2 +-
 gas/testsuite/gas/i386/x86-64-align-branch-1c.d    |   2 +-
 gas/testsuite/gas/i386/x86-64-align-branch-1d.d    |   2 +-
 gas/testsuite/gas/i386/x86-64-align-branch-1e.d    |   2 +-
 gas/testsuite/gas/i386/x86-64-align-branch-1f.d    |   2 +-
 gas/testsuite/gas/i386/x86-64-align-branch-1g.d    |   2 +-
 gas/testsuite/gas/i386/x86-64-align-branch-1h.d    |   2 +-
 gas/testsuite/gas/i386/x86-64-align-branch-1i.d    |   2 +-
 gas/testsuite/gas/i386/x86-64-align-branch-4a.d    |   2 +-
 gas/testsuite/gas/i386/x86-64-align-branch-4b.d    |   2 +-
 gas/testsuite/gas/i386/x86-64-align-branch-6.d     |   2 +-
 gas/testsuite/gas/i386/x86-64-amx-bad.d            |   4 +-
 gas/testsuite/gas/i386/x86-64-amx-intel.d          |   4 +-
 gas/testsuite/gas/i386/x86-64-amx.d                |   4 +-
 gas/testsuite/gas/i386/x86-64-arch-2.d             |  16 +-
 gas/testsuite/gas/i386/x86-64-arch-3.d             |  16 +-
 gas/testsuite/gas/i386/x86-64-arch-4.d             |  16 +-
 gas/testsuite/gas/i386/x86-64-avx-gather-intel.d   |   2 +-
 gas/testsuite/gas/i386/x86-64-avx-gather.d         |   2 +-
 gas/testsuite/gas/i386/x86-64-avx-intel.d          |   4 +-
 gas/testsuite/gas/i386/x86-64-avx-wig.d            |   4 +-
 gas/testsuite/gas/i386/x86-64-avx.d                |   4 +-
 gas/testsuite/gas/i386/x86-64-avx512f-nondef.d     |   2 +-
 gas/testsuite/gas/i386/x86-64-bmi-intel.d          |   2 +-
 gas/testsuite/gas/i386/x86-64-bmi.d                |   2 +-
 gas/testsuite/gas/i386/x86-64-bmi2-intel.d         |   2 +-
 gas/testsuite/gas/i386/x86-64-bmi2.d               |   2 +-
 gas/testsuite/gas/i386/x86-64-branch-2.d           |   2 +-
 gas/testsuite/gas/i386/x86-64-branch.d             |   4 +-
 gas/testsuite/gas/i386/x86-64-cbw-intel.d          |  24 +-
 gas/testsuite/gas/i386/x86-64-cbw.d                |  24 +-
 gas/testsuite/gas/i386/x86-64-cet-intel.d          |  16 +-
 gas/testsuite/gas/i386/x86-64-cet.d                |  16 +-
 gas/testsuite/gas/i386/x86-64-clzero.d             |   2 +-
 gas/testsuite/gas/i386/x86-64-disassem.d           | 442 ++++++++++-----------
 .../gas/i386/x86-64-fence-as-lock-add-no.d         |   6 +-
 gas/testsuite/gas/i386/x86-64-ifunc.d              |   4 +-
 gas/testsuite/gas/i386/x86-64-intel64.d            |   6 +-
 gas/testsuite/gas/i386/x86-64-invpcid-intel.d      |   2 +-
 gas/testsuite/gas/i386/x86-64-invpcid.d            |   2 +-
 gas/testsuite/gas/i386/x86-64-lfence-byte.d        |  24 +-
 gas/testsuite/gas/i386/x86-64-lfence-indbr-a.d     |   4 +-
 gas/testsuite/gas/i386/x86-64-lfence-indbr-b.d     |   4 +-
 gas/testsuite/gas/i386/x86-64-lfence-load.d        | 100 ++---
 gas/testsuite/gas/i386/x86-64-lfence-ret-a.d       |  18 +-
 gas/testsuite/gas/i386/x86-64-lfence-ret-b.d       |  18 +-
 gas/testsuite/gas/i386/x86-64-lfence-ret-c.d       |  18 +-
 gas/testsuite/gas/i386/x86-64-lfence-ret-d.d       |  18 +-
 gas/testsuite/gas/i386/x86-64-lfence-ret-e.d       |  18 +-
 gas/testsuite/gas/i386/x86-64-mpx-add-bnd-prefix.d |  10 +-
 gas/testsuite/gas/i386/x86-64-mpx.d                |   6 +-
 gas/testsuite/gas/i386/x86-64-opcode-inval-intel.d |  22 +-
 gas/testsuite/gas/i386/x86-64-opcode-inval.d       |  22 +-
 gas/testsuite/gas/i386/x86-64-opcode.d             |  38 +-
 gas/testsuite/gas/i386/x86-64-ospke.d              |   4 +-
 gas/testsuite/gas/i386/x86-64-pconfig-intel.d      |   2 +-
 gas/testsuite/gas/i386/x86-64-pconfig.d            |   2 +-
 gas/testsuite/gas/i386/x86-64-property-1.d         |   2 +-
 gas/testsuite/gas/i386/x86-64-relax-2.d            |  10 +-
 gas/testsuite/gas/i386/x86-64-relax-3.d            |  10 +-
 gas/testsuite/gas/i386/x86-64-relax-4.d            |   2 +-
 gas/testsuite/gas/i386/x86-64-rtm-intel.d          |   6 +-
 gas/testsuite/gas/i386/x86-64-rtm.d                |   6 +-
 gas/testsuite/gas/i386/x86-64-se1.d                |   6 +-
 gas/testsuite/gas/i386/x86-64-serialize.d          |   2 +-
 gas/testsuite/gas/i386/x86-64-smap.d               |   4 +-
 gas/testsuite/gas/i386/x86-64-sse-noavx.d          |   6 +-
 gas/testsuite/gas/i386/x86-64-sse3-intel.d         |  24 +-
 gas/testsuite/gas/i386/x86-64-suffix-intel.d       |  34 +-
 gas/testsuite/gas/i386/x86-64-suffix.d             |  30 +-
 gas/testsuite/gas/i386/x86-64-sysenter-amd.d       |  12 +-
 gas/testsuite/gas/i386/x86-64-sysenter-intel.d     |  12 +-
 gas/testsuite/gas/i386/x86-64-tbm-intel.d          |   2 +-
 gas/testsuite/gas/i386/x86-64-tdx.d                |   8 +-
 gas/testsuite/gas/i386/x86-64-tsxldtrk.d           |   4 +-
 gas/testsuite/gas/i386/x86-64-uintr.d              |   8 +-
 gas/testsuite/gas/i386/x86-64-unique.d             |  12 +-
 gas/testsuite/gas/i386/x86-64-vmfunc.d             |   2 +-
 gas/testsuite/gas/i386/x86-64-vmx.d                |   8 +-
 gas/testsuite/gas/i386/x86-64-wbnoinvd-intel.d     |   2 +-
 gas/testsuite/gas/i386/x86-64-wbnoinvd.d           |   2 +-
 gas/testsuite/gas/i386/x86-64-xsave-intel.d        |   4 +-
 gas/testsuite/gas/i386/x86-64-xsave.d              |   4 +-
 gas/testsuite/gas/i386/x86_64-intel.d              |  12 +-
 gas/testsuite/gas/i386/x86_64.d                    |  12 +-
 gas/testsuite/gas/i386/xsave-intel.d               |   4 +-
 gas/testsuite/gas/i386/xsave.d                     |   4 +-
 gdb/testsuite/gdb.base/step-over-exit.exp          |   2 +-
 gdb/testsuite/gdb.base/step-over-syscall.exp       |   2 +-
 ld/testsuite/ld-i386/align-branch-1.d              |   2 +-
 ld/testsuite/ld-i386/code16.d                      |   2 +-
 ld/testsuite/ld-i386/ibt-plt-1.d                   |  12 +-
 ld/testsuite/ld-i386/ibt-plt-2a.d                  |  12 +-
 ld/testsuite/ld-i386/ibt-plt-2c.d                  |  12 +-
 ld/testsuite/ld-i386/ibt-plt-3a.d                  |  12 +-
 ld/testsuite/ld-i386/ibt-plt-3c.d                  |  12 +-
 ld/testsuite/ld-i386/pr20244-2a.d                  |   4 +-
 ld/testsuite/ld-i386/pr20244-4a.d                  |   4 +-
 ld/testsuite/ld-i386/pr23930.d                     |   2 +-
 ld/testsuite/ld-i386/pr26018.d                     |   2 +-
 ld/testsuite/ld-i386/pr26263.d                     |   2 +-
 ld/testsuite/ld-i386/pr27193.dd                    |   2 +-
 ld/testsuite/ld-i386/protected2.d                  |   4 +-
 ld/testsuite/ld-i386/protected3.d                  |   2 +-
 ld/testsuite/ld-i386/protected7.d                  |   2 +-
 ld/testsuite/ld-i386/tlspie3b.d                    |   6 +-
 ld/testsuite/ld-i386/tlspie3c.d                    |   6 +-
 ld/testsuite/ld-ifunc/ifunc-2-i386-now.d           |   4 +-
 ld/testsuite/ld-ifunc/ifunc-2-local-i386-now.d     |   4 +-
 ld/testsuite/ld-ifunc/ifunc-2-local-x86-64-now.d   |   4 +-
 ld/testsuite/ld-ifunc/ifunc-2-x86-64-now.d         |   4 +-
 ld/testsuite/ld-ifunc/ifunc-21-i386.d              |   4 +-
 ld/testsuite/ld-ifunc/ifunc-21-x86-64.d            |   4 +-
 ld/testsuite/ld-ifunc/ifunc-22-i386.d              |   4 +-
 ld/testsuite/ld-ifunc/ifunc-22-x86-64.d            |   4 +-
 ld/testsuite/ld-x86-64/align-branch-1.d            |   2 +-
 ld/testsuite/ld-x86-64/bnd-ifunc-1-now.d           |   4 +-
 ld/testsuite/ld-x86-64/code16.d                    |   2 +-
 ld/testsuite/ld-x86-64/hidden2.d                   |   2 +-
 ld/testsuite/ld-x86-64/ibt-plt-1-x32.d             |   8 +-
 ld/testsuite/ld-x86-64/ibt-plt-1.d                 |   8 +-
 ld/testsuite/ld-x86-64/ibt-plt-2a-x32.d            |   8 +-
 ld/testsuite/ld-x86-64/ibt-plt-2a.d                |   8 +-
 ld/testsuite/ld-x86-64/ibt-plt-2c-x32.d            |   8 +-
 ld/testsuite/ld-x86-64/ibt-plt-2c.d                |   8 +-
 ld/testsuite/ld-x86-64/ibt-plt-3a-x32.d            |   8 +-
 ld/testsuite/ld-x86-64/ibt-plt-3a.d                |   8 +-
 ld/testsuite/ld-x86-64/ibt-plt-3c-x32.d            |   8 +-
 ld/testsuite/ld-x86-64/ibt-plt-3c.d                |   8 +-
 ld/testsuite/ld-x86-64/pe-x86-64-1.od              |   6 +-
 ld/testsuite/ld-x86-64/pe-x86-64-2.od              |   6 +-
 ld/testsuite/ld-x86-64/pe-x86-64-3.od              |   6 +-
 ld/testsuite/ld-x86-64/pe-x86-64-4.od              |   6 +-
 ld/testsuite/ld-x86-64/pe-x86-64-5.od              |   8 +-
 ld/testsuite/ld-x86-64/pe-x86-64-6.od              |  14 +-
 ld/testsuite/ld-x86-64/plt-main-ibt-x32.dd         |   2 +-
 ld/testsuite/ld-x86-64/plt-main-ibt.dd             |   2 +-
 ld/testsuite/ld-x86-64/pr18160.d                   |   2 +-
 ld/testsuite/ld-x86-64/pr20253-1b.d                |   4 +-
 ld/testsuite/ld-x86-64/pr20253-1d.d                |   4 +-
 ld/testsuite/ld-x86-64/pr20253-1f.d                |   4 +-
 ld/testsuite/ld-x86-64/pr20253-1h.d                |   4 +-
 ld/testsuite/ld-x86-64/pr20253-1j.d                |   4 +-
 ld/testsuite/ld-x86-64/pr20253-1l.d                |   4 +-
 ld/testsuite/ld-x86-64/pr23930-x32.d               |   2 +-
 ld/testsuite/ld-x86-64/pr23930.d                   |   2 +-
 ld/testsuite/ld-x86-64/pr26018.d                   |   2 +-
 ld/testsuite/ld-x86-64/pr26263.d                   |   2 +-
 ld/testsuite/ld-x86-64/pr27016a.d                  |   2 +-
 ld/testsuite/ld-x86-64/pr27016b.d                  |   2 +-
 ld/testsuite/ld-x86-64/protected2.d                |   4 +-
 ld/testsuite/ld-x86-64/protected3.d                |   2 +-
 ld/testsuite/ld-x86-64/protected8.d                |   2 +-
 ld/testsuite/ld-x86-64/tlsdesc.pd                  |   2 +-
 ld/testsuite/ld-x86-64/tlspie2b.d                  |   4 +-
 ld/testsuite/ld-x86-64/tlspie2c.d                  |   4 +-
 opcodes/i386-dis.c                                 |  27 +-
 273 files changed, 1854 insertions(+), 1837 deletions(-)

diff --git a/gas/testsuite/gas/i386/387.d b/gas/testsuite/gas/i386/387.d
index 145381d59a9..7c0f4b9de6e 100644
--- a/gas/testsuite/gas/i386/387.d
+++ b/gas/testsuite/gas/i386/387.d
@@ -7,11 +7,11 @@
 Disassembly of section .text:
 
 0+ <_387>:
-[ 	]*[0-9a-f]+:	d9 ff[ 	]+fcos[ 	]*
-[ 	]*[0-9a-f]+:	d9 f5[ 	]+fprem1[ 	]*
-[ 	]*[0-9a-f]+:	d9 fe[ 	]+fsin[ 	]*
-[ 	]*[0-9a-f]+:	d9 fb[ 	]+fsincos[ 	]*
+[ 	]*[0-9a-f]+:	d9 ff[ 	]+fcos
+[ 	]*[0-9a-f]+:	d9 f5[ 	]+fprem1
+[ 	]*[0-9a-f]+:	d9 fe[ 	]+fsin
+[ 	]*[0-9a-f]+:	d9 fb[ 	]+fsincos
 [ 	]*[0-9a-f]+:	dd e1[ 	]+fucom[ 	]+%st\(1\)
 [ 	]*[0-9a-f]+:	dd e9[ 	]+fucomp[ 	]+%st\(1\)
-[ 	]*[0-9a-f]+:	da e9[ 	]+fucompp[ 	]*
+[ 	]*[0-9a-f]+:	da e9[ 	]+fucompp
 #pass
diff --git a/gas/testsuite/gas/i386/adx-intel.d b/gas/testsuite/gas/i386/adx-intel.d
index 1de1e8f7634..cd63afaf6e7 100644
--- a/gas/testsuite/gas/i386/adx-intel.d
+++ b/gas/testsuite/gas/i386/adx-intel.d
@@ -31,11 +31,11 @@ Disassembly of section .text:
 [       ]*[a-f0-9]+:	67 66 0f 38 f6 42 24 	adcx   eax,DWORD PTR \[bp\+si\+0x24\]
 [       ]*[a-f0-9]+:	66 0f 38 f6 d1       	adcx   edx,ecx
 [       ]*[a-f0-9]+:	67 66 0f 38 f6 54 f4 	adcx   edx,DWORD PTR \[si-0xc\]
-[       ]*[a-f0-9]+:	f4                   	hlt *
+[       ]*[a-f0-9]+:	f4                   	hlt
 [       ]*[a-f0-9]+:	67 66 0f 38 f6 00    	adcx   eax,DWORD PTR \[bx\+si\]
 [       ]*[a-f0-9]+:	67 f3 0f 38 f6 42 24 	adox   eax,DWORD PTR \[bp\+si\+0x24\]
 [       ]*[a-f0-9]+:	f3 0f 38 f6 d1       	adox   edx,ecx
 [       ]*[a-f0-9]+:	67 f3 0f 38 f6 54 f4 	adox   edx,DWORD PTR \[si-0xc\]
-[       ]*[a-f0-9]+:	f4                   	hlt *
+[       ]*[a-f0-9]+:	f4                   	hlt
 [       ]*[a-f0-9]+:	67 f3 0f 38 f6 00    	adox   eax,DWORD PTR \[bx\+si\]
 #pass
diff --git a/gas/testsuite/gas/i386/adx.d b/gas/testsuite/gas/i386/adx.d
index 2c54be37d4e..3de1e8bfdc1 100644
--- a/gas/testsuite/gas/i386/adx.d
+++ b/gas/testsuite/gas/i386/adx.d
@@ -30,11 +30,11 @@ Disassembly of section .text:
 [       ]*[a-f0-9]+:	67 66 0f 38 f6 42 24 	adcx   0x24\(%bp,%si\),%eax
 [       ]*[a-f0-9]+:	66 0f 38 f6 d1       	adcx   %ecx,%edx
 [       ]*[a-f0-9]+:	67 66 0f 38 f6 54 f4 	adcx   -0xc\(%si\),%edx
-[       ]*[a-f0-9]+:	f4                   	hlt *
+[       ]*[a-f0-9]+:	f4                   	hlt
 [       ]*[a-f0-9]+:	67 66 0f 38 f6 00    	adcx   \(%bx,%si\),%eax
 [       ]*[a-f0-9]+:	67 f3 0f 38 f6 42 24 	adox   0x24\(%bp,%si\),%eax
 [       ]*[a-f0-9]+:	f3 0f 38 f6 d1       	adox   %ecx,%edx
 [       ]*[a-f0-9]+:	67 f3 0f 38 f6 54 f4 	adox   -0xc\(%si\),%edx
-[       ]*[a-f0-9]+:	f4                   	hlt *
+[       ]*[a-f0-9]+:	f4                   	hlt
 [       ]*[a-f0-9]+:	67 f3 0f 38 f6 00    	adox   \(%bx,%si\),%eax
 #pass
diff --git a/gas/testsuite/gas/i386/align-branch-4a.d b/gas/testsuite/gas/i386/align-branch-4a.d
index 2b1e0b1f451..4c46c851a6d 100644
--- a/gas/testsuite/gas/i386/align-branch-4a.d
+++ b/gas/testsuite/gas/i386/align-branch-4a.d
@@ -20,7 +20,7 @@ Disassembly of section .text:
   16:	89 75 f4             	mov    %esi,-0xc\(%ebp\)
   19:	89 75 f4             	mov    %esi,-0xc\(%ebp\)
   1c:	89 75 f4             	mov    %esi,-0xc\(%ebp\)
-  1f:	c3                   	ret    
+  1f:	c3                   	ret
   20:	55                   	push   %ebp
   21:	55                   	push   %ebp
   22:	64 a3 01 00 00 00    	mov    %eax,%fs:0x1
diff --git a/gas/testsuite/gas/i386/align-branch-4b.d b/gas/testsuite/gas/i386/align-branch-4b.d
index c7690d36aaa..6745c5a3b28 100644
--- a/gas/testsuite/gas/i386/align-branch-4b.d
+++ b/gas/testsuite/gas/i386/align-branch-4b.d
@@ -20,7 +20,7 @@ Disassembly of section .text:
   17:	89 75 f4             	mov    %esi,-0xc\(%ebp\)
   1a:	89 75 f4             	mov    %esi,-0xc\(%ebp\)
   1d:	89 75 f4             	mov    %esi,-0xc\(%ebp\)
-  20:	c3                   	ret    
+  20:	c3                   	ret
   21:	3e 3e 3e 55          	ds ds ds push %ebp
   25:	55                   	push   %ebp
   26:	64 a3 01 00 00 00    	mov    %eax,%fs:0x1
diff --git a/gas/testsuite/gas/i386/align-branch-6.d b/gas/testsuite/gas/i386/align-branch-6.d
index 29e27878f45..46e245db033 100644
--- a/gas/testsuite/gas/i386/align-branch-6.d
+++ b/gas/testsuite/gas/i386/align-branch-6.d
@@ -18,5 +18,5 @@ Disassembly of section .text:
  +[a-f0-9]+:	8d b4 26 00 00 00 00 	lea    0x0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	8d 74 26 00          	lea    0x0\(%esi,%eiz,1\),%esi
  +[a-f0-9]+:	f2 73 bf             	bnd jae 0 <_start>
- +[a-f0-9]+:	c3                   	ret    
+ +[a-f0-9]+:	c3                   	ret
 #pass
diff --git a/gas/testsuite/gas/i386/amd.d b/gas/testsuite/gas/i386/amd.d
index a164c06d76b..0ccfcf1786d 100644
--- a/gas/testsuite/gas/i386/amd.d
+++ b/gas/testsuite/gas/i386/amd.d
@@ -8,7 +8,7 @@ Disassembly of section .text:
 0+ <foo>:
 [ 	]*[a-f0-9]+:	0f 0d 03             	prefetch \(%ebx\)
 [ 	]*[a-f0-9]+:	0f 0d 0c 75 00 10 00 00 	prefetchw 0x1000\(,%esi,2\)
-[ 	]*[a-f0-9]+:	0f 0e                	femms  
+[ 	]*[a-f0-9]+:	0f 0e                	femms
 [ 	]*[a-f0-9]+:	0f 0f 00 bf          	pavgusb \(%eax\),%mm0
 [ 	]*[a-f0-9]+:	0f 0f 48 02 1d       	pf2id  0x2\(%eax\),%mm1
 [ 	]*[a-f0-9]+:	0f 0f 90 00 01 00 00 ae 	pfacc  0x100\(%eax\),%mm2
@@ -28,11 +28,11 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	0f 0f c5 aa          	pfsubr %mm5,%mm0
 [ 	]*[a-f0-9]+:	0f 0f ce 0d          	pi2fd  %mm6,%mm1
 [ 	]*[a-f0-9]+:	0f 0f d7 b7          	pmulhrw %mm7,%mm2
-[ 	]*[a-f0-9]+:	0f 05                	syscall 
-[ 	]*[a-f0-9]+:	0f 07                	sysret 
-[ 	]*[a-f0-9]+:	0f 01 f9             	rdtscp 
-[ 	]*[a-f0-9]+:	2e 0f                	\(bad\)  
+[ 	]*[a-f0-9]+:	0f 05                	syscall
+[ 	]*[a-f0-9]+:	0f 07                	sysret
+[ 	]*[a-f0-9]+:	0f 01 f9             	rdtscp
+[ 	]*[a-f0-9]+:	2e 0f                	\(bad\)
 [ 	]*[a-f0-9]+:	0f 54 c3             	andps  %xmm3,%xmm0
 [ 	]*[a-f0-9]+:	07                   	pop    %es
-[ 	]*[a-f0-9]+:	c3                   	ret    
+[ 	]*[a-f0-9]+:	c3                   	ret
 #pass
diff --git a/gas/testsuite/gas/i386/arch-10.d b/gas/testsuite/gas/i386/arch-10.d
index f97698ea64d..d89a31e98f6 100644
--- a/gas/testsuite/gas/i386/arch-10.d
+++ b/gas/testsuite/gas/i386/arch-10.d
@@ -9,7 +9,7 @@ Disassembly of section .text:
 0+ <.text>:
 [ 	]*[a-f0-9]+:	0f 44 d8             	cmove  %eax,%ebx
 [ 	]*[a-f0-9]+:	0f ae 38             	clflush \(%eax\)
-[ 	]*[a-f0-9]+:	0f 05                	syscall 
+[ 	]*[a-f0-9]+:	0f 05                	syscall
 [ 	]*[a-f0-9]+:	0f fc dc             	paddb  %mm4,%mm3
 [ 	]*[a-f0-9]+:	f3 0f 58 dc          	addss  %xmm4,%xmm3
 [ 	]*[a-f0-9]+:	f2 0f 58 dc          	addsd  %xmm4,%xmm3
@@ -17,10 +17,10 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	66 0f 38 01 dc       	phaddw %xmm4,%xmm3
 [ 	]*[a-f0-9]+:	66 0f 38 41 d9       	phminposuw %xmm1,%xmm3
 [ 	]*[a-f0-9]+:	f2 0f 38 f1 d9       	crc32  %ecx,%ebx
-[ 	]*[a-f0-9]+:	c5 fc 77             	vzeroall 
-[ 	]*[a-f0-9]+:	0f 01 c4             	vmxoff 
-[ 	]*[a-f0-9]+:	0f 37                	getsec 
-[ 	]*[a-f0-9]+:	0f 01 d0             	xgetbv 
+[ 	]*[a-f0-9]+:	c5 fc 77             	vzeroall
+[ 	]*[a-f0-9]+:	0f 01 c4             	vmxoff
+[ 	]*[a-f0-9]+:	0f 37                	getsec
+[ 	]*[a-f0-9]+:	0f 01 d0             	xgetbv
 [ 	]*[a-f0-9]+:	0f ae 31             	xsaveopt \(%ecx\)
 [ 	]*[a-f0-9]+:	66 0f 38 dc 01       	aesenc \(%ecx\),%xmm0
 [ 	]*[a-f0-9]+:	66 0f 3a 44 c1 08    	pclmulqdq \$0x8,%xmm1,%xmm0
@@ -29,12 +29,12 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	c4 e2 c9 98 d4       	vfmadd132pd %xmm4,%xmm6,%xmm2
 [ 	]*[a-f0-9]+:	0f 38 f0 19          	movbe  \(%ecx\),%ebx
 [ 	]*[a-f0-9]+:	66 0f 38 80 19       	invept \(%ecx\),%ebx
-[ 	]*[a-f0-9]+:	0f 01 f9             	rdtscp 
+[ 	]*[a-f0-9]+:	0f 01 f9             	rdtscp
 [ 	]*[a-f0-9]+:	0f 0d 0c 75 00 10 00 00 	prefetchw 0x1000\(,%esi,2\)
 [ 	]*[a-f0-9]+:	f2 0f 79 ca          	insertq %xmm2,%xmm1
-[ 	]*[a-f0-9]+:	0f 01 da             	vmload 
+[ 	]*[a-f0-9]+:	0f 01 da             	vmload
 [ 	]*[a-f0-9]+:	f3 0f bd d9          	lzcnt  %ecx,%ebx
-[ 	]*[a-f0-9]+:	0f a7 c0             	xstore-rng 
+[ 	]*[a-f0-9]+:	0f a7 c0             	xstore-rng
 [ 	]*[a-f0-9]+:	0f 1f 00             	nopl   \(%eax\)
 [ 	]*[a-f0-9]+:	c4 e2 60 f3 c9       	blsr   %ecx,%ebx
 [ 	]*[a-f0-9]+:	8f e9 60 01 c9       	blcfill %ecx,%ebx
diff --git a/gas/testsuite/gas/i386/arch-13.d b/gas/testsuite/gas/i386/arch-13.d
index 7a1278f8637..17a5f3fd83c 100644
--- a/gas/testsuite/gas/i386/arch-13.d
+++ b/gas/testsuite/gas/i386/arch-13.d
@@ -7,14 +7,14 @@
 Disassembly of section .text:
 
 0+ <.text>:
-[ 	]*[a-f0-9]+:	0f 01 ca             	clac   
-[ 	]*[a-f0-9]+:	0f 01 cb             	stac   
+[ 	]*[a-f0-9]+:	0f 01 ca             	clac
+[ 	]*[a-f0-9]+:	0f 01 cb             	stac
 [ 	]*[a-f0-9]+:	66 0f 38 f6 ca       	adcx   %edx,%ecx
 [ 	]*[a-f0-9]+:	f3 0f 38 f6 ca       	adox   %edx,%ecx
 [ 	]*[a-f0-9]+:	0f c7 f8             	rdseed %eax
-[ 	]*[a-f0-9]+:	0f 01 fc             	clzero[ 	]*
-[ 	]*[a-f0-9]+:	0f 01 fc             	clzero[ 	]*
-[ 	]*[a-f0-9]+:	67 0f 01 fc          	addr16 clzero[ 	]*
+[ 	]*[a-f0-9]+:	0f 01 fc             	clzero
+[ 	]*[a-f0-9]+:	0f 01 fc             	clzero
+[ 	]*[a-f0-9]+:	67 0f 01 fc          	addr16 clzero
 [ 	]*[a-f0-9]+:	0f c7 21             	xsavec \(%ecx\)
 [ 	]*[a-f0-9]+:	0f c7 29             	xsaves \(%ecx\)
 [ 	]*[a-f0-9]+:	66 0f ae 39          	clflushopt \(%ecx\)
@@ -25,10 +25,10 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	0f 01 fb             	mwaitx %eax,%ecx,%ebx
 [ 	]*[a-f0-9]+:[ 	]*66 0f ae 31[ 	]*clwb   \(%ecx\)
 [ 	]*[a-f0-9]+:[ 	]*66 0f ae b4 f4 c0 1d fe ff[ 	]*clwb   -0x1e240\(%esp,%esi,8\)
-[ 	]*[a-f0-9]+:[ 	]*f3 0f 01 fa[ 	]*mcommit[ 	]*
+[ 	]*[a-f0-9]+:[ 	]*f3 0f 01 fa[ 	]*mcommit
 [ 	]*[a-f0-9]+:[ 	]*f3 0f c7 f8[ 	]*rdpid  %eax
-[ 	]*[a-f0-9]+:[ 	]*0f 01 fd[ 	]*rdpru[ 	]*
-[ 	]*[a-f0-9]+:[ 	]*f3 0f 01 d9[ 	]*vmgexit[ 	]*
-[ 	]*[a-f0-9]+:[ 	]*f2 0f 01 d9[ 	]*vmgexit[ 	]*
-[ 	]*[a-f0-9]+:[ 	]*f3 0f 09[ 	]*wbnoinvd[ 	]*
+[ 	]*[a-f0-9]+:[ 	]*0f 01 fd[ 	]*rdpru
+[ 	]*[a-f0-9]+:[ 	]*f3 0f 01 d9[ 	]*vmgexit
+[ 	]*[a-f0-9]+:[ 	]*f2 0f 01 d9[ 	]*vmgexit
+[ 	]*[a-f0-9]+:[ 	]*f3 0f 09[ 	]*wbnoinvd
 #pass
diff --git a/gas/testsuite/gas/i386/arch-14.d b/gas/testsuite/gas/i386/arch-14.d
index 55edf2795d4..2d269af3950 100644
--- a/gas/testsuite/gas/i386/arch-14.d
+++ b/gas/testsuite/gas/i386/arch-14.d
@@ -6,9 +6,9 @@
 Disassembly of section .text:
 
 0+ <.text>:
-[ 	]*[0-9a-f]+:[ 	]+0f 01 fe[ 	]+invlpgb[ 	]*
-[ 	]*[0-9a-f]+:[ 	]+0f 01 ff[ 	]+tlbsync[ 	]*
-[ 	]*[a-f0-9]+:[ 	]*f2 0f 01 ff[ 	]+pvalidate[ 	]*
-[ 	]*[a-f0-9]+:[ 	]*0f 01 ee[ 	]+rdpkru[ 	]*
-[ 	]*[a-f0-9]+:[ 	]*0f 01 ef[ 	]+wrpkru[ 	]*
+[ 	]*[0-9a-f]+:[ 	]+0f 01 fe[ 	]+invlpgb
+[ 	]*[0-9a-f]+:[ 	]+0f 01 ff[ 	]+tlbsync
+[ 	]*[a-f0-9]+:[ 	]*f2 0f 01 ff[ 	]+pvalidate
+[ 	]*[a-f0-9]+:[ 	]*0f 01 ee[ 	]+rdpkru
+[ 	]*[a-f0-9]+:[ 	]*0f 01 ef[ 	]+wrpkru
 #pass
diff --git a/gas/testsuite/gas/i386/arch-4.d b/gas/testsuite/gas/i386/arch-4.d
index dc2c05dfdcd..54fde1584db 100644
--- a/gas/testsuite/gas/i386/arch-4.d
+++ b/gas/testsuite/gas/i386/arch-4.d
@@ -8,7 +8,7 @@ Disassembly of section .text:
 0+ <.text>:
 [ 	]*[a-f0-9]+:	0f ff 07 [ 	]*ud0    \(%edi\),%eax
 [ 	]*[a-f0-9]+:	0f b9 07 [ 	]*ud1    \(%edi\),%eax
-[ 	]*[a-f0-9]+:	0f 0b                	ud2    
-[ 	]*[a-f0-9]+:	0f 0b                	ud2    
+[ 	]*[a-f0-9]+:	0f 0b                	ud2
+[ 	]*[a-f0-9]+:	0f 0b                	ud2
 [ 	]*[a-f0-9]+:	0f b9 07 [ 	]*ud1    \(%edi\),%eax
 #pass
diff --git a/gas/testsuite/gas/i386/arch-9.d b/gas/testsuite/gas/i386/arch-9.d
index 6736af8eb06..858dcf2cf85 100644
--- a/gas/testsuite/gas/i386/arch-9.d
+++ b/gas/testsuite/gas/i386/arch-9.d
@@ -6,5 +6,5 @@
 Disassembly of section .text:
 
 0+ <.text>:
-[ 	]*[a-f0-9]+:	0f a7 c0             	xstore-rng 
+[ 	]*[a-f0-9]+:	0f a7 c0             	xstore-rng
 #pass
diff --git a/gas/testsuite/gas/i386/avx-16bit.d b/gas/testsuite/gas/i386/avx-16bit.d
index c1c6929e1d6..0c306bff266 100644
--- a/gas/testsuite/gas/i386/avx-16bit.d
+++ b/gas/testsuite/gas/i386/avx-16bit.d
@@ -7,8 +7,8 @@
 Disassembly of section .text:
 
 0+ <_start>:
-[ 	]*[a-f0-9]+:	c5 fc 77             	vzeroall 
-[ 	]*[a-f0-9]+:	c5 f8 77             	vzeroupper 
+[ 	]*[a-f0-9]+:	c5 fc 77             	vzeroall
+[ 	]*[a-f0-9]+:	c5 f8 77             	vzeroupper
 [ 	]*[a-f0-9]+:	67 c5 f8 ae 11       	vldmxcsr \(%ecx\)
 [ 	]*[a-f0-9]+:	67 c5 f8 ae 19       	vstmxcsr \(%ecx\)
 [ 	]*[a-f0-9]+:	67 c4 e2 5d 2d 31    	vmaskmovpd \(%ecx\),%ymm4,%ymm6
diff --git a/gas/testsuite/gas/i386/avx-gather-intel.d b/gas/testsuite/gas/i386/avx-gather-intel.d
index 7493d52c324..e4f0d21b24e 100644
--- a/gas/testsuite/gas/i386/avx-gather-intel.d
+++ b/gas/testsuite/gas/i386/avx-gather-intel.d
@@ -1,4 +1,4 @@
-#as: 
+#as:
 #objdump: -dwMintel
 #name: i386 AVX GATHER insns (Intel disassembly)
 #source: avx-gather.s
diff --git a/gas/testsuite/gas/i386/avx-gather.d b/gas/testsuite/gas/i386/avx-gather.d
index 8ad267f50ba..a2552537c35 100644
--- a/gas/testsuite/gas/i386/avx-gather.d
+++ b/gas/testsuite/gas/i386/avx-gather.d
@@ -1,4 +1,4 @@
-#as: 
+#as:
 #objdump: -dw
 #name: i386 AVX GATHER insns
 
diff --git a/gas/testsuite/gas/i386/avx-intel.d b/gas/testsuite/gas/i386/avx-intel.d
index 85a329b0daf..78162277420 100644
--- a/gas/testsuite/gas/i386/avx-intel.d
+++ b/gas/testsuite/gas/i386/avx-intel.d
@@ -7,8 +7,8 @@
 Disassembly of section .text:
 
 0+ <_start>:
-[ 	]*[a-f0-9]+:	c5 fc 77             	vzeroall 
-[ 	]*[a-f0-9]+:	c5 f8 77             	vzeroupper 
+[ 	]*[a-f0-9]+:	c5 fc 77             	vzeroall
+[ 	]*[a-f0-9]+:	c5 f8 77             	vzeroupper
 [ 	]*[a-f0-9]+:	c5 f8 ae 11          	vldmxcsr DWORD PTR \[ecx\]
 [ 	]*[a-f0-9]+:	c5 f8 ae 19          	vstmxcsr DWORD PTR \[ecx\]
 [ 	]*[a-f0-9]+:	c4 e2 5d 2d 31       	vmaskmovpd ymm6,ymm4,YMMWORD PTR \[ecx\]
diff --git a/gas/testsuite/gas/i386/avx-wig.d b/gas/testsuite/gas/i386/avx-wig.d
index 7a8f9473446..9cab639da89 100644
--- a/gas/testsuite/gas/i386/avx-wig.d
+++ b/gas/testsuite/gas/i386/avx-wig.d
@@ -316,6 +316,6 @@ Disassembly of section .text:
  +[a-f0-9]+:	c4 e1 cc 14 d4       	vunpcklps %ymm4,%ymm6,%ymm2
  +[a-f0-9]+:	c4 e1 cd 57 d4       	vxorpd %ymm4,%ymm6,%ymm2
  +[a-f0-9]+:	c4 e1 cc 57 d4       	vxorps %ymm4,%ymm6,%ymm2
- +[a-f0-9]+:	c4 e1 fc 77          	vzeroall 
- +[a-f0-9]+:	c4 e1 f8 77          	vzeroupper 
+ +[a-f0-9]+:	c4 e1 fc 77          	vzeroall
+ +[a-f0-9]+:	c4 e1 f8 77          	vzeroupper
 #pass
diff --git a/gas/testsuite/gas/i386/avx.d b/gas/testsuite/gas/i386/avx.d
index 4741c459867..9bbfbbaa962 100644
--- a/gas/testsuite/gas/i386/avx.d
+++ b/gas/testsuite/gas/i386/avx.d
@@ -6,8 +6,8 @@
 Disassembly of section .text:
 
 0+ <_start>:
-[ 	]*[a-f0-9]+:	c5 fc 77             	vzeroall 
-[ 	]*[a-f0-9]+:	c5 f8 77             	vzeroupper 
+[ 	]*[a-f0-9]+:	c5 fc 77             	vzeroall
+[ 	]*[a-f0-9]+:	c5 f8 77             	vzeroupper
 [ 	]*[a-f0-9]+:	c5 f8 ae 11          	vldmxcsr \(%ecx\)
 [ 	]*[a-f0-9]+:	c5 f8 ae 19          	vstmxcsr \(%ecx\)
 [ 	]*[a-f0-9]+:	c4 e2 5d 2d 31       	vmaskmovpd \(%ecx\),%ymm4,%ymm6
diff --git a/gas/testsuite/gas/i386/avx512f-nondef.d b/gas/testsuite/gas/i386/avx512f-nondef.d
index 07ffe60e177..a062fe335bc 100644
--- a/gas/testsuite/gas/i386/avx512f-nondef.d
+++ b/gas/testsuite/gas/i386/avx512f-nondef.d
@@ -1,4 +1,4 @@
-#as: 
+#as:
 #objdump: -dw
 #name: i386 AVX512F insns with nondefault values in ignored / reserved bits
 
@@ -16,7 +16,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	62 f2 7e 48 31 72 7f 	vpmovdb %zmm6,0x7f0\(%edx\)
 [ 	]*[a-f0-9]+:	62 f2 7e 58 31 72 7f 	vpmovdb %zmm6,0x7f0\(%edx\)\{bad\}
 [ 	]*[a-f0-9]+:	62 f1 7c 88 58       	\(bad\)
-[ 	]*[a-f0-9]+:	c3                   	ret *
+[ 	]*[a-f0-9]+:	c3                   	ret
 [ 	]*[a-f0-9]+:	62 f2 7d 4f 92 01    	vgatherdps \(bad\),%zmm0\{%k7\}
 [ 	]*[a-f0-9]+:	67 62 f2 7d 4f 92 01 	addr16 vgatherdps \(bad\),%zmm0\{%k7\}
 [ 	]*[a-f0-9]+:	62 f2 7d cf 92 04 08 	vgatherdps \(%eax,%zmm1(,1)?\),%zmm0\{%k7\}\{z\}/\(bad\)
diff --git a/gas/testsuite/gas/i386/bmi-intel.d b/gas/testsuite/gas/i386/bmi-intel.d
index 38eb5b4294f..baaa1ce8be9 100644
--- a/gas/testsuite/gas/i386/bmi-intel.d
+++ b/gas/testsuite/gas/i386/bmi-intel.d
@@ -1,4 +1,4 @@
-#as: 
+#as:
 #objdump: -dwMintel
 #name: i386 BMI insns (Intel disassembly)
 #source: bmi.s
diff --git a/gas/testsuite/gas/i386/bmi.d b/gas/testsuite/gas/i386/bmi.d
index 1cded8b739f..1f468d34658 100644
--- a/gas/testsuite/gas/i386/bmi.d
+++ b/gas/testsuite/gas/i386/bmi.d
@@ -1,4 +1,4 @@
-#as: 
+#as:
 #objdump: -dw
 #name: i386 BMI insns
 
diff --git a/gas/testsuite/gas/i386/bmi2-intel.d b/gas/testsuite/gas/i386/bmi2-intel.d
index fa12a0ccff0..438443b82f4 100644
--- a/gas/testsuite/gas/i386/bmi2-intel.d
+++ b/gas/testsuite/gas/i386/bmi2-intel.d
@@ -1,4 +1,4 @@
-#as: 
+#as:
 #objdump: -dwMintel
 #name: i386 BMI2 insns (Intel disassembly)
 #source: bmi2.s
diff --git a/gas/testsuite/gas/i386/bmi2.d b/gas/testsuite/gas/i386/bmi2.d
index d52e4d1e2ae..9f59ca35840 100644
--- a/gas/testsuite/gas/i386/bmi2.d
+++ b/gas/testsuite/gas/i386/bmi2.d
@@ -1,4 +1,4 @@
-#as: 
+#as:
 #objdump: -dw
 #name: i386 BMI2 insns
 
diff --git a/gas/testsuite/gas/i386/cet-intel.d b/gas/testsuite/gas/i386/cet-intel.d
index 787d6d218ba..27e6737c6aa 100644
--- a/gas/testsuite/gas/i386/cet-intel.d
+++ b/gas/testsuite/gas/i386/cet-intel.d
@@ -10,40 +10,40 @@ Disassembly of section .text:
 0+ <_start>:
  +[a-f0-9]+:	f3 0f ae e9          	incsspd ecx
  +[a-f0-9]+:	f3 0f 1e c9          	rdsspd ecx
- +[a-f0-9]+:	f3 0f 01 ea          	saveprevssp 
+ +[a-f0-9]+:	f3 0f 01 ea          	saveprevssp
  +[a-f0-9]+:	f3 0f 01 29          	rstorssp QWORD PTR \[ecx\]
  +[a-f0-9]+:	0f 38 f6 04 02       	wrssd  \[edx\+eax\*1\],eax
  +[a-f0-9]+:	66 0f 38 f5 14 2f    	wrussd \[edi\+ebp\*1\],edx
- +[a-f0-9]+:	f3 0f 01 e8          	setssbsy 
+ +[a-f0-9]+:	f3 0f 01 e8          	setssbsy
  +[a-f0-9]+:	f3 0f ae 34 04       	clrssbsy QWORD PTR \[esp\+eax\*1\]
- +[a-f0-9]+:	f3 0f 1e fa          	endbr64 
- +[a-f0-9]+:	f3 0f 1e fb          	endbr32 
+ +[a-f0-9]+:	f3 0f 1e fa          	endbr64
+ +[a-f0-9]+:	f3 0f 1e fb          	endbr32
  +[a-f0-9]+:	f3 0f ae e9          	incsspd ecx
  +[a-f0-9]+:	f3 0f 1e c9          	rdsspd ecx
- +[a-f0-9]+:	f3 0f 01 ea          	saveprevssp 
+ +[a-f0-9]+:	f3 0f 01 ea          	saveprevssp
  +[a-f0-9]+:	f3 0f 01 6c 01 90    	rstorssp QWORD PTR \[ecx\+eax\*1-0x70\]
  +[a-f0-9]+:	0f 38 f6 02          	wrssd  \[edx\],eax
  +[a-f0-9]+:	0f 38 f6 10          	wrssd  \[eax\],edx
  +[a-f0-9]+:	66 0f 38 f5 14 2f    	wrussd \[edi\+ebp\*1\],edx
  +[a-f0-9]+:	66 0f 38 f5 3c 0e    	wrussd \[esi\+ecx\*1\],edi
- +[a-f0-9]+:	f3 0f 01 e8          	setssbsy 
+ +[a-f0-9]+:	f3 0f 01 e8          	setssbsy
  +[a-f0-9]+:	f3 0f ae 34 44       	clrssbsy QWORD PTR \[esp\+eax\*2\]
- +[a-f0-9]+:	f3 0f 1e fa          	endbr64 
- +[a-f0-9]+:	f3 0f 1e fb          	endbr32 
+ +[a-f0-9]+:	f3 0f 1e fa          	endbr64
+ +[a-f0-9]+:	f3 0f 1e fb          	endbr32
  +[a-f0-9]+:	f3 0f ae e9          	incsspd ecx
  +[a-f0-9]+:	f3 0f 1e c9          	rdsspd ecx
- +[a-f0-9]+:	f3 0f 01 ea          	saveprevssp *
+ +[a-f0-9]+:	f3 0f 01 ea          	saveprevssp
  +[a-f0-9]+:	67 f3 0f 01 6c 01    	rstorssp QWORD PTR \[si\+0x1\]
- +[a-f0-9]+:	90                   	nop *
+ +[a-f0-9]+:	90                   	nop
  +[a-f0-9]+:	67 0f 38 f6 02       	wrssd  \[bp\+si\],eax
  +[a-f0-9]+:	67 0f 38 f6 10       	wrssd  \[bx\+si\],edx
  +[a-f0-9]+:	67 66 0f 38 f5 14    	wrussd \[si\],edx
- +[a-f0-9]+:	2f                   	das *
+ +[a-f0-9]+:	2f                   	das
  +[a-f0-9]+:	67 66 0f 38 f5 3c    	wrussd \[si\],edi
  +[a-f0-9]+:	0e                   	push   cs
- +[a-f0-9]+:	f3 0f 01 e8          	setssbsy *
+ +[a-f0-9]+:	f3 0f 01 e8          	setssbsy
  +[a-f0-9]+:	67 f3 0f ae 34       	clrssbsy QWORD PTR \[si\]
  +[a-f0-9]+:	44                   	inc    esp
- +[a-f0-9]+:	f3 0f 1e fa          	endbr64 *
- +[a-f0-9]+:	f3 0f 1e fb          	endbr32 *
+ +[a-f0-9]+:	f3 0f 1e fa          	endbr64
+ +[a-f0-9]+:	f3 0f 1e fb          	endbr32
 #pass
diff --git a/gas/testsuite/gas/i386/cet.d b/gas/testsuite/gas/i386/cet.d
index b0a23b8028b..7869ab87706 100644
--- a/gas/testsuite/gas/i386/cet.d
+++ b/gas/testsuite/gas/i386/cet.d
@@ -8,40 +8,40 @@ Disassembly of section .text:
 0+ <_start>:
  +[a-f0-9]+:	f3 0f ae e9          	incsspd %ecx
  +[a-f0-9]+:	f3 0f 1e c9          	rdsspd %ecx
- +[a-f0-9]+:	f3 0f 01 ea          	saveprevssp 
+ +[a-f0-9]+:	f3 0f 01 ea          	saveprevssp
  +[a-f0-9]+:	f3 0f 01 29          	rstorssp \(%ecx\)
  +[a-f0-9]+:	0f 38 f6 04 02       	wrssd  %eax,\(%edx,%eax,1\)
  +[a-f0-9]+:	66 0f 38 f5 14 2f    	wrussd %edx,\(%edi,%ebp,1\)
- +[a-f0-9]+:	f3 0f 01 e8          	setssbsy 
+ +[a-f0-9]+:	f3 0f 01 e8          	setssbsy
  +[a-f0-9]+:	f3 0f ae 34 04       	clrssbsy \(%esp,%eax,1\)
- +[a-f0-9]+:	f3 0f 1e fa          	endbr64 
- +[a-f0-9]+:	f3 0f 1e fb          	endbr32 
+ +[a-f0-9]+:	f3 0f 1e fa          	endbr64
+ +[a-f0-9]+:	f3 0f 1e fb          	endbr32
  +[a-f0-9]+:	f3 0f ae e9          	incsspd %ecx
  +[a-f0-9]+:	f3 0f 1e c9          	rdsspd %ecx
- +[a-f0-9]+:	f3 0f 01 ea          	saveprevssp 
+ +[a-f0-9]+:	f3 0f 01 ea          	saveprevssp
  +[a-f0-9]+:	f3 0f 01 6c 01 90    	rstorssp -0x70\(%ecx,%eax,1\)
  +[a-f0-9]+:	0f 38 f6 02          	wrssd  %eax,\(%edx\)
  +[a-f0-9]+:	0f 38 f6 10          	wrssd  %edx,\(%eax\)
  +[a-f0-9]+:	66 0f 38 f5 14 2f    	wrussd %edx,\(%edi,%ebp,1\)
  +[a-f0-9]+:	66 0f 38 f5 3c 0e    	wrussd %edi,\(%esi,%ecx,1\)
- +[a-f0-9]+:	f3 0f 01 e8          	setssbsy 
+ +[a-f0-9]+:	f3 0f 01 e8          	setssbsy
  +[a-f0-9]+:	f3 0f ae 34 44       	clrssbsy \(%esp,%eax,2\)
- +[a-f0-9]+:	f3 0f 1e fa          	endbr64 
- +[a-f0-9]+:	f3 0f 1e fb          	endbr32 
+ +[a-f0-9]+:	f3 0f 1e fa          	endbr64
+ +[a-f0-9]+:	f3 0f 1e fb          	endbr32
  +[a-f0-9]+:	f3 0f ae e9          	incsspd %ecx
  +[a-f0-9]+:	f3 0f 1e c9          	rdsspd %ecx
- +[a-f0-9]+:	f3 0f 01 ea          	saveprevssp *
+ +[a-f0-9]+:	f3 0f 01 ea          	saveprevssp
  +[a-f0-9]+:	67 f3 0f 01 6c 01    	rstorssp 0x1\(%si\)
- +[a-f0-9]+:	90                   	nop *
+ +[a-f0-9]+:	90                   	nop
  +[a-f0-9]+:	67 0f 38 f6 02       	wrssd  %eax,\(%bp,%si\)
  +[a-f0-9]+:	67 0f 38 f6 10       	wrssd  %edx,\(%bx,%si\)
  +[a-f0-9]+:	67 66 0f 38 f5 14    	wrussd %edx,\(%si\)
- +[a-f0-9]+:	2f                   	das *
+ +[a-f0-9]+:	2f                   	das
  +[a-f0-9]+:	67 66 0f 38 f5 3c    	wrussd %edi,\(%si\)
  +[a-f0-9]+:	0e                   	push   %cs
- +[a-f0-9]+:	f3 0f 01 e8          	setssbsy *
+ +[a-f0-9]+:	f3 0f 01 e8          	setssbsy
  +[a-f0-9]+:	67 f3 0f ae 34       	clrssbsy \(%si\)
  +[a-f0-9]+:	44                   	inc    %esp
- +[a-f0-9]+:	f3 0f 1e fa          	endbr64 *
- +[a-f0-9]+:	f3 0f 1e fb          	endbr32 *
+ +[a-f0-9]+:	f3 0f 1e fa          	endbr64
+ +[a-f0-9]+:	f3 0f 1e fb          	endbr32
 #pass
diff --git a/gas/testsuite/gas/i386/clzero.d b/gas/testsuite/gas/i386/clzero.d
index 369873fa7bd..771eb2f0f3b 100644
--- a/gas/testsuite/gas/i386/clzero.d
+++ b/gas/testsuite/gas/i386/clzero.d
@@ -7,5 +7,5 @@
 Disassembly of section \.text:
 
 00000000 <_start>:
-[ 	]*[a-f0-9]+:	0f 01 fc             	clzero 
+[ 	]*[a-f0-9]+:	0f 01 fc             	clzero
 #pass
diff --git a/gas/testsuite/gas/i386/disassem.d b/gas/testsuite/gas/i386/disassem.d
index be821ad49d1..ac52818577a 100644
--- a/gas/testsuite/gas/i386/disassem.d
+++ b/gas/testsuite/gas/i386/disassem.d
@@ -7,350 +7,350 @@
 Disassembly of section \.text:
 
 0+ <\.text>:
-[ 	]*[a-f0-9]+:[ 	]*ff[ 	]*\(bad\)  
+[ 	]*[a-f0-9]+:[ 	]*ff[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*ef[ 	]*out    %eax,\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*ff[ 	]*\(bad\)  
+[ 	]*[a-f0-9]+:[ 	]*ff[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*d8 90 90 90 90 90[ 	]*fcoms  -0x6f6f6f70\(%eax\)
-[ 	]*[a-f0-9]+:[ 	]*c5 ec 4a[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 ec 4a[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c5 ec 4a[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 ec 4a[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c5 ec 4a[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c5 ed 4a[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 ec 4a[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c5 ed 4a[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c5 ed 4a[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 ed 4a[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c5 ed 4a[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 4a[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 ed 4a[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 4a[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 4a[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 4a[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 4a[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 ed 4a[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 4a[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 ed 4a[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 ed 4a[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 ed 4a[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 ed 4a[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c5 ec 41[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 ed 4a[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c5 ec 41[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c5 ec 41[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 ec 41[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c5 ec 41[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c5 ed 41[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 ec 41[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c5 ed 41[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c5 ed 41[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 ed 41[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c5 ed 41[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 41[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 ed 41[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 41[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 41[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 41[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 41[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 ed 41[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 41[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 ed 41[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 ed 41[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 ed 41[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 ed 41[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c5 ec 42[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 ed 41[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c5 ec 42[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c5 ec 42[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 ec 42[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c5 ec 42[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c5 ed 42[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 ec 42[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c5 ed 42[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c5 ed 42[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 ed 42[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c5 ed 42[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 42[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 ed 42[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 42[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 42[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 42[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 42[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 ed 42[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 42[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 ed 42[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 ed 42[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 ed 42[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 ed 42[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c5 ec 4b[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 ed 42[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c5 ec 4b[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c5 ec 4b[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 ec 4b[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c5 ec 4b[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c5 ed 4b[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 ec 4b[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c5 ed 4b[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c5 ed 4b[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 ed 4b[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c5 ed 4b[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 4b[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 ed 4b[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 4b[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 4b[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 4b[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 4b[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c5 f8 44[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 4b[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c5 f8 44[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c5 f8 44[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 f8 44[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c5 f8 44[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c5 f9 44[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 f8 44[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c5 f9 44[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c5 f9 44[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 f9 44[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c5 f9 44[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 f8 44[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 f9 44[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 f8 44[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 f8 44[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 f8 44[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 f8 44[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 f9 44[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 f8 44[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 f9 44[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 f9 44[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 f9 44[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 f9 44[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c5 ec 45[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 f9 44[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c5 ec 45[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c5 ec 45[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 ec 45[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c5 ec 45[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c5 ed 45[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 ec 45[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c5 ed 45[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c5 ed 45[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 ed 45[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c5 ed 45[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 45[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 ed 45[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 45[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 45[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 45[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 45[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 ed 45[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 45[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 ed 45[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 ed 45[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 ed 45[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 ed 45[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c5 f8 98[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 ed 45[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c5 f8 98[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c5 f8 98[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 f8 98[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c5 f8 98[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c5 f9 98[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 f8 98[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c5 f9 98[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c5 f9 98[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 f9 98[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c5 f9 98[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 f8 98[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 f9 98[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 f8 98[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 f8 98[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 f8 98[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 f8 98[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 f9 98[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 f8 98[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 f9 98[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 f9 98[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 f9 98[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 f9 98[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c5 ec 46[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 f9 98[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c5 ec 46[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c5 ec 46[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 ec 46[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c5 ec 46[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c5 ed 46[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 ec 46[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c5 ed 46[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c5 ed 46[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 ed 46[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c5 ed 46[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 46[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 ed 46[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 46[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 46[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 46[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 46[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 ed 46[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 46[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 ed 46[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 ed 46[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 ed 46[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 ed 46[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c5 ec 47[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 ed 46[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c5 ec 47[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c5 ec 47[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 ec 47[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c5 ec 47[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c5 ed 47[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 ec 47[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c5 ed 47[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c5 ed 47[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 ed 47[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c5 ed 47[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 47[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 ed 47[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 47[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 47[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 47[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 47[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 ed 47[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 ec 47[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 ed 47[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 ed 47[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 ed 47[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 ed 47[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c5 f8 99[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 ed 47[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c5 f8 99[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c5 f8 99[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 f8 99[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c5 f8 99[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c5 f9 99[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 f8 99[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c5 f9 99[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c5 f9 99[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 f9 99[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c5 f9 99[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 f8 99[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 f9 99[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 f8 99[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 f8 99[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 f8 99[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 f8 99[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 f9 99[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 f8 99[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 f9 99[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 f9 99[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 f9 99[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 f9 99[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c4 e3 f9 30[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 f9 99[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c4 e3 f9 30[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*8f 01[ 	]*pop    \(%ecx\)
-[ 	]*[a-f0-9]+:[ 	]*c4 e3 f9 30[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e3 f9 30[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6a 01[ 	]*push   \$0x1
-[ 	]*[a-f0-9]+:[ 	]*c4 e3 f9 30[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e3 f9 30[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*04 01[ 	]*add    \$0x1,%al
-[ 	]*[a-f0-9]+:[ 	]*c4 e3 79 30[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e3 79 30[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*8f 01[ 	]*pop    \(%ecx\)
-[ 	]*[a-f0-9]+:[ 	]*c4 e3 79 30[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e3 79 30[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6a 01[ 	]*push   \$0x1
-[ 	]*[a-f0-9]+:[ 	]*c4 e3 79 30[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e3 79 30[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*04 01[ 	]*add    \$0x1,%al
-[ 	]*[a-f0-9]+:[ 	]*c4 e3 f9 31[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e3 f9 31[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*8f 01[ 	]*pop    \(%ecx\)
-[ 	]*[a-f0-9]+:[ 	]*c4 e3 f9 31[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e3 f9 31[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6a 01[ 	]*push   \$0x1
-[ 	]*[a-f0-9]+:[ 	]*c4 e3 f9 31[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e3 f9 31[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*04 01[ 	]*add    \$0x1,%al
-[ 	]*[a-f0-9]+:[ 	]*c4 e3 79 31[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e3 79 31[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*8f 01[ 	]*pop    \(%ecx\)
-[ 	]*[a-f0-9]+:[ 	]*c4 e3 79 31[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e3 79 31[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6a 01[ 	]*push   \$0x1
-[ 	]*[a-f0-9]+:[ 	]*c4 e3 79 31[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e3 79 31[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*04 01[ 	]*add    \$0x1,%al
-[ 	]*[a-f0-9]+:[ 	]*c4 e3 f9 32[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e3 f9 32[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*8f 01[ 	]*pop    \(%ecx\)
-[ 	]*[a-f0-9]+:[ 	]*c4 e3 f9 32[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e3 f9 32[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6a 01[ 	]*push   \$0x1
-[ 	]*[a-f0-9]+:[ 	]*c4 e3 f9 32[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e3 f9 32[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*04 01[ 	]*add    \$0x1,%al
-[ 	]*[a-f0-9]+:[ 	]*c4 e3 79 32[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e3 79 32[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*8f 01[ 	]*pop    \(%ecx\)
-[ 	]*[a-f0-9]+:[ 	]*c4 e3 79 32[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e3 79 32[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6a 01[ 	]*push   \$0x1
-[ 	]*[a-f0-9]+:[ 	]*c4 e3 79 32[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e3 79 32[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*04 01[ 	]*add    \$0x1,%al
-[ 	]*[a-f0-9]+:[ 	]*c4 e3 f9 33[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e3 f9 33[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*8f 01[ 	]*pop    \(%ecx\)
-[ 	]*[a-f0-9]+:[ 	]*c4 e3 f9 33[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e3 f9 33[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6a 01[ 	]*push   \$0x1
-[ 	]*[a-f0-9]+:[ 	]*c4 e3 f9 33[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e3 f9 33[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*04 01[ 	]*add    \$0x1,%al
-[ 	]*[a-f0-9]+:[ 	]*c4 e3 79 33[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e3 79 33[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*8f 01[ 	]*pop    \(%ecx\)
-[ 	]*[a-f0-9]+:[ 	]*c4 e3 79 33[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e3 79 33[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6a 01[ 	]*push   \$0x1
-[ 	]*[a-f0-9]+:[ 	]*c4 e3 79 33[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e3 79 33[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*04 01[ 	]*add    \$0x1,%al
-[ 	]*[a-f0-9]+:[ 	]*c5 f8 92[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 f8 92[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c5 f8 92[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 f8 92[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c5 f8 92[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c5 f9 92[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 f8 92[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c5 f9 92[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c5 f9 92[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 f9 92[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c5 f9 92[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c5 fb 92[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 f9 92[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c5 fb 92[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c5 fb 92[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 fb 92[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c5 fb 92[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 f9 92[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 fb 92[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 f9 92[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 f9 92[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 f9 92[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 f9 92[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c5 f8 93[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 f9 92[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c5 f8 93[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c5 f8 93[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 f8 93[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c5 f8 93[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c5 f9 93[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 f8 93[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c5 f9 93[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c5 f9 93[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 f9 93[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c5 f9 93[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c5 fb 93[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 f9 93[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c5 fb 93[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c5 fb 93[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 fb 93[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c5 fb 93[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 f9 93[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c5 fb 93[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 f9 93[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*9b[ 	]*fwait
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 f9 93[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 f9 93[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*6f[ 	]*outsl  %ds:\(%esi\),\(%dx\)
-[ 	]*[a-f0-9]+:[ 	]*c4 e1 f9 93[ 	]*\(bad\)[ ]*
-[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas[ ]*
-[ 	]*[a-f0-9]+:[ 	]*c4 e2 01 1c[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*c4 e1 f9 93[ 	]*\(bad\)
+[ 	]*[a-f0-9]+:[ 	]*3f[ 	]*aas
+[ 	]*[a-f0-9]+:[ 	]*c4 e2 01 1c[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*41[ 	]*inc[ 	]*%ecx
-[ 	]*[a-f0-9]+:[ 	]*37[ 	]*aaa[ ]*
-[ 	]*[a-f0-9]+:[ 	]*62 f2 ad 08 1c[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*37[ 	]*aaa
+[ 	]*[a-f0-9]+:[ 	]*62 f2 ad 08 1c[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*01 01[ 	]*add[ 	]*%eax,\(%ecx\)
-[ 	]*[a-f0-9]+:[ 	]*62 f3 7d 28 1b[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*62 f3 7d 28 1b[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*c8 25 62 f3[ 	]*enter[ ]*\$0x6225,\$0xf3
-[ 	]*[a-f0-9]+:[ 	]*62 f3 75 08 23[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*62 f3 75 08 23[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*c2 25 62[ 	]*ret[ ]*\$0x6225
-[ 	]*[a-f0-9]+:[ 	]*62 f2 7d 28 5b[ 	]*\(bad\)[ ]*
+[ 	]*[a-f0-9]+:[ 	]*62 f2 7d 28 5b[ 	]*\(bad\)
 [ 	]*[a-f0-9]+:[ 	]*41[ 	]*inc[ 	]*%ecx
-[ 	]*[a-f0-9]+:[ 	]*37[ 	]*aaa[ ]*
+[ 	]*[a-f0-9]+:[ 	]*37[ 	]*aaa
 #pass
diff --git a/gas/testsuite/gas/i386/fence-as-lock-add-no.d b/gas/testsuite/gas/i386/fence-as-lock-add-no.d
index 208306668d8..8efa877e447 100644
--- a/gas/testsuite/gas/i386/fence-as-lock-add-no.d
+++ b/gas/testsuite/gas/i386/fence-as-lock-add-no.d
@@ -8,7 +8,7 @@
 Disassembly of section .text:
 
 0+ <main>:
-[   ]*[a-f0-9]+:	0f ae e8[ ]*	lfence 
-[   ]*[a-f0-9]+:	0f ae f0[ ]*	mfence 
-[   ]*[a-f0-9]+:	0f ae f8[ ]*	sfence 
+[   ]*[a-f0-9]+:	0f ae e8[ ]*	lfence
+[   ]*[a-f0-9]+:	0f ae f0[ ]*	mfence
+[   ]*[a-f0-9]+:	0f ae f8[ ]*	sfence
 #pass
diff --git a/gas/testsuite/gas/i386/fpu-bad.d b/gas/testsuite/gas/i386/fpu-bad.d
index ea1fe24b224..415e5e6c3b6 100644
--- a/gas/testsuite/gas/i386/fpu-bad.d
+++ b/gas/testsuite/gas/i386/fpu-bad.d
@@ -7,5 +7,5 @@
 Disassembly of section .text:
 
 0+ <start>:
- +[a-f0-9]+:	dd f0                	\(bad\)  
+ +[a-f0-9]+:	dd f0                	\(bad\)
 #pass
diff --git a/gas/testsuite/gas/i386/iamcu-4.d b/gas/testsuite/gas/i386/iamcu-4.d
index e71971f1db7..b255d5da5fc 100644
--- a/gas/testsuite/gas/i386/iamcu-4.d
+++ b/gas/testsuite/gas/i386/iamcu-4.d
@@ -6,6 +6,6 @@
 Disassembly of section .text:
 
 0+ <.text>:
- +[a-f0-9]+:	d9 ff                	fcos   
+ +[a-f0-9]+:	d9 ff                	fcos
  +[a-f0-9]+:	66 0f 58 01          	addpd  \(%ecx\),%xmm0
 #pass
diff --git a/gas/testsuite/gas/i386/iamcu-5.d b/gas/testsuite/gas/i386/iamcu-5.d
index 1378f1c0fb3..2eaed3b88b1 100644
--- a/gas/testsuite/gas/i386/iamcu-5.d
+++ b/gas/testsuite/gas/i386/iamcu-5.d
@@ -6,6 +6,6 @@
 Disassembly of section .text:
 
 0+ <.text>:
- +[a-f0-9]+:	d9 ff                	fcos   
+ +[a-f0-9]+:	d9 ff                	fcos
  +[a-f0-9]+:	66 0f 58 01          	addpd  \(%ecx\),%xmm0
 #pass
diff --git a/gas/testsuite/gas/i386/ifunc.d b/gas/testsuite/gas/i386/ifunc.d
index ed933b94f12..7206eb93cbe 100644
--- a/gas/testsuite/gas/i386/ifunc.d
+++ b/gas/testsuite/gas/i386/ifunc.d
@@ -9,11 +9,11 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	e9 fc ff ff ff       	jmp    1 <foo\+0x1>	1: R_386_PLT32	ifunc
 
 0+5 <ifunc>:
-[ 	]*[a-f0-9]+:	c3                   	ret    
+[ 	]*[a-f0-9]+:	c3                   	ret
 
 0+6 <bar>:
 [ 	]*[a-f0-9]+:	eb 00                	jmp    8 <normal>
 
 0+8 <normal>:
-[ 	]*[a-f0-9]+:	c3                   	ret    
+[ 	]*[a-f0-9]+:	c3                   	ret
 #pass
diff --git a/gas/testsuite/gas/i386/ilp32/mixed-mode-reloc64.d b/gas/testsuite/gas/i386/ilp32/mixed-mode-reloc64.d
index f071a2256d1..7b30dfc6a64 100644
--- a/gas/testsuite/gas/i386/ilp32/mixed-mode-reloc64.d
+++ b/gas/testsuite/gas/i386/ilp32/mixed-mode-reloc64.d
@@ -7,9 +7,9 @@
 
 RELOCATION RECORDS FOR \[.text\]:
 OFFSET[ 	]+TYPE[ 	]+VALUE[ 	]*
-[0-9a-f]+[ 	]+R_X86_64_GOT32[ 	]+xtrn[ 	]*
-[0-9a-f]+[ 	]+R_X86_64_PLT32[ 	]+xtrn-0x0*4[ 	]*
-[0-9a-f]+[ 	]+R_X86_64_GOT32[ 	]+xtrn[ 	]*
-[0-9a-f]+[ 	]+R_X86_64_PLT32[ 	]+xtrn-0x0*4[ 	]*
-[0-9a-f]+[ 	]+R_X86_64_GOT32[ 	]+xtrn[ 	]*
-[0-9a-f]+[ 	]+R_X86_64_PLT32[ 	]+xtrn-0x0*4[ 	]*
+[0-9a-f]+[ 	]+R_X86_64_GOT32[ 	]+xtrn
+[0-9a-f]+[ 	]+R_X86_64_PLT32[ 	]+xtrn-0x0*4
+[0-9a-f]+[ 	]+R_X86_64_GOT32[ 	]+xtrn
+[0-9a-f]+[ 	]+R_X86_64_PLT32[ 	]+xtrn-0x0*4
+[0-9a-f]+[ 	]+R_X86_64_GOT32[ 	]+xtrn
+[0-9a-f]+[ 	]+R_X86_64_PLT32[ 	]+xtrn-0x0*4
diff --git a/gas/testsuite/gas/i386/ilp32/svme64.d b/gas/testsuite/gas/i386/ilp32/svme64.d
index 677cf9ba4bf..1325ffa2bd9 100644
--- a/gas/testsuite/gas/i386/ilp32/svme64.d
+++ b/gas/testsuite/gas/i386/ilp32/svme64.d
@@ -8,34 +8,34 @@
 Disassembly of section .text:
 
 0+000 <common>:
-[	 ]*[0-9a-f]+:[	 ]+0f 01 dd[	 ]+clgi[	 ]*
-[	 ]*[0-9a-f]+:[	 ]+0f 01 df[	 ]+invlpga[	 ]*
-[	 ]*[0-9a-f]+:[	 ]+0f 01 de[	 ]+skinit[	 ]*
-[	 ]*[0-9a-f]+:[	 ]+0f 01 dc[	 ]+stgi[	 ]*
-[	 ]*[0-9a-f]+:[	 ]+0f 01 da[	 ]+vmload[	 ]*
-[	 ]*[0-9a-f]+:[	 ]+0f 01 d9[	 ]+vmmcall[	 ]*
-[	 ]*[0-9a-f]+:[	 ]+0f 01 d8[	 ]+vmrun[	 ]*
-[	 ]*[0-9a-f]+:[	 ]+0f 01 db[	 ]+vmsave[	 ]*
+[	 ]*[0-9a-f]+:[	 ]+0f 01 dd[	 ]+clgi
+[	 ]*[0-9a-f]+:[	 ]+0f 01 df[	 ]+invlpga
+[	 ]*[0-9a-f]+:[	 ]+0f 01 de[	 ]+skinit
+[	 ]*[0-9a-f]+:[	 ]+0f 01 dc[	 ]+stgi
+[	 ]*[0-9a-f]+:[	 ]+0f 01 da[	 ]+vmload
+[	 ]*[0-9a-f]+:[	 ]+0f 01 d9[	 ]+vmmcall
+[	 ]*[0-9a-f]+:[	 ]+0f 01 d8[	 ]+vmrun
+[	 ]*[0-9a-f]+:[	 ]+0f 01 db[	 ]+vmsave
 [0-9a-f]+ <att64>:
-[	 ]*[0-9a-f]+:[	 ]+0f 01 df[	 ]+invlpga[	 ]*
-[	 ]*[0-9a-f]+:[	 ]+0f 01 da[	 ]+vmload[	 ]*
-[	 ]*[0-9a-f]+:[	 ]+0f 01 d8[	 ]+vmrun[	 ]*
-[	 ]*[0-9a-f]+:[	 ]+0f 01 db[	 ]+vmsave[	 ]*
+[	 ]*[0-9a-f]+:[	 ]+0f 01 df[	 ]+invlpga
+[	 ]*[0-9a-f]+:[	 ]+0f 01 da[	 ]+vmload
+[	 ]*[0-9a-f]+:[	 ]+0f 01 d8[	 ]+vmrun
+[	 ]*[0-9a-f]+:[	 ]+0f 01 db[	 ]+vmsave
 [0-9a-f]+ <att32>:
-[	 ]*[0-9a-f]+:[	 ]+0f 01 de[	 ]+skinit[	 ]*
-[	 ]*[0-9a-f]+:[	 ]+67 0f 01 df[	 ]+addr32 invlpga[	 ]
-[	 ]*[0-9a-f]+:[	 ]+67 0f 01 da[	 ]+addr32 vmload[	 ]
-[	 ]*[0-9a-f]+:[	 ]+67 0f 01 d8[	 ]+addr32 vmrun[	 ]
-[	 ]*[0-9a-f]+:[	 ]+67 0f 01 db[	 ]+addr32 vmsave[	 ]
+[	 ]*[0-9a-f]+:[	 ]+0f 01 de[	 ]+skinit
+[	 ]*[0-9a-f]+:[	 ]+67 0f 01 df[	 ]+addr32 invlpga
+[	 ]*[0-9a-f]+:[	 ]+67 0f 01 da[	 ]+addr32 vmload
+[	 ]*[0-9a-f]+:[	 ]+67 0f 01 d8[	 ]+addr32 vmrun
+[	 ]*[0-9a-f]+:[	 ]+67 0f 01 db[	 ]+addr32 vmsave
 [0-9a-f]+ <intel64>:
-[	 ]*[0-9a-f]+:[	 ]+0f 01 df[	 ]+invlpga[	 ]*
-[	 ]*[0-9a-f]+:[	 ]+0f 01 da[	 ]+vmload[	 ]*
-[	 ]*[0-9a-f]+:[	 ]+0f 01 d8[	 ]+vmrun[	 ]*
-[	 ]*[0-9a-f]+:[	 ]+0f 01 db[	 ]+vmsave[	 ]*
+[	 ]*[0-9a-f]+:[	 ]+0f 01 df[	 ]+invlpga
+[	 ]*[0-9a-f]+:[	 ]+0f 01 da[	 ]+vmload
+[	 ]*[0-9a-f]+:[	 ]+0f 01 d8[	 ]+vmrun
+[	 ]*[0-9a-f]+:[	 ]+0f 01 db[	 ]+vmsave
 [0-9a-f]+ <intel32>:
-[	 ]*[0-9a-f]+:[	 ]+0f 01 de[	 ]+skinit[	 ]*
-[	 ]*[0-9a-f]+:[	 ]+67 0f 01 df[	 ]+addr32 invlpga[	 ]
-[	 ]*[0-9a-f]+:[	 ]+67 0f 01 da[	 ]+addr32 vmload[	 ]
-[	 ]*[0-9a-f]+:[	 ]+67 0f 01 d8[	 ]+addr32 vmrun[	 ]
-[	 ]*[0-9a-f]+:[	 ]+67 0f 01 db[	 ]+addr32 vmsave[	 ]
+[	 ]*[0-9a-f]+:[	 ]+0f 01 de[	 ]+skinit
+[	 ]*[0-9a-f]+:[	 ]+67 0f 01 df[	 ]+addr32 invlpga
+[	 ]*[0-9a-f]+:[	 ]+67 0f 01 da[	 ]+addr32 vmload
+[	 ]*[0-9a-f]+:[	 ]+67 0f 01 d8[	 ]+addr32 vmrun
+[	 ]*[0-9a-f]+:[	 ]+67 0f 01 db[	 ]+addr32 vmsave
 #pass
diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-branch.d b/gas/testsuite/gas/i386/ilp32/x86-64-branch.d
index acf8c42ca97..b553bb15b4a 100644
--- a/gas/testsuite/gas/i386/ilp32/x86-64-branch.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-branch.d
@@ -23,7 +23,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	66 e8 00 00 00 00    	data16 call (0x)?2a <.*>	26: R_X86_64_PLT32	foo-0x4
 [ 	]*[a-f0-9]+:	66 e9 00 00 00 00    	data16 jmp (0x)?30 <.*>	2c: R_X86_64_PLT32	foo-0x4
 [ 	]*[a-f0-9]+:	66 0f 82 00 00 00 00 	data16 jb (0x)?37 <.*>	33: R_X86_64_PLT32	foo-0x4
-[ 	]*[a-f0-9]+:	66 c3                	data16 ret *
+[ 	]*[a-f0-9]+:	66 c3                	data16 ret
 [ 	]*[a-f0-9]+:	66 c2 08 00          	data16 ret \$0x8
 [ 	]*[a-f0-9]+:	3e 74 03[ 	]+je,pt  +[0-9a-fx]+ <.*>
 [ 	]*[a-f0-9]+:	2e 74 00[ 	]+je,pn  +[0-9a-fx]+ <.*>
@@ -40,6 +40,6 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	66 ff 20             	data16 jmp \*\(%rax\)
 [ 	]*[a-f0-9]+:	e8 00 00 00 00       	call   [0-9a-fx]* <.*>	[0-9a-f]*: R_X86_64_PC32	\*ABS\*\+0x10003c
 [ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmp    [0-9a-fx]* <.*>	[0-9a-f]*: R_X86_64_PC32	\*ABS\*\+0x10003c
-[ 	]*[a-f0-9]+:	66 c3                	data16 ret *
+[ 	]*[a-f0-9]+:	66 c3                	data16 ret
 [ 	]*[a-f0-9]+:	66 c2 08 00          	data16 ret \$0x8
 #pass
diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-cbw-intel.d b/gas/testsuite/gas/i386/ilp32/x86-64-cbw-intel.d
index 6d955eb3a38..037eb8b8945 100644
--- a/gas/testsuite/gas/i386/ilp32/x86-64-cbw-intel.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-cbw-intel.d
@@ -7,18 +7,18 @@
 Disassembly of section .text:
 
 0+000 <_cbw>:
-   0:	66 98                	cbw    
-   2:	98                   	cwde   
-   3:	48 98                	cdqe   
-   5:	66 40 98             	rex cbw 
-   8:	40 98                	rex cwde 
-   a:	66 48 98             	data16 cdqe 
+   0:	66 98                	cbw
+   2:	98                   	cwde
+   3:	48 98                	cdqe
+   5:	66 40 98             	rex cbw
+   8:	40 98                	rex cwde
+   a:	66 48 98             	data16 cdqe
 
 0+00d <_cwd>:
-   d:	66 99                	cwd    
-   f:	99                   	cdq    
-  10:	48 99                	cqo    
-  12:	66 40 99             	rex cwd 
-  15:	40 99                	rex cdq 
-  17:	66 48 99             	data16 cqo 
+   d:	66 99                	cwd
+   f:	99                   	cdq
+  10:	48 99                	cqo
+  12:	66 40 99             	rex cwd
+  15:	40 99                	rex cdq
+  17:	66 48 99             	data16 cqo
 #pass
diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-cbw.d b/gas/testsuite/gas/i386/ilp32/x86-64-cbw.d
index 3cb0697375f..66c39521623 100644
--- a/gas/testsuite/gas/i386/ilp32/x86-64-cbw.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-cbw.d
@@ -7,18 +7,18 @@
 Disassembly of section .text:
 
 0+000 <_cbw>:
-   0:	66 98                	cbtw   
-   2:	98                   	cwtl   
-   3:	48 98                	cltq   
-   5:	66 40 98             	rex cbtw 
-   8:	40 98                	rex cwtl 
-   a:	66 48 98             	data16 cltq 
+   0:	66 98                	cbtw
+   2:	98                   	cwtl
+   3:	48 98                	cltq
+   5:	66 40 98             	rex cbtw
+   8:	40 98                	rex cwtl
+   a:	66 48 98             	data16 cltq
 
 0+00d <_cwd>:
-   d:	66 99                	cwtd   
-   f:	99                   	cltd   
-  10:	48 99                	cqto   
-  12:	66 40 99             	rex cwtd 
-  15:	40 99                	rex cltd 
-  17:	66 48 99             	data16 cqto 
+   d:	66 99                	cwtd
+   f:	99                   	cltd
+  10:	48 99                	cqto
+  12:	66 40 99             	rex cwtd
+  15:	40 99                	rex cltd
+  17:	66 48 99             	data16 cqto
 #pass
diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-opcode-inval-intel.d b/gas/testsuite/gas/i386/ilp32/x86-64-opcode-inval-intel.d
index cefd9fd28e6..a2b09d2e74f 100644
--- a/gas/testsuite/gas/i386/ilp32/x86-64-opcode-inval-intel.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-opcode-inval-intel.d
@@ -8,43 +8,43 @@
 Disassembly of section .text:
 
 0+ <aaa>:
-[ 	]*[a-f0-9]+:	37                   	\(bad\)  
+[ 	]*[a-f0-9]+:	37                   	\(bad\)
 
 0+1 <aad0>:
-[ 	]*[a-f0-9]+:	d5                   	\(bad\)  
+[ 	]*[a-f0-9]+:	d5                   	\(bad\)
 [ 	]*[a-f0-9]+:	0a                   	.byte 0xa
 
 0+3 <aad1>:
-[ 	]*[a-f0-9]+:	d5                   	\(bad\)  
+[ 	]*[a-f0-9]+:	d5                   	\(bad\)
 [ 	]*[a-f0-9]+:	02                   	.byte 0x2
 
 0+5 <aam0>:
-[ 	]*[a-f0-9]+:	d4                   	\(bad\)  
+[ 	]*[a-f0-9]+:	d4                   	\(bad\)
 [ 	]*[a-f0-9]+:	0a                   	.byte 0xa
 
 0+7 <aam1>:
-[ 	]*[a-f0-9]+:	d4                   	\(bad\)  
+[ 	]*[a-f0-9]+:	d4                   	\(bad\)
 [ 	]*[a-f0-9]+:	02                   	.byte 0x2
 
 0+9 <aas>:
-[ 	]*[a-f0-9]+:	3f                   	\(bad\)  
+[ 	]*[a-f0-9]+:	3f                   	\(bad\)
 
 0+a <bound>:
 [ 	]*[a-f0-9]+:	62                   	.byte 0x62
 [ 	]*[a-f0-9]+:	10                   	.byte 0x10
 
 0+c <daa>:
-[ 	]*[a-f0-9]+:	27                   	\(bad\)  
+[ 	]*[a-f0-9]+:	27                   	\(bad\)
 
 0+d <das>:
-[ 	]*[a-f0-9]+:	2f                   	\(bad\)  
+[ 	]*[a-f0-9]+:	2f                   	\(bad\)
 
 0+e <into>:
-[ 	]*[a-f0-9]+:	ce                   	\(bad\)  
+[ 	]*[a-f0-9]+:	ce                   	\(bad\)
 
 0+f <pusha>:
-[ 	]*[a-f0-9]+:	60                   	\(bad\)  
+[ 	]*[a-f0-9]+:	60                   	\(bad\)
 
 0+10 <popa>:
-[ 	]*[a-f0-9]+:	61                   	\(bad\)  
+[ 	]*[a-f0-9]+:	61                   	\(bad\)
 #pass
diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-opcode-inval.d b/gas/testsuite/gas/i386/ilp32/x86-64-opcode-inval.d
index 21ac5de1205..5a17b0b412e 100644
--- a/gas/testsuite/gas/i386/ilp32/x86-64-opcode-inval.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-opcode-inval.d
@@ -8,43 +8,43 @@
 Disassembly of section .text:
 
 0+ <aaa>:
-[ 	]*[a-f0-9]+:	37                   	\(bad\)  
+[ 	]*[a-f0-9]+:	37                   	\(bad\)
 
 0+1 <aad0>:
-[ 	]*[a-f0-9]+:	d5                   	\(bad\)  
+[ 	]*[a-f0-9]+:	d5                   	\(bad\)
 [ 	]*[a-f0-9]+:	0a                   	.byte 0xa
 
 0+3 <aad1>:
-[ 	]*[a-f0-9]+:	d5                   	\(bad\)  
+[ 	]*[a-f0-9]+:	d5                   	\(bad\)
 [ 	]*[a-f0-9]+:	02                   	.byte 0x2
 
 0+5 <aam0>:
-[ 	]*[a-f0-9]+:	d4                   	\(bad\)  
+[ 	]*[a-f0-9]+:	d4                   	\(bad\)
 [ 	]*[a-f0-9]+:	0a                   	.byte 0xa
 
 0+7 <aam1>:
-[ 	]*[a-f0-9]+:	d4                   	\(bad\)  
+[ 	]*[a-f0-9]+:	d4                   	\(bad\)
 [ 	]*[a-f0-9]+:	02                   	.byte 0x2
 
 0+9 <aas>:
-[ 	]*[a-f0-9]+:	3f                   	\(bad\)  
+[ 	]*[a-f0-9]+:	3f                   	\(bad\)
 
 0+a <bound>:
 [ 	]*[a-f0-9]+:	62                   	.byte 0x62
 [ 	]*[a-f0-9]+:	10                   	.byte 0x10
 
 0+c <daa>:
-[ 	]*[a-f0-9]+:	27                   	\(bad\)  
+[ 	]*[a-f0-9]+:	27                   	\(bad\)
 
 0+d <das>:
-[ 	]*[a-f0-9]+:	2f                   	\(bad\)  
+[ 	]*[a-f0-9]+:	2f                   	\(bad\)
 
 0+e <into>:
-[ 	]*[a-f0-9]+:	ce                   	\(bad\)  
+[ 	]*[a-f0-9]+:	ce                   	\(bad\)
 
 0+f <pusha>:
-[ 	]*[a-f0-9]+:	60                   	\(bad\)  
+[ 	]*[a-f0-9]+:	60                   	\(bad\)
 
 0+10 <popa>:
-[ 	]*[a-f0-9]+:	61                   	\(bad\)  
+[ 	]*[a-f0-9]+:	61                   	\(bad\)
 #pass
diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-vmx.d b/gas/testsuite/gas/i386/ilp32/x86-64-vmx.d
index ca98d74840d..c3d91bde2ef 100644
--- a/gas/testsuite/gas/i386/ilp32/x86-64-vmx.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-vmx.d
@@ -7,10 +7,10 @@
 Disassembly of section .text:
 
 0+000 <foo>:
-   0:	0f 01 c1 [ 	]*vmcall 
-   3:	0f 01 c2 [ 	]*vmlaunch 
-   6:	0f 01 c3 [ 	]*vmresume 
-   9:	0f 01 c4 [ 	]*vmxoff 
+   0:	0f 01 c1 [ 	]*vmcall
+   3:	0f 01 c2 [ 	]*vmlaunch
+   6:	0f 01 c3 [ 	]*vmresume
+   9:	0f 01 c4 [ 	]*vmxoff
    c:	66 0f c7 30 [ 	]*vmclear \(%rax\)
   10:	0f c7 30 [ 	]*vmptrld \(%rax\)
   13:	0f c7 38 [ 	]*vmptrst \(%rax\)
diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-xsave-intel.d b/gas/testsuite/gas/i386/ilp32/x86-64-xsave-intel.d
index 1c08752729c..ef31b4b9ca0 100644
--- a/gas/testsuite/gas/i386/ilp32/x86-64-xsave-intel.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-xsave-intel.d
@@ -8,8 +8,8 @@
 Disassembly of section .text:
 
 0+ <_start>:
-[ 	]*[a-f0-9]+:	0f 01 d0             	xgetbv 
-[ 	]*[a-f0-9]+:	0f 01 d1             	xsetbv 
+[ 	]*[a-f0-9]+:	0f 01 d0             	xgetbv
+[ 	]*[a-f0-9]+:	0f 01 d1             	xsetbv
 [ 	]*[a-f0-9]+:	0f ae 20             	xsave  \[rax\]
 [ 	]*[a-f0-9]+:	41 0f ae 20          	xsave  \[r8\]
 [ 	]*[a-f0-9]+:	41 0f ae 24 00       	xsave  \[r8\+rax\*1\]
diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-xsave.d b/gas/testsuite/gas/i386/ilp32/x86-64-xsave.d
index b578c51a3ef..577f5d31dff 100644
--- a/gas/testsuite/gas/i386/ilp32/x86-64-xsave.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-xsave.d
@@ -7,8 +7,8 @@
 Disassembly of section .text:
 
 0+ <_start>:
-[ 	]*[a-f0-9]+:	0f 01 d0             	xgetbv 
-[ 	]*[a-f0-9]+:	0f 01 d1             	xsetbv 
+[ 	]*[a-f0-9]+:	0f 01 d0             	xgetbv
+[ 	]*[a-f0-9]+:	0f 01 d1             	xsetbv
 [ 	]*[a-f0-9]+:	0f ae 20             	xsave  \(%rax\)
 [ 	]*[a-f0-9]+:	41 0f ae 20          	xsave  \(%r8\)
 [ 	]*[a-f0-9]+:	41 0f ae 24 00       	xsave  \(%r8,%rax,1\)
diff --git a/gas/testsuite/gas/i386/ilp32/x86-64.d b/gas/testsuite/gas/i386/ilp32/x86-64.d
index dbc3ceae914..9f7e7949389 100644
--- a/gas/testsuite/gas/i386/ilp32/x86-64.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64.d
@@ -99,8 +99,8 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	a3 11 22 33 44 55 66 77 88 	movabs %eax,0x8877665544332211
 [ 	]*[a-f0-9]+:	48 a1 11 22 33 44 55 66 77 88 	movabs 0x8877665544332211,%rax
 [ 	]*[a-f0-9]+:	48 a3 11 22 33 44 55 66 77 88 	movabs %rax,0x8877665544332211
-[ 	]*[a-f0-9]+:	48 99                	cqto   
-[ 	]*[a-f0-9]+:	48 98                	cltq   
+[ 	]*[a-f0-9]+:	48 99                	cqto
+[ 	]*[a-f0-9]+:	48 98                	cltq
 [ 	]*[a-f0-9]+:	48 63 c0             	movslq %eax,%rax
 [ 	]*[a-f0-9]+:	48 0f bf c0          	movswq %ax,%rax
 [ 	]*[a-f0-9]+:	48 0f be c0          	movsbq %al,%rax
diff --git a/gas/testsuite/gas/i386/intel-got32.d b/gas/testsuite/gas/i386/intel-got32.d
index 8e5c797979a..5e18a2f9c92 100644
--- a/gas/testsuite/gas/i386/intel-got32.d
+++ b/gas/testsuite/gas/i386/intel-got32.d
@@ -7,5 +7,5 @@ Disassembly of section .text:
 
 0+000 <_start>:
 [ 	]*[0-9a-f]+:[ 	]+8b 15 04 00 00 00[ 	]+mov[ 	]+edx,(DWORD PTR )?(ds:)?0x4
-[ 	]*[0-9a-f]+:[ 	]+c3[ 	]+ret[ 	]*
+[ 	]*[0-9a-f]+:[ 	]+c3[ 	]+ret
 #pass
diff --git a/gas/testsuite/gas/i386/intel-got64.d b/gas/testsuite/gas/i386/intel-got64.d
index e16f552b00b..08722da14f7 100644
--- a/gas/testsuite/gas/i386/intel-got64.d
+++ b/gas/testsuite/gas/i386/intel-got64.d
@@ -8,5 +8,5 @@ Disassembly of section .text:
 0+000 <_start>:
 [ 	]*[0-9a-f]+:[ 	]+a1 00 00 00 00 00 00 00 00[ 	]+movabs[ 	]+eax,(ds:)?0x0
 [ 	]*[0-9a-f]+:[ 	]+ff 35 00 00 00 00[ 	]+push[ 	]+(QWORD PTR )?\[rip(\+(0x)?0)?\]([ 	]+#.*)?
-[ 	]*[0-9a-f]+:[ 	]+c3[ 	]+ret[ 	]*
+[ 	]*[0-9a-f]+:[ 	]+c3[ 	]+ret
 #pass
diff --git a/gas/testsuite/gas/i386/intel-intel.d b/gas/testsuite/gas/i386/intel-intel.d
index b2663dd4574..a2bc62ba01e 100644
--- a/gas/testsuite/gas/i386/intel-intel.d
+++ b/gas/testsuite/gas/i386/intel-intel.d
@@ -46,28 +46,28 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	23 90 90 90 90 90 +	and    edx,DWORD PTR \[eax-0x6f6f6f70\]
 [ 	]*[a-f0-9]+:	24 90 +	and    al,0x90
 [ 	]*[a-f0-9]+:	25 90 90 90 90 +	and    eax,0x90909090
-[ 	]*[a-f0-9]+:	27 +	daa *
+[ 	]*[a-f0-9]+:	27 +	daa
 [ 	]*[a-f0-9]+:	28 90 90 90 90 90 +	sub    BYTE PTR \[eax-0x6f6f6f70\],dl
 [ 	]*[a-f0-9]+:	29 90 90 90 90 90 +	sub    DWORD PTR \[eax-0x6f6f6f70\],edx
 [ 	]*[a-f0-9]+:	2a 90 90 90 90 90 +	sub    dl,BYTE PTR \[eax-0x6f6f6f70\]
 [ 	]*[a-f0-9]+:	2b 90 90 90 90 90 +	sub    edx,DWORD PTR \[eax-0x6f6f6f70\]
 [ 	]*[a-f0-9]+:	2c 90 +	sub    al,0x90
 [ 	]*[a-f0-9]+:	2d 90 90 90 90 +	sub    eax,0x90909090
-[ 	]*[a-f0-9]+:	2f +	das *
+[ 	]*[a-f0-9]+:	2f +	das
 [ 	]*[a-f0-9]+:	30 90 90 90 90 90 +	xor    BYTE PTR \[eax-0x6f6f6f70\],dl
 [ 	]*[a-f0-9]+:	31 90 90 90 90 90 +	xor    DWORD PTR \[eax-0x6f6f6f70\],edx
 [ 	]*[a-f0-9]+:	32 90 90 90 90 90 +	xor    dl,BYTE PTR \[eax-0x6f6f6f70\]
 [ 	]*[a-f0-9]+:	33 90 90 90 90 90 +	xor    edx,DWORD PTR \[eax-0x6f6f6f70\]
 [ 	]*[a-f0-9]+:	34 90 +	xor    al,0x90
 [ 	]*[a-f0-9]+:	35 90 90 90 90 +	xor    eax,0x90909090
-[ 	]*[a-f0-9]+:	37 +	aaa *
+[ 	]*[a-f0-9]+:	37 +	aaa
 [ 	]*[a-f0-9]+:	38 90 90 90 90 90 +	cmp    BYTE PTR \[eax-0x6f6f6f70\],dl
 [ 	]*[a-f0-9]+:	39 90 90 90 90 90 +	cmp    DWORD PTR \[eax-0x6f6f6f70\],edx
 [ 	]*[a-f0-9]+:	3a 90 90 90 90 90 +	cmp    dl,BYTE PTR \[eax-0x6f6f6f70\]
 [ 	]*[a-f0-9]+:	3b 90 90 90 90 90 +	cmp    edx,DWORD PTR \[eax-0x6f6f6f70\]
 [ 	]*[a-f0-9]+:	3c 90 +	cmp    al,0x90
 [ 	]*[a-f0-9]+:	3d 90 90 90 90 +	cmp    eax,0x90909090
-[ 	]*[a-f0-9]+:	3f +	aas *
+[ 	]*[a-f0-9]+:	3f +	aas
 [ 	]*[a-f0-9]+:	40 +	inc    eax
 [ 	]*[a-f0-9]+:	41 +	inc    ecx
 [ 	]*[a-f0-9]+:	42 +	inc    edx
@@ -100,8 +100,8 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	5d +	pop    ebp
 [ 	]*[a-f0-9]+:	5e +	pop    esi
 [ 	]*[a-f0-9]+:	5f +	pop    edi
-[ 	]*[a-f0-9]+:	60 +	pusha *
-[ 	]*[a-f0-9]+:	61 +	popa *
+[ 	]*[a-f0-9]+:	60 +	pusha
+[ 	]*[a-f0-9]+:	61 +	popa
 [ 	]*[a-f0-9]+:	62 90 90 90 90 90 +	bound  edx,QWORD PTR \[eax-0x6f6f6f70\]
 [ 	]*[a-f0-9]+:	63 90 90 90 90 90 +	arpl   WORD PTR \[eax-0x6f6f6f70\],dx
 [ 	]*[a-f0-9]+:	68 90 90 90 90 +	push   0x90909090
@@ -151,14 +151,14 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	95 +	xchg   ebp,eax
 [ 	]*[a-f0-9]+:	96 +	xchg   esi,eax
 [ 	]*[a-f0-9]+:	97 +	xchg   edi,eax
-[ 	]*[a-f0-9]+:	98 +	cwde *
-[ 	]*[a-f0-9]+:	99 +	cdq *
+[ 	]*[a-f0-9]+:	98 +	cwde
+[ 	]*[a-f0-9]+:	99 +	cdq
 [ 	]*[a-f0-9]+:	9a 90 90 90 90 90 90 	call   0x9090:0x90909090
 [ 	]*[a-f0-9]+:	9b +	fwait
-[ 	]*[a-f0-9]+:	9c +	pushf *
-[ 	]*[a-f0-9]+:	9d +	popf *
-[ 	]*[a-f0-9]+:	9e +	sahf *
-[ 	]*[a-f0-9]+:	9f +	lahf *
+[ 	]*[a-f0-9]+:	9c +	pushf
+[ 	]*[a-f0-9]+:	9d +	popf
+[ 	]*[a-f0-9]+:	9e +	sahf
+[ 	]*[a-f0-9]+:	9f +	lahf
 [ 	]*[a-f0-9]+:	a0 90 90 90 90 +	mov    al,ds:0x90909090
 [ 	]*[a-f0-9]+:	a1 90 90 90 90 +	mov    eax,ds:0x90909090
 [ 	]*[a-f0-9]+:	a2 90 90 90 90 +	mov    ds:0x90909090,al
@@ -194,21 +194,21 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	c0 90 90 90 90 90 90 	rcl    BYTE PTR \[eax-0x6f6f6f70\],0x90
 [ 	]*[a-f0-9]+:	c1 90 90 90 90 90 90 	rcl    DWORD PTR \[eax-0x6f6f6f70\],0x90
 [ 	]*[a-f0-9]+:	c2 90 90 +	ret    0x9090
-[ 	]*[a-f0-9]+:	c3 +	ret *
+[ 	]*[a-f0-9]+:	c3 +	ret
 [ 	]*[a-f0-9]+:	c4 90 90 90 90 90 +	les    edx,FWORD PTR \[eax-0x6f6f6f70\]
 [ 	]*[a-f0-9]+:	c5 90 90 90 90 90 +	lds    edx,FWORD PTR \[eax-0x6f6f6f70\]
 [ 	]*[a-f0-9]+:	c6 80 90 90 90 90 90 	mov    BYTE PTR \[eax-0x6f6f6f70\],0x90
 [ 	]*[a-f0-9]+:	c7 80 90 90 90 90 90 90 90 90 	mov    DWORD PTR \[eax-0x6f6f6f70\],0x90909090
 [ 	]*[a-f0-9]+:	c8 90 90 90 +	enter  0x9090,0x90
-[ 	]*[a-f0-9]+:	c9 +	leave *
+[ 	]*[a-f0-9]+:	c9 +	leave
 [ 	]*[a-f0-9]+:	ca 90 90 +	retf   0x9090
-[ 	]*[a-f0-9]+:	cb +	retf *
+[ 	]*[a-f0-9]+:	cb +	retf
 [ 	]*[a-f0-9]+:	ca 90 90 +	retf   0x9090
-[ 	]*[a-f0-9]+:	cb +	retf *
-[ 	]*[a-f0-9]+:	cc +	int3 *
+[ 	]*[a-f0-9]+:	cb +	retf
+[ 	]*[a-f0-9]+:	cc +	int3
 [ 	]*[a-f0-9]+:	cd 90 +	int    0x90
-[ 	]*[a-f0-9]+:	ce +	into *
-[ 	]*[a-f0-9]+:	cf +	iret *
+[ 	]*[a-f0-9]+:	ce +	into
+[ 	]*[a-f0-9]+:	cf +	iret
 [ 	]*[a-f0-9]+:	d0 90 90 90 90 90 +	rcl    BYTE PTR \[eax-0x6f6f6f70\],1
 [ 	]*[a-f0-9]+:	d1 90 90 90 90 90 +	rcl    DWORD PTR \[eax-0x6f6f6f70\],1
 [ 	]*[a-f0-9]+:	d2 90 90 90 90 90 +	rcl    BYTE PTR \[eax-0x6f6f6f70\],cl
@@ -240,35 +240,35 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	ed +	in     eax,dx
 [ 	]*[a-f0-9]+:	ee +	out    dx,al
 [ 	]*[a-f0-9]+:	ef +	out    dx,eax
-[ 	]*[a-f0-9]+:	f4 +	hlt *
-[ 	]*[a-f0-9]+:	f5 +	cmc *
+[ 	]*[a-f0-9]+:	f4 +	hlt
+[ 	]*[a-f0-9]+:	f5 +	cmc
 [ 	]*[a-f0-9]+:	f6 90 90 90 90 90 +	not    BYTE PTR \[eax-0x6f6f6f70\]
 [ 	]*[a-f0-9]+:	f7 90 90 90 90 90 +	not    DWORD PTR \[eax-0x6f6f6f70\]
-[ 	]*[a-f0-9]+:	f8 +	clc *
-[ 	]*[a-f0-9]+:	f9 +	stc *
-[ 	]*[a-f0-9]+:	fa +	cli *
-[ 	]*[a-f0-9]+:	fb +	sti *
-[ 	]*[a-f0-9]+:	fc +	cld *
-[ 	]*[a-f0-9]+:	fd +	std *
+[ 	]*[a-f0-9]+:	f8 +	clc
+[ 	]*[a-f0-9]+:	f9 +	stc
+[ 	]*[a-f0-9]+:	fa +	cli
+[ 	]*[a-f0-9]+:	fb +	sti
+[ 	]*[a-f0-9]+:	fc +	cld
+[ 	]*[a-f0-9]+:	fd +	std
 [ 	]*[a-f0-9]+:	ff 90 90 90 90 90 +	call   DWORD PTR \[eax-0x6f6f6f70\]
 [ 	]*[a-f0-9]+:	0f 00 90 90 90 90 90 	lldt   WORD PTR \[eax-0x6f6f6f70\]
 [ 	]*[a-f0-9]+:	0f 01 90 90 90 90 90 	lgdtd  \[eax-0x6f6f6f70\]
 [ 	]*[a-f0-9]+:	0f 02 90 90 90 90 90 	lar    edx,WORD PTR \[eax-0x6f6f6f70\]
 [ 	]*[a-f0-9]+:	0f 03 90 90 90 90 90 	lsl    edx,WORD PTR \[eax-0x6f6f6f70\]
-[ 	]*[a-f0-9]+:	0f 06 +	clts *
-[ 	]*[a-f0-9]+:	0f 08 +	invd *
-[ 	]*[a-f0-9]+:	0f 09 +	wbinvd *
-[ 	]*[a-f0-9]+:	0f 0b +	ud2 *
+[ 	]*[a-f0-9]+:	0f 06 +	clts
+[ 	]*[a-f0-9]+:	0f 08 +	invd
+[ 	]*[a-f0-9]+:	0f 09 +	wbinvd
+[ 	]*[a-f0-9]+:	0f 0b +	ud2
 [ 	]*[a-f0-9]+:	0f 20 d0 +	mov    eax,cr2
 [ 	]*[a-f0-9]+:	0f 21 d0 +	mov    eax,dr2
 [ 	]*[a-f0-9]+:	0f 22 d0 +	mov    cr2,eax
 [ 	]*[a-f0-9]+:	0f 23 d0 +	mov    dr2,eax
 [ 	]*[a-f0-9]+:	0f 24 d0 +	mov    eax,tr2
 [ 	]*[a-f0-9]+:	0f 26 d0 +	mov    tr2,eax
-[ 	]*[a-f0-9]+:	0f 30 +	wrmsr *
-[ 	]*[a-f0-9]+:	0f 31 +	rdtsc *
-[ 	]*[a-f0-9]+:	0f 32 +	rdmsr *
-[ 	]*[a-f0-9]+:	0f 33 +	rdpmc *
+[ 	]*[a-f0-9]+:	0f 30 +	wrmsr
+[ 	]*[a-f0-9]+:	0f 31 +	rdtsc
+[ 	]*[a-f0-9]+:	0f 32 +	rdmsr
+[ 	]*[a-f0-9]+:	0f 33 +	rdpmc
 [ 	]*[a-f0-9]+:	0f 40 90 90 90 90 90 	cmovo  edx,DWORD PTR \[eax-0x6f6f6f70\]
 [ 	]*[a-f0-9]+:	0f 41 90 90 90 90 90 	cmovno edx,DWORD PTR \[eax-0x6f6f6f70\]
 [ 	]*[a-f0-9]+:	0f 42 90 90 90 90 90 	cmovb  edx,DWORD PTR \[eax-0x6f6f6f70\]
@@ -305,7 +305,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	0f 74 90 90 90 90 90 	pcmpeqb mm2,QWORD PTR \[eax-0x6f6f6f70\]
 [ 	]*[a-f0-9]+:	0f 75 90 90 90 90 90 	pcmpeqw mm2,QWORD PTR \[eax-0x6f6f6f70\]
 [ 	]*[a-f0-9]+:	0f 76 90 90 90 90 90 	pcmpeqd mm2,QWORD PTR \[eax-0x6f6f6f70\]
-[ 	]*[a-f0-9]+:	0f 77 +	emms *
+[ 	]*[a-f0-9]+:	0f 77 +	emms
 [ 	]*[a-f0-9]+:	0f 7e 90 90 90 90 90 	movd   DWORD PTR \[eax-0x6f6f6f70\],mm2
 [ 	]*[a-f0-9]+:	0f 7f 90 90 90 90 90 	movq   QWORD PTR \[eax-0x6f6f6f70\],mm2
 [ 	]*[a-f0-9]+:	0f 80 90 90 90 90 +	jo     909094e6 <barn\+0x909089a4>
@@ -342,13 +342,13 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	0f 9f 80 90 90 90 90 	setg   BYTE PTR \[eax-0x6f6f6f70\]
 [ 	]*[a-f0-9]+:	0f a0 +	push   fs
 [ 	]*[a-f0-9]+:	0f a1 +	pop    fs
-[ 	]*[a-f0-9]+:	0f a2 +	cpuid *
+[ 	]*[a-f0-9]+:	0f a2 +	cpuid
 [ 	]*[a-f0-9]+:	0f a3 90 90 90 90 90 	bt     DWORD PTR \[eax-0x6f6f6f70\],edx
 [ 	]*[a-f0-9]+:	0f a4 90 90 90 90 90 90 	shld   DWORD PTR \[eax-0x6f6f6f70\],edx,0x90
 [ 	]*[a-f0-9]+:	0f a5 90 90 90 90 90 	shld   DWORD PTR \[eax-0x6f6f6f70\],edx,cl
 [ 	]*[a-f0-9]+:	0f a8 +	push   gs
 [ 	]*[a-f0-9]+:	0f a9 +	pop    gs
-[ 	]*[a-f0-9]+:	0f aa +	rsm *
+[ 	]*[a-f0-9]+:	0f aa +	rsm
 [ 	]*[a-f0-9]+:	0f ab 90 90 90 90 90 	bts    DWORD PTR \[eax-0x6f6f6f70\],edx
 [ 	]*[a-f0-9]+:	0f ac 90 90 90 90 90 90 	shrd   DWORD PTR \[eax-0x6f6f6f70\],edx,0x90
 [ 	]*[a-f0-9]+:	0f ad 90 90 90 90 90 	shrd   DWORD PTR \[eax-0x6f6f6f70\],edx,cl
@@ -361,7 +361,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	0f b5 90 90 90 90 90 	lgs    edx,FWORD PTR \[eax-0x6f6f6f70\]
 [ 	]*[a-f0-9]+:	0f b6 90 90 90 90 90 	movzx  edx,BYTE PTR \[eax-0x6f6f6f70\]
 [ 	]*[a-f0-9]+:	0f b7 90 90 90 90 90 	movzx  edx,WORD PTR \[eax-0x6f6f6f70\]
-[ 	]*[a-f0-9]+:	0f 0b +	ud2 *
+[ 	]*[a-f0-9]+:	0f 0b +	ud2
 [ 	]*[a-f0-9]+:	0f bb 90 90 90 90 90 	btc    DWORD PTR \[eax-0x6f6f6f70\],edx
 [ 	]*[a-f0-9]+:	0f bc 90 90 90 90 90 	bsf    edx,DWORD PTR \[eax-0x6f6f6f70\]
 [ 	]*[a-f0-9]+:	0f bd 90 90 90 90 90 	bsr    edx,DWORD PTR \[eax-0x6f6f6f70\]
@@ -469,8 +469,8 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	66 5d +	pop    bp
 [ 	]*[a-f0-9]+:	66 5e +	pop    si
 [ 	]*[a-f0-9]+:	66 5f +	pop    di
-[ 	]*[a-f0-9]+:	66 60 +	pushaw *
-[ 	]*[a-f0-9]+:	66 61 +	popaw *
+[ 	]*[a-f0-9]+:	66 60 +	pushaw
+[ 	]*[a-f0-9]+:	66 61 +	popaw
 [ 	]*[a-f0-9]+:	66 62 90 90 90 90 90 	bound  dx,DWORD PTR \[eax-0x6f6f6f70\]
 [ 	]*[a-f0-9]+:	66 68 90 90 +	pushw  0x9090
 [ 	]*[a-f0-9]+:	66 69 90 90 90 90 90 90 90 	imul   dx,WORD PTR \[eax-0x6f6f6f70\],0x9090
@@ -494,11 +494,11 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	66 95 +	xchg   bp,ax
 [ 	]*[a-f0-9]+:	66 96 +	xchg   si,ax
 [ 	]*[a-f0-9]+:	66 97 +	xchg   di,ax
-[ 	]*[a-f0-9]+:	66 98 +	cbw *
-[ 	]*[a-f0-9]+:	66 99 +	cwd *
+[ 	]*[a-f0-9]+:	66 98 +	cbw
+[ 	]*[a-f0-9]+:	66 99 +	cwd
 [ 	]*[a-f0-9]+:	66 9a 90 90 90 90 +	call   0x9090:0x9090
-[ 	]*[a-f0-9]+:	66 9c +	pushfw *
-[ 	]*[a-f0-9]+:	66 9d +	popfw *
+[ 	]*[a-f0-9]+:	66 9c +	pushfw
+[ 	]*[a-f0-9]+:	66 9d +	popfw
 [ 	]*[a-f0-9]+:	66 a1 90 90 90 90 +	mov    ax,ds:0x90909090
 [ 	]*[a-f0-9]+:	66 a3 90 90 90 90 +	mov    ds:0x90909090,ax
 [ 	]*[a-f0-9]+:	66 a5 +	movs   WORD PTR es:\[edi\],WORD PTR ds:\[esi\]
@@ -517,17 +517,17 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	66 bf 90 90 +	mov    di,0x9090
 [ 	]*[a-f0-9]+:	66 c1 90 90 90 90 90 90 	rcl    WORD PTR \[eax-0x6f6f6f70\],0x90
 [ 	]*[a-f0-9]+:	66 c2 90 90 +	retw   0x9090
-[ 	]*[a-f0-9]+:	66 c3 +	retw *
+[ 	]*[a-f0-9]+:	66 c3 +	retw
 [ 	]*[a-f0-9]+:	66 c4 90 90 90 90 90 	les    dx,DWORD PTR \[eax-0x6f6f6f70\]
 [ 	]*[a-f0-9]+:	66 c5 90 90 90 90 90 	lds    dx,DWORD PTR \[eax-0x6f6f6f70\]
 [ 	]*[a-f0-9]+:	66 c7 80 90 90 90 90 90 90 	mov    WORD PTR \[eax-0x6f6f6f70\],0x9090
 [ 	]*[a-f0-9]+:	66 c8 90 90 90 +	enterw 0x9090,0x90
-[ 	]*[a-f0-9]+:	66 c9 +	leavew *
+[ 	]*[a-f0-9]+:	66 c9 +	leavew
 [ 	]*[a-f0-9]+:	66 ca 90 90 +	retfw  0x9090
-[ 	]*[a-f0-9]+:	66 cb +	retfw *
+[ 	]*[a-f0-9]+:	66 cb +	retfw
 [ 	]*[a-f0-9]+:	66 ca 90 90 +	retfw  0x9090
-[ 	]*[a-f0-9]+:	66 cb +	retfw *
-[ 	]*[a-f0-9]+:	66 cf +	iretw *
+[ 	]*[a-f0-9]+:	66 cb +	retfw
+[ 	]*[a-f0-9]+:	66 cf +	iretw
 [ 	]*[a-f0-9]+:	66 d1 90 90 90 90 90 	rcl    WORD PTR \[eax-0x6f6f6f70\],1
 [ 	]*[a-f0-9]+:	66 d3 90 90 90 90 90 	rcl    WORD PTR \[eax-0x6f6f6f70\],cl
 [ 	]*[a-f0-9]+:	66 e5 90 +	in     ax,0x90
@@ -580,10 +580,10 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	66 0f c1 90 90 90 90 90 	xadd   WORD PTR \[eax-0x6f6f6f70\],dx
 
 [a-f0-9]+ <gs_foo>:
-[ 	]*[a-f0-9]+:	c3 +	ret *
+[ 	]*[a-f0-9]+:	c3 +	ret
 
 [a-f0-9]+ <short_foo>:
-[ 	]*[a-f0-9]+:	c3 +	ret *
+[ 	]*[a-f0-9]+:	c3 +	ret
 
 [a-f0-9]+ <bar>:
 [ 	]*[a-f0-9]+:	e8 f9 ff ff ff +	call   9d9 <gs_foo>
@@ -607,7 +607,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	0e +	push   cs
 [ 	]*[a-f0-9]+:	8b 04 5d 00 00 00 00 	mov    eax,DWORD PTR \[ebx\*2\+0x0\]
 [ 	]*[a-f0-9]+:	10 14 85 90 90 90 90 	adc    BYTE PTR \[eax\*4-0x6f6f6f70\],dl
-[ 	]*[a-f0-9]+:	2f +	das *
+[ 	]*[a-f0-9]+:	2f +	das
 [ 	]*[a-f0-9]+:	ea 90 90 90 90 90 90 	jmp    0x9090:0x90909090
 [ 	]*[a-f0-9]+:	66 a5 +	movs   WORD PTR es:\[edi\],WORD PTR ds:\[esi\]
 [ 	]*[a-f0-9]+:	70 90 +	jo     9be <foo\+0x9be>
diff --git a/gas/testsuite/gas/i386/intel.d b/gas/testsuite/gas/i386/intel.d
index fe71dcf0e1b..7bc28ed96a1 100644
--- a/gas/testsuite/gas/i386/intel.d
+++ b/gas/testsuite/gas/i386/intel.d
@@ -45,28 +45,28 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	23 90 90 90 90 90 [ 	]*and    -0x6f6f6f70\(%eax\),%edx
 [ 	]*[a-f0-9]+:	24 90 [ 	]*and    \$0x90,%al
 [ 	]*[a-f0-9]+:	25 90 90 90 90 [ 	]*and    \$0x90909090,%eax
-[ 	]*[a-f0-9]+:	27 [ 	]*daa    
+[ 	]*[a-f0-9]+:	27 [ 	]*daa
 [ 	]*[a-f0-9]+:	28 90 90 90 90 90 [ 	]*sub    %dl,-0x6f6f6f70\(%eax\)
 [ 	]*[a-f0-9]+:	29 90 90 90 90 90 [ 	]*sub    %edx,-0x6f6f6f70\(%eax\)
 [ 	]*[a-f0-9]+:	2a 90 90 90 90 90 [ 	]*sub    -0x6f6f6f70\(%eax\),%dl
 [ 	]*[a-f0-9]+:	2b 90 90 90 90 90 [ 	]*sub    -0x6f6f6f70\(%eax\),%edx
 [ 	]*[a-f0-9]+:	2c 90 [ 	]*sub    \$0x90,%al
 [ 	]*[a-f0-9]+:	2d 90 90 90 90 [ 	]*sub    \$0x90909090,%eax
-[ 	]*[a-f0-9]+:	2f [ 	]*das    
+[ 	]*[a-f0-9]+:	2f [ 	]*das
 [ 	]*[a-f0-9]+:	30 90 90 90 90 90 [ 	]*xor    %dl,-0x6f6f6f70\(%eax\)
 [ 	]*[a-f0-9]+:	31 90 90 90 90 90 [ 	]*xor    %edx,-0x6f6f6f70\(%eax\)
 [ 	]*[a-f0-9]+:	32 90 90 90 90 90 [ 	]*xor    -0x6f6f6f70\(%eax\),%dl
 [ 	]*[a-f0-9]+:	33 90 90 90 90 90 [ 	]*xor    -0x6f6f6f70\(%eax\),%edx
 [ 	]*[a-f0-9]+:	34 90 [ 	]*xor    \$0x90,%al
 [ 	]*[a-f0-9]+:	35 90 90 90 90 [ 	]*xor    \$0x90909090,%eax
-[ 	]*[a-f0-9]+:	37 [ 	]*aaa    
+[ 	]*[a-f0-9]+:	37 [ 	]*aaa
 [ 	]*[a-f0-9]+:	38 90 90 90 90 90 [ 	]*cmp    %dl,-0x6f6f6f70\(%eax\)
 [ 	]*[a-f0-9]+:	39 90 90 90 90 90 [ 	]*cmp    %edx,-0x6f6f6f70\(%eax\)
 [ 	]*[a-f0-9]+:	3a 90 90 90 90 90 [ 	]*cmp    -0x6f6f6f70\(%eax\),%dl
 [ 	]*[a-f0-9]+:	3b 90 90 90 90 90 [ 	]*cmp    -0x6f6f6f70\(%eax\),%edx
 [ 	]*[a-f0-9]+:	3c 90 [ 	]*cmp    \$0x90,%al
 [ 	]*[a-f0-9]+:	3d 90 90 90 90 [ 	]*cmp    \$0x90909090,%eax
-[ 	]*[a-f0-9]+:	3f [ 	]*aas    
+[ 	]*[a-f0-9]+:	3f [ 	]*aas
 [ 	]*[a-f0-9]+:	40 [ 	]*inc    %eax
 [ 	]*[a-f0-9]+:	41 [ 	]*inc    %ecx
 [ 	]*[a-f0-9]+:	42 [ 	]*inc    %edx
@@ -99,8 +99,8 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	5d [ 	]*pop    %ebp
 [ 	]*[a-f0-9]+:	5e [ 	]*pop    %esi
 [ 	]*[a-f0-9]+:	5f [ 	]*pop    %edi
-[ 	]*[a-f0-9]+:	60 [ 	]*pusha  
-[ 	]*[a-f0-9]+:	61 [ 	]*popa   
+[ 	]*[a-f0-9]+:	60 [ 	]*pusha
+[ 	]*[a-f0-9]+:	61 [ 	]*popa
 [ 	]*[a-f0-9]+:	62 90 90 90 90 90 [ 	]*bound  %edx,-0x6f6f6f70\(%eax\)
 [ 	]*[a-f0-9]+:	63 90 90 90 90 90 [ 	]*arpl   %dx,-0x6f6f6f70\(%eax\)
 [ 	]*[a-f0-9]+:	68 90 90 90 90 [ 	]*push   \$0x90909090
@@ -150,14 +150,14 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	95 [ 	]*xchg   %eax,%ebp
 [ 	]*[a-f0-9]+:	96 [ 	]*xchg   %eax,%esi
 [ 	]*[a-f0-9]+:	97 [ 	]*xchg   %eax,%edi
-[ 	]*[a-f0-9]+:	98 [ 	]*cwtl   
-[ 	]*[a-f0-9]+:	99 [ 	]*cltd   
+[ 	]*[a-f0-9]+:	98 [ 	]*cwtl
+[ 	]*[a-f0-9]+:	99 [ 	]*cltd
 [ 	]*[a-f0-9]+:	9a 90 90 90 90 90 90 [ 	]*lcall  \$0x9090,\$0x90909090
 [ 	]*[a-f0-9]+:	9b [ 	]*fwait
-[ 	]*[a-f0-9]+:	9c [ 	]*pushf  
-[ 	]*[a-f0-9]+:	9d [ 	]*popf   
-[ 	]*[a-f0-9]+:	9e [ 	]*sahf   
-[ 	]*[a-f0-9]+:	9f [ 	]*lahf   
+[ 	]*[a-f0-9]+:	9c [ 	]*pushf
+[ 	]*[a-f0-9]+:	9d [ 	]*popf
+[ 	]*[a-f0-9]+:	9e [ 	]*sahf
+[ 	]*[a-f0-9]+:	9f [ 	]*lahf
 [ 	]*[a-f0-9]+:	a0 90 90 90 90 [ 	]*mov    0x90909090,%al
 [ 	]*[a-f0-9]+:	a1 90 90 90 90 [ 	]*mov    0x90909090,%eax
 [ 	]*[a-f0-9]+:	a2 90 90 90 90 [ 	]*mov    %al,0x90909090
@@ -193,21 +193,21 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	c0 90 90 90 90 90 90 [ 	]*rclb   \$0x90,-0x6f6f6f70\(%eax\)
 [ 	]*[a-f0-9]+:	c1 90 90 90 90 90 90 [ 	]*rcll   \$0x90,-0x6f6f6f70\(%eax\)
 [ 	]*[a-f0-9]+:	c2 90 90 [ 	]*ret    \$0x9090
-[ 	]*[a-f0-9]+:	c3 [ 	]*ret    
+[ 	]*[a-f0-9]+:	c3 [ 	]*ret
 [ 	]*[a-f0-9]+:	c4 90 90 90 90 90 [ 	]*les    -0x6f6f6f70\(%eax\),%edx
 [ 	]*[a-f0-9]+:	c5 90 90 90 90 90 [ 	]*lds    -0x6f6f6f70\(%eax\),%edx
 [ 	]*[a-f0-9]+:	c6 80 90 90 90 90 90 [ 	]*movb   \$0x90,-0x6f6f6f70\(%eax\)
 [ 	]*[a-f0-9]+:	c7 80 90 90 90 90 90 90 90 90 [ 	]*movl   \$0x90909090,-0x6f6f6f70\(%eax\)
 [ 	]*[a-f0-9]+:	c8 90 90 90 [ 	]*enter  \$0x9090,\$0x90
-[ 	]*[a-f0-9]+:	c9 [ 	]*leave  
+[ 	]*[a-f0-9]+:	c9 [ 	]*leave
 [ 	]*[a-f0-9]+:	ca 90 90 [ 	]*lret   \$0x9090
-[ 	]*[a-f0-9]+:	cb [ 	]*lret   
+[ 	]*[a-f0-9]+:	cb [ 	]*lret
 [ 	]*[a-f0-9]+:	ca 90 90 [ 	]*lret   \$0x9090
-[ 	]*[a-f0-9]+:	cb [ 	]*lret   
-[ 	]*[a-f0-9]+:	cc [ 	]*int3   
+[ 	]*[a-f0-9]+:	cb [ 	]*lret
+[ 	]*[a-f0-9]+:	cc [ 	]*int3
 [ 	]*[a-f0-9]+:	cd 90 [ 	]*int    \$0x90
-[ 	]*[a-f0-9]+:	ce [ 	]*into   
-[ 	]*[a-f0-9]+:	cf [ 	]*iret   
+[ 	]*[a-f0-9]+:	ce [ 	]*into
+[ 	]*[a-f0-9]+:	cf [ 	]*iret
 [ 	]*[a-f0-9]+:	d0 90 90 90 90 90 [ 	]*rclb   -0x6f6f6f70\(%eax\)
 [ 	]*[a-f0-9]+:	d1 90 90 90 90 90 [ 	]*rcll   -0x6f6f6f70\(%eax\)
 [ 	]*[a-f0-9]+:	d2 90 90 90 90 90 [ 	]*rclb   %cl,-0x6f6f6f70\(%eax\)
@@ -239,35 +239,35 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	ed [ 	]*in     \(%dx\),%eax
 [ 	]*[a-f0-9]+:	ee [ 	]*out    %al,\(%dx\)
 [ 	]*[a-f0-9]+:	ef [ 	]*out    %eax,\(%dx\)
-[ 	]*[a-f0-9]+:	f4 [ 	]*hlt    
-[ 	]*[a-f0-9]+:	f5 [ 	]*cmc    
+[ 	]*[a-f0-9]+:	f4 [ 	]*hlt
+[ 	]*[a-f0-9]+:	f5 [ 	]*cmc
 [ 	]*[a-f0-9]+:	f6 90 90 90 90 90 [ 	]*notb   -0x6f6f6f70\(%eax\)
 [ 	]*[a-f0-9]+:	f7 90 90 90 90 90 [ 	]*notl   -0x6f6f6f70\(%eax\)
-[ 	]*[a-f0-9]+:	f8 [ 	]*clc    
-[ 	]*[a-f0-9]+:	f9 [ 	]*stc    
-[ 	]*[a-f0-9]+:	fa [ 	]*cli    
-[ 	]*[a-f0-9]+:	fb [ 	]*sti    
-[ 	]*[a-f0-9]+:	fc [ 	]*cld    
-[ 	]*[a-f0-9]+:	fd [ 	]*std    
+[ 	]*[a-f0-9]+:	f8 [ 	]*clc
+[ 	]*[a-f0-9]+:	f9 [ 	]*stc
+[ 	]*[a-f0-9]+:	fa [ 	]*cli
+[ 	]*[a-f0-9]+:	fb [ 	]*sti
+[ 	]*[a-f0-9]+:	fc [ 	]*cld
+[ 	]*[a-f0-9]+:	fd [ 	]*std
 [ 	]*[a-f0-9]+:	ff 90 90 90 90 90 [ 	]*call   \*-0x6f6f6f70\(%eax\)
 [ 	]*[a-f0-9]+:	0f 00 90 90 90 90 90 [ 	]*lldt   -0x6f6f6f70\(%eax\)
 [ 	]*[a-f0-9]+:	0f 01 90 90 90 90 90 [ 	]*lgdtl  -0x6f6f6f70\(%eax\)
 [ 	]*[a-f0-9]+:	0f 02 90 90 90 90 90 [ 	]*lar    -0x6f6f6f70\(%eax\),%edx
 [ 	]*[a-f0-9]+:	0f 03 90 90 90 90 90 [ 	]*lsl  [...]

[diff truncated at 100000 bytes]


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2022-05-27 13:13 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-27 13:13 [binutils-gdb] opcodes/i386: remove trailing whitespace from insns with zero operands Andrew Burgess

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).