* [binutils-gdb/upstream/users/aburgess/arm-disasm-styling] opcodes/arm: use '@' consistently for the comment character
@ 2022-10-19 10:06 Andrew Burgess
0 siblings, 0 replies; only message in thread
From: Andrew Burgess @ 2022-10-19 10:06 UTC (permalink / raw)
To: bfd-cvs
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=5a5d3b010cbb5c223991a6d513d95b34bf373709
commit 5a5d3b010cbb5c223991a6d513d95b34bf373709
Author: Andrew Burgess <aburgess@redhat.com>
Date: Fri Sep 2 18:15:30 2022 +0100
opcodes/arm: use '@' consistently for the comment character
Looking at the ARM disassembler output, every comment seems to start
with a ';' character, so I assumed this was the correct character to
start an assembler comment.
I then started a couple of places where there was no ';', but instead,
just a '@' character. I thought that this was a case of a missing
';', and proposed a patch to add the missing characters.
Turns out I was wrong, '@' is actually the ARM assembler comment
character, while ';' is the statement separator. Thus this:
nop ;@ comment
is two statements, the first is the 'nop' instruction, while the
second contains no instructions, just the '@ comment' comment text.
This:
nop @ comment
is a single 'nop' instruction followed by a comment. And finally,
this:
nop ; comment
is two statements, the first contains the 'nop' instruction, while the
second contains the instruction 'comment', which obviously isn't
actually an instruction at all.
Why this matters is that, in the next commit, I would like to add
libopcodes syntax styling support for ARM.
The question then is how should the disassembler style the three cases
above?
As '@' is the actual comment start character then clearly the '@' and
anything after it can be styled as a comment. But what about ';' in
the second example? Style as text? Style as a comment?
And the third example is event harder, what about the 'comment' text?
Style as an instruction mnemonic? Style as text? Style as a comment?
I think the only sensible answer is to move the disassembler to use
'@' consistently as its comment character, and remove all the uses of
';'.
Then, in the next commit, it's obvious what to do.
There's obviously a *lot* of tests that get updated after this change.
Diff:
---
gas/testsuite/gas/arm/adr.d | 2 +-
gas/testsuite/gas/arm/adrl.d | 20 +-
gas/testsuite/gas/arm/arch4t-eabi.d | 8 +-
gas/testsuite/gas/arm/arch4t.d | 8 +-
gas/testsuite/gas/arm/arch7.d | 4 +-
gas/testsuite/gas/arm/arch7a-mp.d | 6 +-
gas/testsuite/gas/arm/arch7r-mp.d | 6 +-
gas/testsuite/gas/arm/archv6t2.d | 10 +-
gas/testsuite/gas/arm/archv8m-base.d | 12 +-
gas/testsuite/gas/arm/archv8m-main-dsp-1.d | 12 +-
gas/testsuite/gas/arm/archv8m-main.d | 12 +-
gas/testsuite/gas/arm/arm3.d | 2 +-
gas/testsuite/gas/arm/arm6.d | 4 +-
gas/testsuite/gas/arm/arm7dm.d | 6 +-
gas/testsuite/gas/arm/arm7t.d | 26 +-
gas/testsuite/gas/arm/armv1.d | 8 +-
gas/testsuite/gas/arm/armv7-a+virt.d | 4 +-
gas/testsuite/gas/arm/armv8-2-fp16-scalar-ext.d | 8 +-
.../gas/arm/armv8-2-fp16-scalar-thumb-ext.d | 8 +-
gas/testsuite/gas/arm/armv8-2-fp16-scalar-thumb.d | 8 +-
gas/testsuite/gas/arm/armv8-2-fp16-scalar.d | 8 +-
gas/testsuite/gas/arm/armv8.1-m.main-fp.d | 70 +--
gas/testsuite/gas/arm/armv8.1-m.main-hp.d | 8 +-
gas/testsuite/gas/arm/bl-local-2.d | 10 +-
gas/testsuite/gas/arm/bl-local-v4t.d | 10 +-
gas/testsuite/gas/arm/blx-bad.d | 14 +-
gas/testsuite/gas/arm/blx-local-thumb.d | 10 +-
gas/testsuite/gas/arm/blx-local.d | 12 +-
gas/testsuite/gas/arm/branch-reloc.d | 10 +-
gas/testsuite/gas/arm/ccs.d | 2 +-
gas/testsuite/gas/arm/copro-arm_v2plus-arm_v2.d | 8 +-
gas/testsuite/gas/arm/copro-arm_v5plus-arm_v5.d | 4 +-
.../gas/arm/copro-thumb_v6t2plus-thumb_v6t2-1.d | 4 +-
.../gas/arm/copro-thumb_v6t2plus-thumb_v6t2-2.d | 4 +-
gas/testsuite/gas/arm/crc32-armv8-a-bad.d | 24 +-
gas/testsuite/gas/arm/crc32-armv8-r-bad.d | 24 +-
gas/testsuite/gas/arm/dis-data3.d | 2 +-
gas/testsuite/gas/arm/el_segundo.d | 2 +-
gas/testsuite/gas/arm/float.d | 2 +-
gas/testsuite/gas/arm/group-reloc-alu.d | 160 +++---
gas/testsuite/gas/arm/group-reloc-ldrs.d | 240 ++++-----
gas/testsuite/gas/arm/immed.d | 10 +-
gas/testsuite/gas/arm/immed2.d | 2 +-
gas/testsuite/gas/arm/inst.d | 36 +-
gas/testsuite/gas/arm/iwmmxt.d | 2 +-
gas/testsuite/gas/arm/ldconst.d | 42 +-
gas/testsuite/gas/arm/ldr-global.d | 14 +-
gas/testsuite/gas/arm/ldr-t.d | 16 +-
gas/testsuite/gas/arm/ldr.d | 10 +-
gas/testsuite/gas/arm/ldst-offset0.d | 6 +-
gas/testsuite/gas/arm/ldst-pc.d | 8 +-
gas/testsuite/gas/arm/m0-load-pseudo.d | 4 +-
gas/testsuite/gas/arm/m23-load-pseudo.d | 4 +-
gas/testsuite/gas/arm/m33-load-pseudo.d | 4 +-
gas/testsuite/gas/arm/macro1.d | 6 +-
gas/testsuite/gas/arm/mapdir.d | 4 +-
gas/testsuite/gas/arm/mapmisc.d | 38 +-
gas/testsuite/gas/arm/mapsecs.d | 10 +-
gas/testsuite/gas/arm/mapshort-eabi.d | 10 +-
gas/testsuite/gas/arm/mapshort-elf.d | 10 +-
gas/testsuite/gas/arm/mask_1-armv8-a.d | 32 +-
gas/testsuite/gas/arm/mask_1-armv8-r.d | 32 +-
gas/testsuite/gas/arm/mrs-msr-arm-v6.d | 6 +-
gas/testsuite/gas/arm/mrs-msr-arm-v7-a.d | 6 +-
gas/testsuite/gas/arm/msr-imm.d | 268 +++++-----
gas/testsuite/gas/arm/mve-vand.d | 94 ++--
gas/testsuite/gas/arm/mve-vbic.d | 20 +-
gas/testsuite/gas/arm/mve-vcvt-3.d | 80 +--
gas/testsuite/gas/arm/mve-vmov-1.d | 20 +-
gas/testsuite/gas/arm/mve-vmov-2.d | 34 +-
gas/testsuite/gas/arm/mve-vmov-vmvn-vorr-vbic.d | 64 +--
gas/testsuite/gas/arm/mve-vmvn.d | 114 ++---
gas/testsuite/gas/arm/mve-vorn.d | 22 +-
gas/testsuite/gas/arm/mve-vorr.d | 20 +-
gas/testsuite/gas/arm/neon-cond-bad_t2.d | 4 +-
gas/testsuite/gas/arm/neon-const.d | 516 +++++++++----------
gas/testsuite/gas/arm/neon-cov.d | 564 ++++++++++-----------
gas/testsuite/gas/arm/neon-ldst-rm.d | 4 +-
gas/testsuite/gas/arm/neon-logic.d | 8 +-
gas/testsuite/gas/arm/nops.d | 2 +-
gas/testsuite/gas/arm/offset-1.d | 8 +-
gas/testsuite/gas/arm/offset.d | 8 +-
gas/testsuite/gas/arm/pr21458.d | 14 +-
gas/testsuite/gas/arm/pr24907.d | 6 +-
gas/testsuite/gas/arm/pr25235.d | 14 +-
gas/testsuite/gas/arm/push-pop.d | 8 +-
gas/testsuite/gas/arm/reg-alias.d | 6 +-
gas/testsuite/gas/arm/relax_branch_align.d | 8 +-
gas/testsuite/gas/arm/relax_load_align.d | 6 +-
gas/testsuite/gas/arm/sp-pc-usage-t.d | 8 +-
gas/testsuite/gas/arm/tcompat.d | 6 +-
gas/testsuite/gas/arm/tcompat2.d | 8 +-
gas/testsuite/gas/arm/thumb-eabi.d | 42 +-
gas/testsuite/gas/arm/thumb-nop.d | 4 +-
gas/testsuite/gas/arm/thumb.d | 42 +-
gas/testsuite/gas/arm/thumb1_unified.d | 4 +-
gas/testsuite/gas/arm/thumb2_add.d | 38 +-
gas/testsuite/gas/arm/thumb2_invert.d | 24 +-
gas/testsuite/gas/arm/thumb2_pool.d | 32 +-
gas/testsuite/gas/arm/thumb2_relax.d | 52 +-
gas/testsuite/gas/arm/thumb2_vpool.d | 158 +++---
gas/testsuite/gas/arm/thumb2_vpool_be.d | 158 +++---
gas/testsuite/gas/arm/thumb32.d | 186 +++----
gas/testsuite/gas/arm/thumbv6.d | 8 +-
gas/testsuite/gas/arm/thumbv6k.d | 8 +-
gas/testsuite/gas/arm/tls.d | 14 +-
gas/testsuite/gas/arm/tls_vxworks.d | 6 +-
gas/testsuite/gas/arm/udf.d | 24 +-
gas/testsuite/gas/arm/unpredictable.d | 2 +-
gas/testsuite/gas/arm/vfp-mov-enc.d | 18 +-
gas/testsuite/gas/arm/vfp-neon-overlap.d | 8 +-
gas/testsuite/gas/arm/vfp1.d | 6 +-
gas/testsuite/gas/arm/vfp1xD.d | 76 +--
gas/testsuite/gas/arm/vfp1xD_t2.d | 70 +--
gas/testsuite/gas/arm/vfpv3-32drs.d | 6 +-
gas/testsuite/gas/arm/vldconst.d | 246 ++++-----
gas/testsuite/gas/arm/vldconst_be.d | 246 ++++-----
gas/testsuite/gas/arm/vldr.d | 4 +-
gas/testsuite/gas/arm/wince.d | 12 +-
gas/testsuite/gas/arm/wince_inst.d | 36 +-
gas/testsuite/gas/arm/xscale.d | 4 +-
ld/testsuite/ld-arm/arm-app-abs32.d | 8 +-
ld/testsuite/ld-arm/arm-app.d | 6 +-
ld/testsuite/ld-arm/arm-be8.d | 2 +-
ld/testsuite/ld-arm/arm-call.d | 8 +-
ld/testsuite/ld-arm/arm-lib-plt32.d | 6 +-
ld/testsuite/ld-arm/arm-lib.d | 6 +-
ld/testsuite/ld-arm/arm-movwt.d | 40 +-
ld/testsuite/ld-arm/arm-pic-veneer.d | 4 +-
ld/testsuite/ld-arm/armthumb-lib.d | 16 +-
ld/testsuite/ld-arm/attr-merge-wchar-24.d | 2 +-
ld/testsuite/ld-arm/attr-merge-wchar-42.d | 2 +-
ld/testsuite/ld-arm/callweak.d | 2 +-
ld/testsuite/ld-arm/cortex-a8-far.d | 6 +-
ld/testsuite/ld-arm/cortex-a8-fix-b-plt.d | 8 +-
ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.d | 8 +-
ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.d | 8 +-
ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-plt.d | 8 +-
ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.d | 8 +-
ld/testsuite/ld-arm/farcall-arm-arm-pic-veneer.d | 2 +-
ld/testsuite/ld-arm/farcall-arm-arm.d | 2 +-
ld/testsuite/ld-arm/farcall-arm-nacl-pic.d | 4 +-
ld/testsuite/ld-arm/farcall-arm-nacl.d | 4 +-
.../ld-arm/farcall-arm-thumb-blx-pic-veneer.d | 2 +-
ld/testsuite/ld-arm/farcall-arm-thumb-blx.d | 2 +-
ld/testsuite/ld-arm/farcall-arm-thumb-pic-veneer.d | 2 +-
ld/testsuite/ld-arm/farcall-arm-thumb.d | 2 +-
ld/testsuite/ld-arm/farcall-data-nacl.d | 4 +-
ld/testsuite/ld-arm/farcall-data.d | 2 +-
ld/testsuite/ld-arm/farcall-group-limit.d | 2 +-
ld/testsuite/ld-arm/farcall-group-size2.d | 10 +-
ld/testsuite/ld-arm/farcall-group.d | 10 +-
ld/testsuite/ld-arm/farcall-mix.d | 10 +-
ld/testsuite/ld-arm/farcall-mix2.d | 10 +-
ld/testsuite/ld-arm/farcall-mixed-app-v5.d | 26 +-
ld/testsuite/ld-arm/farcall-mixed-app.d | 26 +-
ld/testsuite/ld-arm/farcall-mixed-app2.d | 28 +-
ld/testsuite/ld-arm/farcall-mixed-lib-v4t.d | 36 +-
ld/testsuite/ld-arm/farcall-mixed-lib.d | 24 +-
.../ld-arm/farcall-thumb-arm-blx-pic-veneer.d | 2 +-
ld/testsuite/ld-arm/farcall-thumb-arm-blx.d | 2 +-
ld/testsuite/ld-arm/farcall-thumb-arm-pic-veneer.d | 2 +-
ld/testsuite/ld-arm/farcall-thumb-arm.d | 2 +-
.../ld-arm/farcall-thumb-thumb-blx-pic-veneer.d | 2 +-
ld/testsuite/ld-arm/farcall-thumb-thumb-blx.d | 2 +-
.../ld-arm/farcall-thumb-thumb-m-no-profile.d | 2 +-
.../ld-arm/farcall-thumb-thumb-m-pic-veneer.d | 2 +-
ld/testsuite/ld-arm/farcall-thumb-thumb-m.d | 2 +-
.../ld-arm/farcall-thumb-thumb-pic-veneer.d | 2 +-
ld/testsuite/ld-arm/farcall-thumb-thumb.d | 2 +-
ld/testsuite/ld-arm/farcall-thumb2-purecode.d | 2 +-
ld/testsuite/ld-arm/farcall-thumb2-thumb2-m.d | 2 +-
ld/testsuite/ld-arm/fdpic-main-m.d | 16 +-
ld/testsuite/ld-arm/fdpic-main.d | 16 +-
ld/testsuite/ld-arm/fdpic-shared-m.d | 4 +-
ld/testsuite/ld-arm/fdpic-shared.d | 4 +-
ld/testsuite/ld-arm/fix-arm1176-off.d | 2 +-
ld/testsuite/ld-arm/fix-arm1176-on.d | 2 +-
ld/testsuite/ld-arm/gc-hidden-1.d | 2 +-
ld/testsuite/ld-arm/group-relocs.d | 58 +--
ld/testsuite/ld-arm/ifunc-1.dd | 50 +-
ld/testsuite/ld-arm/ifunc-10.dd | 236 ++++-----
ld/testsuite/ld-arm/ifunc-11.dd | 28 +-
ld/testsuite/ld-arm/ifunc-12.dd | 28 +-
ld/testsuite/ld-arm/ifunc-13.dd | 28 +-
ld/testsuite/ld-arm/ifunc-14.dd | 42 +-
ld/testsuite/ld-arm/ifunc-15.dd | 42 +-
ld/testsuite/ld-arm/ifunc-16.dd | 36 +-
ld/testsuite/ld-arm/ifunc-17.dd | 2 +-
ld/testsuite/ld-arm/ifunc-2.dd | 146 +++---
ld/testsuite/ld-arm/ifunc-3.dd | 40 +-
ld/testsuite/ld-arm/ifunc-4.dd | 236 ++++-----
ld/testsuite/ld-arm/ifunc-5.dd | 26 +-
ld/testsuite/ld-arm/ifunc-6.dd | 38 +-
ld/testsuite/ld-arm/ifunc-7.dd | 18 +-
ld/testsuite/ld-arm/ifunc-8.dd | 118 ++---
ld/testsuite/ld-arm/ifunc-9.dd | 56 +-
.../ld-arm/jump-reloc-veneers-cond-long-backward.d | 2 +-
ld/testsuite/ld-arm/jump-reloc-veneers-cond-long.d | 2 +-
ld/testsuite/ld-arm/jump-reloc-veneers-long.d | 2 +-
ld/testsuite/ld-arm/long-plt-format.d | 4 +-
ld/testsuite/ld-arm/mixed-app-v5.d | 26 +-
ld/testsuite/ld-arm/mixed-app.d | 26 +-
ld/testsuite/ld-arm/mixed-lib.d | 12 +-
ld/testsuite/ld-arm/movw-merge.d | 4 +-
ld/testsuite/ld-arm/non-contiguous-arm2.d | 10 +-
ld/testsuite/ld-arm/non-contiguous-arm3.d | 12 +-
ld/testsuite/ld-arm/non-contiguous-arm5.d | 10 +-
ld/testsuite/ld-arm/non-contiguous-arm6.d | 12 +-
ld/testsuite/ld-arm/stm32l4xx-cannot-fix-far-ldm.d | 2 +-
ld/testsuite/ld-arm/stm32l4xx-fix-ldm.d | 8 +-
ld/testsuite/ld-arm/stm32l4xx-fix-vldm-dp.d | 2 +-
ld/testsuite/ld-arm/stm32l4xx-fix-vldm.d | 2 +-
ld/testsuite/ld-arm/thumb-plt.d | 4 +-
ld/testsuite/ld-arm/thumb1-adds.d | 12 +-
ld/testsuite/ld-arm/thumb1-movs.d | 10 +-
ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad.d | 2 +-
ld/testsuite/ld-arm/thumb2-bl-bad.d | 2 +-
ld/testsuite/ld-arm/tls-app.d | 4 +-
ld/testsuite/ld-arm/tls-descrelax-be32.d | 112 ++--
ld/testsuite/ld-arm/tls-descrelax-be8.d | 78 +--
ld/testsuite/ld-arm/tls-descrelax-v7.d | 78 +--
ld/testsuite/ld-arm/tls-descrelax.d | 112 ++--
ld/testsuite/ld-arm/tls-descseq.d | 20 +-
ld/testsuite/ld-arm/tls-gdesc-neg.d | 14 +-
ld/testsuite/ld-arm/tls-gdesc.d | 22 +-
ld/testsuite/ld-arm/tls-gdierelax.d | 8 +-
ld/testsuite/ld-arm/tls-gdierelax2.d | 10 +-
ld/testsuite/ld-arm/tls-gdlerelax.d | 4 +-
ld/testsuite/ld-arm/tls-lib-loc.d | 14 +-
ld/testsuite/ld-arm/tls-lib.d | 4 +-
ld/testsuite/ld-arm/tls-longplt-lib.d | 28 +-
ld/testsuite/ld-arm/tls-longplt.d | 30 +-
ld/testsuite/ld-arm/tls-thumb1.d | 36 +-
ld/testsuite/ld-arm/vxworks1-lib.dd | 12 +-
ld/testsuite/ld-arm/vxworks1.dd | 10 +-
opcodes/arm-dis.c | 96 ++--
237 files changed, 3548 insertions(+), 3548 deletions(-)
diff --git a/gas/testsuite/gas/arm/adr.d b/gas/testsuite/gas/arm/adr.d
index 13722cd9cdd..817d7df1859 100644
--- a/gas/testsuite/gas/arm/adr.d
+++ b/gas/testsuite/gas/arm/adr.d
@@ -7,4 +7,4 @@
.*: +file format .*arm.*
Disassembly of section .text:
-0+ <.*> 824ff203 subhi pc, pc, #805306368 ; 0x30000000
+0+ <.*> 824ff203 subhi pc, pc, #805306368 @ 0x30000000
diff --git a/gas/testsuite/gas/arm/adrl.d b/gas/testsuite/gas/arm/adrl.d
index b6011f1f89c..9657e0eec1a 100644
--- a/gas/testsuite/gas/arm/adrl.d
+++ b/gas/testsuite/gas/arm/adrl.d
@@ -9,20 +9,20 @@
Disassembly of section .text:
...
0+2000 <.*> e24f0008 sub r0, pc, #8
-0+2004 <.*> e2400c20 sub r0, r0, #32, 24 ; 0x2000
+0+2004 <.*> e2400c20 sub r0, r0, #32, 24 @ 0x2000
0+2008 <.*> e28f0020 add r0, pc, #32
-0+200c <.*> e2800c20 add r0, r0, #32, 24 ; 0x2000
+0+200c <.*> e2800c20 add r0, r0, #32, 24 @ 0x2000
0+2010 <.*> e24f0018 sub r0, pc, #24
-0+2014 <.*> e1a00000 nop ; \(mov r0, r0\)
+0+2014 <.*> e1a00000 nop @ \(mov r0, r0\)
0+2018 <.*> e28f0008 add r0, pc, #8
-0+201c <.*> e1a00000 nop ; \(mov r0, r0\)
+0+201c <.*> e1a00000 nop @ \(mov r0, r0\)
0+2020 <.*> 028f0000 addeq r0, pc, #0
-0+2024 <.*> e1a00000 nop ; \(mov r0, r0\)
-0+2028 <.*> e24f0030 sub r0, pc, #48 ; 0x30
-0+202c <.*> e2400c20 sub r0, r0, #32, 24 ; 0x2000
-0+2030 <.*> e28f0c21 add r0, pc, #8448 ; 0x2100
-0+2034 <.*> e1a00000 nop ; \(mov r0, r0\)
+0+2024 <.*> e1a00000 nop @ \(mov r0, r0\)
+0+2028 <.*> e24f0030 sub r0, pc, #48 @ 0x30
+0+202c <.*> e2400c20 sub r0, r0, #32, 24 @ 0x2000
+0+2030 <.*> e28f0c21 add r0, pc, #8448 @ 0x2100
+0+2034 <.*> e1a00000 nop @ \(mov r0, r0\)
...
-0+4030 <.*> e28fec01 add lr, pc, #256 ; 0x100
+0+4030 <.*> e28fec01 add lr, pc, #256 @ 0x100
...
...
diff --git a/gas/testsuite/gas/arm/arch4t-eabi.d b/gas/testsuite/gas/arm/arch4t-eabi.d
index 66c0a4deb5c..3e3499d13ce 100644
--- a/gas/testsuite/gas/arm/arch4t-eabi.d
+++ b/gas/testsuite/gas/arm/arch4t-eabi.d
@@ -11,7 +11,7 @@ Disassembly of section .text:
.*: R_ARM_V4BX.*
0+04 <[^>]+> 012fff11 ? bxeq r1
.*: R_ARM_V4BX.*
-0+08 <[^>]+> e15f30b8 ? ldrh r3, \[pc, #-8\] ; 0+08 <[^>]+>
+0+08 <[^>]+> e15f30b8 ? ldrh r3, \[pc, #-8\] @ 0+08 <[^>]+>
0+0c <[^>]+> e1d540f0 ? ldrsh r4, \[r5\]
0+10 <[^>]+> e19140d3 ? ldrsb r4, \[r1, r3\]
0+14 <[^>]+> e1b410f4 ? ldrsh r1, \[r4, r4\]!
@@ -21,7 +21,7 @@ Disassembly of section .text:
0+24 <[^>]+> e1d32fdf ? ldrsb r2, \[r3, #255\].*
0+28 <[^>]+> e1541ffa ? ldrsh r1, \[r4, #-250\].*
0+2c <[^>]+> e1d51fd0 ? ldrsb r1, \[r5, #240\].*
-0+30 <[^>]+> e1cf23b0 ? strh r2, \[pc, #48\] ; 0+68 <[^>]+>
+0+30 <[^>]+> e1cf23b0 ? strh r2, \[pc, #48\] @ 0+68 <[^>]+>
0+34 <[^>]+> 11c330b0 ? strhne r3, \[r3\]
0+38 <[^>]+> e328f002 ? msr CPSR_f, #2
0+3c <[^>]+> e121f003 ? msr CPSR_c, r3
@@ -35,5 +35,5 @@ Disassembly of section .text:
0+5c <[^>]+> e164f00a ? msr SPSR_s, sl
0+60 <[^>]+> e168f00b ? msr SPSR_f, fp
0+64 <[^>]+> e169f00c ? msr SPSR_fc, ip
-0+68 <[^>]+> e1a00000 ? nop ; \(mov r0, r0\)
-0+6c <[^>]+> e1a00000 ? nop ; \(mov r0, r0\)
+0+68 <[^>]+> e1a00000 ? nop @ \(mov r0, r0\)
+0+6c <[^>]+> e1a00000 ? nop @ \(mov r0, r0\)
diff --git a/gas/testsuite/gas/arm/arch4t.d b/gas/testsuite/gas/arm/arch4t.d
index f00f2b8209e..d8b7439c656 100644
--- a/gas/testsuite/gas/arm/arch4t.d
+++ b/gas/testsuite/gas/arm/arch4t.d
@@ -9,7 +9,7 @@
Disassembly of section .text:
0+00 <[^>]+> e12fff10 ? bx r0
0+04 <[^>]+> 012fff11 ? bxeq r1
-0+08 <[^>]+> e15f30b8 ? ldrh r3, \[pc, #-8\] ; 0+08 <[^>]+>
+0+08 <[^>]+> e15f30b8 ? ldrh r3, \[pc, #-8\] @ 0+08 <[^>]+>
0+0c <[^>]+> e1d540f0 ? ldrsh r4, \[r5\]
0+10 <[^>]+> e19140d3 ? ldrsb r4, \[r1, r3\]
0+14 <[^>]+> e1b410f4 ? ldrsh r1, \[r4, r4\]!
@@ -19,7 +19,7 @@ Disassembly of section .text:
0+24 <[^>]+> e1d32fdf ? ldrsb r2, \[r3, #255\].*
0+28 <[^>]+> e1541ffa ? ldrsh r1, \[r4, #-250\].*
0+2c <[^>]+> e1d51fd0 ? ldrsb r1, \[r5, #240\].*
-0+30 <[^>]+> e1cf23b0 ? strh r2, \[pc, #48\] ; 0+68 <[^>]+>
+0+30 <[^>]+> e1cf23b0 ? strh r2, \[pc, #48\] @ 0+68 <[^>]+>
0+34 <[^>]+> 11c330b0 ? strhne r3, \[r3\]
0+38 <[^>]+> e328f002 ? msr CPSR_f, #2
0+3c <[^>]+> e121f003 ? msr CPSR_c, r3
@@ -33,6 +33,6 @@ Disassembly of section .text:
0+5c <[^>]+> e164f00a ? msr SPSR_s, sl
0+60 <[^>]+> e168f00b ? msr SPSR_f, fp
0+64 <[^>]+> e169f00c ? msr SPSR_fc, ip
-0+68 <[^>]+> e1a00000 ? nop ; \(mov r0, r0\)
-0+6c <[^>]+> e1a00000 ? nop ; \(mov r0, r0\)
+0+68 <[^>]+> e1a00000 ? nop @ \(mov r0, r0\)
+0+6c <[^>]+> e1a00000 ? nop @ \(mov r0, r0\)
diff --git a/gas/testsuite/gas/arm/arch7.d b/gas/testsuite/gas/arm/arch7.d
index a7149a62b39..c353b8ec21a 100644
--- a/gas/testsuite/gas/arm/arch7.d
+++ b/gas/testsuite/gas/arm/arch7.d
@@ -28,8 +28,8 @@ Disassembly of section .text:
0+050 <[^>]*> f995 f000 pli \[r5\]
0+054 <[^>]*> f995 ffff pli \[r5, #4095\].*
0+058 <[^>]*> f915 fcff pli \[r5, #-255\]
-0+05c <[^>]*> f99f ffff pli \[pc, #4095\] ; 0+0105f <[^>]*>
-0+060 <[^>]*> f91f ffff pli \[pc, #-4095\] ; f+ff065 <[^>]*>
+0+05c <[^>]*> f99f ffff pli \[pc, #4095\] @ 0+0105f <[^>]*>
+0+060 <[^>]*> f91f ffff pli \[pc, #-4095\] @ f+ff065 <[^>]*>
0+064 <[^>]*> f3af 80f0 dbg #0
0+068 <[^>]*> f3af 80ff dbg #15
0+06c <[^>]*> f3bf 8f5f dmb sy
diff --git a/gas/testsuite/gas/arm/arch7a-mp.d b/gas/testsuite/gas/arm/arch7a-mp.d
index 06042e297cc..2797d8abf74 100644
--- a/gas/testsuite/gas/arm/arch7a-mp.d
+++ b/gas/testsuite/gas/arm/arch7a-mp.d
@@ -9,8 +9,8 @@ Disassembly of section .text:
0[0-9a-f]+ <[^>]+> f590f000 pldw \[r0\]
0[0-9a-f]+ <[^>]+> f59ef000 pldw \[lr\]
0[0-9a-f]+ <[^>]+> f591f000 pldw \[r1\]
-0[0-9a-f]+ <[^>]+> f590ffff pldw \[r0, #4095\] ; 0xfff
-0[0-9a-f]+ <[^>]+> f510ffff pldw \[r0, #-4095\] ; 0xfffff001
+0[0-9a-f]+ <[^>]+> f590ffff pldw \[r0, #4095\] @ 0xfff
+0[0-9a-f]+ <[^>]+> f510ffff pldw \[r0, #-4095\] @ 0xfffff001
0[0-9a-f]+ <[^>]+> f790f000 pldw \[r0, r0\]
0[0-9a-f]+ <[^>]+> f791f000 pldw \[r1, r0\]
0[0-9a-f]+ <[^>]+> f79ef000 pldw \[lr, r0\]
@@ -20,7 +20,7 @@ Disassembly of section .text:
0[0-9a-f]+ <[^>]+> f8b0 f000 pldw \[r0\]
0[0-9a-f]+ <[^>]+> f8be f000 pldw \[lr\]
0[0-9a-f]+ <[^>]+> f8b1 f000 pldw \[r1\]
-0[0-9a-f]+ <[^>]+> f8b0 ffff pldw \[r0, #4095\] ; 0xfff
+0[0-9a-f]+ <[^>]+> f8b0 ffff pldw \[r0, #4095\] @ 0xfff
0[0-9a-f]+ <[^>]+> f830 fcff pldw \[r0, #-255\]
0[0-9a-f]+ <[^>]+> f830 f000 pldw \[r0, r0\]
0[0-9a-f]+ <[^>]+> f831 f000 pldw \[r1, r0\]
diff --git a/gas/testsuite/gas/arm/arch7r-mp.d b/gas/testsuite/gas/arm/arch7r-mp.d
index b6efd6a934e..45400c0c0ea 100644
--- a/gas/testsuite/gas/arm/arch7r-mp.d
+++ b/gas/testsuite/gas/arm/arch7r-mp.d
@@ -9,8 +9,8 @@ Disassembly of section .text:
0[0-9a-f]+ <[^>]+> f590f000 pldw \[r0\]
0[0-9a-f]+ <[^>]+> f59ef000 pldw \[lr\]
0[0-9a-f]+ <[^>]+> f591f000 pldw \[r1\]
-0[0-9a-f]+ <[^>]+> f590ffff pldw \[r0, #4095\] ; 0xfff
-0[0-9a-f]+ <[^>]+> f510ffff pldw \[r0, #-4095\] ; 0xfffff001
+0[0-9a-f]+ <[^>]+> f590ffff pldw \[r0, #4095\] @ 0xfff
+0[0-9a-f]+ <[^>]+> f510ffff pldw \[r0, #-4095\] @ 0xfffff001
0[0-9a-f]+ <[^>]+> f790f000 pldw \[r0, r0\]
0[0-9a-f]+ <[^>]+> f791f000 pldw \[r1, r0\]
0[0-9a-f]+ <[^>]+> f79ef000 pldw \[lr, r0\]
@@ -20,7 +20,7 @@ Disassembly of section .text:
0[0-9a-f]+ <[^>]+> f8b0 f000 pldw \[r0\]
0[0-9a-f]+ <[^>]+> f8be f000 pldw \[lr\]
0[0-9a-f]+ <[^>]+> f8b1 f000 pldw \[r1\]
-0[0-9a-f]+ <[^>]+> f8b0 ffff pldw \[r0, #4095\] ; 0xfff
+0[0-9a-f]+ <[^>]+> f8b0 ffff pldw \[r0, #4095\] @ 0xfff
0[0-9a-f]+ <[^>]+> f830 fcff pldw \[r0, #-255\]
0[0-9a-f]+ <[^>]+> f830 f000 pldw \[r0, r0\]
0[0-9a-f]+ <[^>]+> f831 f000 pldw \[r1, r0\]
diff --git a/gas/testsuite/gas/arm/archv6t2.d b/gas/testsuite/gas/arm/archv6t2.d
index 8769b3f3a18..cc6fbc0cc13 100644
--- a/gas/testsuite/gas/arm/archv6t2.d
+++ b/gas/testsuite/gas/arm/archv6t2.d
@@ -38,8 +38,8 @@ Disassembly of section .text:
0+78 <[^>]+> e3400000 movt r0, #0
0+7c <[^>]+> 13000000 movwne r0, #0
0+80 <[^>]+> e3009000 movw r9, #0
-0+84 <[^>]+> e3000999 movw r0, #2457 ; 0x999
-0+88 <[^>]+> e3090000 movw r0, #36864 ; 0x9000
+0+84 <[^>]+> e3000999 movw r0, #2457 @ 0x999
+0+88 <[^>]+> e3090000 movw r0, #36864 @ 0x9000
0+8c <[^>]+> e0f900b0 ldrht r0, \[r9\], #0
0+90 <[^>]+> e0f900f0 ldrsht r0, \[r9\], #0
0+94 <[^>]+> e0f900d0 ldrsbt r0, \[r9\], #0
@@ -51,8 +51,8 @@ Disassembly of section .text:
0+ac <[^>]+> e07099b9 ldrht r9, \[r0\], #-153.*
0+b0 <[^>]+> 10b090b9 ldrhtne r9, \[r0\], r9
0+b4 <[^>]+> 103090b9 ldrhtne r9, \[r0\], -r9
-0+b8 <[^>]+> 10f099b9 ldrhtne r9, \[r0\], #153 ; 0x99
-0+bc <[^>]+> 107099b9 ldrhtne r9, \[r0\], #-153 ; 0xffffff67
+0+b8 <[^>]+> 10f099b9 ldrhtne r9, \[r0\], #153 @ 0x99
+0+bc <[^>]+> 107099b9 ldrhtne r9, \[r0\], #-153 @ 0xffffff67
0+c0 <[^>]+> e02100b2 strht r0, \[r1\], -r2
0+c4 <[^>]+> 102100b2 strhtne r0, \[r1\], -r2
0+c8 <[^>]+> e0a100b2 strht r0, \[r1\], r2
@@ -61,4 +61,4 @@ Disassembly of section .text:
0+d4 <[^>]+> e06100b2 strht r0, \[r1\], #-2
0+d8 <[^>]+> 10e100b2 strhtne r0, \[r1\], #2
0+dc <[^>]+> 106100b2 strhtne r0, \[r1\], #-2
-0+e0 <[^>]+> e3009999 movw r9, #2457 ; 0x999
+0+e0 <[^>]+> e3009999 movw r9, #2457 @ 0x999
diff --git a/gas/testsuite/gas/arm/archv8m-base.d b/gas/testsuite/gas/arm/archv8m-base.d
index 6075ee048a0..d956eb55e11 100644
--- a/gas/testsuite/gas/arm/archv8m-base.d
+++ b/gas/testsuite/gas/arm/archv8m-base.d
@@ -14,12 +14,12 @@ Disassembly of section .text:
0+.* <[^>]*> e849 f800 tt r8, r9
0+.* <[^>]*> e841 f040 ttt r0, r1
0+.* <[^>]*> e849 f840 ttt r8, r9
-0+.* <[^>]*> f24f 1023 movw r0, #61731 ; 0xf123
-0+.* <[^>]*> f24f 1823 movw r8, #61731 ; 0xf123
-0+.* <[^>]*> f24f 1823 movw r8, #61731 ; 0xf123
-0+.* <[^>]*> f24f 1823 movw r8, #61731 ; 0xf123
-0+.* <[^>]*> f2cf 1023 movt r0, #61731 ; 0xf123
-0+.* <[^>]*> f2cf 1823 movt r8, #61731 ; 0xf123
+0+.* <[^>]*> f24f 1023 movw r0, #61731 @ 0xf123
+0+.* <[^>]*> f24f 1823 movw r8, #61731 @ 0xf123
+0+.* <[^>]*> f24f 1823 movw r8, #61731 @ 0xf123
+0+.* <[^>]*> f24f 1823 movw r8, #61731 @ 0xf123
+0+.* <[^>]*> f2cf 1023 movt r0, #61731 @ 0xf123
+0+.* <[^>]*> f2cf 1823 movt r8, #61731 @ 0xf123
0+.* <[^>]*> b154 cbz r4, 0+.* <[^>]*>
0+.* <[^>]*> b94c cbnz r4, 0+.* <[^>]*>
0+.* <[^>]*> f000 b808 b.w 0+.* <[^>]*>
diff --git a/gas/testsuite/gas/arm/archv8m-main-dsp-1.d b/gas/testsuite/gas/arm/archv8m-main-dsp-1.d
index 8c2c12d0d1c..444d3005ac4 100644
--- a/gas/testsuite/gas/arm/archv8m-main-dsp-1.d
+++ b/gas/testsuite/gas/arm/archv8m-main-dsp-1.d
@@ -14,12 +14,12 @@ Disassembly of section .text:
0+.* <[^>]*> e849 f800 tt r8, r9
0+.* <[^>]*> e841 f040 ttt r0, r1
0+.* <[^>]*> e849 f840 ttt r8, r9
-0+.* <[^>]*> f24f 1023 movw r0, #61731 ; 0xf123
-0+.* <[^>]*> f24f 1823 movw r8, #61731 ; 0xf123
-0+.* <[^>]*> f24f 1823 movw r8, #61731 ; 0xf123
-0+.* <[^>]*> f24f 1823 movw r8, #61731 ; 0xf123
-0+.* <[^>]*> f2cf 1023 movt r0, #61731 ; 0xf123
-0+.* <[^>]*> f2cf 1823 movt r8, #61731 ; 0xf123
+0+.* <[^>]*> f24f 1023 movw r0, #61731 @ 0xf123
+0+.* <[^>]*> f24f 1823 movw r8, #61731 @ 0xf123
+0+.* <[^>]*> f24f 1823 movw r8, #61731 @ 0xf123
+0+.* <[^>]*> f24f 1823 movw r8, #61731 @ 0xf123
+0+.* <[^>]*> f2cf 1023 movt r0, #61731 @ 0xf123
+0+.* <[^>]*> f2cf 1823 movt r8, #61731 @ 0xf123
0+.* <[^>]*> b154 cbz r4, 0+.* <[^>]*>
0+.* <[^>]*> b94c cbnz r4, 0+.* <[^>]*>
0+.* <[^>]*> f000 b808 b.w 0+.* <[^>]*>
diff --git a/gas/testsuite/gas/arm/archv8m-main.d b/gas/testsuite/gas/arm/archv8m-main.d
index 0b76db10fbd..d5a0c9a16a1 100644
--- a/gas/testsuite/gas/arm/archv8m-main.d
+++ b/gas/testsuite/gas/arm/archv8m-main.d
@@ -14,12 +14,12 @@ Disassembly of section .text:
0+.* <[^>]*> e849 f800 tt r8, r9
0+.* <[^>]*> e841 f040 ttt r0, r1
0+.* <[^>]*> e849 f840 ttt r8, r9
-0+.* <[^>]*> f24f 1023 movw r0, #61731 ; 0xf123
-0+.* <[^>]*> f24f 1823 movw r8, #61731 ; 0xf123
-0+.* <[^>]*> f24f 1823 movw r8, #61731 ; 0xf123
-0+.* <[^>]*> f24f 1823 movw r8, #61731 ; 0xf123
-0+.* <[^>]*> f2cf 1023 movt r0, #61731 ; 0xf123
-0+.* <[^>]*> f2cf 1823 movt r8, #61731 ; 0xf123
+0+.* <[^>]*> f24f 1023 movw r0, #61731 @ 0xf123
+0+.* <[^>]*> f24f 1823 movw r8, #61731 @ 0xf123
+0+.* <[^>]*> f24f 1823 movw r8, #61731 @ 0xf123
+0+.* <[^>]*> f24f 1823 movw r8, #61731 @ 0xf123
+0+.* <[^>]*> f2cf 1023 movt r0, #61731 @ 0xf123
+0+.* <[^>]*> f2cf 1823 movt r8, #61731 @ 0xf123
0+.* <[^>]*> b154 cbz r4, 0+.* <[^>]*>
0+.* <[^>]*> b94c cbnz r4, 0+.* <[^>]*>
0+.* <[^>]*> f000 b808 b.w 0+.* <[^>]*>
diff --git a/gas/testsuite/gas/arm/arm3.d b/gas/testsuite/gas/arm/arm3.d
index c4a1001ba10..dd973ab7621 100644
--- a/gas/testsuite/gas/arm/arm3.d
+++ b/gas/testsuite/gas/arm/arm3.d
@@ -8,4 +8,4 @@ Disassembly of section .text:
0+0 <[^>]*> e1080091 ? swp r0, r1, \[r8\]
0+4 <[^>]*> e1423093 ? swpb r3, r3, \[r2\]
0+8 <[^>]*> a1454091 ? swpbge r4, r1, \[r5\]
-0+c <[^>]*> e1a00000 ? nop ; \(mov r0, r0\)
+0+c <[^>]*> e1a00000 ? nop @ \(mov r0, r0\)
diff --git a/gas/testsuite/gas/arm/arm6.d b/gas/testsuite/gas/arm/arm6.d
index 3fc0de8198b..27bd08ffbf9 100644
--- a/gas/testsuite/gas/arm/arm6.d
+++ b/gas/testsuite/gas/arm/arm6.d
@@ -8,12 +8,12 @@ Disassembly of section .text:
0+00 <[^>]+> e10f8000 ? mrs r8, CPSR
0+04 <[^>]+> e14f2000 ? mrs r2, SPSR
0+08 <[^>]+> e129f001 ? msr CPSR_fc, r1
-0+0c <[^>]+> 1328f20f ? msrne CPSR_f, #-268435456 ; 0xf0000000
+0+0c <[^>]+> 1328f20f ? msrne CPSR_f, #-268435456 @ 0xf0000000
0+10 <[^>]+> e168f008 ? msr SPSR_f, r8
0+14 <[^>]+> e169f009 ? msr SPSR_fc, r9
0+18 <[^>]+> e10f8000 ? mrs r8, CPSR
0+1c <[^>]+> e14f2000 ? mrs r2, SPSR
0+20 <[^>]+> e129f001 ? msr CPSR_fc, r1
-0+24 <[^>]+> 1328f20f ? msrne CPSR_f, #-268435456 ; 0xf0000000
+0+24 <[^>]+> 1328f20f ? msrne CPSR_f, #-268435456 @ 0xf0000000
0+28 <[^>]+> e168f008 ? msr SPSR_f, r8
0+2c <[^>]+> e169f009 ? msr SPSR_fc, r9
diff --git a/gas/testsuite/gas/arm/arm7dm.d b/gas/testsuite/gas/arm/arm7dm.d
index 9411170dbdf..0cb31cde062 100644
--- a/gas/testsuite/gas/arm/arm7dm.d
+++ b/gas/testsuite/gas/arm/arm7dm.d
@@ -14,6 +14,6 @@ Disassembly of section .text:
0+18 <[^>]+> 00b92994 ? umlalseq r2, r9, r4, r9
0+1c <[^>]+> a0eaee98 ? smlalge lr, sl, r8, lr
0+20 <[^>]+> e322f000 ? msr CPSR_x, #0
-0+24 <[^>]+> e1a00000 ? nop ; \(mov r0, r0\)
-0+28 <[^>]+> e1a00000 ? nop ; \(mov r0, r0\)
-0+2c <[^>]+> e1a00000 ? nop ; \(mov r0, r0\)
+0+24 <[^>]+> e1a00000 ? nop @ \(mov r0, r0\)
+0+28 <[^>]+> e1a00000 ? nop @ \(mov r0, r0\)
+0+2c <[^>]+> e1a00000 ? nop @ \(mov r0, r0\)
diff --git a/gas/testsuite/gas/arm/arm7t.d b/gas/testsuite/gas/arm/arm7t.d
index a16192bd078..451497d7a77 100644
--- a/gas/testsuite/gas/arm/arm7t.d
+++ b/gas/testsuite/gas/arm/arm7t.d
@@ -15,9 +15,9 @@ Disassembly of section .text:
0+14 <[^>]*> e1f100bc ? ldrh r0, \[r1, #12\]!
0+18 <[^>]*> e15100bc ? ldrh r0, \[r1, #-12\]
0+1c <[^>]*> e09100b2 ? ldrh r0, \[r1\], r2
-0+20 <[^>]*> e3a00cff ? mov r0, #65280 ; 0xff00
-0+24 <[^>]*> e1df0bb4 ? ldrh r0, \[pc, #180\] ; 0+e0 <[^>]*>
-0+28 <[^>]*> e1df0abc ? ldrh r0, \[pc, #172\] ; 0+dc <[^>]*>
+0+20 <[^>]*> e3a00cff ? mov r0, #65280 @ 0xff00
+0+24 <[^>]*> e1df0bb4 ? ldrh r0, \[pc, #180\] @ 0+e0 <[^>]*>
+0+28 <[^>]*> e1df0abc ? ldrh r0, \[pc, #172\] @ 0+dc <[^>]*>
0+2c <[^>]*> e1c100b0 ? strh r0, \[r1\]
0+30 <[^>]*> e1e100b0 ? strh r0, \[r1, #0\]!
0+34 <[^>]*> e18100b2 ? strh r0, \[r1, r2\]
@@ -26,7 +26,7 @@ Disassembly of section .text:
0+40 <[^>]*> e1e100bc ? strh r0, \[r1, #12\]!
0+44 <[^>]*> e14100bc ? strh r0, \[r1, #-12\]
0+48 <[^>]*> e08100b2 ? strh r0, \[r1\], r2
-0+4c <[^>]*> e1cf08b8 ? strh r0, \[pc, #136\] ; 0+dc <[^>]*>
+0+4c <[^>]*> e1cf08b8 ? strh r0, \[pc, #136\] @ 0+dc <[^>]*>
0+50 <[^>]*> e1d100d0 ? ldrsb r0, \[r1\]
0+54 <[^>]*> e1f100d0 ? ldrsb r0, \[r1, #0\]!
0+58 <[^>]*> e19100d2 ? ldrsb r0, \[r1, r2\]
@@ -35,8 +35,8 @@ Disassembly of section .text:
0+64 <[^>]*> e1f100dc ? ldrsb r0, \[r1, #12\]!
0+68 <[^>]*> e15100dc ? ldrsb r0, \[r1, #-12\]
0+6c <[^>]*> e09100d2 ? ldrsb r0, \[r1\], r2
-0+70 <[^>]*> e3a000de ? mov r0, #222 ; 0xde
-0+74 <[^>]*> e1df06d0 ? ldrsb r0, \[pc, #96\] ; 0+dc <[^>]*>
+0+70 <[^>]*> e3a000de ? mov r0, #222 @ 0xde
+0+74 <[^>]*> e1df06d0 ? ldrsb r0, \[pc, #96\] @ 0+dc <[^>]*>
0+78 <[^>]*> e1d100f0 ? ldrsh r0, \[r1\]
0+7c <[^>]*> e1f100f0 ? ldrsh r0, \[r1, #0\]!
0+80 <[^>]*> e19100f2 ? ldrsh r0, \[r1, r2\]
@@ -45,9 +45,9 @@ Disassembly of section .text:
0+8c <[^>]*> e1f100fc ? ldrsh r0, \[r1, #12\]!
0+90 <[^>]*> e15100fc ? ldrsh r0, \[r1, #-12\]
0+94 <[^>]*> e09100f2 ? ldrsh r0, \[r1\], r2
-0+98 <[^>]*> e3a00cff ? mov r0, #65280 ; 0xff00
-0+9c <[^>]*> e1df03fc ? ldrsh r0, \[pc, #60\] ; 0+e0 <[^>]*>
-0+a0 <[^>]*> e1df03f4 ? ldrsh r0, \[pc, #52\] ; 0+dc <[^>]*>
+0+98 <[^>]*> e3a00cff ? mov r0, #65280 @ 0xff00
+0+9c <[^>]*> e1df03fc ? ldrsh r0, \[pc, #60\] @ 0+e0 <[^>]*>
+0+a0 <[^>]*> e1df03f4 ? ldrsh r0, \[pc, #52\] @ 0+dc <[^>]*>
0+a4 <[^>]*> e19100b2 ? ldrh r0, \[r1, r2\]
0+a8 <[^>]*> 119100b2 ? ldrhne r0, \[r1, r2\]
0+ac <[^>]*> 819100b2 ? ldrhhi r0, \[r1, r2\]
@@ -60,11 +60,11 @@ Disassembly of section .text:
0+c8 <[^>]*> 119100d2 ? ldrsbne r0, \[r1, r2\]
0+cc <[^>]*> 819100d2 ? ldrsbhi r0, \[r1, r2\]
0+d0 <[^>]*> b19100d2 ? ldrsblt r0, \[r1, r2\]
-0+d4 <[^>]*> e1df00f4 ? ldrsh r0, \[pc, #4\] ; 0+e0 <[^>]*>
-0+d8 <[^>]*> e1df00f4 ? ldrsh r0, \[pc, #4\] ; 0+e4 <[^>]*>
+0+d4 <[^>]*> e1df00f4 ? ldrsh r0, \[pc, #4\] @ 0+e0 <[^>]*>
+0+d8 <[^>]*> e1df00f4 ? ldrsh r0, \[pc, #4\] @ 0+e4 <[^>]*>
0+dc <[^>]*> 00000000 ? .*
[ ]*dc:.*fred
0+e0 <[^>]*> 0000c0de ? .*
0+e4 <[^>]*> 0000dead ? .*
-0+e8 <[^>]*> e1a00000 ? nop[ ]+; \(mov r0, r0\)
-0+ec <[^>]*> e1a00000 ? nop[ ]+; \(mov r0, r0\)
+0+e8 <[^>]*> e1a00000 ? nop[ ]+@ \(mov r0, r0\)
+0+ec <[^>]*> e1a00000 ? nop[ ]+@ \(mov r0, r0\)
diff --git a/gas/testsuite/gas/arm/armv1.d b/gas/testsuite/gas/arm/armv1.d
index ad8fc48f2d0..3ae310a2fb7 100644
--- a/gas/testsuite/gas/arm/armv1.d
+++ b/gas/testsuite/gas/arm/armv1.d
@@ -40,7 +40,7 @@ Disassembly of section .text:
0+74 <[^>]*> e1700000 ? cmn r0, r0
0+78 <[^>]*> e1700000 ? cmn r0, r0
0+7c <[^>]*> e170f000 ? cmnp r0, r0
-0+80 <[^>]*> e1a00000 ? nop[\s]+; \(mov r0, r0\)
+0+80 <[^>]*> e1a00000 ? nop[\s]+@ \(mov r0, r0\)
0+84 <[^>]*> e1b00000 ? movs r0, r0
0+88 <[^>]*> e1e00000 ? mvn r0, r0
0+8c <[^>]*> e1f00000 ? mvns r0, r0
@@ -69,6 +69,6 @@ Disassembly of section .text:
0+e8 <[^>]*> e8100001 ? ldmda r0, {r0}
0+ec <[^>]*> e9100001 ? ldmdb r0, {r0}
0+f0 <[^>]*> e9900001 ? ldmib r0, {r0}
-0+f4 <[^>]*> e1a00000 ? nop[\s]+; \(mov r0, r0\)
-0+f8 <[^>]*> e1a00000 ? nop[\s]+; \(mov r0, r0\)
-0+fc <[^>]*> e1a00000 ? nop[\s]+; \(mov r0, r0\)
+0+f4 <[^>]*> e1a00000 ? nop[\s]+@ \(mov r0, r0\)
+0+f8 <[^>]*> e1a00000 ? nop[\s]+@ \(mov r0, r0\)
+0+fc <[^>]*> e1a00000 ? nop[\s]+@ \(mov r0, r0\)
diff --git a/gas/testsuite/gas/arm/armv7-a+virt.d b/gas/testsuite/gas/arm/armv7-a+virt.d
index 1e3224ceca2..b0893f2c6c4 100644
--- a/gas/testsuite/gas/arm/armv7-a+virt.d
+++ b/gas/testsuite/gas/arm/armv7-a+virt.d
@@ -6,7 +6,7 @@
Disassembly of section .text:
0[0-9a-f]+ <[^>]+> e1400070 hvc 0
-0[0-9a-f]+ <[^>]+> e14fff7f hvc 65535 ; 0xffff
+0[0-9a-f]+ <[^>]+> e14fff7f hvc 65535 @ 0xffff
0[0-9a-f]+ <[^>]+> e160006e eret
0[0-9a-f]+ <[^>]+> e1001200 mrs r1, R8_usr
0[0-9a-f]+ <[^>]+> e1011200 mrs r1, R9_usr
@@ -75,7 +75,7 @@ Disassembly of section .text:
0[0-9a-f]+ <[^>]+> e12ef301 msr ELR_hyp, r1
0[0-9a-f]+ <[^>]+> e16ef301 msr SPSR_hyp, r1
0[0-9a-f]+ <[^>]+> f7e0 8000 hvc #0
-0[0-9a-f]+ <[^>]+> f7ef 8fff hvc #65535 ; 0xffff
+0[0-9a-f]+ <[^>]+> f7ef 8fff hvc #65535 @ 0xffff
0[0-9a-f]+ <[^>]+> f3de 8f00 subs pc, lr, #0
0[0-9a-f]+ <[^>]+> f3e0 8120 mrs r1, R8_usr
0[0-9a-f]+ <[^>]+> f3e1 8120 mrs r1, R9_usr
diff --git a/gas/testsuite/gas/arm/armv8-2-fp16-scalar-ext.d b/gas/testsuite/gas/arm/armv8-2-fp16-scalar-ext.d
index 0b5e4e4861c..7934fdb0544 100644
--- a/gas/testsuite/gas/arm/armv8-2-fp16-scalar-ext.d
+++ b/gas/testsuite/gas/arm/armv8-2-fp16-scalar-ext.d
@@ -10,13 +10,13 @@ Disassembly of section .text:
00000000 <label-0xc>:
0: ee001910 vmov.f16 s0, r1
4: ee100990 vmov.f16 r0, s1
- 8: eeb00900 vmov.f16 s0, #0 ; 0x40000000 2.0
+ 8: eeb00900 vmov.f16 s0, #0 @ 0x40000000 2.0
0000000c <label>:
c: 00000ffe .word 0x00000ffe
- 10: ed5f1906 vldr.16 s3, \[pc, #-12\] ; c <label>
- 14: ed1f3902 vldr.16 s6, \[pc, #-4\] ; 18 <label\+0xc>
- 18: eddf1902 vldr.16 s3, \[pc, #4\] ; 24 <label\+0x18>
+ 10: ed5f1906 vldr.16 s3, \[pc, #-12\] @ c <label>
+ 14: ed1f3902 vldr.16 s6, \[pc, #-4\] @ 18 <label\+0xc>
+ 18: eddf1902 vldr.16 s3, \[pc, #4\] @ 24 <label\+0x18>
1c: edd00902 vldr.16 s1, \[r0, #4\]
20: ed101902 vldr.16 s2, \[r0, #-4\]
24: ed803902 vstr.16 s6, \[r0, #4\]
diff --git a/gas/testsuite/gas/arm/armv8-2-fp16-scalar-thumb-ext.d b/gas/testsuite/gas/arm/armv8-2-fp16-scalar-thumb-ext.d
index 9b1ab0aaeaa..cfe40d37f3e 100644
--- a/gas/testsuite/gas/arm/armv8-2-fp16-scalar-thumb-ext.d
+++ b/gas/testsuite/gas/arm/armv8-2-fp16-scalar-thumb-ext.d
@@ -10,13 +10,13 @@ Disassembly of section .text:
00000000 <label-0xc>:
0: ee00 1910 vmov.f16 s0, r1
4: ee10 0990 vmov.f16 r0, s1
- 8: eeb0 0900 vmov.f16 s0, #0 ; 0x40000000 2.0
+ 8: eeb0 0900 vmov.f16 s0, #0 @ 0x40000000 2.0
0000000c <label>:
c: 00000ffe .word 0x00000ffe
- 10: ed5f 1904 vldr.16 s3, \[pc, #-8\] ; c <label>
- 14: ed1f 3902 vldr.16 s6, \[pc, #-4\] ; 14 <label\+0x8>
- 18: eddf 1902 vldr.16 s3, \[pc, #4\] ; 20 <label\+0x14>
+ 10: ed5f 1904 vldr.16 s3, \[pc, #-8\] @ c <label>
+ 14: ed1f 3902 vldr.16 s6, \[pc, #-4\] @ 14 <label\+0x8>
+ 18: eddf 1902 vldr.16 s3, \[pc, #4\] @ 20 <label\+0x14>
1c: edd0 0902 vldr.16 s1, \[r0, #4\]
20: ed10 1902 vldr.16 s2, \[r0, #-4\]
24: ed80 3902 vstr.16 s6, \[r0, #4\]
diff --git a/gas/testsuite/gas/arm/armv8-2-fp16-scalar-thumb.d b/gas/testsuite/gas/arm/armv8-2-fp16-scalar-thumb.d
index 0fb04fe7033..b41893373fa 100644
--- a/gas/testsuite/gas/arm/armv8-2-fp16-scalar-thumb.d
+++ b/gas/testsuite/gas/arm/armv8-2-fp16-scalar-thumb.d
@@ -10,13 +10,13 @@ Disassembly of section .text:
00000000 <label-0xc>:
0: ee00 1910 vmov.f16 s0, r1
4: ee10 0990 vmov.f16 r0, s1
- 8: eeb0 0900 vmov.f16 s0, #0 ; 0x40000000 2.0
+ 8: eeb0 0900 vmov.f16 s0, #0 @ 0x40000000 2.0
0000000c <label>:
c: 00000ffe .word 0x00000ffe
- 10: ed5f 1904 vldr.16 s3, \[pc, #-8\] ; c <label>
- 14: ed1f 3902 vldr.16 s6, \[pc, #-4\] ; 14 <label\+0x8>
- 18: eddf 1902 vldr.16 s3, \[pc, #4\] ; 20 <label\+0x14>
+ 10: ed5f 1904 vldr.16 s3, \[pc, #-8\] @ c <label>
+ 14: ed1f 3902 vldr.16 s6, \[pc, #-4\] @ 14 <label\+0x8>
+ 18: eddf 1902 vldr.16 s3, \[pc, #4\] @ 20 <label\+0x14>
1c: edd0 0902 vldr.16 s1, \[r0, #4\]
20: ed10 1902 vldr.16 s2, \[r0, #-4\]
24: ed80 3902 vstr.16 s6, \[r0, #4\]
diff --git a/gas/testsuite/gas/arm/armv8-2-fp16-scalar.d b/gas/testsuite/gas/arm/armv8-2-fp16-scalar.d
index 42e8ef4dca4..3111ee4bc25 100644
--- a/gas/testsuite/gas/arm/armv8-2-fp16-scalar.d
+++ b/gas/testsuite/gas/arm/armv8-2-fp16-scalar.d
@@ -10,13 +10,13 @@ Disassembly of section .text:
00000000 <label-0xc>:
0: ee001910 vmov.f16 s0, r1
4: ee100990 vmov.f16 r0, s1
- 8: eeb00900 vmov.f16 s0, #0 ; 0x40000000 2.0
+ 8: eeb00900 vmov.f16 s0, #0 @ 0x40000000 2.0
0000000c <label>:
c: 00000ffe .word 0x00000ffe
- 10: ed5f1906 vldr.16 s3, \[pc, #-12\] ; c <label>
- 14: ed1f3902 vldr.16 s6, \[pc, #-4\] ; 18 <label\+0xc>
- 18: eddf1902 vldr.16 s3, \[pc, #4\] ; 24 <label\+0x18>
+ 10: ed5f1906 vldr.16 s3, \[pc, #-12\] @ c <label>
+ 14: ed1f3902 vldr.16 s6, \[pc, #-4\] @ 18 <label\+0xc>
+ 18: eddf1902 vldr.16 s3, \[pc, #4\] @ 24 <label\+0x18>
1c: edd00902 vldr.16 s1, \[r0, #4\]
20: ed101902 vldr.16 s2, \[r0, #-4\]
24: ed803902 vstr.16 s6, \[r0, #4\]
diff --git a/gas/testsuite/gas/arm/armv8.1-m.main-fp.d b/gas/testsuite/gas/arm/armv8.1-m.main-fp.d
index dd69e0d5252..d1186f25684 100644
--- a/gas/testsuite/gas/arm/armv8.1-m.main-fp.d
+++ b/gas/testsuite/gas/arm/armv8.1-m.main-fp.d
@@ -32,24 +32,24 @@ Disassembly of section .text:
0+05c <[^>]*> ecb0 0a01 (vldmia|fldmias) r0!, {s0}
0+060 <[^>]*> ed30 0a01 (vldmdb|fldmdbs) r0!, {s0}
0+064 <[^>]*> ed30 0a01 (vldmdb|fldmdbs) r0!, {s0}
-0+068 <[^>]*> ec90 0b03 fldmiax r0, {d0}( ;@ Deprecated|)
-0+06c <[^>]*> ec90 0b03 fldmiax r0, {d0}( ;@ Deprecated|)
-0+070 <[^>]*> ecb0 0b03 fldmiax r0!, {d0}( ;@ Deprecated|)
-0+074 <[^>]*> ecb0 0b03 fldmiax r0!, {d0}( ;@ Deprecated|)
-0+078 <[^>]*> ed30 0b03 fldmdbx r0!, {d0}( ;@ Deprecated|)
-0+07c <[^>]*> ed30 0b03 fldmdbx r0!, {d0}( ;@ Deprecated|)
+0+068 <[^>]*> ec90 0b03 fldmiax r0, {d0}( @ Deprecated|)
+0+06c <[^>]*> ec90 0b03 fldmiax r0, {d0}( @ Deprecated|)
+0+070 <[^>]*> ecb0 0b03 fldmiax r0!, {d0}( @ Deprecated|)
+0+074 <[^>]*> ecb0 0b03 fldmiax r0!, {d0}( @ Deprecated|)
+0+078 <[^>]*> ed30 0b03 fldmdbx r0!, {d0}( @ Deprecated|)
+0+07c <[^>]*> ed30 0b03 fldmdbx r0!, {d0}( @ Deprecated|)
0+080 <[^>]*> ec80 0a01 (vstmia|fstmias) r0, {s0}
0+084 <[^>]*> ec80 0a01 (vstmia|fstmias) r0, {s0}
0+088 <[^>]*> eca0 0a01 (vstmia|fstmias) r0!, {s0}
0+08c <[^>]*> eca0 0a01 (vstmia|fstmias) r0!, {s0}
0+090 <[^>]*> ed20 0a01 (vstmdb|fstmdbs) r0!, {s0}
0+094 <[^>]*> ed20 0a01 (vstmdb|fstmdbs) r0!, {s0}
-0+098 <[^>]*> ec80 0b03 fstmiax r0, {d0}( ;@ Deprecated|)
-0+09c <[^>]*> ec80 0b03 fstmiax r0, {d0}( ;@ Deprecated|)
-0+0a0 <[^>]*> eca0 0b03 fstmiax r0!, {d0}( ;@ Deprecated|)
-0+0a4 <[^>]*> eca0 0b03 fstmiax r0!, {d0}( ;@ Deprecated|)
-0+0a8 <[^>]*> ed20 0b03 fstmdbx r0!, {d0}( ;@ Deprecated|)
-0+0ac <[^>]*> ed20 0b03 fstmdbx r0!, {d0}( ;@ Deprecated|)
+0+098 <[^>]*> ec80 0b03 fstmiax r0, {d0}( @ Deprecated|)
+0+09c <[^>]*> ec80 0b03 fstmiax r0, {d0}( @ Deprecated|)
+0+0a0 <[^>]*> eca0 0b03 fstmiax r0!, {d0}( @ Deprecated|)
+0+0a4 <[^>]*> eca0 0b03 fstmiax r0!, {d0}( @ Deprecated|)
+0+0a8 <[^>]*> ed20 0b03 fstmdbx r0!, {d0}( @ Deprecated|)
+0+0ac <[^>]*> ed20 0b03 fstmdbx r0!, {d0}( @ Deprecated|)
0+0b0 <[^>]*> eeb8 0ac0 (vcvt\.f32\.s32|fsitos) s0, s0
0+0b4 <[^>]*> eeb8 0a40 (vcvt\.f32\.u32|fuitos) s0, s0
0+0b8 <[^>]*> eebd 0a40 (vcvtr\.s32\.f32|ftosis) s0, s0
@@ -141,17 +141,17 @@ Disassembly of section .text:
0+210 <[^>]*> ec90 fa02 (vldmia|fldmias) r0, {s30-s31}
0+214 <[^>]*> ec91 0a01 (vldmia|fldmias) r1, {s0}
0+218 <[^>]*> ec9e 0a01 (vldmia|fldmias) lr, {s0}
-0+21c <[^>]*> ec80 1b03 fstmiax r0, {d1}( ;@ Deprecated|)
-0+220 <[^>]*> ec80 2b03 fstmiax r0, {d2}( ;@ Deprecated|)
-0+224 <[^>]*> ec80 fb03 fstmiax r0, {d15}( ;@ Deprecated|)
-0+228 <[^>]*> ec80 0b05 fstmiax r0, {d0-d1}( ;@ Deprecated|)
-0+22c <[^>]*> ec80 0b07 fstmiax r0, {d0-d2}( ;@ Deprecated|)
-0+230 <[^>]*> ec80 0b21 fstmiax r0, {d0-d15}( ;@ Deprecated|)
-0+234 <[^>]*> ec80 1b1f fstmiax r0, {d1-d15}( ;@ Deprecated|)
-0+238 <[^>]*> ec80 2b1d fstmiax r0, {d2-d15}( ;@ Deprecated|)
-0+23c <[^>]*> ec80 eb05 fstmiax r0, {d14-d15}( ;@ Deprecated|)
-0+240 <[^>]*> ec81 0b03 fstmiax r1, {d0}( ;@ Deprecated|)
-0+244 <[^>]*> ec8e 0b03 fstmiax lr, {d0}( ;@ Deprecated|)
+0+21c <[^>]*> ec80 1b03 fstmiax r0, {d1}( @ Deprecated|)
+0+220 <[^>]*> ec80 2b03 fstmiax r0, {d2}( @ Deprecated|)
+0+224 <[^>]*> ec80 fb03 fstmiax r0, {d15}( @ Deprecated|)
+0+228 <[^>]*> ec80 0b05 fstmiax r0, {d0-d1}( @ Deprecated|)
+0+22c <[^>]*> ec80 0b07 fstmiax r0, {d0-d2}( @ Deprecated|)
+0+230 <[^>]*> ec80 0b21 fstmiax r0, {d0-d15}( @ Deprecated|)
+0+234 <[^>]*> ec80 1b1f fstmiax r0, {d1-d15}( @ Deprecated|)
+0+238 <[^>]*> ec80 2b1d fstmiax r0, {d2-d15}( @ Deprecated|)
+0+23c <[^>]*> ec80 eb05 fstmiax r0, {d14-d15}( @ Deprecated|)
+0+240 <[^>]*> ec81 0b03 fstmiax r1, {d0}( @ Deprecated|)
+0+244 <[^>]*> ec8e 0b03 fstmiax lr, {d0}( @ Deprecated|)
0+248 <[^>]*> eeb5 0a40 (vcmp\.f32 s0, #0.0|fcmpzs s0)
0+24c <[^>]*> eef5 0a40 (vcmp\.f32 s1, #0.0|fcmpzs s1)
0+250 <[^>]*> eeb5 1a40 (vcmp\.f32 s2, #0.0|fcmpzs s2)
@@ -217,13 +217,13 @@ Disassembly of section .text:
0+334 <[^>]*> bf01 itttt eq
0+336 <[^>]*> ed35 2a01 (vldmdbeq|fldmdbseq) r5!, {s4}
0+33a <[^>]*> ed76 1a01 (vldmdbeq|fldmdbseq) r6!, {s3}
-0+33e <[^>]*> ec97 1b03 fldmiaxeq r7, {d1}( ;@ Deprecated|)
-0+342 <[^>]*> ec98 2b03 fldmiaxeq r8, {d2}( ;@ Deprecated|)
+0+33e <[^>]*> ec97 1b03 fldmiaxeq r7, {d1}( @ Deprecated|)
+0+342 <[^>]*> ec98 2b03 fldmiaxeq r8, {d2}( @ Deprecated|)
0+346 <[^>]*> bf01 itttt eq
-0+348 <[^>]*> ecb9 3b03 fldmiaxeq r9!, {d3}( ;@ Deprecated|)
-0+34c <[^>]*> ecba 4b03 fldmiaxeq sl!, {d4}( ;@ Deprecated|)
-0+350 <[^>]*> ed3b 5b03 fldmdbxeq fp!, {d5}( ;@ Deprecated|)
-0+354 <[^>]*> ed3c 6b03 fldmdbxeq ip!, {d6}( ;@ Deprecated|)
+0+348 <[^>]*> ecb9 3b03 fldmiaxeq r9!, {d3}( @ Deprecated|)
+0+34c <[^>]*> ecba 4b03 fldmiaxeq sl!, {d4}( @ Deprecated|)
+0+350 <[^>]*> ed3b 5b03 fldmdbxeq fp!, {d5}( @ Deprecated|)
+0+354 <[^>]*> ed3c 6b03 fldmdbxeq ip!, {d6}( @ Deprecated|)
0+358 <[^>]*> bf01 itttt eq
0+35a <[^>]*> ec8d 1a01 (vstmiaeq|fstmiaseq) sp, {s2}
0+35e <[^>]*> ecce 0a01 (vstmiaeq|fstmiaseq) lr, {s1}
@@ -232,13 +232,13 @@ Disassembly of section .text:
0+36a <[^>]*> bf01 itttt eq
0+36c <[^>]*> ed63 ea01 (vstmdbeq|fstmdbseq) r3!, {s29}
0+370 <[^>]*> ed24 ea01 (vstmdbeq|fstmdbseq) r4!, {s28}
-0+374 <[^>]*> ec85 7b03 fstmiaxeq r5, {d7}( ;@ Deprecated|)
-0+378 <[^>]*> ec86 8b03 fstmiaxeq r6, {d8}( ;@ Deprecated|)
+0+374 <[^>]*> ec85 7b03 fstmiaxeq r5, {d7}( @ Deprecated|)
+0+378 <[^>]*> ec86 8b03 fstmiaxeq r6, {d8}( @ Deprecated|)
0+37c <[^>]*> bf01 itttt eq
-0+37e <[^>]*> eca7 9b03 fstmiaxeq r7!, {d9}( ;@ Deprecated|)
-0+382 <[^>]*> eca8 ab03 fstmiaxeq r8!, {d10}( ;@ Deprecated|)
-0+386 <[^>]*> ed29 bb03 fstmdbxeq r9!, {d11}( ;@ Deprecated|)
-0+38a <[^>]*> ed2a cb03 fstmdbxeq sl!, {d12}( ;@ Deprecated|)
+0+37e <[^>]*> eca7 9b03 fstmiaxeq r7!, {d9}( @ Deprecated|)
+0+382 <[^>]*> eca8 ab03 fstmiaxeq r8!, {d10}( @ Deprecated|)
+0+386 <[^>]*> ed29 bb03 fstmdbxeq r9!, {d11}( @ Deprecated|)
+0+38a <[^>]*> ed2a cb03 fstmdbxeq sl!, {d12}( @ Deprecated|)
0+38e <[^>]*> bf01 itttt eq
0+390 <[^>]*> eef8 dac3 (vcvteq\.f32\.s32|fsitoseq) s27, s6
0+394 <[^>]*> eefd ca62 (vcvtreq\.s32\.f32|ftosiseq) s25, s5
diff --git a/gas/testsuite/gas/arm/armv8.1-m.main-hp.d b/gas/testsuite/gas/arm/armv8.1-m.main-hp.d
index 1743d1e19cd..41ebb842f1d 100644
--- a/gas/testsuite/gas/arm/armv8.1-m.main-hp.d
+++ b/gas/testsuite/gas/arm/armv8.1-m.main-hp.d
@@ -10,13 +10,13 @@ Disassembly of section .text:
00000000 <label-0xc>:
0: ee00 1910 vmov.f16 s0, r1
4: ee10 0990 vmov.f16 r0, s1
- 8: eeb0 0900 vmov.f16 s0, #0 ; 0x40000000 2.0
+ 8: eeb0 0900 vmov.f16 s0, #0 @ 0x40000000 2.0
0000000c <label>:
c: 00000ffe .word 0x00000ffe
- 10: ed5f 1904 vldr.16 s3, \[pc, #-8\] ; c <label>
- 14: ed1f 3902 vldr.16 s6, \[pc, #-4\] ; 14 <label\+0x8>
- 18: eddf 1902 vldr.16 s3, \[pc, #4\] ; 20 <label\+0x14>
+ 10: ed5f 1904 vldr.16 s3, \[pc, #-8\] @ c <label>
+ 14: ed1f 3902 vldr.16 s6, \[pc, #-4\] @ 14 <label\+0x8>
+ 18: eddf 1902 vldr.16 s3, \[pc, #4\] @ 20 <label\+0x14>
1c: edd0 0902 vldr.16 s1, \[r0, #4\]
20: ed10 1902 vldr.16 s2, \[r0, #-4\]
24: ed80 3902 vstr.16 s6, \[r0, #4\]
diff --git a/gas/testsuite/gas/arm/bl-local-2.d b/gas/testsuite/gas/arm/bl-local-2.d
index 6b55f5ab773..ba75aeeb617 100644
--- a/gas/testsuite/gas/arm/bl-local-2.d
+++ b/gas/testsuite/gas/arm/bl-local-2.d
@@ -9,14 +9,14 @@
Disassembly of section \.text:
0+00 <[^>]+> e12fff1e bx lr
-0+04 <[^>]+> 46c0 nop ; \(mov r8, r8\)
+0+04 <[^>]+> 46c0 nop @ \(mov r8, r8\)
0+06 <[^>]+> f7ff effc blx 0+ <myfunction>
-0+0a <[^>]+> 46c0 nop ; \(mov r8, r8\)
+0+0a <[^>]+> 46c0 nop @ \(mov r8, r8\)
0+0c <[^>]+> f7ff eff8 blx 0+ <myfunction>
-0+10 <[^>]+> 46c0 nop ; \(mov r8, r8\)
+0+10 <[^>]+> 46c0 nop @ \(mov r8, r8\)
0+12 <[^>]+> f7ff eff6 blx 0+ <myfunction>
-0+16 <[^>]+> 46c0 nop ; \(mov r8, r8\)
+0+16 <[^>]+> 46c0 nop @ \(mov r8, r8\)
0+18 <[^>]+> f7ff eff2 blx 0+ <myfunction>
0+1c <[^>]+> 4770 bx lr
-0+1e <[^>]+> 46c0 nop ; \(mov r8, r8\)
+0+1e <[^>]+> 46c0 nop @ \(mov r8, r8\)
0+20 <[^>]+> fafffffd blx 0000001c <mythumbfunction>
diff --git a/gas/testsuite/gas/arm/bl-local-v4t.d b/gas/testsuite/gas/arm/bl-local-v4t.d
index cf68093988d..11af135bdcd 100644
--- a/gas/testsuite/gas/arm/bl-local-v4t.d
+++ b/gas/testsuite/gas/arm/bl-local-v4t.d
@@ -10,9 +10,9 @@ Disassembly of section .text:
0+06 <[^>]*> e003 b.n 00+10 <[^>]*>
0+08 <[^>]*> f000 f808 bl 00+1c <[^>]*>
0+0c <[^>]*> f000 f802 bl 00+14 <[^>]*>
-0+10 <[^>]*> 46c0 nop ; \(mov r8, r8\)
-0+12 <[^>]*> 46c0 nop ; \(mov r8, r8\)
-0+14 <[^>]*> 46c0 nop ; \(mov r8, r8\)
+0+10 <[^>]*> 46c0 nop @ \(mov r8, r8\)
+0+12 <[^>]*> 46c0 nop @ \(mov r8, r8\)
+0+14 <[^>]*> 46c0 nop @ \(mov r8, r8\)
...
-0+18 <[^>]*> e1a00000 nop ; \(mov r0, r0\)
-0+1c <[^>]*> e1a00000 nop ; \(mov r0, r0\)
+0+18 <[^>]*> e1a00000 nop @ \(mov r0, r0\)
+0+1c <[^>]*> e1a00000 nop @ \(mov r0, r0\)
diff --git a/gas/testsuite/gas/arm/blx-bad.d b/gas/testsuite/gas/arm/blx-bad.d
index d95729c34fe..79608eb1e21 100644
--- a/gas/testsuite/gas/arm/blx-bad.d
+++ b/gas/testsuite/gas/arm/blx-bad.d
@@ -9,16 +9,16 @@
Disassembly of section .text:
00000000 <ARM>:
- 0: e1a00000 nop ; \(mov r0, r0\)
+ 0: e1a00000 nop @ \(mov r0, r0\)
00000004 <THUMB>:
4: f7ff effc blx 0 <ARM>
- 8: 46c0 nop ; \(mov r8, r8\)
+ 8: 46c0 nop @ \(mov r8, r8\)
a: f7ff effa blx 0 <ARM>
- e: 46c0 nop ; \(mov r8, r8\)
+ e: 46c0 nop @ \(mov r8, r8\)
10: f7ff eff6 blx 0 <ARM>
- 14: f7ff eff5 ; <UNDEFINED> instruction: 0xf7ffeff5
- 18: 46c0 nop ; \(mov r8, r8\)
- 1a: f7ff eff1 ; <UNDEFINED> instruction: 0xf7ffeff1
+ 14: f7ff eff5 @ <UNDEFINED> instruction: 0xf7ffeff5
+ 18: 46c0 nop @ \(mov r8, r8\)
+ 1a: f7ff eff1 @ <UNDEFINED> instruction: 0xf7ffeff1
1e: f7ff eff0 blx 0 <ARM>
- 22: 46c0 nop ; \(mov r8, r8\)
+ 22: 46c0 nop @ \(mov r8, r8\)
diff --git a/gas/testsuite/gas/arm/blx-local-thumb.d b/gas/testsuite/gas/arm/blx-local-thumb.d
index 61b1fbdf886..9a76584c909 100644
--- a/gas/testsuite/gas/arm/blx-local-thumb.d
+++ b/gas/testsuite/gas/arm/blx-local-thumb.d
@@ -16,9 +16,9 @@ Disassembly of section .text:
[^<]*<one\+0x1c> f000 f804 bl 00000028 <fooundefthumb>
[^<]*<foo> e7ee b.n 00000000 <one>
[^<]*<foo\+0x2> e003 b.n 0000002c <foo2>
-[^<]*<foo\+0x4> 46c0 nop ; \(mov r8, r8\)
-[^<]*<foo\+0x6> 46c0 nop ; \(mov r8, r8\)
-[^<]*<fooundefthumb> 46c0 nop ; \(mov r8, r8\)
+[^<]*<foo\+0x4> 46c0 nop @ \(mov r8, r8\)
+[^<]*<foo\+0x6> 46c0 nop @ \(mov r8, r8\)
+[^<]*<fooundefthumb> 46c0 nop @ \(mov r8, r8\)
...
-[^<]*<foo2> e1a00000 nop ; \(mov r0, r0\)
-[^<]*<fooundefarm> e1a00000 nop ; \(mov r0, r0\)
+[^<]*<foo2> e1a00000 nop @ \(mov r0, r0\)
+[^<]*<fooundefarm> e1a00000 nop @ \(mov r0, r0\)
diff --git a/gas/testsuite/gas/arm/blx-local.d b/gas/testsuite/gas/arm/blx-local.d
index 36cfd4f7487..44c885c8ee2 100644
--- a/gas/testsuite/gas/arm/blx-local.d
+++ b/gas/testsuite/gas/arm/blx-local.d
@@ -15,15 +15,15 @@ Disassembly of section .text:
0+14 <[^>]*> eb00000a bl 00000044 <fooundefarm>
0+18 <[^>]*> fa000001 blx 00000024 <fooundefthumb>
0+1c <[^>]*> eb000000 bl 00000024 <fooundefthumb>
-0+20 <[^>]*> 46c0 nop ; \(mov r8, r8\)
-0+22 <[^>]*> 46c0 nop ; \(mov r8, r8\)
-0+24 <[^>]*> 46c0 nop ; \(mov r8, r8\)
-0+26 <[^>]*> 46c0 nop ; \(mov r8, r8\)
+0+20 <[^>]*> 46c0 nop @ \(mov r8, r8\)
+0+22 <[^>]*> 46c0 nop @ \(mov r8, r8\)
+0+24 <[^>]*> 46c0 nop @ \(mov r8, r8\)
+0+26 <[^>]*> 46c0 nop @ \(mov r8, r8\)
0+28 <[^>]*> 0bfffffd bleq 00000024 <fooundefthumb>
0+2c <[^>]*> 0afffffc beq 00000024 <fooundefthumb>
0+30 <[^>]*> eafffffb b 00000024 <fooundefthumb>
0+34 <[^>]*> 0bfffffe bleq 00000020 <foo> 34: R_ARM_JUMP24 foo
0+38 <[^>]*> 0afffffe beq 00000020 <foo> 38: R_ARM_JUMP24 foo
0+3c <[^>]*> eafffffe b 00000020 <foo> 3c: R_ARM_JUMP24 foo
-0+40 <[^>]*> e1a00000 nop ; \(mov r0, r0\)
-0+44 <[^>]*> e1a00000 nop ; \(mov r0, r0\)
+0+40 <[^>]*> e1a00000 nop @ \(mov r0, r0\)
+0+44 <[^>]*> e1a00000 nop @ \(mov r0, r0\)
diff --git a/gas/testsuite/gas/arm/branch-reloc.d b/gas/testsuite/gas/arm/branch-reloc.d
index 40159557861..118c4b8553f 100644
--- a/gas/testsuite/gas/arm/branch-reloc.d
+++ b/gas/testsuite/gas/arm/branch-reloc.d
@@ -13,7 +13,7 @@
Disassembly of section .text:
00000000 <arm_glob_sym1-0x4>:
- 0: e1a00000 nop ; \(mov r0, r0\)
+ 0: e1a00000 nop @ \(mov r0, r0\)
00000004 <arm_glob_sym1>:
4: ebfffffe bl 46 <thumb_glob_sym1>
@@ -36,11 +36,11 @@ Disassembly of section .text:
2c: fafffffe blx 13c <arm_glob_sym2>
2c: R_ARM_CALL arm_glob_sym2
30: eb000001 bl 3c <arm_sym1>
- 34: e1a00000 nop ; \(mov r0, r0\)
+ 34: e1a00000 nop @ \(mov r0, r0\)
38: e12fff1e bx lr
0000003c <arm_sym1>:
- 3c: e1a00000 nop ; \(mov r0, r0\)
+ 3c: e1a00000 nop @ \(mov r0, r0\)
40: e12fff1e bx lr
00000044 <thumb_sym1>:
@@ -75,11 +75,11 @@ Disassembly of section foo:
128: f7ff effe blx 100 <thumb_glob_sym2>
128: R_ARM_THM_CALL thumb_glob_sym2
12c: f000 f802 bl 134 <thumb_sym2>
- 130: 46c0 nop ; \(mov r8, r8\)
+ 130: 46c0 nop @ \(mov r8, r8\)
132: 4770 bx lr
00000134 <thumb_sym2>:
- 134: 46c0 nop ; \(mov r8, r8\)
+ 134: 46c0 nop @ \(mov r8, r8\)
136: 4770 bx lr
00000138 <arm_sym2>:
diff --git a/gas/testsuite/gas/arm/ccs.d b/gas/testsuite/gas/arm/ccs.d
index 742993ba846..3be96d9979e 100644
--- a/gas/testsuite/gas/arm/ccs.d
+++ b/gas/testsuite/gas/arm/ccs.d
@@ -8,7 +8,7 @@ Disassembly of section \.text:
00000000 <_test_func>:
0: e92d5fff push {r0, r1, r2, r3, r4, r5, r6, r7, r8, r9, sl, fp, ip, lr}
- 4: e59fc018 ldr ip, \[pc, #24\] ; 24 <sym1>
+ 4: e59fc018 ldr ip, \[pc, #24\] @ 24 <sym1>
8: e59c0000 ldr r0, \[ip\]
c: e3100008 tst r0, #8
10: 1a000000 bne 18 <aLabel>
diff --git a/gas/testsuite/gas/arm/copro-arm_v2plus-arm_v2.d b/gas/testsuite/gas/arm/copro-arm_v2plus-arm_v2.d
index 04a3d37eae2..a7f01668b79 100644
--- a/gas/testsuite/gas/arm/copro-arm_v2plus-arm_v2.d
+++ b/gas/testsuite/gas/arm/copro-arm_v2plus-arm_v2.d
@@ -14,12 +14,12 @@ Disassembly of section .text:
0+00c <[^>]*> edd1e108 ldfp f6, \[r1, #32\]
0+010 <[^>]*> 4db200ff ldcmi 0, cr0, \[r2, #1020\]!.*
0+014 <[^>]*> 5cf31710 ldclpl 7, cr1, \[r3\], #64.*
-0+018 <[^>]*> ed1f8001 ldc 0, cr8, \[pc, #-4\] ; .* <foo>
+0+018 <[^>]*> ed1f8001 ldc 0, cr8, \[pc, #-4\] @ .* <foo>
0+01c <[^>]*> ed830500 cfstr32 mvfx0, \[r3\]
0+020 <[^>]*> edc0f302 stcl 3, cr15, \[r0, #8\]
0+024 <[^>]*> 0da2c419 cfstrseq mvf12, \[r2, #100\]!.*
0+028 <[^>]*> 3ca4860c stccc 6, cr8, \[r4\], #48.*
-0+02c <[^>]*> ed0f7101 stfs f7, \[pc, #-4\] ; .* <bar>
+0+02c <[^>]*> ed0f7101 stfs f7, \[pc, #-4\] @ .* <bar>
0+030 <[^>]*> ee715212 mrc 2, 3, r5, cr1, cr2, \{0\}
0+034 <[^>]*> aeb1f4f2 mrcge 4, 5, APSR_nzcv, cr1, cr2, \{7\}
0+038 <[^>]*> ee215711 mcr 7, 1, r5, cr1, cr1, \{0\}
@@ -30,6 +30,6 @@ Disassembly of section .text:
0+04c <[^>]*> ecc52805 stcl 8, cr2, \[r5\], \{5\}
0+050 <[^>]*> ecd88cff ldcl 12, cr8, \[r8\], \{255\}.*
0+054 <[^>]*> ecc99cfe stcl 12, cr9, \[r9\], \{254\}.*
-0+058 <[^>]*> e1a00000 nop ; \(mov r0, r0\)
-0+05c <[^>]*> e1a00000 nop ; \(mov r0, r0\)
+0+058 <[^>]*> e1a00000 nop @ \(mov r0, r0\)
+0+05c <[^>]*> e1a00000 nop @ \(mov r0, r0\)
0+060 <[^>]*> aeb1f4f2 mrcge 4, 5, APSR_nzcv, cr1, cr2, \{7\}
diff --git a/gas/testsuite/gas/arm/copro-arm_v5plus-arm_v5.d b/gas/testsuite/gas/arm/copro-arm_v5plus-arm_v5.d
index ab9571707ba..3d1fe79c20e 100644
--- a/gas/testsuite/gas/arm/copro-arm_v5plus-arm_v5.d
+++ b/gas/testsuite/gas/arm/copro-arm_v5plus-arm_v5.d
@@ -11,10 +11,10 @@ Disassembly of section .text:
0+000 <[^>]*> fe421103 cdp2 1, 4, cr1, cr2, cr3, \{0\}
0+004 <[^>]*> fd939500 ldc2 5, cr9, \[r3\]
0+008 <[^>]*> fdd1e108 ldc2l 1, cr14, \[r1, #32\]
-0+00c <[^>]*> fd1f8001 ldc2 0, cr8, \[pc, #-4\] ; .* <foo>
+0+00c <[^>]*> fd1f8001 ldc2 0, cr8, \[pc, #-4\] @ .* <foo>
0+010 <[^>]*> fd830500 stc2 5, cr0, \[r3\]
0+014 <[^>]*> fdc0f302 stc2l 3, cr15, \[r0, #8\]
-0+018 <[^>]*> fd0f7101 stc2 1, cr7, \[pc, #-4\] ; .* <bar>
+0+018 <[^>]*> fd0f7101 stc2 1, cr7, \[pc, #-4\] @ .* <bar>
0+01c <[^>]*> fe715212 mrc2 2, 3, r5, cr1, cr2, \{0\}
0+020 <[^>]*> fe215711 mcr2 7, 1, r5, cr1, cr1, \{0\}
0+024 <[^>]*> fc925502 ldc2 5, cr5, \[r2\], \{2\}
diff --git a/gas/testsuite/gas/arm/copro-thumb_v6t2plus-thumb_v6t2-1.d b/gas/testsuite/gas/arm/copro-thumb_v6t2plus-thumb_v6t2-1.d
index 55c696735af..35c65ac7150 100644
--- a/gas/testsuite/gas/arm/copro-thumb_v6t2plus-thumb_v6t2-1.d
+++ b/gas/testsuite/gas/arm/copro-thumb_v6t2plus-thumb_v6t2-1.d
@@ -16,14 +16,14 @@ Disassembly of section .text:
0+012 <[^>]*> [^ ]* ite mi
0+014 <[^>]*> edb2 00ff ldcmi 0, cr0, \[r2, #1020\]!.*
0+018 <[^>]*> ecf3 1710 ldclpl 7, cr1, \[r3\], #64.*
-0+01c <[^>]*> ed9f 8000 ldc 0, cr8, \[pc] ; .* <foo>
+0+01c <[^>]*> ed9f 8000 ldc 0, cr8, \[pc] @ .* <foo>
0+020 <[^>]*> ed83 0500 cfstr32 mvfx0, \[r3\]
0+024 <[^>]*> edc0 f302 stcl 3, cr15, \[r0, #8\]
0+028 <[^>]*> [^ ]* it eq
0+02a <[^>]*> eda2 c419 cfstrseq mvf12, \[r2, #100\]!.*
0+02e <[^>]*> [^ ]* it cc
0+030 <[^>]*> eca4 860c stccc 6, cr8, \[r4\], #48.*
-0+034 <[^>]*> ed8f 7100 stfs f7, \[pc\] ; .* <bar>
+0+034 <[^>]*> ed8f 7100 stfs f7, \[pc\] @ .* <bar>
0+038 <[^>]*> ee71 5212 mrc 2, 3, r5, cr1, cr2, \{0\}
0+03c <[^>]*> [^ ]* it ge
0+03e <[^>]*> eeb1 f4f2 mrcge 4, 5, APSR_nzcv, cr1, cr2, \{7\}
diff --git a/gas/testsuite/gas/arm/copro-thumb_v6t2plus-thumb_v6t2-2.d b/gas/testsuite/gas/arm/copro-thumb_v6t2plus-thumb_v6t2-2.d
index e31536e1584..5abc82cf1dd 100644
--- a/gas/testsuite/gas/arm/copro-thumb_v6t2plus-thumb_v6t2-2.d
+++ b/gas/testsuite/gas/arm/copro-thumb_v6t2plus-thumb_v6t2-2.d
@@ -11,10 +11,10 @@ Disassembly of section .text:
0+000 <[^>]*> fe42 1103 cdp2 1, 4, cr1, cr2, cr3, \{0\}
0+004 <[^>]*> fd93 9500 ldc2 5, cr9, \[r3\]
0+008 <[^>]*> fdd1 e108 ldc2l 1, cr14, \[r1, #32\]
-0+00c <[^>]*> fd9f 8000 ldc2 0, cr8, \[pc\] ; .* <foo>
+0+00c <[^>]*> fd9f 8000 ldc2 0, cr8, \[pc\] @ .* <foo>
0+010 <[^>]*> fd83 0500 stc2 5, cr0, \[r3\]
0+014 <[^>]*> fdc0 f302 stc2l 3, cr15, \[r0, #8\]
-0+018 <[^>]*> fd8f 7100 stc2 1, cr7, \[pc\] ; .* <bar>
+0+018 <[^>]*> fd8f 7100 stc2 1, cr7, \[pc\] @ .* <bar>
0+01c <[^>]*> fe71 5212 mrc2 2, 3, r5, cr1, cr2, \{0\}
0+020 <[^>]*> fe21 5711 mcr2 7, 1, r5, cr1, cr1, \{0\}
0+024 <[^>]*> fc92 5502 ldc2 5, cr5, \[r2\], \{2\}
diff --git a/gas/testsuite/gas/arm/crc32-armv8-a-bad.d b/gas/testsuite/gas/arm/crc32-armv8-a-bad.d
index 638c972d8a2..e19f0786d3c 100644
--- a/gas/testsuite/gas/arm/crc32-armv8-a-bad.d
+++ b/gas/testsuite/gas/arm/crc32-armv8-a-bad.d
@@ -9,15 +9,15 @@
Disassembly of section .text:
-0+0 <[^>]*> e101f042 crc32b pc, r1, r2 ; <UNPREDICTABLE>
-0+4 <[^>]*> e12f0042 crc32h r0, pc, r2 ; <UNPREDICTABLE>
-0+8 <[^>]*> e141004f crc32w r0, r1, pc ; <UNPREDICTABLE>
-0+c <[^>]*> e10f0242 crc32cb r0, pc, r2 ; <UNPREDICTABLE>
-0+10 <[^>]*> e121f242 crc32ch pc, r1, r2 ; <UNPREDICTABLE>
-0+14 <[^>]*> e14f0242 crc32cw r0, pc, r2 ; <UNPREDICTABLE>
-0+18 <[^>]*> fac1 ff82 crc32b pc, r1, r2 ; <UNPREDICTABLE>
-0+1c <[^>]*> facf f092 crc32h r0, pc, r2 ; <UNPREDICTABLE>
-0+20 <[^>]*> fac1 f0af crc32w r0, r1, pc ; <UNPREDICTABLE>
-0+24 <[^>]*> fadf f082 crc32cb r0, pc, r2 ; <UNPREDICTABLE>
-0+28 <[^>]*> fad1 ff92 crc32ch pc, r1, r2 ; <UNPREDICTABLE>
-0+2c <[^>]*> fadf f0a2 crc32cw r0, pc, r2 ; <UNPREDICTABLE>
+0+0 <[^>]*> e101f042 crc32b pc, r1, r2 @ <UNPREDICTABLE>
+0+4 <[^>]*> e12f0042 crc32h r0, pc, r2 @ <UNPREDICTABLE>
+0+8 <[^>]*> e141004f crc32w r0, r1, pc @ <UNPREDICTABLE>
+0+c <[^>]*> e10f0242 crc32cb r0, pc, r2 @ <UNPREDICTABLE>
+0+10 <[^>]*> e121f242 crc32ch pc, r1, r2 @ <UNPREDICTABLE>
+0+14 <[^>]*> e14f0242 crc32cw r0, pc, r2 @ <UNPREDICTABLE>
+0+18 <[^>]*> fac1 ff82 crc32b pc, r1, r2 @ <UNPREDICTABLE>
+0+1c <[^>]*> facf f092 crc32h r0, pc, r2 @ <UNPREDICTABLE>
+0+20 <[^>]*> fac1 f0af crc32w r0, r1, pc @ <UNPREDICTABLE>
+0+24 <[^>]*> fadf f082 crc32cb r0, pc, r2 @ <UNPREDICTABLE>
+0+28 <[^>]*> fad1 ff92 crc32ch pc, r1, r2 @ <UNPREDICTABLE>
+0+2c <[^>]*> fadf f0a2 crc32cw r0, pc, r2 @ <UNPREDICTABLE>
diff --git a/gas/testsuite/gas/arm/crc32-armv8-r-bad.d b/gas/testsuite/gas/arm/crc32-armv8-r-bad.d
index 5a00ffcacc3..a4cefc184c7 100644
--- a/gas/testsuite/gas/arm/crc32-armv8-r-bad.d
+++ b/gas/testsuite/gas/arm/crc32-armv8-r-bad.d
@@ -9,15 +9,15 @@
Disassembly of section .text:
-0+0 <[^>]*> e101f042 crc32b pc, r1, r2 ; <UNPREDICTABLE>
-0+4 <[^>]*> e12f0042 crc32h r0, pc, r2 ; <UNPREDICTABLE>
-0+8 <[^>]*> e141004f crc32w r0, r1, pc ; <UNPREDICTABLE>
-0+c <[^>]*> e10f0242 crc32cb r0, pc, r2 ; <UNPREDICTABLE>
-0+10 <[^>]*> e121f242 crc32ch pc, r1, r2 ; <UNPREDICTABLE>
-0+14 <[^>]*> e14f0242 crc32cw r0, pc, r2 ; <UNPREDICTABLE>
-0+18 <[^>]*> fac1 ff82 crc32b pc, r1, r2 ; <UNPREDICTABLE>
-0+1c <[^>]*> facf f092 crc32h r0, pc, r2 ; <UNPREDICTABLE>
-0+20 <[^>]*> fac1 f0af crc32w r0, r1, pc ; <UNPREDICTABLE>
-0+24 <[^>]*> fadf f082 crc32cb r0, pc, r2 ; <UNPREDICTABLE>
-0+28 <[^>]*> fad1 ff92 crc32ch pc, r1, r2 ; <UNPREDICTABLE>
-0+2c <[^>]*> fadf f0a2 crc32cw r0, pc, r2 ; <UNPREDICTABLE>
+0+0 <[^>]*> e101f042 crc32b pc, r1, r2 @ <UNPREDICTABLE>
+0+4 <[^>]*> e12f0042 crc32h r0, pc, r2 @ <UNPREDICTABLE>
+0+8 <[^>]*> e141004f crc32w r0, r1, pc @ <UNPREDICTABLE>
+0+c <[^>]*> e10f0242 crc32cb r0, pc, r2 @ <UNPREDICTABLE>
+0+10 <[^>]*> e121f242 crc32ch pc, r1, r2 @ <UNPREDICTABLE>
+0+14 <[^>]*> e14f0242 crc32cw r0, pc, r2 @ <UNPREDICTABLE>
+0+18 <[^>]*> fac1 ff82 crc32b pc, r1, r2 @ <UNPREDICTABLE>
+0+1c <[^>]*> facf f092 crc32h r0, pc, r2 @ <UNPREDICTABLE>
+0+20 <[^>]*> fac1 f0af crc32w r0, r1, pc @ <UNPREDICTABLE>
+0+24 <[^>]*> fadf f082 crc32cb r0, pc, r2 @ <UNPREDICTABLE>
+0+28 <[^>]*> fad1 ff92 crc32ch pc, r1, r2 @ <UNPREDICTABLE>
+0+2c <[^>]*> fadf f0a2 crc32cw r0, pc, r2 @ <UNPREDICTABLE>
diff --git a/gas/testsuite/gas/arm/dis-data3.d b/gas/testsuite/gas/arm/dis-data3.d
index f0e1afd456e..e7ea111c73b 100644
--- a/gas/testsuite/gas/arm/dis-data3.d
+++ b/gas/testsuite/gas/arm/dis-data3.d
@@ -8,4 +8,4 @@ Disassembly of section \.text:
00000000 <main> 20010000 .word 0x20010000
00000004 <main\+0x4> 000000f9 .word 0x000000f9
00000008 <main\+0x8> 00004cd5 .word 0x00004cd5
-0000000c <main\+0xc> e1a00000 nop ; \(mov r0, r0\)
+0000000c <main\+0xc> e1a00000 nop @ \(mov r0, r0\)
diff --git a/gas/testsuite/gas/arm/el_segundo.d b/gas/testsuite/gas/arm/el_segundo.d
index 6126060bbdb..256e3b86472 100644
--- a/gas/testsuite/gas/arm/el_segundo.d
+++ b/gas/testsuite/gas/arm/el_segundo.d
@@ -31,4 +31,4 @@ Disassembly of section \.text:
0+60 <[^>]+> e1220051 qsub r0, r1, r2
0+64 <[^>]+> e1620051 qdsub r0, r1, r2
0+68 <[^>]+> e1220051 qsub r0, r1, r2
-0+6c <[^>]+> e1a00000 nop ; \(mov r0, r0\)
+0+6c <[^>]+> e1a00000 nop @ \(mov r0, r0\)
diff --git a/gas/testsuite/gas/arm/float.d b/gas/testsuite/gas/arm/float.d
index c04943099a0..9faaf209158 100644
--- a/gas/testsuite/gas/arm/float.d
+++ b/gas/testsuite/gas/arm/float.d
@@ -124,7 +124,7 @@ Disassembly of section .text:
0+1d0 <[^>]+> ed911210 ? lfm f1, 4, \[r1, #64\].*
0+1d4 <[^>]+> edae22ff ? sfm f2, 4, \[lr, #1020\]!.*
0+1d8 <[^>]+> 0c68f2ff ? sfmeq f7, 3, \[r8\], #-1020.*
-0+1dc <[^>]+> eddf6200 ? lfm f6, 2, \[pc\] ; .* <l\+.*>
+0+1dc <[^>]+> eddf6200 ? lfm f6, 2, \[pc\] @ .* <l\+.*>
0+1e0 <[^>]+> eca8f203 ? sfm f7, 1, \[r8\], #12
0+1e4 <[^>]+> 0d16520c ? lfmeq f5, 4, \[r6, #-48\].*
0+1e8 <[^>]+> 1d42c209 ? sfmne f4, 3, \[r2, #-36\].*
diff --git a/gas/testsuite/gas/arm/group-reloc-alu.d b/gas/testsuite/gas/arm/group-reloc-alu.d
index 3f84b7042b1..d435017f7b0 100644
--- a/gas/testsuite/gas/arm/group-reloc-alu.d
+++ b/gas/testsuite/gas/arm/group-reloc-alu.d
@@ -5,164 +5,164 @@
.*: +file format .*arm.*
Disassembly of section .text:
-0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 @ 0x100
0: R_ARM_ALU_PC_G0 f
-0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 @ 0x100
4: R_ARM_ALU_PC_G1 f
-0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 @ 0x100
8: R_ARM_ALU_PC_G2 f
-0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 @ 0x100
c: R_ARM_ALU_PC_G0_NC f
-0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 @ 0x100
10: R_ARM_ALU_PC_G1_NC f
-0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 @ 0x100
14: R_ARM_ALU_SB_G0 f
-0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 @ 0x100
18: R_ARM_ALU_SB_G1 f
-0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 @ 0x100
1c: R_ARM_ALU_SB_G2 f
-0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 @ 0x100
20: R_ARM_ALU_SB_G0_NC f
-0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 @ 0x100
24: R_ARM_ALU_SB_G1_NC f
-0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 @ 0x100
28: R_ARM_ALU_PC_G0 localsym
-0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 @ 0x100
2c: R_ARM_ALU_PC_G1 localsym
-0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 @ 0x100
30: R_ARM_ALU_PC_G2 localsym
-0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 @ 0x100
34: R_ARM_ALU_PC_G0_NC localsym
-0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 @ 0x100
38: R_ARM_ALU_PC_G1_NC localsym
-0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 @ 0x100
3c: R_ARM_ALU_SB_G0 localsym
-0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 @ 0x100
40: R_ARM_ALU_SB_G1 localsym
-0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 @ 0x100
44: R_ARM_ALU_SB_G2 localsym
-0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 @ 0x100
48: R_ARM_ALU_SB_G0_NC localsym
-0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2800c01 add r0, r0, #256 @ 0x100
4c: R_ARM_ALU_SB_G1_NC localsym
-0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 @ 0x100
50: R_ARM_ALU_PC_G0 f
-0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 @ 0x100
54: R_ARM_ALU_PC_G1 f
-0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 @ 0x100
58: R_ARM_ALU_PC_G2 f
-0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 @ 0x100
5c: R_ARM_ALU_PC_G0_NC f
-0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 @ 0x100
60: R_ARM_ALU_PC_G1_NC f
-0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 @ 0x100
64: R_ARM_ALU_SB_G0 f
-0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 @ 0x100
68: R_ARM_ALU_SB_G1 f
-0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 @ 0x100
6c: R_ARM_ALU_SB_G2 f
-0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 @ 0x100
70: R_ARM_ALU_SB_G0_NC f
-0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 @ 0x100
74: R_ARM_ALU_SB_G1_NC f
-0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 @ 0x100
78: R_ARM_ALU_PC_G0 localsym
-0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 @ 0x100
7c: R_ARM_ALU_PC_G1 localsym
-0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 @ 0x100
80: R_ARM_ALU_PC_G2 localsym
-0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 @ 0x100
84: R_ARM_ALU_PC_G0_NC localsym
-0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 @ 0x100
88: R_ARM_ALU_PC_G1_NC localsym
-0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 @ 0x100
8c: R_ARM_ALU_SB_G0 localsym
-0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 @ 0x100
90: R_ARM_ALU_SB_G1 localsym
-0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 @ 0x100
94: R_ARM_ALU_SB_G2 localsym
-0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 @ 0x100
98: R_ARM_ALU_SB_G0_NC localsym
-0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2900c01 adds r0, r0, #256 @ 0x100
9c: R_ARM_ALU_SB_G1_NC localsym
-0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 @ 0x100
a0: R_ARM_ALU_PC_G0 f
-0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 @ 0x100
a4: R_ARM_ALU_PC_G1 f
-0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 @ 0x100
a8: R_ARM_ALU_PC_G2 f
-0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 @ 0x100
ac: R_ARM_ALU_PC_G0_NC f
-0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 @ 0x100
b0: R_ARM_ALU_PC_G1_NC f
-0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 @ 0x100
b4: R_ARM_ALU_SB_G0 f
-0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 @ 0x100
b8: R_ARM_ALU_SB_G1 f
-0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 @ 0x100
bc: R_ARM_ALU_SB_G2 f
-0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 @ 0x100
c0: R_ARM_ALU_SB_G0_NC f
-0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 @ 0x100
c4: R_ARM_ALU_SB_G1_NC f
-0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 @ 0x100
c8: R_ARM_ALU_PC_G0 localsym
-0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 @ 0x100
cc: R_ARM_ALU_PC_G1 localsym
-0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 @ 0x100
d0: R_ARM_ALU_PC_G2 localsym
-0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 @ 0x100
d4: R_ARM_ALU_PC_G0_NC localsym
-0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 @ 0x100
d8: R_ARM_ALU_PC_G1_NC localsym
-0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 @ 0x100
dc: R_ARM_ALU_SB_G0 localsym
-0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 @ 0x100
e0: R_ARM_ALU_SB_G1 localsym
-0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 @ 0x100
e4: R_ARM_ALU_SB_G2 localsym
-0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 @ 0x100
e8: R_ARM_ALU_SB_G0_NC localsym
-0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2400c01 sub r0, r0, #256 @ 0x100
ec: R_ARM_ALU_SB_G1_NC localsym
-0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 @ 0x100
f0: R_ARM_ALU_PC_G0 f
-0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 @ 0x100
f4: R_ARM_ALU_PC_G1 f
-0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 @ 0x100
f8: R_ARM_ALU_PC_G2 f
-0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 @ 0x100
fc: R_ARM_ALU_PC_G0_NC f
-0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 @ 0x100
100: R_ARM_ALU_PC_G1_NC f
-0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 @ 0x100
104: R_ARM_ALU_SB_G0 f
-0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 @ 0x100
108: R_ARM_ALU_SB_G1 f
-0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 @ 0x100
10c: R_ARM_ALU_SB_G2 f
-0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 @ 0x100
110: R_ARM_ALU_SB_G0_NC f
-0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 @ 0x100
114: R_ARM_ALU_SB_G1_NC f
-0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 @ 0x100
118: R_ARM_ALU_PC_G0 localsym
-0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 @ 0x100
11c: R_ARM_ALU_PC_G1 localsym
-0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 @ 0x100
120: R_ARM_ALU_PC_G2 localsym
-0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 @ 0x100
124: R_ARM_ALU_PC_G0_NC localsym
-0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 @ 0x100
128: R_ARM_ALU_PC_G1_NC localsym
-0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 @ 0x100
12c: R_ARM_ALU_SB_G0 localsym
-0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 @ 0x100
130: R_ARM_ALU_SB_G1 localsym
-0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 @ 0x100
134: R_ARM_ALU_SB_G2 localsym
-0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 @ 0x100
138: R_ARM_ALU_SB_G0_NC localsym
-0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 ; 0x100
+0[0-9a-f]+ <[^>]+> e2500c01 subs r0, r0, #256 @ 0x100
13c: R_ARM_ALU_SB_G1_NC localsym
0[0-9a-f]+ <[^>]+> e3a00000 mov r0, #0
diff --git a/gas/testsuite/gas/arm/group-reloc-ldrs.d b/gas/testsuite/gas/arm/group-reloc-ldrs.d
index 6aba9bbc252..6db5d36c730 100644
--- a/gas/testsuite/gas/arm/group-reloc-ldrs.d
+++ b/gas/testsuite/gas/arm/group-reloc-ldrs.d
@@ -5,244 +5,244 @@
.*: +file format .*arm.*
Disassembly of section .text:
-0[0-9a-f]+ <[^>]+> e1c00fdf ldrd r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1c00fdf ldrd r0, \[r0, #255\] @ 0xff
0: R_ARM_LDRS_PC_G1 f
-0[0-9a-f]+ <[^>]+> e1c00fdf ldrd r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1c00fdf ldrd r0, \[r0, #255\] @ 0xff
4: R_ARM_LDRS_PC_G2 f
-0[0-9a-f]+ <[^>]+> e1c00fdf ldrd r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1c00fdf ldrd r0, \[r0, #255\] @ 0xff
8: R_ARM_LDRS_SB_G0 f
-0[0-9a-f]+ <[^>]+> e1c00fdf ldrd r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1c00fdf ldrd r0, \[r0, #255\] @ 0xff
c: R_ARM_LDRS_SB_G1 f
-0[0-9a-f]+ <[^>]+> e1c00fdf ldrd r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1c00fdf ldrd r0, \[r0, #255\] @ 0xff
10: R_ARM_LDRS_SB_G2 f
-0[0-9a-f]+ <[^>]+> e1c00fff strd r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1c00fff strd r0, \[r0, #255\] @ 0xff
14: R_ARM_LDRS_PC_G1 f
-0[0-9a-f]+ <[^>]+> e1c00fff strd r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1c00fff strd r0, \[r0, #255\] @ 0xff
18: R_ARM_LDRS_PC_G2 f
-0[0-9a-f]+ <[^>]+> e1c00fff strd r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1c00fff strd r0, \[r0, #255\] @ 0xff
1c: R_ARM_LDRS_SB_G0 f
-0[0-9a-f]+ <[^>]+> e1c00fff strd r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1c00fff strd r0, \[r0, #255\] @ 0xff
20: R_ARM_LDRS_SB_G1 f
-0[0-9a-f]+ <[^>]+> e1c00fff strd r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1c00fff strd r0, \[r0, #255\] @ 0xff
24: R_ARM_LDRS_SB_G2 f
-0[0-9a-f]+ <[^>]+> e1d00fbf ldrh r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1d00fbf ldrh r0, \[r0, #255\] @ 0xff
28: R_ARM_LDRS_PC_G1 f
-0[0-9a-f]+ <[^>]+> e1d00fbf ldrh r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1d00fbf ldrh r0, \[r0, #255\] @ 0xff
2c: R_ARM_LDRS_PC_G2 f
-0[0-9a-f]+ <[^>]+> e1d00fbf ldrh r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1d00fbf ldrh r0, \[r0, #255\] @ 0xff
30: R_ARM_LDRS_SB_G0 f
-0[0-9a-f]+ <[^>]+> e1d00fbf ldrh r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1d00fbf ldrh r0, \[r0, #255\] @ 0xff
34: R_ARM_LDRS_SB_G1 f
-0[0-9a-f]+ <[^>]+> e1d00fbf ldrh r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1d00fbf ldrh r0, \[r0, #255\] @ 0xff
38: R_ARM_LDRS_SB_G2 f
-0[0-9a-f]+ <[^>]+> e1c00fbf strh r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1c00fbf strh r0, \[r0, #255\] @ 0xff
3c: R_ARM_LDRS_PC_G1 f
-0[0-9a-f]+ <[^>]+> e1c00fbf strh r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1c00fbf strh r0, \[r0, #255\] @ 0xff
40: R_ARM_LDRS_PC_G2 f
-0[0-9a-f]+ <[^>]+> e1c00fbf strh r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1c00fbf strh r0, \[r0, #255\] @ 0xff
44: R_ARM_LDRS_SB_G0 f
-0[0-9a-f]+ <[^>]+> e1c00fbf strh r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1c00fbf strh r0, \[r0, #255\] @ 0xff
48: R_ARM_LDRS_SB_G1 f
-0[0-9a-f]+ <[^>]+> e1c00fbf strh r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1c00fbf strh r0, \[r0, #255\] @ 0xff
4c: R_ARM_LDRS_SB_G2 f
-0[0-9a-f]+ <[^>]+> e1d00fff ldrsh r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1d00fff ldrsh r0, \[r0, #255\] @ 0xff
50: R_ARM_LDRS_PC_G1 f
-0[0-9a-f]+ <[^>]+> e1d00fff ldrsh r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1d00fff ldrsh r0, \[r0, #255\] @ 0xff
54: R_ARM_LDRS_PC_G2 f
-0[0-9a-f]+ <[^>]+> e1d00fff ldrsh r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1d00fff ldrsh r0, \[r0, #255\] @ 0xff
58: R_ARM_LDRS_SB_G0 f
-0[0-9a-f]+ <[^>]+> e1d00fff ldrsh r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1d00fff ldrsh r0, \[r0, #255\] @ 0xff
5c: R_ARM_LDRS_SB_G1 f
-0[0-9a-f]+ <[^>]+> e1d00fff ldrsh r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1d00fff ldrsh r0, \[r0, #255\] @ 0xff
60: R_ARM_LDRS_SB_G2 f
-0[0-9a-f]+ <[^>]+> e1d00fdf ldrsb r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1d00fdf ldrsb r0, \[r0, #255\] @ 0xff
64: R_ARM_LDRS_PC_G1 f
-0[0-9a-f]+ <[^>]+> e1d00fdf ldrsb r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1d00fdf ldrsb r0, \[r0, #255\] @ 0xff
68: R_ARM_LDRS_PC_G2 f
-0[0-9a-f]+ <[^>]+> e1d00fdf ldrsb r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1d00fdf ldrsb r0, \[r0, #255\] @ 0xff
6c: R_ARM_LDRS_SB_G0 f
-0[0-9a-f]+ <[^>]+> e1d00fdf ldrsb r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1d00fdf ldrsb r0, \[r0, #255\] @ 0xff
70: R_ARM_LDRS_SB_G1 f
-0[0-9a-f]+ <[^>]+> e1d00fdf ldrsb r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1d00fdf ldrsb r0, \[r0, #255\] @ 0xff
74: R_ARM_LDRS_SB_G2 f
-0[0-9a-f]+ <[^>]+> e1400fdf ldrd r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1400fdf ldrd r0, \[r0, #-255\] @ 0xffffff01
78: R_ARM_LDRS_PC_G1 f
-0[0-9a-f]+ <[^>]+> e1400fdf ldrd r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1400fdf ldrd r0, \[r0, #-255\] @ 0xffffff01
7c: R_ARM_LDRS_PC_G2 f
-0[0-9a-f]+ <[^>]+> e1400fdf ldrd r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1400fdf ldrd r0, \[r0, #-255\] @ 0xffffff01
80: R_ARM_LDRS_SB_G0 f
-0[0-9a-f]+ <[^>]+> e1400fdf ldrd r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1400fdf ldrd r0, \[r0, #-255\] @ 0xffffff01
84: R_ARM_LDRS_SB_G1 f
-0[0-9a-f]+ <[^>]+> e1400fdf ldrd r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1400fdf ldrd r0, \[r0, #-255\] @ 0xffffff01
88: R_ARM_LDRS_SB_G2 f
-0[0-9a-f]+ <[^>]+> e1400fff strd r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1400fff strd r0, \[r0, #-255\] @ 0xffffff01
8c: R_ARM_LDRS_PC_G1 f
-0[0-9a-f]+ <[^>]+> e1400fff strd r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1400fff strd r0, \[r0, #-255\] @ 0xffffff01
90: R_ARM_LDRS_PC_G2 f
-0[0-9a-f]+ <[^>]+> e1400fff strd r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1400fff strd r0, \[r0, #-255\] @ 0xffffff01
94: R_ARM_LDRS_SB_G0 f
-0[0-9a-f]+ <[^>]+> e1400fff strd r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1400fff strd r0, \[r0, #-255\] @ 0xffffff01
98: R_ARM_LDRS_SB_G1 f
-0[0-9a-f]+ <[^>]+> e1400fff strd r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1400fff strd r0, \[r0, #-255\] @ 0xffffff01
9c: R_ARM_LDRS_SB_G2 f
-0[0-9a-f]+ <[^>]+> e1500fbf ldrh r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1500fbf ldrh r0, \[r0, #-255\] @ 0xffffff01
a0: R_ARM_LDRS_PC_G1 f
-0[0-9a-f]+ <[^>]+> e1500fbf ldrh r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1500fbf ldrh r0, \[r0, #-255\] @ 0xffffff01
a4: R_ARM_LDRS_PC_G2 f
-0[0-9a-f]+ <[^>]+> e1500fbf ldrh r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1500fbf ldrh r0, \[r0, #-255\] @ 0xffffff01
a8: R_ARM_LDRS_SB_G0 f
-0[0-9a-f]+ <[^>]+> e1500fbf ldrh r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1500fbf ldrh r0, \[r0, #-255\] @ 0xffffff01
ac: R_ARM_LDRS_SB_G1 f
-0[0-9a-f]+ <[^>]+> e1500fbf ldrh r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1500fbf ldrh r0, \[r0, #-255\] @ 0xffffff01
b0: R_ARM_LDRS_SB_G2 f
-0[0-9a-f]+ <[^>]+> e1400fbf strh r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1400fbf strh r0, \[r0, #-255\] @ 0xffffff01
b4: R_ARM_LDRS_PC_G1 f
-0[0-9a-f]+ <[^>]+> e1400fbf strh r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1400fbf strh r0, \[r0, #-255\] @ 0xffffff01
b8: R_ARM_LDRS_PC_G2 f
-0[0-9a-f]+ <[^>]+> e1400fbf strh r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1400fbf strh r0, \[r0, #-255\] @ 0xffffff01
bc: R_ARM_LDRS_SB_G0 f
-0[0-9a-f]+ <[^>]+> e1400fbf strh r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1400fbf strh r0, \[r0, #-255\] @ 0xffffff01
c0: R_ARM_LDRS_SB_G1 f
-0[0-9a-f]+ <[^>]+> e1400fbf strh r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1400fbf strh r0, \[r0, #-255\] @ 0xffffff01
c4: R_ARM_LDRS_SB_G2 f
-0[0-9a-f]+ <[^>]+> e1500fff ldrsh r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1500fff ldrsh r0, \[r0, #-255\] @ 0xffffff01
c8: R_ARM_LDRS_PC_G1 f
-0[0-9a-f]+ <[^>]+> e1500fff ldrsh r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1500fff ldrsh r0, \[r0, #-255\] @ 0xffffff01
cc: R_ARM_LDRS_PC_G2 f
-0[0-9a-f]+ <[^>]+> e1500fff ldrsh r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1500fff ldrsh r0, \[r0, #-255\] @ 0xffffff01
d0: R_ARM_LDRS_SB_G0 f
-0[0-9a-f]+ <[^>]+> e1500fff ldrsh r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1500fff ldrsh r0, \[r0, #-255\] @ 0xffffff01
d4: R_ARM_LDRS_SB_G1 f
-0[0-9a-f]+ <[^>]+> e1500fff ldrsh r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1500fff ldrsh r0, \[r0, #-255\] @ 0xffffff01
d8: R_ARM_LDRS_SB_G2 f
-0[0-9a-f]+ <[^>]+> e1500fdf ldrsb r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1500fdf ldrsb r0, \[r0, #-255\] @ 0xffffff01
dc: R_ARM_LDRS_PC_G1 f
-0[0-9a-f]+ <[^>]+> e1500fdf ldrsb r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1500fdf ldrsb r0, \[r0, #-255\] @ 0xffffff01
e0: R_ARM_LDRS_PC_G2 f
-0[0-9a-f]+ <[^>]+> e1500fdf ldrsb r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1500fdf ldrsb r0, \[r0, #-255\] @ 0xffffff01
e4: R_ARM_LDRS_SB_G0 f
-0[0-9a-f]+ <[^>]+> e1500fdf ldrsb r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1500fdf ldrsb r0, \[r0, #-255\] @ 0xffffff01
e8: R_ARM_LDRS_SB_G1 f
-0[0-9a-f]+ <[^>]+> e1500fdf ldrsb r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1500fdf ldrsb r0, \[r0, #-255\] @ 0xffffff01
ec: R_ARM_LDRS_SB_G2 f
-0[0-9a-f]+ <[^>]+> e1c00fdf ldrd r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1c00fdf ldrd r0, \[r0, #255\] @ 0xff
f0: R_ARM_LDRS_PC_G1 localsym
-0[0-9a-f]+ <[^>]+> e1c00fdf ldrd r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1c00fdf ldrd r0, \[r0, #255\] @ 0xff
f4: R_ARM_LDRS_PC_G2 localsym
-0[0-9a-f]+ <[^>]+> e1c00fdf ldrd r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1c00fdf ldrd r0, \[r0, #255\] @ 0xff
f8: R_ARM_LDRS_SB_G0 localsym
-0[0-9a-f]+ <[^>]+> e1c00fdf ldrd r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1c00fdf ldrd r0, \[r0, #255\] @ 0xff
fc: R_ARM_LDRS_SB_G1 localsym
-0[0-9a-f]+ <[^>]+> e1c00fdf ldrd r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1c00fdf ldrd r0, \[r0, #255\] @ 0xff
100: R_ARM_LDRS_SB_G2 localsym
-0[0-9a-f]+ <[^>]+> e1c00fff strd r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1c00fff strd r0, \[r0, #255\] @ 0xff
104: R_ARM_LDRS_PC_G1 localsym
-0[0-9a-f]+ <[^>]+> e1c00fff strd r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1c00fff strd r0, \[r0, #255\] @ 0xff
108: R_ARM_LDRS_PC_G2 localsym
-0[0-9a-f]+ <[^>]+> e1c00fff strd r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1c00fff strd r0, \[r0, #255\] @ 0xff
10c: R_ARM_LDRS_SB_G0 localsym
-0[0-9a-f]+ <[^>]+> e1c00fff strd r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1c00fff strd r0, \[r0, #255\] @ 0xff
110: R_ARM_LDRS_SB_G1 localsym
-0[0-9a-f]+ <[^>]+> e1c00fff strd r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1c00fff strd r0, \[r0, #255\] @ 0xff
114: R_ARM_LDRS_SB_G2 localsym
-0[0-9a-f]+ <[^>]+> e1d00fbf ldrh r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1d00fbf ldrh r0, \[r0, #255\] @ 0xff
118: R_ARM_LDRS_PC_G1 localsym
-0[0-9a-f]+ <[^>]+> e1d00fbf ldrh r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1d00fbf ldrh r0, \[r0, #255\] @ 0xff
11c: R_ARM_LDRS_PC_G2 localsym
-0[0-9a-f]+ <[^>]+> e1d00fbf ldrh r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1d00fbf ldrh r0, \[r0, #255\] @ 0xff
120: R_ARM_LDRS_SB_G0 localsym
-0[0-9a-f]+ <[^>]+> e1d00fbf ldrh r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1d00fbf ldrh r0, \[r0, #255\] @ 0xff
124: R_ARM_LDRS_SB_G1 localsym
-0[0-9a-f]+ <[^>]+> e1d00fbf ldrh r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1d00fbf ldrh r0, \[r0, #255\] @ 0xff
128: R_ARM_LDRS_SB_G2 localsym
-0[0-9a-f]+ <[^>]+> e1c00fbf strh r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1c00fbf strh r0, \[r0, #255\] @ 0xff
12c: R_ARM_LDRS_PC_G1 localsym
-0[0-9a-f]+ <[^>]+> e1c00fbf strh r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1c00fbf strh r0, \[r0, #255\] @ 0xff
130: R_ARM_LDRS_PC_G2 localsym
-0[0-9a-f]+ <[^>]+> e1c00fbf strh r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1c00fbf strh r0, \[r0, #255\] @ 0xff
134: R_ARM_LDRS_SB_G0 localsym
-0[0-9a-f]+ <[^>]+> e1c00fbf strh r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1c00fbf strh r0, \[r0, #255\] @ 0xff
138: R_ARM_LDRS_SB_G1 localsym
-0[0-9a-f]+ <[^>]+> e1c00fbf strh r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1c00fbf strh r0, \[r0, #255\] @ 0xff
13c: R_ARM_LDRS_SB_G2 localsym
-0[0-9a-f]+ <[^>]+> e1d00fff ldrsh r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1d00fff ldrsh r0, \[r0, #255\] @ 0xff
140: R_ARM_LDRS_PC_G1 localsym
-0[0-9a-f]+ <[^>]+> e1d00fff ldrsh r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1d00fff ldrsh r0, \[r0, #255\] @ 0xff
144: R_ARM_LDRS_PC_G2 localsym
-0[0-9a-f]+ <[^>]+> e1d00fff ldrsh r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1d00fff ldrsh r0, \[r0, #255\] @ 0xff
148: R_ARM_LDRS_SB_G0 localsym
-0[0-9a-f]+ <[^>]+> e1d00fff ldrsh r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1d00fff ldrsh r0, \[r0, #255\] @ 0xff
14c: R_ARM_LDRS_SB_G1 localsym
-0[0-9a-f]+ <[^>]+> e1d00fff ldrsh r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1d00fff ldrsh r0, \[r0, #255\] @ 0xff
150: R_ARM_LDRS_SB_G2 localsym
-0[0-9a-f]+ <[^>]+> e1d00fdf ldrsb r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1d00fdf ldrsb r0, \[r0, #255\] @ 0xff
154: R_ARM_LDRS_PC_G1 localsym
-0[0-9a-f]+ <[^>]+> e1d00fdf ldrsb r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1d00fdf ldrsb r0, \[r0, #255\] @ 0xff
158: R_ARM_LDRS_PC_G2 localsym
-0[0-9a-f]+ <[^>]+> e1d00fdf ldrsb r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1d00fdf ldrsb r0, \[r0, #255\] @ 0xff
15c: R_ARM_LDRS_SB_G0 localsym
-0[0-9a-f]+ <[^>]+> e1d00fdf ldrsb r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1d00fdf ldrsb r0, \[r0, #255\] @ 0xff
160: R_ARM_LDRS_SB_G1 localsym
-0[0-9a-f]+ <[^>]+> e1d00fdf ldrsb r0, \[r0, #255\] ; 0xff
+0[0-9a-f]+ <[^>]+> e1d00fdf ldrsb r0, \[r0, #255\] @ 0xff
164: R_ARM_LDRS_SB_G2 localsym
-0[0-9a-f]+ <[^>]+> e1400fdf ldrd r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1400fdf ldrd r0, \[r0, #-255\] @ 0xffffff01
168: R_ARM_LDRS_PC_G1 localsym
-0[0-9a-f]+ <[^>]+> e1400fdf ldrd r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1400fdf ldrd r0, \[r0, #-255\] @ 0xffffff01
16c: R_ARM_LDRS_PC_G2 localsym
-0[0-9a-f]+ <[^>]+> e1400fdf ldrd r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1400fdf ldrd r0, \[r0, #-255\] @ 0xffffff01
170: R_ARM_LDRS_SB_G0 localsym
-0[0-9a-f]+ <[^>]+> e1400fdf ldrd r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1400fdf ldrd r0, \[r0, #-255\] @ 0xffffff01
174: R_ARM_LDRS_SB_G1 localsym
-0[0-9a-f]+ <[^>]+> e1400fdf ldrd r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1400fdf ldrd r0, \[r0, #-255\] @ 0xffffff01
178: R_ARM_LDRS_SB_G2 localsym
-0[0-9a-f]+ <[^>]+> e1400fff strd r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1400fff strd r0, \[r0, #-255\] @ 0xffffff01
17c: R_ARM_LDRS_PC_G1 localsym
-0[0-9a-f]+ <[^>]+> e1400fff strd r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1400fff strd r0, \[r0, #-255\] @ 0xffffff01
180: R_ARM_LDRS_PC_G2 localsym
-0[0-9a-f]+ <[^>]+> e1400fff strd r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1400fff strd r0, \[r0, #-255\] @ 0xffffff01
184: R_ARM_LDRS_SB_G0 localsym
-0[0-9a-f]+ <[^>]+> e1400fff strd r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1400fff strd r0, \[r0, #-255\] @ 0xffffff01
188: R_ARM_LDRS_SB_G1 localsym
-0[0-9a-f]+ <[^>]+> e1400fff strd r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1400fff strd r0, \[r0, #-255\] @ 0xffffff01
18c: R_ARM_LDRS_SB_G2 localsym
-0[0-9a-f]+ <[^>]+> e1500fbf ldrh r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1500fbf ldrh r0, \[r0, #-255\] @ 0xffffff01
190: R_ARM_LDRS_PC_G1 localsym
-0[0-9a-f]+ <[^>]+> e1500fbf ldrh r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1500fbf ldrh r0, \[r0, #-255\] @ 0xffffff01
194: R_ARM_LDRS_PC_G2 localsym
-0[0-9a-f]+ <[^>]+> e1500fbf ldrh r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1500fbf ldrh r0, \[r0, #-255\] @ 0xffffff01
198: R_ARM_LDRS_SB_G0 localsym
-0[0-9a-f]+ <[^>]+> e1500fbf ldrh r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1500fbf ldrh r0, \[r0, #-255\] @ 0xffffff01
19c: R_ARM_LDRS_SB_G1 localsym
-0[0-9a-f]+ <[^>]+> e1500fbf ldrh r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1500fbf ldrh r0, \[r0, #-255\] @ 0xffffff01
1a0: R_ARM_LDRS_SB_G2 localsym
-0[0-9a-f]+ <[^>]+> e1400fbf strh r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1400fbf strh r0, \[r0, #-255\] @ 0xffffff01
1a4: R_ARM_LDRS_PC_G1 localsym
-0[0-9a-f]+ <[^>]+> e1400fbf strh r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1400fbf strh r0, \[r0, #-255\] @ 0xffffff01
1a8: R_ARM_LDRS_PC_G2 localsym
-0[0-9a-f]+ <[^>]+> e1400fbf strh r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1400fbf strh r0, \[r0, #-255\] @ 0xffffff01
1ac: R_ARM_LDRS_SB_G0 localsym
-0[0-9a-f]+ <[^>]+> e1400fbf strh r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1400fbf strh r0, \[r0, #-255\] @ 0xffffff01
1b0: R_ARM_LDRS_SB_G1 localsym
-0[0-9a-f]+ <[^>]+> e1400fbf strh r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1400fbf strh r0, \[r0, #-255\] @ 0xffffff01
1b4: R_ARM_LDRS_SB_G2 localsym
-0[0-9a-f]+ <[^>]+> e1500fff ldrsh r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1500fff ldrsh r0, \[r0, #-255\] @ 0xffffff01
1b8: R_ARM_LDRS_PC_G1 localsym
-0[0-9a-f]+ <[^>]+> e1500fff ldrsh r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1500fff ldrsh r0, \[r0, #-255\] @ 0xffffff01
1bc: R_ARM_LDRS_PC_G2 localsym
-0[0-9a-f]+ <[^>]+> e1500fff ldrsh r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1500fff ldrsh r0, \[r0, #-255\] @ 0xffffff01
1c0: R_ARM_LDRS_SB_G0 localsym
-0[0-9a-f]+ <[^>]+> e1500fff ldrsh r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1500fff ldrsh r0, \[r0, #-255\] @ 0xffffff01
1c4: R_ARM_LDRS_SB_G1 localsym
-0[0-9a-f]+ <[^>]+> e1500fff ldrsh r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1500fff ldrsh r0, \[r0, #-255\] @ 0xffffff01
1c8: R_ARM_LDRS_SB_G2 localsym
-0[0-9a-f]+ <[^>]+> e1500fdf ldrsb r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1500fdf ldrsb r0, \[r0, #-255\] @ 0xffffff01
1cc: R_ARM_LDRS_PC_G1 localsym
-0[0-9a-f]+ <[^>]+> e1500fdf ldrsb r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1500fdf ldrsb r0, \[r0, #-255\] @ 0xffffff01
1d0: R_ARM_LDRS_PC_G2 localsym
-0[0-9a-f]+ <[^>]+> e1500fdf ldrsb r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1500fdf ldrsb r0, \[r0, #-255\] @ 0xffffff01
1d4: R_ARM_LDRS_SB_G0 localsym
-0[0-9a-f]+ <[^>]+> e1500fdf ldrsb r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1500fdf ldrsb r0, \[r0, #-255\] @ 0xffffff01
1d8: R_ARM_LDRS_SB_G1 localsym
-0[0-9a-f]+ <[^>]+> e1500fdf ldrsb r0, \[r0, #-255\] ; 0xffffff01
+0[0-9a-f]+ <[^>]+> e1500fdf ldrsb r0, \[r0, #-255\] @ 0xffffff01
1dc: R_ARM_LDRS_SB_G2 localsym
0[0-9a-f]+ <[^>]+> e3a00000 mov r0, #0
diff --git a/gas/testsuite/gas/arm/immed.d b/gas/testsuite/gas/arm/immed.d
index 42ca13bc327..4890f954d33 100644
--- a/gas/testsuite/gas/arm/immed.d
+++ b/gas/testsuite/gas/arm/immed.d
@@ -7,10 +7,10 @@
Disassembly of section .text:
0+0000 <[^>]+> e3a00000 ? mov r0, #0
0+0004 <[^>]+> e3e00003 ? mvn r0, #3
-0+0008 <[^>]+> e51f0010 ? ldr r0, \[pc, #-16\] ; 0+0 <[^>]+>
-0+000c <[^>]+> e51f0014 ? ldr r0, \[pc, #-20\] ; 0+0 <[^>]+>
+0+0008 <[^>]+> e51f0010 ? ldr r0, \[pc, #-16\] @ 0+0 <[^>]+>
+0+000c <[^>]+> e51f0014 ? ldr r0, \[pc, #-20\] @ 0+0 <[^>]+>
\.\.\.
0+1010 <[^>]+> e3a00008 ? mov r0, #8
-0+1014 <[^>]+> e59f00e4 ? ldr r0, \[pc, #228\] ; 0+1100 <[^>]+>
-0+1018 <[^>]+> e1a00000 ? nop ; \(mov r0, r0\)
-0+101c <[^>]+> e1a00000 ? nop ; \(mov r0, r0\)
+0+1014 <[^>]+> e59f00e4 ? ldr r0, \[pc, #228\] @ 0+1100 <[^>]+>
+0+1018 <[^>]+> e1a00000 ? nop @ \(mov r0, r0\)
+0+101c <[^>]+> e1a00000 ? nop @ \(mov r0, r0\)
diff --git a/gas/testsuite/gas/arm/immed2.d b/gas/testsuite/gas/arm/immed2.d
index 49fa895be56..3e5d4f4225c 100644
--- a/gas/testsuite/gas/arm/immed2.d
+++ b/gas/testsuite/gas/arm/immed2.d
@@ -5,4 +5,4 @@
.*: +file format .*arm.*
Disassembly of section .text:
-0+0000 <[^>]+> b351029c ? cmplt r1, #156, 4 ; 0xc0000009
+0+0000 <[^>]+> b351029c ? cmplt r1, #156, 4 @ 0xc0000009
diff --git a/gas/testsuite/gas/arm/inst.d b/gas/testsuite/gas/arm/inst.d
index d7ca4a3ce84..6f642dbe97f 100644
--- a/gas/testsuite/gas/arm/inst.d
+++ b/gas/testsuite/gas/arm/inst.d
@@ -95,22 +95,22 @@ Disassembly of section .text:
0+14c <[^>]*> e1720004 ? cmn r2, r4
0+150 <[^>]*> e1750287 ? cmn r5, r7, lsl #5
0+154 <[^>]*> e1710113 ? cmn r1, r3, lsl r1
-0+158 <[^>]*> e330f00a ? teq r0, #10 ; <UNPREDICTABLE>
-0+15c <[^>]*> e132f004 ? teq r2, r4 ; <UNPREDICTABLE>
-0+160 <[^>]*> e135f287 ? teq r5, r7, lsl #5 ; <UNPREDICTABLE>
-0+164 <[^>]*> e131f113 ? teq r1, r3, lsl r1 ; <UNPREDICTABLE>
-0+168 <[^>]*> e370f00a ? cmn r0, #10 ; <UNPREDICTABLE>
-0+16c <[^>]*> e172f004 ? cmn r2, r4 ; <UNPREDICTABLE>
-0+170 <[^>]*> e175f287 ? cmn r5, r7, lsl #5 ; <UNPREDICTABLE>
-0+174 <[^>]*> e171f113 ? cmn r1, r3, lsl r1 ; <UNPREDICTABLE>
-0+178 <[^>]*> e350f00a ? cmp r0, #10 ; <UNPREDICTABLE>
-0+17c <[^>]*> e152f004 ? cmp r2, r4 ; <UNPREDICTABLE>
-0+180 <[^>]*> e155f287 ? cmp r5, r7, lsl #5 ; <UNPREDICTABLE>
-0+184 <[^>]*> e151f113 ? cmp r1, r3, lsl r1 ; <UNPREDICTABLE>
-0+188 <[^>]*> e310f00a ? tst r0, #10 ; <UNPREDICTABLE>
-0+18c <[^>]*> e112f004 ? tst r2, r4 ; <UNPREDICTABLE>
-0+190 <[^>]*> e115f287 ? tst r5, r7, lsl #5 ; <UNPREDICTABLE>
-0+194 <[^>]*> e111f113 ? tst r1, r3, lsl r1 ; <UNPREDICTABLE>
+0+158 <[^>]*> e330f00a ? teq r0, #10 @ <UNPREDICTABLE>
+0+15c <[^>]*> e132f004 ? teq r2, r4 @ <UNPREDICTABLE>
+0+160 <[^>]*> e135f287 ? teq r5, r7, lsl #5 @ <UNPREDICTABLE>
+0+164 <[^>]*> e131f113 ? teq r1, r3, lsl r1 @ <UNPREDICTABLE>
+0+168 <[^>]*> e370f00a ? cmn r0, #10 @ <UNPREDICTABLE>
+0+16c <[^>]*> e172f004 ? cmn r2, r4 @ <UNPREDICTABLE>
+0+170 <[^>]*> e175f287 ? cmn r5, r7, lsl #5 @ <UNPREDICTABLE>
+0+174 <[^>]*> e171f113 ? cmn r1, r3, lsl r1 @ <UNPREDICTABLE>
+0+178 <[^>]*> e350f00a ? cmp r0, #10 @ <UNPREDICTABLE>
+0+17c <[^>]*> e152f004 ? cmp r2, r4 @ <UNPREDICTABLE>
+0+180 <[^>]*> e155f287 ? cmp r5, r7, lsl #5 @ <UNPREDICTABLE>
+0+184 <[^>]*> e151f113 ? cmp r1, r3, lsl r1 @ <UNPREDICTABLE>
+0+188 <[^>]*> e310f00a ? tst r0, #10 @ <UNPREDICTABLE>
+0+18c <[^>]*> e112f004 ? tst r2, r4 @ <UNPREDICTABLE>
+0+190 <[^>]*> e115f287 ? tst r5, r7, lsl #5 @ <UNPREDICTABLE>
+0+194 <[^>]*> e111f113 ? tst r1, r3, lsl r1 @ <UNPREDICTABLE>
0+198 <[^>]*> e0000291 ? mul r0, r1, r2
0+19c <[^>]*> e0110392 ? muls r1, r2, r3
0+1a0 <[^>]*> 10000091 ? mulne r0, r1, r0
@@ -128,7 +128,7 @@ Disassembly of section .text:
0+1d0 <[^>]*> 14954006 ? ldrne r4, \[r5\], #6
0+1d4 <[^>]*> e6b21003 ? ldrt r1, \[r2\], r3
0+1d8 <[^>]*> e6942425 ? ldr r2, \[r4\], r5, lsr #8
-0+1dc <[^>]*> e51f0008 ? ldr r0, \[pc, #-8\] ; 0+1dc <[^>]*>
+0+1dc <[^>]*> e51f0008 ? ldr r0, \[pc, #-8\] @ 0+1dc <[^>]*>
0+1e0 <[^>]*> e5d43000 ? ldrb r3, \[r4\]
0+1e4 <[^>]*> 14f85000 ? ldrbtne r5, \[r8\], #0
0+1e8 <[^>]*> e5810000 ? str r0, \[r1\]
@@ -140,7 +140,7 @@ Disassembly of section .text:
0+200 <[^>]*> 14854006 ? strne r4, \[r5\], #6
0+204 <[^>]*> e6821003 ? str r1, \[r2\], r3
0+208 <[^>]*> e6a42425 ? strt r2, \[r4\], r5, lsr #8
-0+20c <[^>]*> e50f1004 ? str r1, \[pc, #-4\] ; 0+210 <[^>]*>
+0+20c <[^>]*> e50f1004 ? str r1, \[pc, #-4\] @ 0+210 <[^>]*>
0+210 <[^>]*> e5c71000 ? strb r1, \[r7\]
0+214 <[^>]*> e4e02000 ? strbt r2, \[r0\], #0
0+218 <[^>]*> e8900002 ? ldm r0, {r1}
diff --git a/gas/testsuite/gas/arm/iwmmxt.d b/gas/testsuite/gas/arm/iwmmxt.d
index 1739ebb476f..54b8546a87a 100644
--- a/gas/testsuite/gas/arm/iwmmxt.d
+++ b/gas/testsuite/gas/arm/iwmmxt.d
@@ -168,4 +168,4 @@ Disassembly of section .text:
0+280 <[^>]*> ae377007[ ]+wandnge[ ]+wr7, wr7, wr7
0+284 <[^>]*> ee080110[ ]+tmcr[ ]+wcgr0, r0
0+288 <[^>]*> ee1a1110[ ]+tmrc[ ]+r1, wcgr2
-0+28c <[^>]*> e1a00000[ ]+nop[ ]+; \(mov r0, r0\)
+0+28c <[^>]*> e1a00000[ ]+nop[ ]+@ \(mov r0, r0\)
diff --git a/gas/testsuite/gas/arm/ldconst.d b/gas/testsuite/gas/arm/ldconst.d
index 167ed00e49f..60b28ea15c8 100644
--- a/gas/testsuite/gas/arm/ldconst.d
+++ b/gas/testsuite/gas/arm/ldconst.d
@@ -7,34 +7,34 @@
Disassembly of section .text:
0+00 <[^>]*> e3a00000 ? mov r0, #0
-0+04 <[^>]*> e3a004ff ? mov r0, #-16777216 ; 0xff000000
+0+04 <[^>]*> e3a004ff ? mov r0, #-16777216 @ 0xff000000
0+08 <[^>]*> e3e00000 ? mvn r0, #0
-0+0c <[^>]*> e51f0004 ? ldr r0, \[pc, #-4\] ; 0+10 <[^>]*>
+0+0c <[^>]*> e51f0004 ? ldr r0, \[pc, #-4\] @ 0+10 <[^>]*>
0+10 <[^>]*> 0fff0000 ? .*
0+14 <[^>]*> e3a0e000 ? mov lr, #0
-0+18 <[^>]*> e3a0e8ff ? mov lr, #16711680 ; 0xff0000
-0+1c <[^>]*> e3e0e8ff ? mvn lr, #16711680 ; 0xff0000
-0+20 <[^>]*> e51fe004 ? ldr lr, \[pc, #-4\] ; 0+24 <[^>]*>
+0+18 <[^>]*> e3a0e8ff ? mov lr, #16711680 @ 0xff0000
+0+1c <[^>]*> e3e0e8ff ? mvn lr, #16711680 @ 0xff0000
+0+20 <[^>]*> e51fe004 ? ldr lr, \[pc, #-4\] @ 0+24 <[^>]*>
0+24 <[^>]*> 00fff000 ? .*
0+28 <[^>]*> 03a00000 ? moveq r0, #0
-0+2c <[^>]*> 03a00cff ? moveq r0, #65280 ; 0xff00
-0+30 <[^>]*> 03e00cff ? mvneq r0, #65280 ; 0xff00
-0+34 <[^>]*> 051f0004 ? ldreq r0, \[pc, #-4\] ; 0+38 <[^>]*>
+0+2c <[^>]*> 03a00cff ? moveq r0, #65280 @ 0xff00
+0+30 <[^>]*> 03e00cff ? mvneq r0, #65280 @ 0xff00
+0+34 <[^>]*> 051f0004 ? ldreq r0, \[pc, #-4\] @ 0+38 <[^>]*>
0+38 <[^>]*> 000fff00 ? .*
0+3c <[^>]*> 43a0b000 ? movmi fp, #0
-0+40 <[^>]*> 43a0b0ff[...]
[diff truncated at 100000 bytes]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-10-19 10:06 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-19 10:06 [binutils-gdb/upstream/users/aburgess/arm-disasm-styling] opcodes/arm: use '@' consistently for the comment character 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).