aboutsummaryrefslogtreecommitdiff
path: root/gas
diff options
context:
space:
mode:
Diffstat (limited to 'gas')
-rw-r--r--gas/testsuite/ChangeLog58
-rw-r--r--gas/testsuite/gas/arm/adrl.d18
-rw-r--r--gas/testsuite/gas/arm/arch4t-eabi.d15
-rw-r--r--gas/testsuite/gas/arm/arch4t.d14
-rw-r--r--gas/testsuite/gas/arm/arch6zk.d4
-rw-r--r--gas/testsuite/gas/arm/archv6t2.d12
-rw-r--r--gas/testsuite/gas/arm/arm-it.d2
-rw-r--r--gas/testsuite/gas/arm/arm3.d2
-rw-r--r--gas/testsuite/gas/arm/arm7dm.d8
-rw-r--r--gas/testsuite/gas/arm/arm7t.d4
-rw-r--r--gas/testsuite/gas/arm/backslash-at.d18
-rw-r--r--gas/testsuite/gas/arm/bl-local-v4t.d12
-rw-r--r--gas/testsuite/gas/arm/blx-local.d14
-rw-r--r--gas/testsuite/gas/arm/copro.d4
-rw-r--r--gas/testsuite/gas/arm/el_segundo.d2
-rw-r--r--gas/testsuite/gas/arm/float.d8
-rw-r--r--gas/testsuite/gas/arm/fp-save.d2
-rw-r--r--gas/testsuite/gas/arm/fpa-mem.d8
-rw-r--r--gas/testsuite/gas/arm/group-reloc-alu.d2
-rw-r--r--gas/testsuite/gas/arm/group-reloc-ldr.d2
-rw-r--r--gas/testsuite/gas/arm/group-reloc-ldrs.d242
-rw-r--r--gas/testsuite/gas/arm/immed.d10
-rw-r--r--gas/testsuite/gas/arm/inst.d40
-rw-r--r--gas/testsuite/gas/arm/iwmmxt.d2
-rw-r--r--gas/testsuite/gas/arm/ldconst.d10
-rw-r--r--gas/testsuite/gas/arm/macro1.d6
-rw-r--r--gas/testsuite/gas/arm/mapmisc.d34
-rw-r--r--gas/testsuite/gas/arm/mapsecs.d10
-rw-r--r--gas/testsuite/gas/arm/mapshort-eabi.d10
-rw-r--r--gas/testsuite/gas/arm/mapshort-elf.d10
-rw-r--r--gas/testsuite/gas/arm/movw-local.d8
-rw-r--r--gas/testsuite/gas/arm/neon-ldst-rm.d8
-rw-r--r--gas/testsuite/gas/arm/offset.d6
-rw-r--r--gas/testsuite/gas/arm/reg-alias.d6
-rw-r--r--gas/testsuite/gas/arm/relax_load_align.d4
-rw-r--r--gas/testsuite/gas/arm/tcompat.d14
-rw-r--r--gas/testsuite/gas/arm/tcompat2.d8
-rw-r--r--gas/testsuite/gas/arm/thumb-eabi.d36
-rw-r--r--gas/testsuite/gas/arm/thumb.d36
-rw-r--r--gas/testsuite/gas/arm/thumb1_unified.d4
-rw-r--r--gas/testsuite/gas/arm/thumb2_add.d14
-rw-r--r--gas/testsuite/gas/arm/thumb2_it.d6
-rw-r--r--gas/testsuite/gas/arm/thumb2_it_auto.d6
-rw-r--r--gas/testsuite/gas/arm/thumb2_pool.d6
-rw-r--r--gas/testsuite/gas/arm/thumb2_relax.d16
-rw-r--r--gas/testsuite/gas/arm/thumb32.d54
-rw-r--r--gas/testsuite/gas/arm/thumbv6.d8
-rw-r--r--gas/testsuite/gas/arm/thumbv6k.d8
-rw-r--r--gas/testsuite/gas/arm/tls.d4
-rw-r--r--gas/testsuite/gas/arm/vfp1.d12
-rw-r--r--gas/testsuite/gas/arm/vfp1_t2.d6
-rw-r--r--gas/testsuite/gas/arm/vfp1xD.d4
-rw-r--r--gas/testsuite/gas/arm/wince.d6
-rw-r--r--gas/testsuite/gas/arm/wince_inst.d40
-rw-r--r--gas/testsuite/gas/arm/xscale.d10
55 files changed, 485 insertions, 428 deletions
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index ac27947..678a0a2 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,61 @@
+2009-06-30 Nick Clifton <nickc@redhat.com>
+
+ PR 10288
+ * gas/arm/adrl.d: Update expected disassembly.
+ * gas/arm/arch4t-eabi.d: Likewise.
+ * gas/arm/arch4t.d: Likewise.
+ * gas/arm/arch6zk.d: Likewise.
+ * gas/arm/archv6t2.d: Likewise.
+ * gas/arm/arm-it.d: Likewise.
+ * gas/arm/arm3.d: Likewise.
+ * gas/arm/arm7dm.d: Likewise.
+ * gas/arm/arm7t.d: Likewise.
+ * gas/arm/backslash-at.d: Likewise.
+ * gas/arm/bl-local-v4t.d: Likewise.
+ * gas/arm/blx-local.d: Likewise.
+ * gas/arm/copro.d: Likewise.
+ * gas/arm/el_segundo.d: Likewise.
+ * gas/arm/float.d: Likewise.
+ * gas/arm/fp-save.d: Likewise.
+ * gas/arm/fpa-mem.d: Likewise.
+ * gas/arm/group-reloc-alu.d: Likewise.
+ * gas/arm/group-reloc-ldr.d: Likewise.
+ * gas/arm/group-reloc-ldrs.d: Likewise.
+ * gas/arm/immed.d: Likewise.
+ * gas/arm/inst.d: Likewise.
+ * gas/arm/iwmmxt.d: Likewise.
+ * gas/arm/ldconst.d: Likewise.
+ * gas/arm/macro1.d: Likewise.
+ * gas/arm/mapmisc.d: Likewise.
+ * gas/arm/mapsecs.d: Likewise.
+ * gas/arm/mapshort-eabi.d: Likewise.
+ * gas/arm/mapshort-elf.d: Likewise.
+ * gas/arm/movw-local.d: Likewise.
+ * gas/arm/neon-ldst-rm.d: Likewise.
+ * gas/arm/offset.d: Likewise.
+ * gas/arm/reg-alias.d: Likewise.
+ * gas/arm/relax_load_align.d: Likewise.
+ * gas/arm/tcompat.d: Likewise.
+ * gas/arm/tcompat2.d: Likewise.
+ * gas/arm/thumb-eabi.d: Likewise.
+ * gas/arm/thumb.d: Likewise.
+ * gas/arm/thumb1_unified.d: Likewise.
+ * gas/arm/thumb2_add.d: Likewise.
+ * gas/arm/thumb2_it.d: Likewise.
+ * gas/arm/thumb2_it_auto.d: Likewise.
+ * gas/arm/thumb2_pool.d: Likewise.
+ * gas/arm/thumb2_relax.d: Likewise.
+ * gas/arm/thumb32.d: Likewise.
+ * gas/arm/thumbv6.d: Likewise.
+ * gas/arm/thumbv6k.d: Likewise.
+ * gas/arm/tls.d: Likewise.
+ * gas/arm/vfp1.d: Likewise.
+ * gas/arm/vfp1_t2.d: Likewise.
+ * gas/arm/vfp1xD.d: Likewise.
+ * gas/arm/wince.d: Likewise.
+ * gas/arm/wince_inst.d: Likewise.
+ * gas/arm/xscale.d: Likewise.
+
2009-06-29 Nick Clifton <nickc@redhat.com>
PR 10288
diff --git a/gas/testsuite/gas/arm/adrl.d b/gas/testsuite/gas/arm/adrl.d
index ccd4ef7..3261311 100644
--- a/gas/testsuite/gas/arm/adrl.d
+++ b/gas/testsuite/gas/arm/adrl.d
@@ -7,20 +7,20 @@
Disassembly of section .text:
...
-0+2000 <.*> e24f0008 sub r0, pc, #8 ; 0x8
+0+2000 <.*> e24f0008 sub r0, pc, #8
0+2004 <.*> e2400c20 sub r0, r0, #8192 ; 0x2000
-0+2008 <.*> e28f0020 add r0, pc, #32 ; 0x20
+0+2008 <.*> e28f0020 add r0, pc, #32
0+200c <.*> e2800c20 add r0, r0, #8192 ; 0x2000
-0+2010 <.*> e24f0018 sub r0, pc, #24 ; 0x18
-0+2014 <.*> e1a00000 nop \(mov r0,r0\)
-0+2018 <.*> e28f0008 add r0, pc, #8 ; 0x8
-0+201c <.*> e1a00000 nop \(mov r0,r0\)
-0+2020 <.*> 028f0000 addeq r0, pc, #0 ; 0x0
-0+2024 <.*> e1a00000 nop \(mov r0,r0\)
+0+2010 <.*> e24f0018 sub r0, pc, #24
+0+2014 <.*> e1a00000 nop ; \(mov r0, r0\)
+0+2018 <.*> e28f0008 add r0, pc, #8
+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, #8192 ; 0x2000
0+2030 <.*> e28f0c21 add r0, pc, #8448 ; 0x2100
-0+2034 <.*> e1a00000 nop \(mov r0,r0\)
+0+2034 <.*> e1a00000 nop ; \(mov r0, r0\)
...
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 dfab64d..afd92f7 100644
--- a/gas/testsuite/gas/arm/arch4t-eabi.d
+++ b/gas/testsuite/gas/arm/arch4t-eabi.d
@@ -18,23 +18,22 @@ Disassembly of section .text:
0+18 <[^>]+> 011510d3 ? ldrsbeq r1, \[r5, -r3\]
0+1c <[^>]+> 109620b7 ? ldrhne r2, \[r6\], r7
0+20 <[^>]+> 309720f8 ? ldrshcc r2, \[r7\], r8
-0+24 <[^>]+> e1d32fdf ? ldrsb r2, \[r3, #255\]
-0+28 <[^>]+> e1541ffa ? ldrsh r1, \[r4, #-250\]
-0+2c <[^>]+> e1d51fd0 ? ldrsb r1, \[r5, #240\]
+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+34 <[^>]+> 11c330b0 ? strhne r3, \[r3\]
-0+38 <[^>]+> e328f002 ? msr CPSR_f, #2 ; 0x2
+0+38 <[^>]+> e328f002 ? msr CPSR_f, #2
0+3c <[^>]+> e121f003 ? msr CPSR_c, r3
0+40 <[^>]+> e122f004 ? msr CPSR_x, r4
0+44 <[^>]+> e124f005 ? msr CPSR_s, r5
0+48 <[^>]+> e128f006 ? msr CPSR_f, r6
0+4c <[^>]+> e129f007 ? msr CPSR_fc, r7
-0+50 <[^>]+> e368f004 ? msr SPSR_f, #4 ; 0x4
+0+50 <[^>]+> e368f004 ? msr SPSR_f, #4
0+54 <[^>]+> e161f008 ? msr SPSR_c, r8
0+58 <[^>]+> e162f009 ? msr SPSR_x, r9
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 4ec95f4..6655852 100644
--- a/gas/testsuite/gas/arm/arch4t.d
+++ b/gas/testsuite/gas/arm/arch4t.d
@@ -16,23 +16,23 @@ Disassembly of section .text:
0+18 <[^>]+> 011510d3 ? ldrsbeq r1, \[r5, -r3\]
0+1c <[^>]+> 109620b7 ? ldrhne r2, \[r6\], r7
0+20 <[^>]+> 309720f8 ? ldrshcc r2, \[r7\], r8
-0+24 <[^>]+> e1d32fdf ? ldrsb r2, \[r3, #255\]
-0+28 <[^>]+> e1541ffa ? ldrsh r1, \[r4, #-250\]
-0+2c <[^>]+> e1d51fd0 ? ldrsb r1, \[r5, #240\]
+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+34 <[^>]+> 11c330b0 ? strhne r3, \[r3\]
-0+38 <[^>]+> e328f002 ? msr CPSR_f, #2 ; 0x2
+0+38 <[^>]+> e328f002 ? msr CPSR_f, #2
0+3c <[^>]+> e121f003 ? msr CPSR_c, r3
0+40 <[^>]+> e122f004 ? msr CPSR_x, r4
0+44 <[^>]+> e124f005 ? msr CPSR_s, r5
0+48 <[^>]+> e128f006 ? msr CPSR_f, r6
0+4c <[^>]+> e129f007 ? msr CPSR_fc, r7
-0+50 <[^>]+> e368f004 ? msr SPSR_f, #4 ; 0x4
+0+50 <[^>]+> e368f004 ? msr SPSR_f, #4
0+54 <[^>]+> e161f008 ? msr SPSR_c, r8
0+58 <[^>]+> e162f009 ? msr SPSR_x, r9
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/arch6zk.d b/gas/testsuite/gas/arm/arch6zk.d
index 6aa73ff..5ec8def 100644
--- a/gas/testsuite/gas/arm/arch6zk.d
+++ b/gas/testsuite/gas/arm/arch6zk.d
@@ -24,6 +24,6 @@ Disassembly of section .text:
0+040 <[^>]*> e320f002 ? wfe
0+044 <[^>]*> e320f003 ? wfi
0+048 <[^>]*> e320f001 ? yield
-0+04c <[^>]*> e16ec371 ? smc 60465
-0+050 <[^>]*> 11613c7e ? smcne 5070
+0+04c <[^>]*> e16ec371 ? smc 60465.*
+0+050 <[^>]*> 11613c7e ? smcne 5070.*
#...
diff --git a/gas/testsuite/gas/arm/archv6t2.d b/gas/testsuite/gas/arm/archv6t2.d
index e6e57c8..cacf641 100644
--- a/gas/testsuite/gas/arm/archv6t2.d
+++ b/gas/testsuite/gas/arm/archv6t2.d
@@ -34,10 +34,10 @@ Disassembly of section .text:
0+68 <[^>]+> e0600099 mls r0, r9, r0, r0
0+6c <[^>]+> e0600990 mls r0, r0, r9, r0
0+70 <[^>]+> e0609090 mls r0, r0, r0, r9
-0+74 <[^>]+> e3000000 movw r0, #0 ; 0x0
-0+78 <[^>]+> e3400000 movt r0, #0 ; 0x0
-0+7c <[^>]+> 13000000 movwne r0, #0 ; 0x0
-0+80 <[^>]+> e3009000 movw r9, #0 ; 0x0
+0+74 <[^>]+> e3000000 movw r0, #0
+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+8c <[^>]+> e0f900b0 ldrht r0, \[r9\]
@@ -47,5 +47,5 @@ Disassembly of section .text:
0+9c <[^>]+> 10f900b0 ldrhtne r0, \[r9\]
0+a0 <[^>]+> e0b090b9 ldrht r9, \[r0\], r9
0+a4 <[^>]+> e03090b9 ldrht r9, \[r0\], -r9
-0+a8 <[^>]+> e0f099b9 ldrht r9, \[r0\], #153
-0+ac <[^>]+> e07099b9 ldrht r9, \[r0\], #-153
+0+a8 <[^>]+> e0f099b9 ldrht r9, \[r0\], #153.*
+0+ac <[^>]+> e07099b9 ldrht r9, \[r0\], #-153.*
diff --git a/gas/testsuite/gas/arm/arm-it.d b/gas/testsuite/gas/arm/arm-it.d
index 674f815..1abe049 100644
--- a/gas/testsuite/gas/arm/arm-it.d
+++ b/gas/testsuite/gas/arm/arm-it.d
@@ -5,5 +5,5 @@
.*: +file format .*arm.*
Disassembly of section .text:
-0+000 <[^>]*> 03a00000 ? moveq r0, #0 ; 0x0
+0+000 <[^>]*> 03a00000 ? moveq r0, #0
0+004 <[^>]*> e1a0f00e ? mov pc, lr
diff --git a/gas/testsuite/gas/arm/arm3.d b/gas/testsuite/gas/arm/arm3.d
index 41b6b7e..c4a1001 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/arm7dm.d b/gas/testsuite/gas/arm/arm7dm.d
index 43f6420..9411170 100644
--- a/gas/testsuite/gas/arm/arm7dm.d
+++ b/gas/testsuite/gas/arm/arm7dm.d
@@ -13,7 +13,7 @@ Disassembly of section .text:
0+14 <[^>]+> e0d01b99 ? smulls r1, r0, r9, fp
0+18 <[^>]+> 00b92994 ? umlalseq r2, r9, r4, r9
0+1c <[^>]+> a0eaee98 ? smlalge lr, sl, r8, lr
-0+20 <[^>]+> e322f000 ? msr CPSR_x, #0 ; 0x0
-0+24 <[^>]+> e1a00000 ? nop \(mov r0,r0\)
-0+28 <[^>]+> e1a00000 ? nop \(mov r0,r0\)
-0+2c <[^>]+> e1a00000 ? nop \(mov r0,r0\)
+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\)
diff --git a/gas/testsuite/gas/arm/arm7t.d b/gas/testsuite/gas/arm/arm7t.d
index 37abd7a..2d16984 100644
--- a/gas/testsuite/gas/arm/arm7t.d
+++ b/gas/testsuite/gas/arm/arm7t.d
@@ -66,5 +66,5 @@ Disassembly of section .text:
[ ]*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/backslash-at.d b/gas/testsuite/gas/arm/backslash-at.d
index a8992bd..c87965f 100644
--- a/gas/testsuite/gas/arm/backslash-at.d
+++ b/gas/testsuite/gas/arm/backslash-at.d
@@ -5,13 +5,13 @@
Disassembly of section .text:
0+000 <.*>.*615c.*
-0+002 <foo> e3a00000 mov r0, #0 ; 0x0
-0+006 <foo\+0x4> e3a00000 mov r0, #0 ; 0x0
-0+00a <foo\+0x8> e3a00000 mov r0, #0 ; 0x0
-0+00e <foo\+0xc> e3a00001 mov r0, #1 ; 0x1
-0+012 <foo\+0x10> e3a00001 mov r0, #1 ; 0x1
-0+016 <foo\+0x14> e3a00001 mov r0, #1 ; 0x1
-0+01a <foo\+0x18> e3a00002 mov r0, #2 ; 0x2
-0+01e <foo\+0x1c> e3a00002 mov r0, #2 ; 0x2
-0+022 <foo\+0x20> e3a00002 mov r0, #2 ; 0x2
+0+002 <foo> e3a00000 mov r0, #0
+0+006 <foo\+0x4> e3a00000 mov r0, #0
+0+00a <foo\+0x8> e3a00000 mov r0, #0
+0+00e <foo\+0xc> e3a00001 mov r0, #1
+0+012 <foo\+0x10> e3a00001 mov r0, #1
+0+016 <foo\+0x14> e3a00001 mov r0, #1
+0+01a <foo\+0x18> e3a00002 mov r0, #2
+0+01e <foo\+0x1c> e3a00002 mov r0, #2
+0+022 <foo\+0x20> e3a00002 mov r0, #2
#...
diff --git a/gas/testsuite/gas/arm/bl-local-v4t.d b/gas/testsuite/gas/arm/bl-local-v4t.d
index b5af7fd..767d9ce 100644
--- a/gas/testsuite/gas/arm/bl-local-v4t.d
+++ b/gas/testsuite/gas/arm/bl-local-v4t.d
@@ -1,6 +1,6 @@
#name: bl local instructions for v4t.
#objdump: -drw --prefix-addresses --show-raw-insn
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* *-*-elf
#as:
# stderr: blx-local-thumb.l
@@ -11,9 +11,9 @@ Disassembly of section .text:
0+1e <[^>]*> e003 b.n 00+28 <[^>]*>
0+20 <[^>]*> f000 f808 bl 00+34 <[^>]*>
0+24 <[^>]*> f000 f802 bl 00+2c <[^>]*>
-0+28 <[^>]*> 46c0 nop \(mov r8, r8\)
-0+2a <[^>]*> 46c0 nop \(mov r8, r8\)
-0+2c <[^>]*> 46c0 nop \(mov r8, r8\)
+0+28 <[^>]*> 46c0 nop ; \(mov r8, r8\)
+0+2a <[^>]*> 46c0 nop ; \(mov r8, r8\)
+0+2c <[^>]*> 46c0 nop ; \(mov r8, r8\)
...
-0+30 <[^>]*> e1a00000 nop \(mov r0,r0\)
-0+34 <[^>]*> e1a00000 nop \(mov r0,r0\) \ No newline at end of file
+0+30 <[^>]*> e1a00000 nop ; \(mov r0, r0\)
+0+34 <[^>]*> e1a00000 nop ; \(mov r0, r0\)
diff --git a/gas/testsuite/gas/arm/blx-local.d b/gas/testsuite/gas/arm/blx-local.d
index 4b7d53a..5aae7ba 100644
--- a/gas/testsuite/gas/arm/blx-local.d
+++ b/gas/testsuite/gas/arm/blx-local.d
@@ -1,6 +1,6 @@
#name: Local BLX instructions
#objdump: -drw --prefix-addresses --show-raw-insn
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* *-*-elf
#as:
# stderr: blx-local.l
# Test assembler resolution of blx and bl instructions in ARM mode.
@@ -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+58 <[^>]*> 0afffffe beq 00000020 <foo> 38: R_ARM_JUMP24 foo
0+5c <[^>]*> eafffffe b 00000020 <foo> 3c: R_ARM_JUMP24 foo
-0+60 <[^>]*> e1a00000 nop \(mov r0,r0\)
-0+64 <[^>]*> e1a00000 nop \(mov r0,r0\)
+0+60 <[^>]*> e1a00000 nop ; \(mov r0, r0\)
+0+64 <[^>]*> e1a00000 nop ; \(mov r0, r0\)
diff --git a/gas/testsuite/gas/arm/copro.d b/gas/testsuite/gas/arm/copro.d
index b78d7eb..86340c4 100644
--- a/gas/testsuite/gas/arm/copro.d
+++ b/gas/testsuite/gas/arm/copro.d
@@ -37,5 +37,5 @@ Disassembly of section .text:
0+06c <[^>]*> ec407e05 mcrr 14, 0, r7, r0, cr5
0+070 <[^>]*> ec507fff mrrc 15, 15, r7, r0, cr15
0+074 <[^>]*> ec407efe mcrr 14, 15, r7, r0, cr14
-0+078 <[^>]*> e1a00000 nop \(mov r0,r0\)
-0+07c <[^>]*> e1a00000 nop \(mov r0,r0\)
+0+078 <[^>]*> e1a00000 nop ; \(mov r0, r0\)
+0+07c <[^>]*> e1a00000 nop ; \(mov r0, r0\)
diff --git a/gas/testsuite/gas/arm/el_segundo.d b/gas/testsuite/gas/arm/el_segundo.d
index 064c51f..6126060 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 46039de..16d7eba 100644
--- a/gas/testsuite/gas/arm/float.d
+++ b/gas/testsuite/gas/arm/float.d
@@ -119,13 +119,13 @@ Disassembly of section .text:
0+1bc <[^>]+> 0ef3f114 ? cnfeeq f3, f4
0+1c0 <[^>]+> 0ef4f117 ? cnfeeq f4, f7
0+1c4 <[^>]+> eef4f11d ? cnfe f4, #5\.0
-0+1c8 <[^>]+> ed900200 ? lfm f0, 4, \[r0\]
-0+1cc <[^>]+> ed900200 ? lfm f0, 4, \[r0\]
+0+1c8 <[^>]+> ed900200 ? lfm f0, 4, \[r0\] ; \(ldc 2, cr0, \[r0\]\)
+0+1cc <[^>]+> ed900200 ? lfm f0, 4, \[r0\] ; \(ldc 2, cr0, \[r0\]\)
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\]
-0+1e0 <[^>]+> eca8f203 ? sfm f7, 1, \[r8\], #12
+0+1dc <[^>]+> eddf6200 ? lfm f6, 2, \[pc\] ; \(ldcl 2, cr6, \[pc\]\)
+0+1e0 <[^>]+> eca8f203 ? sfm f7, 1, \[r8\], #12 ; \(stc 2, cr15, \[r8\], #12\)
0+1e4 <[^>]+> 0d16520c ? lfmeq f5, 4, \[r6, #-48\].*
0+1e8 <[^>]+> 1d42c209 ? sfmne f4, 3, \[r2, #-36\].*
0+1ec <[^>]+> 1d62c209 ? sfmne f4, 3, \[r2, #-36\]!.*
diff --git a/gas/testsuite/gas/arm/fp-save.d b/gas/testsuite/gas/arm/fp-save.d
index d32d930..ddf1beb 100644
--- a/gas/testsuite/gas/arm/fp-save.d
+++ b/gas/testsuite/gas/arm/fp-save.d
@@ -6,4 +6,4 @@
.*: *file format .*arm.*
Disassembly of section .text:
-0+00 <[^>]*> ed2dc203[ ]+sfm[ ]+f4, 1, \[sp, #-12\]!
+0+00 <[^>]*> ed2dc203[ ]+sfm[ ]+f4, 1, \[sp, #-12\]! ; \(stc 2, cr12, \[sp, #-12\]!\)
diff --git a/gas/testsuite/gas/arm/fpa-mem.d b/gas/testsuite/gas/arm/fpa-mem.d
index 4a638e1..18000b9 100644
--- a/gas/testsuite/gas/arm/fpa-mem.d
+++ b/gas/testsuite/gas/arm/fpa-mem.d
@@ -24,11 +24,11 @@ Disassembly of section .text:
0+34 <[^>]*> ec600101 ? stfe f0, \[r0\], #-4
0+38 <[^>]*> edc08100 ? stfp f0, \[r0\]
0+3c <[^>]*> ec608101 ? stfp f0, \[r0\], #-4
-0+40 <[^>]*> ed900200 ? lfm f0, 4, \[r0\]
-0+44 <[^>]*> ed900200 ? lfm f0, 4, \[r0\]
+0+40 <[^>]*> ed900200 ? lfm f0, 4, \[r0\] ; \(ldc 2, cr0, \[r0\]\)
+0+44 <[^>]*> ed900200 ? lfm f0, 4, \[r0\] ; \(ldc 2, cr0, \[r0\]\)
0+48 <[^>]*> ed10020c ? lfm f0, 4, \[r0, #-48\].*
-0+4c <[^>]*> ed800200 ? sfm f0, 4, \[r0\]
+0+4c <[^>]*> ed800200 ? sfm f0, 4, \[r0\] ; \(stc 2, cr0, \[r0\]\)
0+50 <[^>]*> ed00020c ? sfm f0, 4, \[r0, #-48\].*
-0+54 <[^>]*> ed800200 ? sfm f0, 4, \[r0\]
+0+54 <[^>]*> ed800200 ? sfm f0, 4, \[r0\] ; \(stc 2, cr0, \[r0\]\)
0+58 <[^>]*> 5d800100 ? stfpls f0, \[r0\]
0+5c <[^>]*> 5d800100 ? stfpls f0, \[r0\]
diff --git a/gas/testsuite/gas/arm/group-reloc-alu.d b/gas/testsuite/gas/arm/group-reloc-alu.d
index ba2c6a6..327de74 100644
--- a/gas/testsuite/gas/arm/group-reloc-alu.d
+++ b/gas/testsuite/gas/arm/group-reloc-alu.d
@@ -165,4 +165,4 @@ Disassembly of section .text:
138: R_ARM_ALU_SB_G0_NC localsym
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 ; 0x0
+0[0-9a-f]+ <[^>]+> e3a00000 mov r0, #0
diff --git a/gas/testsuite/gas/arm/group-reloc-ldr.d b/gas/testsuite/gas/arm/group-reloc-ldr.d
index 07bc983..cd41b26 100644
--- a/gas/testsuite/gas/arm/group-reloc-ldr.d
+++ b/gas/testsuite/gas/arm/group-reloc-ldr.d
@@ -197,4 +197,4 @@ Disassembly of section .text:
178: R_ARM_LDR_SB_G1 localsym
0[0-9a-f]+ <[^>]+> e5400fff strb r0, \[r0, #-4095\].*
17c: R_ARM_LDR_SB_G2 localsym
-0[0-9a-f]+ <[^>]+> e3a00000 mov r0, #0 ; 0x0
+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 5c3d883..49b8f09 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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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\]
+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 ; 0x0
+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 62b7eb7..42ca13b 100644
--- a/gas/testsuite/gas/arm/immed.d
+++ b/gas/testsuite/gas/arm/immed.d
@@ -5,12 +5,12 @@
.*: +file format .*arm.*
Disassembly of section .text:
-0+0000 <[^>]+> e3a00000 ? mov r0, #0 ; 0x0
-0+0004 <[^>]+> e3e00003 ? mvn r0, #3 ; 0x3
+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+1010 <[^>]+> e3a00008 ? mov r0, #8 ; 0x8
+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+1018 <[^>]+> e1a00000 ? nop ; \(mov r0, r0\)
+0+101c <[^>]+> e1a00000 ? nop ; \(mov r0, r0\)
diff --git a/gas/testsuite/gas/arm/inst.d b/gas/testsuite/gas/arm/inst.d
index 4d56e8e..d2ea435 100644
--- a/gas/testsuite/gas/arm/inst.d
+++ b/gas/testsuite/gas/arm/inst.d
@@ -9,7 +9,7 @@
.*: +file format .*arm.*
Disassembly of section .text:
-0+000 <[^>]*> e3a00000 ? mov r0, #0 ; 0x0
+0+000 <[^>]*> e3a00000 ? mov r0, #0
0+004 <[^>]*> e1a01002 ? mov r1, r2
0+008 <[^>]*> e1a03184 ? lsl r3, r4, #3
0+00c <[^>]*> e1a05736 ? lsr r5, r6, r7
@@ -35,79 +35,79 @@ Disassembly of section .text:
0+05c <[^>]*> 31a01003 ? movcc r1, r3
0+060 <[^>]*> e1b00008 ? movs r0, r8
0+064 <[^>]*> 31b00007 ? movscc r0, r7
-0+068 <[^>]*> e281000a ? add r0, r1, #10 ; 0xa
+0+068 <[^>]*> e281000a ? add r0, r1, #10
0+06c <[^>]*> e0832004 ? add r2, r3, r4
0+070 <[^>]*> e0865287 ? add r5, r6, r7, lsl #5
0+074 <[^>]*> e0821113 ? add r1, r2, r3, lsl r1
-0+078 <[^>]*> e201000a ? and r0, r1, #10 ; 0xa
+0+078 <[^>]*> e201000a ? and r0, r1, #10
0+07c <[^>]*> e0032004 ? and r2, r3, r4
0+080 <[^>]*> e0065287 ? and r5, r6, r7, lsl #5
0+084 <[^>]*> e0021113 ? and r1, r2, r3, lsl r1
-0+088 <[^>]*> e221000a ? eor r0, r1, #10 ; 0xa
+0+088 <[^>]*> e221000a ? eor r0, r1, #10
0+08c <[^>]*> e0232004 ? eor r2, r3, r4
0+090 <[^>]*> e0265287 ? eor r5, r6, r7, lsl #5
0+094 <[^>]*> e0221113 ? eor r1, r2, r3, lsl r1
-0+098 <[^>]*> e241000a ? sub r0, r1, #10 ; 0xa
+0+098 <[^>]*> e241000a ? sub r0, r1, #10
0+09c <[^>]*> e0432004 ? sub r2, r3, r4
0+0a0 <[^>]*> e0465287 ? sub r5, r6, r7, lsl #5
0+0a4 <[^>]*> e0421113 ? sub r1, r2, r3, lsl r1
-0+0a8 <[^>]*> e2a1000a ? adc r0, r1, #10 ; 0xa
+0+0a8 <[^>]*> e2a1000a ? adc r0, r1, #10
0+0ac <[^>]*> e0a32004 ? adc r2, r3, r4
0+0b0 <[^>]*> e0a65287 ? adc r5, r6, r7, lsl #5
0+0b4 <[^>]*> e0a21113 ? adc r1, r2, r3, lsl r1
-0+0b8 <[^>]*> e2c1000a ? sbc r0, r1, #10 ; 0xa
+0+0b8 <[^>]*> e2c1000a ? sbc r0, r1, #10
0+0bc <[^>]*> e0c32004 ? sbc r2, r3, r4
0+0c0 <[^>]*> e0c65287 ? sbc r5, r6, r7, lsl #5
0+0c4 <[^>]*> e0c21113 ? sbc r1, r2, r3, lsl r1
-0+0c8 <[^>]*> e261000a ? rsb r0, r1, #10 ; 0xa
+0+0c8 <[^>]*> e261000a ? rsb r0, r1, #10
0+0cc <[^>]*> e0632004 ? rsb r2, r3, r4
0+0d0 <[^>]*> e0665287 ? rsb r5, r6, r7, lsl #5
0+0d4 <[^>]*> e0621113 ? rsb r1, r2, r3, lsl r1
-0+0d8 <[^>]*> e2e1000a ? rsc r0, r1, #10 ; 0xa
+0+0d8 <[^>]*> e2e1000a ? rsc r0, r1, #10
0+0dc <[^>]*> e0e32004 ? rsc r2, r3, r4
0+0e0 <[^>]*> e0e65287 ? rsc r5, r6, r7, lsl #5
0+0e4 <[^>]*> e0e21113 ? rsc r1, r2, r3, lsl r1
-0+0e8 <[^>]*> e381000a ? orr r0, r1, #10 ; 0xa
+0+0e8 <[^>]*> e381000a ? orr r0, r1, #10
0+0ec <[^>]*> e1832004 ? orr r2, r3, r4
0+0f0 <[^>]*> e1865287 ? orr r5, r6, r7, lsl #5
0+0f4 <[^>]*> e1821113 ? orr r1, r2, r3, lsl r1
-0+0f8 <[^>]*> e3c1000a ? bic r0, r1, #10 ; 0xa
+0+0f8 <[^>]*> e3c1000a ? bic r0, r1, #10
0+0fc <[^>]*> e1c32004 ? bic r2, r3, r4
0+100 <[^>]*> e1c65287 ? bic r5, r6, r7, lsl #5
0+104 <[^>]*> e1c21113 ? bic r1, r2, r3, lsl r1
-0+108 <[^>]*> e3e0000a ? mvn r0, #10 ; 0xa
+0+108 <[^>]*> e3e0000a ? mvn r0, #10
0+10c <[^>]*> e1e02004 ? mvn r2, r4
0+110 <[^>]*> e1e05287 ? mvn r5, r7, lsl #5
0+114 <[^>]*> e1e01113 ? mvn r1, r3, lsl r1
-0+118 <[^>]*> e310000a ? tst r0, #10 ; 0xa
+0+118 <[^>]*> e310000a ? tst r0, #10
0+11c <[^>]*> e1120004 ? tst r2, r4
0+120 <[^>]*> e1150287 ? tst r5, r7, lsl #5
0+124 <[^>]*> e1110113 ? tst r1, r3, lsl r1
-0+128 <[^>]*> e330000a ? teq r0, #10 ; 0xa
+0+128 <[^>]*> e330000a ? teq r0, #10
0+12c <[^>]*> e1320004 ? teq r2, r4
0+130 <[^>]*> e1350287 ? teq r5, r7, lsl #5
0+134 <[^>]*> e1310113 ? teq r1, r3, lsl r1
-0+138 <[^>]*> e350000a ? cmp r0, #10 ; 0xa
+0+138 <[^>]*> e350000a ? cmp r0, #10
0+13c <[^>]*> e1520004 ? cmp r2, r4
0+140 <[^>]*> e1550287 ? cmp r5, r7, lsl #5
0+144 <[^>]*> e1510113 ? cmp r1, r3, lsl r1
-0+148 <[^>]*> e370000a ? cmn r0, #10 ; 0xa
+0+148 <[^>]*> e370000a ? cmn r0, #10
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 ? teqp r0, #10 ; 0xa
+0+158 <[^>]*> e330f00a ? teqp r0, #10
0+15c <[^>]*> e132f004 ? teqp r2, r4
0+160 <[^>]*> e135f287 ? teqp r5, r7, lsl #5
0+164 <[^>]*> e131f113 ? teqp r1, r3, lsl r1
-0+168 <[^>]*> e370f00a ? cmnp r0, #10 ; 0xa
+0+168 <[^>]*> e370f00a ? cmnp r0, #10
0+16c <[^>]*> e172f004 ? cmnp r2, r4
0+170 <[^>]*> e175f287 ? cmnp r5, r7, lsl #5
0+174 <[^>]*> e171f113 ? cmnp r1, r3, lsl r1
-0+178 <[^>]*> e350f00a ? cmpp r0, #10 ; 0xa
+0+178 <[^>]*> e350f00a ? cmpp r0, #10
0+17c <[^>]*> e152f004 ? cmpp r2, r4
0+180 <[^>]*> e155f287 ? cmpp r5, r7, lsl #5
0+184 <[^>]*> e151f113 ? cmpp r1, r3, lsl r1
-0+188 <[^>]*> e310f00a ? tstp r0, #10 ; 0xa
+0+188 <[^>]*> e310f00a ? tstp r0, #10
0+18c <[^>]*> e112f004 ? tstp r2, r4
0+190 <[^>]*> e115f287 ? tstp r5, r7, lsl #5
0+194 <[^>]*> e111f113 ? tstp r1, r3, lsl r1
diff --git a/gas/testsuite/gas/arm/iwmmxt.d b/gas/testsuite/gas/arm/iwmmxt.d
index 5016796..1739ebb 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 6ce123d..3d06378 100644
--- a/gas/testsuite/gas/arm/ldconst.d
+++ b/gas/testsuite/gas/arm/ldconst.d
@@ -5,22 +5,22 @@
.*: +file format .*arm.*
Disassembly of section .text:
-0+00 <[^>]*> e3a00000 ? mov r0, #0 ; 0x0
+0+00 <[^>]*> e3a00000 ? mov r0, #0
0+04 <[^>]*> e3a004ff ? mov r0, #-16777216 ; 0xff000000
-0+08 <[^>]*> e3e00000 ? mvn r0, #0 ; 0x0
+0+08 <[^>]*> e3e00000 ? mvn r0, #0
0+0c <[^>]*> e51f0004 ? ldr r0, \[pc, #-4\] ; 0+10 <[^>]*>
0+10 <[^>]*> 0fff0000 ? .*
-0+14 <[^>]*> e3a0e000 ? mov lr, #0 ; 0x0
+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+24 <[^>]*> 00fff000 ? .*
-0+28 <[^>]*> 03a00000 ? moveq r0, #0 ; 0x0
+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+38 <[^>]*> 000fff00 ? .*
-0+3c <[^>]*> 43a0b000 ? movmi fp, #0 ; 0x0
+0+3c <[^>]*> 43a0b000 ? movmi fp, #0
0+40 <[^>]*> 43a0b0ff ? movmi fp, #255 ; 0xff
0+44 <[^>]*> 43e0b0ff ? mvnmi fp, #255 ; 0xff
0+48 <[^>]*> 451fb004 ? ldrmi fp, \[pc, #-4\] ; 0+4c <[^>]*>
diff --git a/gas/testsuite/gas/arm/macro1.d b/gas/testsuite/gas/arm/macro1.d
index c29bb62..1e28877 100644
--- a/gas/testsuite/gas/arm/macro1.d
+++ b/gas/testsuite/gas/arm/macro1.d
@@ -7,6 +7,6 @@
Disassembly of section .text:
0+0 <[^>]*> e8bd8030 ? pop {r4, r5, pc}
-0+4 <[^>]*> e1a00000 ? nop \(mov r0,r0\)
-0+8 <[^>]*> e1a00000 ? nop \(mov r0,r0\)
-0+c <[^>]*> e1a00000 ? nop \(mov r0,r0\)
+0+4 <[^>]*> e1a00000 ? nop ; \(mov r0, r0\)
+0+8 <[^>]*> e1a00000 ? nop ; \(mov r0, r0\)
+0+c <[^>]*> e1a00000 ? nop ; \(mov r0, r0\)
diff --git a/gas/testsuite/gas/arm/mapmisc.d b/gas/testsuite/gas/arm/mapmisc.d
index b2954b7..5117021 100644
--- a/gas/testsuite/gas/arm/mapmisc.d
+++ b/gas/testsuite/gas/arm/mapmisc.d
@@ -53,43 +53,43 @@ SYMBOL TABLE:
Disassembly of section .text:
00000000 <foo>:
- 0: e1a00000 nop \(mov r0,r0\)
+ 0: e1a00000 nop ; \(mov r0, r0\)
4: 64636261 .word 0x64636261
- 8: e1a00000 nop \(mov r0,r0\)
+ 8: e1a00000 nop ; \(mov r0, r0\)
c: 00636261 .word 0x00636261
- 10: e1a00000 nop \(mov r0,r0\)
+ 10: e1a00000 nop ; \(mov r0, r0\)
14: 00676665 .word 0x00676665
- 18: e1a00000 nop \(mov r0,r0\)
+ 18: e1a00000 nop ; \(mov r0, r0\)
1c: 006a6968 .word 0x006a6968
- 20: e1a00000 nop \(mov r0,r0\)
+ 20: e1a00000 nop ; \(mov r0, r0\)
24: 0000006b .word 0x0000006b
- 28: e1a00000 nop \(mov r0,r0\)
+ 28: e1a00000 nop ; \(mov r0, r0\)
2c: 0000006c .word 0x0000006c
30: 00000000 .word 0x00000000
- 34: e1a00000 nop \(mov r0,r0\)
+ 34: e1a00000 nop ; \(mov r0, r0\)
38: 0000006d .word 0x0000006d
...
- 48: e1a00000 nop \(mov r0,r0\)
+ 48: e1a00000 nop ; \(mov r0, r0\)
4c: 3fc00000 .word 0x3fc00000
- 50: e1a00000 nop \(mov r0,r0\)
+ 50: e1a00000 nop ; \(mov r0, r0\)
54: 40200000 .word 0x40200000
- 58: e1a00000 nop \(mov r0,r0\)
+ 58: e1a00000 nop ; \(mov r0, r0\)
5c: 00000000 .word 0x00000000
60: 400c0000 .word 0x400c0000
- 64: e1a00000 nop \(mov r0,r0\)
+ 64: e1a00000 nop ; \(mov r0, r0\)
68: 00000000 .word 0x00000000
6c: 40120000 .word 0x40120000
- 70: e1a00000 nop \(mov r0,r0\)
+ 70: e1a00000 nop ; \(mov r0, r0\)
74: 00000004 .word 0x00000004
78: 00000004 .word 0x00000004
7c: 00000004 .word 0x00000004
80: 00000004 .word 0x00000004
- 84: e1a00000 nop \(mov r0,r0\)
+ 84: e1a00000 nop ; \(mov r0, r0\)
88: 00000000 .word 0x00000000
- 8c: e1a00000 nop \(mov r0,r0\)
+ 8c: e1a00000 nop ; \(mov r0, r0\)
90: 00000000 .word 0x00000000
- 94: e1a00000 nop \(mov r0,r0\)
+ 94: e1a00000 nop ; \(mov r0, r0\)
98: 00000000 .word 0x00000000
- 9c: e1a00000 nop \(mov r0,r0\)
+ 9c: e1a00000 nop ; \(mov r0, r0\)
a0: 7778797a .word 0x7778797a
- a4: e1a00000 nop \(mov r0,r0\)
+ a4: e1a00000 nop ; \(mov r0, r0\)
diff --git a/gas/testsuite/gas/arm/mapsecs.d b/gas/testsuite/gas/arm/mapsecs.d
index 52bca8c..8cd0baf 100644
--- a/gas/testsuite/gas/arm/mapsecs.d
+++ b/gas/testsuite/gas/arm/mapsecs.d
@@ -29,17 +29,17 @@ SYMBOL TABLE:
Disassembly of section .text.f1:
00000000 <f1>:
- 0: e1a00000 nop \(mov r0,r0\)
- 4: e1a00000 nop \(mov r0,r0\)
+ 0: e1a00000 nop ; \(mov r0, r0\)
+ 4: e1a00000 nop ; \(mov r0, r0\)
00000008 <f1a>:
- 8: e1a00000 nop \(mov r0,r0\)
+ 8: e1a00000 nop ; \(mov r0, r0\)
Disassembly of section .text.f2:
00000000 <f2>:
- 0: e1a00000 nop \(mov r0,r0\)
+ 0: e1a00000 nop ; \(mov r0, r0\)
4: 00000001 .word 0x00000001
00000008 <f2a>:
- 8: e1a00000 nop \(mov r0,r0\)
+ 8: e1a00000 nop ; \(mov r0, r0\)
diff --git a/gas/testsuite/gas/arm/mapshort-eabi.d b/gas/testsuite/gas/arm/mapshort-eabi.d
index c6ff62e..4bcc0e1 100644
--- a/gas/testsuite/gas/arm/mapshort-eabi.d
+++ b/gas/testsuite/gas/arm/mapshort-eabi.d
@@ -29,14 +29,14 @@ SYMBOL TABLE:
Disassembly of section .text:
0+00 <foo>:
- 0: e1a00000 nop \(mov r0,r0\)
- 4: 46c0 nop \(mov r8, r8\)
- 6: 46c0 nop \(mov r8, r8\)
+ 0: e1a00000 nop ; \(mov r0, r0\)
+ 4: 46c0 nop ; \(mov r8, r8\)
+ 6: 46c0 nop ; \(mov r8, r8\)
8: 00000002 .word 0x00000002
c: 00010001 .word 0x00010001
10: 0003 .short 0x0003
- 12: 46c0 nop \(mov r8, r8\)
- 14: 46c0 nop \(mov r8, r8\)
+ 12: 46c0 nop ; \(mov r8, r8\)
+ 14: 46c0 nop ; \(mov r8, r8\)
16: 0001 .short 0x0001
18: ebfffff8 bl 0 <foo>
1c: 0008 .short 0x0008
diff --git a/gas/testsuite/gas/arm/mapshort-elf.d b/gas/testsuite/gas/arm/mapshort-elf.d
index e59337f..38b290e 100644
--- a/gas/testsuite/gas/arm/mapshort-elf.d
+++ b/gas/testsuite/gas/arm/mapshort-elf.d
@@ -28,14 +28,14 @@ SYMBOL TABLE:
Disassembly of section .text:
0+00 <foo>:
- 0: e1a00000 nop \(mov r0,r0\)
- 4: 46c0 nop \(mov r8, r8\)
- 6: 46c0 nop \(mov r8, r8\)
+ 0: e1a00000 nop ; \(mov r0, r0\)
+ 4: 46c0 nop ; \(mov r8, r8\)
+ 6: 46c0 nop ; \(mov r8, r8\)
8: 00000002 .word 0x00000002
c: 00010001 .word 0x00010001
10: 0003 .short 0x0003
- 12: 46c0 nop \(mov r8, r8\)
- 14: 46c0 nop \(mov r8, r8\)
+ 12: 46c0 nop ; \(mov r8, r8\)
+ 14: 46c0 nop ; \(mov r8, r8\)
16: 0001 .short 0x0001
18: ebfffff8 bl 0 <foo>
1c: 0008 .short 0x0008
diff --git a/gas/testsuite/gas/arm/movw-local.d b/gas/testsuite/gas/arm/movw-local.d
index 5fc7727..af9562e 100644
--- a/gas/testsuite/gas/arm/movw-local.d
+++ b/gas/testsuite/gas/arm/movw-local.d
@@ -5,12 +5,12 @@
.*: +file format .*arm.*
Disassembly of section .text:
-0[0-9a-f]+ <[^>]+> e3000000 movw r0, #0 ; 0x0
+0[0-9a-f]+ <[^>]+> e3000000 movw r0, #0
0: R_ARM_MOVW_ABS_NC bar
-0[0-9a-f]+ <[^>]+> e3400000 movt r0, #0 ; 0x0
+0[0-9a-f]+ <[^>]+> e3400000 movt r0, #0
4: R_ARM_MOVT_ABS bar
-0[0-9a-f]+ <[^>]+> f240 0000 movw r0, #0 ; 0x0
+0[0-9a-f]+ <[^>]+> f240 0000 movw r0, #0
8: R_ARM_THM_MOVW_ABS_NC bar
-0[0-9a-f]+ <[^>]+> f2c0 0000 movt r0, #0 ; 0x0
+0[0-9a-f]+ <[^>]+> f2c0 0000 movt r0, #0
c: R_ARM_THM_MOVT_ABS bar
#...
diff --git a/gas/testsuite/gas/arm/neon-ldst-rm.d b/gas/testsuite/gas/arm/neon-ldst-rm.d
index 86285d6..813672c 100644
--- a/gas/testsuite/gas/arm/neon-ldst-rm.d
+++ b/gas/testsuite/gas/arm/neon-ldst-rm.d
@@ -54,10 +54,10 @@ Disassembly of section \.text:
0[0-9a-f]+ <[^>]+> ed035b01 vstr d5, \[r3, #-4\]
0[0-9a-f]+ <[^>]+> ed835b01 vstr d5, \[r3, #4\]
0[0-9a-f]+ <[^>]+> ed935b00 vldr d5, \[r3\]
-0[0-9a-f]+ <[^>]+> ed135b40 vldr d5, \[r3, #-256\]
-0[0-9a-f]+ <[^>]+> ed935b40 vldr d5, \[r3, #256\]
+0[0-9a-f]+ <[^>]+> ed135b40 vldr d5, \[r3, #-256\].*
+0[0-9a-f]+ <[^>]+> ed935b40 vldr d5, \[r3, #256\].*
0[0-9a-f]+ <[^>]+> ed835b00 vstr d5, \[r3\]
-0[0-9a-f]+ <[^>]+> ed035b40 vstr d5, \[r3, #-256\]
-0[0-9a-f]+ <[^>]+> ed835b40 vstr d5, \[r3, #256\]
+0[0-9a-f]+ <[^>]+> ed035b40 vstr d5, \[r3, #-256\].*
+0[0-9a-f]+ <[^>]+> ed835b40 vstr d5, \[r3, #256\].*
0[0-9a-f]+ <forward> 000002bc .*
0[0-9a-f]+ <[^>]+> ed1f7b11 vldr d7, \[pc, #-68\] ; 0[0-9a-f]+ <backward>
diff --git a/gas/testsuite/gas/arm/offset.d b/gas/testsuite/gas/arm/offset.d
index f6957c0..1795477 100644
--- a/gas/testsuite/gas/arm/offset.d
+++ b/gas/testsuite/gas/arm/offset.d
@@ -6,6 +6,6 @@
Disassembly of section .text:
0+0 <[^>]+> e51f0004 ? ldr r0, \[pc, #-4\] ; 0+4 <[^>]+>
-0+4 <[^>]+> e1a00000 ? nop \(mov r0,r0\)
-0+8 <[^>]+> e1a00000 ? nop \(mov r0,r0\)
-0+c <[^>]+> e1a00000 ? nop \(mov r0,r0\)
+0+4 <[^>]+> e1a00000 ? nop ; \(mov r0, r0\)
+0+8 <[^>]+> e1a00000 ? nop ; \(mov r0, r0\)
+0+c <[^>]+> e1a00000 ? nop ; \(mov r0, r0\)
diff --git a/gas/testsuite/gas/arm/reg-alias.d b/gas/testsuite/gas/arm/reg-alias.d
index d9b4be2..06e87d8 100644
--- a/gas/testsuite/gas/arm/reg-alias.d
+++ b/gas/testsuite/gas/arm/reg-alias.d
@@ -5,6 +5,6 @@
Disassembly of section .text:
0+0 <.*> ee060f10 mcr 15, 0, r0, cr6, cr0, \{0\}
-0+4 <.*> e1a00000 nop \(mov r0,r0\)
-0+8 <.*> e1a00000 nop \(mov r0,r0\)
-0+c <.*> e1a00000 nop \(mov r0,r0\)
+0+4 <.*> e1a00000 nop ; \(mov r0, r0\)
+0+8 <.*> e1a00000 nop ; \(mov r0, r0\)
+0+c <.*> e1a00000 nop ; \(mov r0, r0\)
diff --git a/gas/testsuite/gas/arm/relax_load_align.d b/gas/testsuite/gas/arm/relax_load_align.d
index 0147b49..776fc3b 100644
--- a/gas/testsuite/gas/arm/relax_load_align.d
+++ b/gas/testsuite/gas/arm/relax_load_align.d
@@ -5,5 +5,5 @@
Disassembly of section .text:
0+000 <[^>]+> f510 707a adds.w r0, r0, #1000 ; 0x3e8
-0+004 <[^>]+> 4800 ldr r0, \[pc, #0\] \(0+008 <[^>]+>\)
-0+006 <[^>]+> 4800 ldr r0, \[pc, #0\] \(0+008 <[^>]+>\)
+0+004 <[^>]+> 4800 ldr r0, \[pc, #0\] ; \(0+008 <[^>]+>\)
+0+006 <[^>]+> 4800 ldr r0, \[pc, #0\] ; \(0+008 <[^>]+>\)
diff --git a/gas/testsuite/gas/arm/tcompat.d b/gas/testsuite/gas/arm/tcompat.d
index b333a31..6e378bf 100644
--- a/gas/testsuite/gas/arm/tcompat.d
+++ b/gas/testsuite/gas/arm/tcompat.d
@@ -28,10 +28,10 @@ Disassembly of section .text:
0+44 <[^>]*> 91a00970 ? rorls r0, r0, r9
0+48 <[^>]*> e1b008e0 ? rors r0, r0, #17
0+4c <[^>]*> e1a008e9 ? ror r0, r9, #17
-0+50 <[^>]*> e2690000 ? rsb r0, r9, #0 ; 0x0
-0+54 <[^>]*> e2709000 ? rsbs r9, r0, #0 ; 0x0
-0+58 <[^>]*> 92600000 ? rsbls r0, r0, #0 ; 0x0
-0+5c <[^>]*> 92799000 ? rsbsls r9, r9, #0 ; 0x0
+0+50 <[^>]*> e2690000 ? rsb r0, r9, #0
+0+54 <[^>]*> e2709000 ? rsbs r9, r0, #0
+0+58 <[^>]*> 92600000 ? rsbls r0, r0, #0
+0+5c <[^>]*> 92799000 ? rsbsls r9, r9, #0
0+60 <[^>]*> e92d000e ? push {r1, r2, r3}
0+64 <[^>]*> 992d8154 ? pushls {r2, r4, r6, r8, pc}
0+68 <[^>]*> e8bd000e ? pop {r1, r2, r3}
@@ -47,8 +47,8 @@ Disassembly of section .text:
0+90 <[^>]*> e1800001 ? orr r0, r0, r1
0+94 <[^>]*> e1c00001 ? bic r0, r0, r1
0+98 <[^>]*> e0000091 ? mul r0, r1, r0
-0+9c <[^>]*> e1a00000 ? nop \(mov r0,r0\)
+0+9c <[^>]*> e1a00000 ? nop ; \(mov r0, r0\)
0+a0 <[^>]*> e1a00069 ? rrx r0, r9
0+a4 <[^>]*> e1b09060 ? rrxs r9, r0
-0+a8 <[^>]*> e1a00000 ? nop \(mov r0,r0\)
-0+ac <[^>]*> e1a00000 ? nop \(mov r0,r0\)
+0+a8 <[^>]*> e1a00000 ? nop ; \(mov r0, r0\)
+0+ac <[^>]*> e1a00000 ? nop ; \(mov r0, r0\)
diff --git a/gas/testsuite/gas/arm/tcompat2.d b/gas/testsuite/gas/arm/tcompat2.d
index ba39db1..4c6de61 100644
--- a/gas/testsuite/gas/arm/tcompat2.d
+++ b/gas/testsuite/gas/arm/tcompat2.d
@@ -20,7 +20,7 @@ Disassembly of section .text:
0+12 <[^>]*> 4308 * orrs r0, r1
0+14 <[^>]*> 4388 * bics r0, r1
0+16 <[^>]*> 4188 * sbcs r0, r1
-0+18 <[^>]*> 46c0 * nop \(mov r8, r8\)
-0+1a <[^>]*> 46c0 * nop \(mov r8, r8\)
-0+1c <[^>]*> 46c0 * nop \(mov r8, r8\)
-0+1e <[^>]*> 46c0 * nop \(mov r8, r8\)
+0+18 <[^>]*> 46c0 * nop ; \(mov r8, r8\)
+0+1a <[^>]*> 46c0 * nop ; \(mov r8, r8\)
+0+1c <[^>]*> 46c0 * nop ; \(mov r8, r8\)
+0+1e <[^>]*> 46c0 * nop ; \(mov r8, r8\)
diff --git a/gas/testsuite/gas/arm/thumb-eabi.d b/gas/testsuite/gas/arm/thumb-eabi.d
index 64c04f9..188a2e2 100644
--- a/gas/testsuite/gas/arm/thumb-eabi.d
+++ b/gas/testsuite/gas/arm/thumb-eabi.d
@@ -47,18 +47,18 @@ Disassembly of section \.text:
0+04a <[^>]+> 45f4 cmp ip, lr
0+04c <[^>]+> 4648 mov r0, r9
0+04e <[^>]+> 46a1 mov r9, r4
-0+050 <[^>]+> 46c0 nop \(mov r8, r8\)
+0+050 <[^>]+> 46c0 nop ; \(mov r8, r8\)
0+052 <[^>]+> 4738 bx r7
0+054 <[^>]+> 4740 bx r8
-0+056 <[^>]+> 46c0 nop \(mov r8, r8\)
+0+056 <[^>]+> 46c0 nop ; \(mov r8, r8\)
0+058 <[^>]+> 4778 bx pc
-0+05a <[^>]+> 4b20 ldr r3, \[pc, #128\] \(0+0dc <[^>]+>\)
-0+05c <[^>]+> 4c02 ldr r4, \[pc, #8\] \(0+068 <[^>]+>\)
+0+05a <[^>]+> 4b20 ldr r3, \[pc, #128\] ; \(0+0dc <[^>]+>\)
+0+05c <[^>]+> 4c02 ldr r4, \[pc, #8\] ; \(0+068 <[^>]+>\)
0+05e <[^>]+> 5088 str r0, \[r1, r2\]
0+060 <[^>]+> 5511 strb r1, \[r2, r4\]
0+062 <[^>]+> 59f5 ldr r5, \[r6, r7\]
0+064 <[^>]+> 5d62 ldrb r2, \[r4, r5\]
-0+066 <[^>]+> 46c0 nop \(mov r8, r8\)
+0+066 <[^>]+> 46c0 nop ; \(mov r8, r8\)
0+068 <[^>]+> 52d1 strh r1, \[r2, r3\]
0+06a <[^>]+> 5a23 ldrh r3, \[r4, r0\]
0+06c <[^>]+> 57f1 ldrsb r1, \[r6, r7\]
@@ -75,7 +75,7 @@ Disassembly of section \.text:
0+082 <[^>]+> 93ff str r3, \[sp, #1020\].*
0+084 <[^>]+> 990b ldr r1, \[sp, #44\].*
0+086 <[^>]+> 9a00 ldr r2, \[sp, #0\]
-0+088 <[^>]+> a7ff add r7, pc, #1020 \(adr r7, 0+488 <[^>]+>\)
+0+088 <[^>]+> a7ff add r7, pc, #1020 ; \(adr r7, 0+488 <[^>]+>\)
0+08a <[^>]+> ac80 add r4, sp, #512.*
0+08c <[^>]+> b043 add sp, #268.*
0+08e <[^>]+> b09a sub sp, #104.*
@@ -111,16 +111,16 @@ Disassembly of section \.text:
0+0ca <[^>]+> b07f add sp, #508.*
0+0cc <[^>]+> b0ff sub sp, #508.*
0+0ce <[^>]+> a8ff add r0, sp, #1020.*
-0+0d0 <[^>]+> a0ff add r0, pc, #1020 \(adr r0, 0+4d0 <[^>]+>\)
+0+0d0 <[^>]+> a0ff add r0, pc, #1020 ; \(adr r0, 0+4d0 <[^>]+>\)
0+0d2 <[^>]+> b01a add sp, #104.*
0+0d4 <[^>]+> b09a sub sp, #104.*
0+0d6 <[^>]+> a81a add r0, sp, #104.*
-0+0d8 <[^>]+> a01a add r0, pc, #104 \(adr r0, 0+144 <[^>]+>\)
+0+0d8 <[^>]+> a01a add r0, pc, #104 ; \(adr r0, 0+144 <[^>]+>\)
0+0da <[^>]+> 3168 adds r1, #104.*
0+0dc <[^>]+> 2668 movs r6, #104.*
0+0de <[^>]+> 2f68 cmp r7, #104.*
-0+0e0 <[^>]+> 46c0 nop \(mov r8, r8\)
-0+0e2 <[^>]+> 46c0 nop \(mov r8, r8\)
+0+0e0 <[^>]+> 46c0 nop ; \(mov r8, r8\)
+0+0e2 <[^>]+> 46c0 nop ; \(mov r8, r8\)
0+0e4 <[^>]+> eafffffe b 0+0e4 <[^>]+>
0+0e8 <[^>]+> ea000011 b 0+134 <[^>]+>
0+0ec <[^>]+> ebfffffc bl 0+0e4 <[^>]+>
@@ -128,14 +128,14 @@ Disassembly of section \.text:
0+0f4 <[^>]+> e12fff10 bx r0
.*: R_ARM_V4BX.*
0+0f8 <[^>]+> ef123456 (swi|svc) 0x00123456
-0+0fc <[^>]+> a004 add r0, pc, #16 \(adr r0, 0+110 <[^>]+>\)
+0+0fc <[^>]+> a004 add r0, pc, #16 ; \(adr r0, 0+110 <[^>]+>\)
0+0fe <[^>]+> e77f b.n 0+000 <[^>]+>
0+100 <[^>]+> e018 b.n 0+134 <[^>]+>
0+102 <[^>]+> f7ff ff7d bl 0+000 <[^>]+>
0+106 <[^>]+> f000 f815 bl 0+134 <[^>]+>
0+10a <[^>]+> 4700 bx r0
0+10c <[^>]+> dfff (swi|svc) 255.*
-0+10e <[^>]+> 46c0 nop \(mov r8, r8\)
+0+10e <[^>]+> 46c0 nop ; \(mov r8, r8\)
0+110 <[^>]+> d010 beq.n 0+134 <[^>]+>
0+112 <[^>]+> d10f bne.n 0+134 <[^>]+>
0+114 <[^>]+> d20e bcs.n 0+134 <[^>]+>
@@ -157,9 +157,9 @@ Disassembly of section \.text:
0+134 <[^>]+> f000 fc00 bl 0+938 <[^>]+>
\.\.\.
0+938 <[^>]+> f7ff fbfc bl 0+134 <[^>]+>
-0+93c <[^>]+> 4801 ldr r0, \[pc, #4\] \(0+944 <[^>]+>\)
-0+93e <[^>]+> 4801 ldr r0, \[pc, #4\] \(0+944 <[^>]+>\)
-0+940 <[^>]+> 4801 ldr r0, \[pc, #4\] \(0+948 <[^>]+>\)
-0+942 <[^>]+> 4801 ldr r0, \[pc, #4\] \(0+948 <[^>]+>\)
-0+944 <[^>]+> 46c0 nop \(mov r8, r8\)
-0+946 <[^>]+> 46c0 nop \(mov r8, r8\)
+0+93c <[^>]+> 4801 ldr r0, \[pc, #4\] ; \(0+944 <[^>]+>\)
+0+93e <[^>]+> 4801 ldr r0, \[pc, #4\] ; \(0+944 <[^>]+>\)
+0+940 <[^>]+> 4801 ldr r0, \[pc, #4\] ; \(0+948 <[^>]+>\)
+0+942 <[^>]+> 4801 ldr r0, \[pc, #4\] ; \(0+948 <[^>]+>\)
+0+944 <[^>]+> 46c0 nop ; \(mov r8, r8\)
+0+946 <[^>]+> 46c0 nop ; \(mov r8, r8\)
diff --git a/gas/testsuite/gas/arm/thumb.d b/gas/testsuite/gas/arm/thumb.d
index 2e8da00..7ee5582 100644
--- a/gas/testsuite/gas/arm/thumb.d
+++ b/gas/testsuite/gas/arm/thumb.d
@@ -48,18 +48,18 @@ Disassembly of section \.text:
0+04a <[^>]+> 45f4 cmp ip, lr
0+04c <[^>]+> 4648 mov r0, r9
0+04e <[^>]+> 46a1 mov r9, r4
-0+050 <[^>]+> 46c0 nop \(mov r8, r8\)
+0+050 <[^>]+> 46c0 nop ; \(mov r8, r8\)
0+052 <[^>]+> 4738 bx r7
0+054 <[^>]+> 4740 bx r8
-0+056 <[^>]+> 46c0 nop \(mov r8, r8\)
+0+056 <[^>]+> 46c0 nop ; \(mov r8, r8\)
0+058 <[^>]+> 4778 bx pc
-0+05a <[^>]+> 4b20 ldr r3, \[pc, #128\] \(0+0dc <[^>]+>\)
-0+05c <[^>]+> 4c02 ldr r4, \[pc, #8\] \(0+068 <[^>]+>\)
+0+05a <[^>]+> 4b20 ldr r3, \[pc, #128\] ; \(0+0dc <[^>]+>\)
+0+05c <[^>]+> 4c02 ldr r4, \[pc, #8\] ; \(0+068 <[^>]+>\)
0+05e <[^>]+> 5088 str r0, \[r1, r2\]
0+060 <[^>]+> 5511 strb r1, \[r2, r4\]
0+062 <[^>]+> 59f5 ldr r5, \[r6, r7\]
0+064 <[^>]+> 5d62 ldrb r2, \[r4, r5\]
-0+066 <[^>]+> 46c0 nop \(mov r8, r8\)
+0+066 <[^>]+> 46c0 nop ; \(mov r8, r8\)
0+068 <[^>]+> 52d1 strh r1, \[r2, r3\]
0+06a <[^>]+> 5a23 ldrh r3, \[r4, r0\]
0+06c <[^>]+> 57f1 ldrsb r1, \[r6, r7\]
@@ -76,7 +76,7 @@ Disassembly of section \.text:
0+082 <[^>]+> 93ff str r3, \[sp, #1020\].*
0+084 <[^>]+> 990b ldr r1, \[sp, #44\].*
0+086 <[^>]+> 9a00 ldr r2, \[sp, #0\]
-0+088 <[^>]+> a7ff add r7, pc, #1020 \(adr r7, 0+488 <[^>]+>\)
+0+088 <[^>]+> a7ff add r7, pc, #1020 ; \(adr r7, 0+488 <[^>]+>\)
0+08a <[^>]+> ac80 add r4, sp, #512.*
0+08c <[^>]+> b043 add sp, #268.*
0+08e <[^>]+> b09a sub sp, #104.*
@@ -112,30 +112,30 @@ Disassembly of section \.text:
0+0ca <[^>]+> b07f add sp, #508.*
0+0cc <[^>]+> b0ff sub sp, #508.*
0+0ce <[^>]+> a8ff add r0, sp, #1020.*
-0+0d0 <[^>]+> a0ff add r0, pc, #1020 \(adr r0, 0+4d0 <[^>]+>\)
+0+0d0 <[^>]+> a0ff add r0, pc, #1020 ; \(adr r0, 0+4d0 <[^>]+>\)
0+0d2 <[^>]+> b01a add sp, #104.*
0+0d4 <[^>]+> b09a sub sp, #104.*
0+0d6 <[^>]+> a81a add r0, sp, #104.*
-0+0d8 <[^>]+> a01a add r0, pc, #104 \(adr r0, 0+144 <[^>]+>\)
+0+0d8 <[^>]+> a01a add r0, pc, #104 ; \(adr r0, 0+144 <[^>]+>\)
0+0da <[^>]+> 3168 adds r1, #104.*
0+0dc <[^>]+> 2668 movs r6, #104.*
0+0de <[^>]+> 2f68 cmp r7, #104.*
-0+0e0 <[^>]+> 46c0 nop \(mov r8, r8\)
-0+0e2 <[^>]+> 46c0 nop \(mov r8, r8\)
+0+0e0 <[^>]+> 46c0 nop ; \(mov r8, r8\)
+0+0e2 <[^>]+> 46c0 nop ; \(mov r8, r8\)
0+0e4 <[^>]+> eafffffe b 0+0e4 <[^>]+>
0+0e8 <[^>]+> ea000011 b 0+134 <[^>]+>
0+0ec <[^>]+> ebfffffc bl 0+0e4 <[^>]+>
0+0f0 <[^>]+> eb00000f bl 0+134 <[^>]+>
0+0f4 <[^>]+> e12fff10 bx r0
0+0f8 <[^>]+> ef123456 (swi|svc) 0x00123456
-0+0fc <[^>]+> a004 add r0, pc, #16 \(adr r0, 0+110 <[^>]+>\)
+0+0fc <[^>]+> a004 add r0, pc, #16 ; \(adr r0, 0+110 <[^>]+>\)
0+0fe <[^>]+> e77f b.n 0+000 <[^>]+>
0+100 <[^>]+> e018 b.n 0+134 <[^>]+>
0+102 <[^>]+> f7ff ff7d bl 0+000 <[^>]+>
0+106 <[^>]+> f000 f815 bl 0+134 <[^>]+>
0+10a <[^>]+> 4700 bx r0
0+10c <[^>]+> dfff (swi|svc) 255.*
-0+10e <[^>]+> 46c0 nop \(mov r8, r8\)
+0+10e <[^>]+> 46c0 nop ; \(mov r8, r8\)
0+110 <[^>]+> d010 beq.n 0+134 <[^>]+>
0+112 <[^>]+> d10f bne.n 0+134 <[^>]+>
0+114 <[^>]+> d20e bcs.n 0+134 <[^>]+>
@@ -157,9 +157,9 @@ Disassembly of section \.text:
0+134 <[^>]+> f000 fc00 bl 0+938 <[^>]+>
\.\.\.
0+938 <[^>]+> f7ff fbfc bl 0+134 <[^>]+>
-0+93c <[^>]+> 4801 ldr r0, \[pc, #4\] \(0+944 <[^>]+>\)
-0+93e <[^>]+> 4801 ldr r0, \[pc, #4\] \(0+944 <[^>]+>\)
-0+940 <[^>]+> 4801 ldr r0, \[pc, #4\] \(0+948 <[^>]+>\)
-0+942 <[^>]+> 4801 ldr r0, \[pc, #4\] \(0+948 <[^>]+>\)
-0+944 <[^>]+> 46c0 nop \(mov r8, r8\)
-0+946 <[^>]+> 46c0 nop \(mov r8, r8\)
+0+93c <[^>]+> 4801 ldr r0, \[pc, #4\] ; \(0+944 <[^>]+>\)
+0+93e <[^>]+> 4801 ldr r0, \[pc, #4\] ; \(0+944 <[^>]+>\)
+0+940 <[^>]+> 4801 ldr r0, \[pc, #4\] ; \(0+948 <[^>]+>\)
+0+942 <[^>]+> 4801 ldr r0, \[pc, #4\] ; \(0+948 <[^>]+>\)
+0+944 <[^>]+> 46c0 nop ; \(mov r8, r8\)
+0+946 <[^>]+> 46c0 nop ; \(mov r8, r8\)
diff --git a/gas/testsuite/gas/arm/thumb1_unified.d b/gas/testsuite/gas/arm/thumb1_unified.d
index 977d742..e34f397 100644
--- a/gas/testsuite/gas/arm/thumb1_unified.d
+++ b/gas/testsuite/gas/arm/thumb1_unified.d
@@ -10,8 +10,8 @@ Disassembly of section .text:
0[0-9a-f]+ <[^>]+> 3364 adds r3, #100.*
0[0-9a-f]+ <[^>]+> 3c83 subs r4, #131.*
0[0-9a-f]+ <[^>]+> 2d27 cmp r5, #39.*
-0[0-9a-f]+ <[^>]+> a103 add r1, pc, #12 \(adr [^)]*\)
-0[0-9a-f]+ <[^>]+> 4a03 ldr r2, \[pc, #12\] \([^)]*\)
+0[0-9a-f]+ <[^>]+> a103 add r1, pc, #12 ; \(adr [^)]*\)
+0[0-9a-f]+ <[^>]+> 4a03 ldr r2, \[pc, #12\] ; \([^)]*\)
0[0-9a-f]+ <[^>]+> 6863 ldr r3, \[r4, #4\]
0[0-9a-f]+ <[^>]+> 9d01 ldr r5, \[sp, #4\]
0[0-9a-f]+ <[^>]+> b001 add sp, #4
diff --git a/gas/testsuite/gas/arm/thumb2_add.d b/gas/testsuite/gas/arm/thumb2_add.d
index d654c8e..1c43896 100644
--- a/gas/testsuite/gas/arm/thumb2_add.d
+++ b/gas/testsuite/gas/arm/thumb2_add.d
@@ -5,26 +5,26 @@
Disassembly of section .text:
0+000 <[^>]+> f60f 0000 addw r0, pc, #2048 ; 0x800
-0+004 <[^>]+> f20f 0900 addw r9, pc, #0 ; 0x0
+0+004 <[^>]+> f20f 0900 addw r9, pc, #0
0+008 <[^>]+> f20f 4900 addw r9, pc, #1024 ; 0x400
0+00c <[^>]+> f509 6880 add.w r8, r9, #1024 ; 0x400
0+010 <[^>]+> f209 1801 addw r8, r9, #257 ; 0x101
0+014 <[^>]+> f201 1301 addw r3, r1, #257 ; 0x101
0+018 <[^>]+> f6af 0000 subw r0, pc, #2048 ; 0x800
-0+01c <[^>]+> f2af 0900 subw r9, pc, #0 ; 0x0
+0+01c <[^>]+> f2af 0900 subw r9, pc, #0
0+020 <[^>]+> f2af 4900 subw r9, pc, #1024 ; 0x400
0+024 <[^>]+> f5a9 6880 sub.w r8, r9, #1024 ; 0x400
0+028 <[^>]+> f2a9 1801 subw r8, r9, #257 ; 0x101
0+02c <[^>]+> f2a1 1301 subw r3, r1, #257 ; 0x101
-0+030 <[^>]+> f103 0301 add.w r3, r3, #1 ; 0x1
-0+034 <[^>]+> f1a3 0301 sub.w r3, r3, #1 ; 0x1
-0+038 <[^>]+> b0c0 sub sp, #256.*
+0+030 <[^>]+> f103 0301 add.w r3, r3, #1
+0+034 <[^>]+> f1a3 0301 sub.w r3, r3, #1
+0+038 <[^>]+> b0c0 sub sp, #256 ; 0x100
0+03a <[^>]+> f5ad 7d00 sub.w sp, sp, #512 ; 0x200
0+03e <[^>]+> f2ad 1d01 subw sp, sp, #257 ; 0x101
-0+042 <[^>]+> b040 add sp, #256.*
+0+042 <[^>]+> b040 add sp, #256 ; 0x100
0+044 <[^>]+> f50d 7d00 add.w sp, sp, #512 ; 0x200
0+048 <[^>]+> f20d 1d01 addw sp, sp, #257 ; 0x101
-0+04c <[^>]+> a840 add r0, sp, #256.*
+0+04c <[^>]+> a840 add r0, sp, #256 ; 0x100
0+04e <[^>]+> f50d 6580 add.w r5, sp, #1024 ; 0x400
0+052 <[^>]+> f20d 1901 addw r9, sp, #257 ; 0x101
0+056 <[^>]+> 4271 negs r1, r6
diff --git a/gas/testsuite/gas/arm/thumb2_it.d b/gas/testsuite/gas/arm/thumb2_it.d
index 6e6bdb8..ab31cdb 100644
--- a/gas/testsuite/gas/arm/thumb2_it.d
+++ b/gas/testsuite/gas/arm/thumb2_it.d
@@ -56,7 +56,7 @@ Disassembly of section .text:
0+080 <[^>]+> 43c8 mvns r0, r1
0+082 <[^>]+> bf02 ittt eq
0+084 <[^>]+> 4248 negeq r0, r1
-0+086 <[^>]+> f1c8 0000 rsbeq r0, r8, #0 ; 0x0
-0+08a <[^>]+> f1d1 0000 rsbseq r0, r1, #0 ; 0x0
-0+08e <[^>]+> f1c1 0000 rsb r0, r1, #0 ; 0x0
+0+086 <[^>]+> f1c8 0000 rsbeq r0, r8, #0
+0+08a <[^>]+> f1d1 0000 rsbseq r0, r1, #0
+0+08e <[^>]+> f1c1 0000 rsb r0, r1, #0
0+092 <[^>]+> 4248 negs r0, r1
diff --git a/gas/testsuite/gas/arm/thumb2_it_auto.d b/gas/testsuite/gas/arm/thumb2_it_auto.d
index c3fdbc2..3cd465d 100644
--- a/gas/testsuite/gas/arm/thumb2_it_auto.d
+++ b/gas/testsuite/gas/arm/thumb2_it_auto.d
@@ -56,7 +56,7 @@ Disassembly of section .text:
0+080 <[^>]+> 43c8 mvns r0, r1
0+082 <[^>]+> bf02 ittt eq
0+084 <[^>]+> 4248 negeq r0, r1
-0+086 <[^>]+> f1c8 0000 rsbeq r0, r8, #0 ; 0x0
-0+08a <[^>]+> f1d1 0000 rsbseq r0, r1, #0 ; 0x0
-0+08e <[^>]+> f1c1 0000 rsb r0, r1, #0 ; 0x0
+0+086 <[^>]+> f1c8 0000 rsbeq r0, r8, #0
+0+08a <[^>]+> f1d1 0000 rsbseq r0, r1, #0
+0+08e <[^>]+> f1c1 0000 rsb r0, r1, #0
0+092 <[^>]+> 4248 negs r0, r1
diff --git a/gas/testsuite/gas/arm/thumb2_pool.d b/gas/testsuite/gas/arm/thumb2_pool.d
index 752da7f..4d6ce44 100644
--- a/gas/testsuite/gas/arm/thumb2_pool.d
+++ b/gas/testsuite/gas/arm/thumb2_pool.d
@@ -6,11 +6,11 @@
.*: +file format .*arm.*
Disassembly of section .text:
-0+000 <[^>]+> 4e04 ldr r6, \[pc, #16\] \(00+14 <[^>]+>\)
-0+002 <[^>]+> 4904 ldr r1, \[pc, #16\] \(00+14 <[^>]+>\)
+0+000 <[^>]+> 4e04 ldr r6, \[pc, #16\] ; \(00+14 <[^>]+>\)
+0+002 <[^>]+> 4904 ldr r1, \[pc, #16\] ; \(00+14 <[^>]+>\)
0+004 <[^>]+> f8df 600c ldr\.w r6, \[pc, #12\] ; 00+14 <[^>]+>
0+008 <[^>]+> f8df 9008 ldr\.w r9, \[pc, #8\] ; 00+14 <[^>]+>
0+00c <[^>]+> bf00 nop
0+00e <[^>]+> f8df 5004 ldr\.w r5, \[pc, #4\] ; 00+14 <[^>]+>
-0+012 <[^>]+> 4900 ldr r1, \[pc, #0\] \(00+14 <[^>]+>\)
+0+012 <[^>]+> 4900 ldr r1, \[pc, #0\] ; \(00+14 <[^>]+>\)
0+014 <[^>]+> 12345678 ? .word 0x12345678
diff --git a/gas/testsuite/gas/arm/thumb2_relax.d b/gas/testsuite/gas/arm/thumb2_relax.d
index ccaac70..e99d55c 100644
--- a/gas/testsuite/gas/arm/thumb2_relax.d
+++ b/gas/testsuite/gas/arm/thumb2_relax.d
@@ -84,7 +84,7 @@ Disassembly of section .text:
0+116 <[^>]+> f855 1d7c ldr.w r1, \[r5, #-124\]!.*
0+11a <[^>]+> 5929 ldr r1, \[r5, r4\]
0+11c <[^>]+> f859 100c ldr.w r1, \[r9, ip\]
-0+120 <[^>]+> 4904 ldr r1, \[pc, #16\] \(0+134 <[^>]+>\)
+0+120 <[^>]+> 4904 ldr r1, \[pc, #16\] ; \(0+134 <[^>]+>\)
0+122 <[^>]+> f8df 1010 ldr.w r1, \[pc, #16\] ; 0+134 <[^>]+>
0+126 <[^>]+> f8df 800c ldr.w r8, \[pc, #12\] ; 0+134 <[^>]+>
0+12a <[^>]+> f8df 100a ldr.w r1, \[pc, #10\] ; 0+136 <[^>]+>
@@ -142,14 +142,14 @@ Disassembly of section .text:
0+1e0 <[^>]+> f8cf 1006 str.w r1, \[pc, #6\] ; 0+1ea <[^>]+>
0+1e4 <[^>]+> f84f 103a str.w r1, \[pc, #-58\] ; 0+1ae <[^>]+>
0+1e8 <[^>]+> bf00 nop
-0+1ea <[^>]+> a104 add r1, pc, #16 \(adr r1, 0+1fc <[^>]+>\)
-0+1ec <[^>]+> f20f 010c addw r1, pc, #12 ; 0xc
-0+1f0 <[^>]+> f20f 0808 addw r8, pc, #8 ; 0x8
-0+1f4 <[^>]+> f20f 0106 addw r1, pc, #6 ; 0x6
-0+1f8 <[^>]+> f2af 0112 subw r1, pc, #18 ; 0x12
+0+1ea <[^>]+> a104 add r1, pc, #16 ; \(adr r1, 0+1fc <[^>]+>\)
+0+1ec <[^>]+> f20f 010c addw r1, pc, #12
+0+1f0 <[^>]+> f20f 0808 addw r8, pc, #8
+0+1f4 <[^>]+> f20f 0106 addw r1, pc, #6
+0+1f8 <[^>]+> f2af 0112 subw r1, pc, #18
0+1fc <[^>]+> bf00 nop
0+1fe <[^>]+> bf00 nop
-0+200 <[^>]+> f20f 0104 addw r1, pc, #4 ; 0x4
-0+204 <[^>]+> f20f 0102 addw r1, pc, #2 ; 0x2
+0+200 <[^>]+> f20f 0104 addw r1, pc, #4
+0+204 <[^>]+> f20f 0102 addw r1, pc, #2
0+208 <[^>]+> bf00 nop
0+20a <[^>]+> bf00 nop
diff --git a/gas/testsuite/gas/arm/thumb32.d b/gas/testsuite/gas/arm/thumb32.d
index b1a73b3..e53a23d 100644
--- a/gas/testsuite/gas/arm/thumb32.d
+++ b/gas/testsuite/gas/arm/thumb32.d
@@ -8,7 +8,7 @@
.*: +file format .*arm.*
Disassembly of section .text:
-0[0-9a-f]+ <[^>]+> f041 0000 orr\.w r0, r1, #0 ; 0x0
+0[0-9a-f]+ <[^>]+> f041 0000 orr\.w r0, r1, #0
0[0-9a-f]+ <[^>]+> f041 00a5 orr\.w r0, r1, #165 ; 0xa5
0[0-9a-f]+ <[^>]+> f041 10a5 orr\.w r0, r1, #10813605 ; 0xa500a5
0[0-9a-f]+ <[^>]+> f041 20a5 orr\.w r0, r1, #2768282880 ; 0xa500a500
@@ -63,24 +63,24 @@ Disassembly of section .text:
0[0-9a-f]+ <[^>]+> eb00 0800 add\.w r8, r0, r0
0[0-9a-f]+ <[^>]+> 4401 add r1, r0
0[0-9a-f]+ <[^>]+> 4408 add r0, r1
-0[0-9a-f]+ <[^>]+> a000 add r0, pc, #0 \(adr r0, [0-9a-f]+ <[^>]+>\)
-0[0-9a-f]+ <[^>]+> a500 add r5, pc, #0 \(adr r5, [0-9a-f]+ <[^>]+>\)
-0[0-9a-f]+ <[^>]+> a081 add r0, pc, #516 \(adr r0, [0-9a-f]+ <[^>]+>\)
+0[0-9a-f]+ <[^>]+> a000 add r0, pc, #0 ; \(adr r0, [0-9a-f]+ <[^>]+>\)
+0[0-9a-f]+ <[^>]+> a500 add r5, pc, #0 ; \(adr r5, [0-9a-f]+ <[^>]+>\)
+0[0-9a-f]+ <[^>]+> a081 add r0, pc, #516 ; \(adr r0, [0-9a-f]+ <[^>]+>\)
0[0-9a-f]+ <[^>]+> a800 add r0, sp, #0
0[0-9a-f]+ <[^>]+> ad00 add r5, sp, #0
0[0-9a-f]+ <[^>]+> a881 add r0, sp, #516.*
0[0-9a-f]+ <[^>]+> b000 add sp, #0
0[0-9a-f]+ <[^>]+> b000 add sp, #0
0[0-9a-f]+ <[^>]+> b041 add sp, #260.*
-0[0-9a-f]+ <[^>]+> f100 0000 add\.w r0, r0, #0 ; 0x0
-0[0-9a-f]+ <[^>]+> f110 0000 adds\.w r0, r0, #0 ; 0x0
-0[0-9a-f]+ <[^>]+> f100 0900 add\.w r9, r0, #0 ; 0x0
-0[0-9a-f]+ <[^>]+> f109 0000 add\.w r0, r9, #0 ; 0x0
+0[0-9a-f]+ <[^>]+> f100 0000 add\.w r0, r0, #0
+0[0-9a-f]+ <[^>]+> f110 0000 adds\.w r0, r0, #0
+0[0-9a-f]+ <[^>]+> f100 0900 add\.w r9, r0, #0
+0[0-9a-f]+ <[^>]+> f109 0000 add\.w r0, r9, #0
0[0-9a-f]+ <[^>]+> f100 0081 add\.w r0, r0, #129 ; 0x81
0[0-9a-f]+ <[^>]+> f513 3580 adds\.w r5, r3, #65536 ; 0x10000
-0[0-9a-f]+ <[^>]+> f10d 0001 add\.w r0, sp, #1 ; 0x1
-0[0-9a-f]+ <[^>]+> f10d 0900 add\.w r9, sp, #0 ; 0x0
-0[0-9a-f]+ <[^>]+> f10d 0d04 add\.w sp, sp, #4 ; 0x4
+0[0-9a-f]+ <[^>]+> f10d 0001 add\.w r0, sp, #1
+0[0-9a-f]+ <[^>]+> f10d 0900 add\.w r9, sp, #0
+0[0-9a-f]+ <[^>]+> f10d 0d04 add\.w sp, sp, #4
0[0-9a-f]+ <[^>]+> eb00 0000 add\.w r0, r0, r0
0[0-9a-f]+ <[^>]+> eb10 0000 adds\.w r0, r0, r0
0[0-9a-f]+ <[^>]+> eb00 0900 add\.w r9, r0, r0
@@ -109,11 +109,11 @@ Disassembly of section .text:
0[0-9a-f]+ <[^>]+> ebb8 0800 subs\.w r8, r8, r0
0[0-9a-f]+ <[^>]+> ebb0 0008 subs\.w r0, r0, r8
0[0-9a-f]+ <[^>]+> f5b0 7082 subs\.w r0, r0, #260 ; 0x104
-0[0-9a-f]+ <[^>]+> f1b2 0104 subs\.w r1, r2, #4 ; 0x4
+0[0-9a-f]+ <[^>]+> f1b2 0104 subs\.w r1, r2, #4
0[0-9a-f]+ <[^>]+> f5b3 3580 subs\.w r5, r3, #65536 ; 0x10000
-0[0-9a-f]+ <[^>]+> f1ad 0104 sub\.w r1, sp, #4 ; 0x4
-0[0-9a-f]+ <[^>]+> f1ad 0900 sub\.w r9, sp, #0 ; 0x0
-0[0-9a-f]+ <[^>]+> f1ad 0d04 sub\.w sp, sp, #4 ; 0x4
+0[0-9a-f]+ <[^>]+> f1ad 0104 sub\.w r1, sp, #4
+0[0-9a-f]+ <[^>]+> f1ad 0900 sub\.w r9, sp, #0
+0[0-9a-f]+ <[^>]+> f1ad 0d04 sub\.w sp, sp, #4
0[0-9a-f]+ <[^>]+> 4140 adcs r0, r0
0[0-9a-f]+ <[^>]+> 4145 adcs r5, r0
0[0-9a-f]+ <[^>]+> 4168 adcs r0, r5
@@ -637,9 +637,9 @@ Disassembly of section .text:
0[0-9a-f]+ <[^>]+> ea7f 0009 mvns\.w r0, r9
0[0-9a-f]+ <[^>]+> f06f 0081 mvn\.w r0, #129 ; 0x81
0[0-9a-f]+ <[^>]+> f06f 0581 mvn\.w r5, #129 ; 0x81
-0[0-9a-f]+ <[^>]+> f240 0000 movw r0, #0 ; 0x0
-0[0-9a-f]+ <[^>]+> f2c0 0000 movt r0, #0 ; 0x0
-0[0-9a-f]+ <[^>]+> f240 0900 movw r9, #0 ; 0x0
+0[0-9a-f]+ <[^>]+> f240 0000 movw r0, #0
+0[0-9a-f]+ <[^>]+> f2c0 0000 movt r0, #0
+0[0-9a-f]+ <[^>]+> f240 0900 movw r9, #0
0[0-9a-f]+ <[^>]+> f249 0000 movw r0, #36864 ; 0x9000
0[0-9a-f]+ <[^>]+> f640 0000 movw r0, #2048 ; 0x800
0[0-9a-f]+ <[^>]+> f240 5000 movw r0, #1280 ; 0x500
@@ -674,13 +674,13 @@ Disassembly of section .text:
0[0-9a-f]+ <[^>]+> 4240 negs r0, r0
0[0-9a-f]+ <[^>]+> 4268 negs r0, r5
0[0-9a-f]+ <[^>]+> 4245 negs r5, r0
-0[0-9a-f]+ <[^>]+> f1d0 0000 rsbs r0, r0, #0 ; 0x0
-0[0-9a-f]+ <[^>]+> f1d0 0500 rsbs r5, r0, #0 ; 0x0
-0[0-9a-f]+ <[^>]+> f1d5 0000 rsbs r0, r5, #0 ; 0x0
-0[0-9a-f]+ <[^>]+> f1c9 0000 rsb r0, r9, #0 ; 0x0
-0[0-9a-f]+ <[^>]+> f1c0 0900 rsb r9, r0, #0 ; 0x0
-0[0-9a-f]+ <[^>]+> f1d9 0000 rsbs r0, r9, #0 ; 0x0
-0[0-9a-f]+ <[^>]+> f1d0 0900 rsbs r9, r0, #0 ; 0x0
+0[0-9a-f]+ <[^>]+> f1d0 0000 rsbs r0, r0, #0
+0[0-9a-f]+ <[^>]+> f1d0 0500 rsbs r5, r0, #0
+0[0-9a-f]+ <[^>]+> f1d5 0000 rsbs r0, r5, #0
+0[0-9a-f]+ <[^>]+> f1c9 0000 rsb r0, r9, #0
+0[0-9a-f]+ <[^>]+> f1c0 0900 rsb r9, r0, #0
+0[0-9a-f]+ <[^>]+> f1d9 0000 rsbs r0, r9, #0
+0[0-9a-f]+ <[^>]+> f1d0 0900 rsbs r9, r0, #0
0[0-9a-f]+ <[^>]+> eac0 0000 pkhbt r0, r0, r0
0[0-9a-f]+ <[^>]+> eac0 0900 pkhbt r9, r0, r0
0[0-9a-f]+ <[^>]+> eac9 0000 pkhbt r0, r9, r0
@@ -842,7 +842,7 @@ Disassembly of section .text:
0[0-9a-f]+ <[^>]+> fa71 f002 rors\.w r0, r1, r2
0[0-9a-f]+ <[^>]+> ea4f 0132 mov.w r1, r2, rrx
0[0-9a-f]+ <[^>]+> ea5f 0334 movs.w r3, r4, rrx
-0[0-9a-f]+ <[^>]+> f7f0 8000 smc #0 ; 0x0
+0[0-9a-f]+ <[^>]+> f7f0 8000 smc #0
0[0-9a-f]+ <[^>]+> f7fd 8bca smc #43981 ; 0xabcd
0[0-9a-f]+ <[^>]+> fb10 0000 smlabb r0, r0, r0, r0
0[0-9a-f]+ <[^>]+> fb10 0900 smlabb r9, r0, r0, r0
@@ -964,7 +964,7 @@ Disassembly of section .text:
0[0-9a-f]+ <[^>]+> f8df 1155 ldr\.w r1, \[pc, #341\] ; 0+d6d <[^>]+>
0[0-9a-f]+ <[^>]+> f85f 12aa ldr\.w r1, \[pc, #-682\] ; 0+972 <[^>]+>
0[0-9a-f]+ <[^>]+> f85f 1155 ldr\.w r1, \[pc, #-341\] ; 0+acb <[^>]+>
-0[0-9a-f]+ <[^>]+> f200 0900 addw r9, r0, #0 ; 0x0
+0[0-9a-f]+ <[^>]+> f200 0900 addw r9, r0, #0
0[0-9a-f]+ <[^>]+> f60f 76ff addw r6, pc, #4095 ; 0xfff
0[0-9a-f]+ <[^>]+> f6a9 2685 subw r6, r9, #2693 ; 0xa85
0[0-9a-f]+ <[^>]+> f2a9 567a subw r6, r9, #1402 ; 0x57a
diff --git a/gas/testsuite/gas/arm/thumbv6.d b/gas/testsuite/gas/arm/thumbv6.d
index 5dc8214..5da7035 100644
--- a/gas/testsuite/gas/arm/thumbv6.d
+++ b/gas/testsuite/gas/arm/thumbv6.d
@@ -17,7 +17,7 @@ Disassembly of section .text:
0+012 <[^>]*> b251 * sxtb r1, r2
0+014 <[^>]*> b2a3 * uxth r3, r4
0+016 <[^>]*> b2f5 * uxtb r5, r6
-0+018 <[^>]*> 46c0 * nop[ ]+\(mov r8, r8\)
-0+01a <[^>]*> 46c0 * nop[ ]+\(mov r8, r8\)
-0+01c <[^>]*> 46c0 * nop[ ]+\(mov r8, r8\)
-0+01e <[^>]*> 46c0 * nop[ ]+\(mov r8, r8\)
+0+018 <[^>]*> 46c0 * nop[ ]+; \(mov r8, r8\)
+0+01a <[^>]*> 46c0 * nop[ ]+; \(mov r8, r8\)
+0+01c <[^>]*> 46c0 * nop[ ]+; \(mov r8, r8\)
+0+01e <[^>]*> 46c0 * nop[ ]+; \(mov r8, r8\)
diff --git a/gas/testsuite/gas/arm/thumbv6k.d b/gas/testsuite/gas/arm/thumbv6k.d
index 54a1d31..1dd30ec 100644
--- a/gas/testsuite/gas/arm/thumbv6k.d
+++ b/gas/testsuite/gas/arm/thumbv6k.d
@@ -9,7 +9,7 @@ Disassembly of section .text:
0+002 <[^>]*> bf20 * wfe
0+004 <[^>]*> bf30 * wfi
0+006 <[^>]*> bf40 * sev
-0+008 <[^>]*> 46c0 * nop[ \t]+\(mov r8, r8\)
-0+00a <[^>]*> 46c0 * nop[ \t]+\(mov r8, r8\)
-0+00c <[^>]*> 46c0 * nop[ \t]+\(mov r8, r8\)
-0+00e <[^>]*> 46c0 * nop[ \t]+\(mov r8, r8\)
+0+008 <[^>]*> 46c0 * nop[ \t]+; \(mov r8, r8\)
+0+00a <[^>]*> 46c0 * nop[ \t]+; \(mov r8, r8\)
+0+00c <[^>]*> 46c0 * nop[ \t]+; \(mov r8, r8\)
+0+00e <[^>]*> 46c0 * nop[ \t]+; \(mov r8, r8\)
diff --git a/gas/testsuite/gas/arm/tls.d b/gas/testsuite/gas/arm/tls.d
index 5189dff..6401f29 100644
--- a/gas/testsuite/gas/arm/tls.d
+++ b/gas/testsuite/gas/arm/tls.d
@@ -12,8 +12,8 @@
Disassembly of section .text:
00+0 <main>:
- 0: e1a00000 nop \(mov r0,r0\)
- 4: e1a00000 nop \(mov r0,r0\)
+ 0: e1a00000 nop ; \(mov r0, r0\)
+ 4: e1a00000 nop ; \(mov r0, r0\)
8: e1a0f00e mov pc, lr
c: 00000000 .word 0x00000000
c: R_ARM_TLS_GD32 a
diff --git a/gas/testsuite/gas/arm/vfp1.d b/gas/testsuite/gas/arm/vfp1.d
index d23fd84..a7a127a 100644
--- a/gas/testsuite/gas/arm/vfp1.d
+++ b/gas/testsuite/gas/arm/vfp1.d
@@ -112,12 +112,12 @@ Disassembly of section .text:
0+198 <[^>]*> ed910b00 vldr d0, \[r1\]
0+19c <[^>]*> ed9e0b00 vldr d0, \[lr\]
0+1a0 <[^>]*> ed900b00 vldr d0, \[r0\]
-0+1a4 <[^>]*> ed900bff vldr d0, \[r0, #1020\]
-0+1a8 <[^>]*> ed100bff vldr d0, \[r0, #-1020\]
+0+1a4 <[^>]*> ed900bff vldr d0, \[r0, #1020\].*
+0+1a8 <[^>]*> ed100bff vldr d0, \[r0, #-1020\].*
0+1ac <[^>]*> ed901b00 vldr d1, \[r0\]
0+1b0 <[^>]*> ed902b00 vldr d2, \[r0\]
0+1b4 <[^>]*> ed90fb00 vldr d15, \[r0\]
-0+1b8 <[^>]*> ed8ccbc9 vstr d12, \[ip, #804\]
+0+1b8 <[^>]*> ed8ccbc9 vstr d12, \[ip, #804\].*
0+1bc <[^>]*> ec901b02 vldmia r0, {d1}
0+1c0 <[^>]*> ec902b02 vldmia r0, {d2}
0+1c4 <[^>]*> ec90fb02 vldmia r0, {d15}
@@ -188,6 +188,6 @@ Disassembly of section .text:
0+2c8 <[^>]*> 0e1f7b10 vmoveq\.32 r7, d15\[0\]
0+2cc <[^>]*> 0e21fb10 vmoveq\.32 d1\[1\], pc
0+2d0 <[^>]*> 0e0f1b10 vmoveq\.32 d15\[0\], r1
-0+2d4 <[^>]*> e1a00000 ? nop[ ]+\(mov r0,r0\)
-0+2d8 <[^>]*> e1a00000 ? nop[ ]+\(mov r0,r0\)
-0+2dc <[^>]*> e1a00000 ? nop[ ]+\(mov r0,r0\)
+0+2d4 <[^>]*> e1a00000 ? nop[ ]+; \(mov r0, r0\)
+0+2d8 <[^>]*> e1a00000 ? nop[ ]+; \(mov r0, r0\)
+0+2dc <[^>]*> e1a00000 ? nop[ ]+; \(mov r0, r0\)
diff --git a/gas/testsuite/gas/arm/vfp1_t2.d b/gas/testsuite/gas/arm/vfp1_t2.d
index 8b3fbc3..2ff52fd 100644
--- a/gas/testsuite/gas/arm/vfp1_t2.d
+++ b/gas/testsuite/gas/arm/vfp1_t2.d
@@ -112,12 +112,12 @@ Disassembly of section .text:
0+198 <[^>]*> ed91 0b00 vldr d0, \[r1\]
0+19c <[^>]*> ed9e 0b00 vldr d0, \[lr\]
0+1a0 <[^>]*> ed90 0b00 vldr d0, \[r0\]
-0+1a4 <[^>]*> ed90 0bff vldr d0, \[r0, #1020\]
-0+1a8 <[^>]*> ed10 0bff vldr d0, \[r0, #-1020\]
+0+1a4 <[^>]*> ed90 0bff vldr d0, \[r0, #1020\].*
+0+1a8 <[^>]*> ed10 0bff vldr d0, \[r0, #-1020\].*
0+1ac <[^>]*> ed90 1b00 vldr d1, \[r0\]
0+1b0 <[^>]*> ed90 2b00 vldr d2, \[r0\]
0+1b4 <[^>]*> ed90 fb00 vldr d15, \[r0\]
-0+1b8 <[^>]*> ed8c cbc9 vstr d12, \[ip, #804\]
+0+1b8 <[^>]*> ed8c cbc9 vstr d12, \[ip, #804\].*
0+1bc <[^>]*> ec90 1b02 vldmia r0, {d1}
0+1c0 <[^>]*> ec90 2b02 vldmia r0, {d2}
0+1c4 <[^>]*> ec90 fb02 vldmia r0, {d15}
diff --git a/gas/testsuite/gas/arm/vfp1xD.d b/gas/testsuite/gas/arm/vfp1xD.d
index 1ec68b9..8de7dd4 100644
--- a/gas/testsuite/gas/arm/vfp1xD.d
+++ b/gas/testsuite/gas/arm/vfp1xD.d
@@ -249,5 +249,5 @@ Disassembly of section .text:
0+3bc <[^>]*> eee70a10 (vmsr|fmxr) mvfr0, r0
0+3c0 <[^>]*> eee60a10 (vmsr|fmxr) mvfr1, r0
0+3c4 <[^>]*> eeec0a10 (vmsr|fmxr) <impl def 0xc>, r0
-0+3c8 <[^>]*> e1a00000 nop \(mov r0,r0\)
-0+3cc <[^>]*> e1a00000 nop \(mov r0,r0\)
+0+3c8 <[^>]*> e1a00000 nop ; \(mov r0, r0\)
+0+3cc <[^>]*> e1a00000 nop ; \(mov r0, r0\)
diff --git a/gas/testsuite/gas/arm/wince.d b/gas/testsuite/gas/arm/wince.d
index 1770cac..1608db9 100644
--- a/gas/testsuite/gas/arm/wince.d
+++ b/gas/testsuite/gas/arm/wince.d
@@ -11,9 +11,9 @@
Disassembly of section .text:
0+000 <global_data> 00000007 andeq r0, r0, r7
0: ARM_32 global_data
-0+004 <global_sym> e1a00000 nop \(mov r0,r0\)
-0+008 <global_sym\+0x4> e1a00000 nop \(mov r0,r0\)
-0+000c <global_sym\+0x8> e1a00000 nop \(mov r0,r0\)
+0+004 <global_sym> e1a00000 nop ; \(mov r0, r0\)
+0+008 <global_sym\+0x4> e1a00000 nop ; \(mov r0, r0\)
+0+000c <global_sym\+0x8> e1a00000 nop ; \(mov r0, r0\)
0+010 <global_sym\+0xc> eafffffb b f+ff8 <global_sym\+0xf+ff4>
10: ARM_26D global_sym\+0xf+ffc
0+018 <global_sym\+0x14> ebfffffa bl f+ff4 <global_sym\+0xf+ff0>
diff --git a/gas/testsuite/gas/arm/wince_inst.d b/gas/testsuite/gas/arm/wince_inst.d
index 7b05a42..5c14582 100644
--- a/gas/testsuite/gas/arm/wince_inst.d
+++ b/gas/testsuite/gas/arm/wince_inst.d
@@ -11,7 +11,7 @@
.*: +file format .*arm.*
Disassembly of section .text:
-0+000 <[^>]*> e3a00000 ? mov r0, #0 ; 0x0
+0+000 <[^>]*> e3a00000 ? mov r0, #0
0+004 <[^>]*> e1a01002 ? mov r1, r2
0+008 <[^>]*> e1a03184 ? lsl r3, r4, #3
0+00c <[^>]*> e1a05736 ? lsr r5, r6, r7
@@ -37,79 +37,79 @@ Disassembly of section .text:
0+05c <[^>]*> 31a01003 ? movcc r1, r3
0+060 <[^>]*> e1b00008 ? movs r0, r8
0+064 <[^>]*> 31b00007 ? movscc r0, r7
-0+068 <[^>]*> e281000a ? add r0, r1, #10 ; 0xa
+0+068 <[^>]*> e281000a ? add r0, r1, #10
0+06c <[^>]*> e0832004 ? add r2, r3, r4
0+070 <[^>]*> e0865287 ? add r5, r6, r7, lsl #5
0+074 <[^>]*> e0821113 ? add r1, r2, r3, lsl r1
-0+078 <[^>]*> e201000a ? and r0, r1, #10 ; 0xa
+0+078 <[^>]*> e201000a ? and r0, r1, #10
0+07c <[^>]*> e0032004 ? and r2, r3, r4
0+080 <[^>]*> e0065287 ? and r5, r6, r7, lsl #5
0+084 <[^>]*> e0021113 ? and r1, r2, r3, lsl r1
-0+088 <[^>]*> e221000a ? eor r0, r1, #10 ; 0xa
+0+088 <[^>]*> e221000a ? eor r0, r1, #10
0+08c <[^>]*> e0232004 ? eor r2, r3, r4
0+090 <[^>]*> e0265287 ? eor r5, r6, r7, lsl #5
0+094 <[^>]*> e0221113 ? eor r1, r2, r3, lsl r1
-0+098 <[^>]*> e241000a ? sub r0, r1, #10 ; 0xa
+0+098 <[^>]*> e241000a ? sub r0, r1, #10
0+09c <[^>]*> e0432004 ? sub r2, r3, r4
0+0a0 <[^>]*> e0465287 ? sub r5, r6, r7, lsl #5
0+0a4 <[^>]*> e0421113 ? sub r1, r2, r3, lsl r1
-0+0a8 <[^>]*> e2a1000a ? adc r0, r1, #10 ; 0xa
+0+0a8 <[^>]*> e2a1000a ? adc r0, r1, #10
0+0ac <[^>]*> e0a32004 ? adc r2, r3, r4
0+0b0 <[^>]*> e0a65287 ? adc r5, r6, r7, lsl #5
0+0b4 <[^>]*> e0a21113 ? adc r1, r2, r3, lsl r1
-0+0b8 <[^>]*> e2c1000a ? sbc r0, r1, #10 ; 0xa
+0+0b8 <[^>]*> e2c1000a ? sbc r0, r1, #10
0+0bc <[^>]*> e0c32004 ? sbc r2, r3, r4
0+0c0 <[^>]*> e0c65287 ? sbc r5, r6, r7, lsl #5
0+0c4 <[^>]*> e0c21113 ? sbc r1, r2, r3, lsl r1
-0+0c8 <[^>]*> e261000a ? rsb r0, r1, #10 ; 0xa
+0+0c8 <[^>]*> e261000a ? rsb r0, r1, #10
0+0cc <[^>]*> e0632004 ? rsb r2, r3, r4
0+0d0 <[^>]*> e0665287 ? rsb r5, r6, r7, lsl #5
0+0d4 <[^>]*> e0621113 ? rsb r1, r2, r3, lsl r1
-0+0d8 <[^>]*> e2e1000a ? rsc r0, r1, #10 ; 0xa
+0+0d8 <[^>]*> e2e1000a ? rsc r0, r1, #10
0+0dc <[^>]*> e0e32004 ? rsc r2, r3, r4
0+0e0 <[^>]*> e0e65287 ? rsc r5, r6, r7, lsl #5
0+0e4 <[^>]*> e0e21113 ? rsc r1, r2, r3, lsl r1
-0+0e8 <[^>]*> e381000a ? orr r0, r1, #10 ; 0xa
+0+0e8 <[^>]*> e381000a ? orr r0, r1, #10
0+0ec <[^>]*> e1832004 ? orr r2, r3, r4
0+0f0 <[^>]*> e1865287 ? orr r5, r6, r7, lsl #5
0+0f4 <[^>]*> e1821113 ? orr r1, r2, r3, lsl r1
-0+0f8 <[^>]*> e3c1000a ? bic r0, r1, #10 ; 0xa
+0+0f8 <[^>]*> e3c1000a ? bic r0, r1, #10
0+0fc <[^>]*> e1c32004 ? bic r2, r3, r4
0+100 <[^>]*> e1c65287 ? bic r5, r6, r7, lsl #5
0+104 <[^>]*> e1c21113 ? bic r1, r2, r3, lsl r1
-0+108 <[^>]*> e3e0000a ? mvn r0, #10 ; 0xa
+0+108 <[^>]*> e3e0000a ? mvn r0, #10
0+10c <[^>]*> e1e02004 ? mvn r2, r4
0+110 <[^>]*> e1e05287 ? mvn r5, r7, lsl #5
0+114 <[^>]*> e1e01113 ? mvn r1, r3, lsl r1
-0+118 <[^>]*> e310000a ? tst r0, #10 ; 0xa
+0+118 <[^>]*> e310000a ? tst r0, #10
0+11c <[^>]*> e1120004 ? tst r2, r4
0+120 <[^>]*> e1150287 ? tst r5, r7, lsl #5
0+124 <[^>]*> e1110113 ? tst r1, r3, lsl r1
-0+128 <[^>]*> e330000a ? teq r0, #10 ; 0xa
+0+128 <[^>]*> e330000a ? teq r0, #10
0+12c <[^>]*> e1320004 ? teq r2, r4
0+130 <[^>]*> e1350287 ? teq r5, r7, lsl #5
0+134 <[^>]*> e1310113 ? teq r1, r3, lsl r1
-0+138 <[^>]*> e350000a ? cmp r0, #10 ; 0xa
+0+138 <[^>]*> e350000a ? cmp r0, #10
0+13c <[^>]*> e1520004 ? cmp r2, r4
0+140 <[^>]*> e1550287 ? cmp r5, r7, lsl #5
0+144 <[^>]*> e1510113 ? cmp r1, r3, lsl r1
-0+148 <[^>]*> e370000a ? cmn r0, #10 ; 0xa
+0+148 <[^>]*> e370000a ? cmn r0, #10
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 ? teqp r0, #10 ; 0xa
+0+158 <[^>]*> e330f00a ? teqp r0, #10
0+15c <[^>]*> e132f004 ? teqp r2, r4
0+160 <[^>]*> e135f287 ? teqp r5, r7, lsl #5
0+164 <[^>]*> e131f113 ? teqp r1, r3, lsl r1
-0+168 <[^>]*> e370f00a ? cmnp r0, #10 ; 0xa
+0+168 <[^>]*> e370f00a ? cmnp r0, #10
0+16c <[^>]*> e172f004 ? cmnp r2, r4
0+170 <[^>]*> e175f287 ? cmnp r5, r7, lsl #5
0+174 <[^>]*> e171f113 ? cmnp r1, r3, lsl r1
-0+178 <[^>]*> e350f00a ? cmpp r0, #10 ; 0xa
+0+178 <[^>]*> e350f00a ? cmpp r0, #10
0+17c <[^>]*> e152f004 ? cmpp r2, r4
0+180 <[^>]*> e155f287 ? cmpp r5, r7, lsl #5
0+184 <[^>]*> e151f113 ? cmpp r1, r3, lsl r1
-0+188 <[^>]*> e310f00a ? tstp r0, #10 ; 0xa
+0+188 <[^>]*> e310f00a ? tstp r0, #10
0+18c <[^>]*> e112f004 ? tstp r2, r4
0+190 <[^>]*> e115f287 ? tstp r5, r7, lsl #5
0+194 <[^>]*> e111f113 ? tstp r1, r3, lsl r1
diff --git a/gas/testsuite/gas/arm/xscale.d b/gas/testsuite/gas/arm/xscale.d
index b08dfca..da4d1d7 100644
--- a/gas/testsuite/gas/arm/xscale.d
+++ b/gas/testsuite/gas/arm/xscale.d
@@ -24,14 +24,14 @@ Disassembly of section .text:
0+38 <[^>]*> f7d2f003 pld \[r2, r3\]
0+3c <[^>]*> f754f285 pld \[r4, -r5, lsl #5\]
0+40 <[^>]*> e1c100d0 ldrd r0, \[r1\]
-0+44 <[^>]*> 01c327d8 ldrdeq r2, \[r3, #120\]
+0+44 <[^>]*> 01c327d8 ldrdeq r2, \[r3, #120\].*
0+48 <[^>]*> b10540d6 ldrdlt r4, \[r5, -r6\]
-0+4c <[^>]*> e16a88f9 strd r8, \[sl, #-137\]!
+0+4c <[^>]*> e16a88f9 strd r8, \[sl, #-137\]!.*
0+50 <[^>]*> e1ac00fd strd r0, \[ip, sp\]!
0+54 <[^>]*> 30ce21f0 strdcc r2, \[lr\], #16
0+58 <[^>]*> 708640f8 strdvc r4, \[r6\], r8
0+5c <[^>]*> e5910000 ldr r0, \[r1\]
0+60 <[^>]*> e5832000 str r2, \[r3\]
-0+64 <[^>]*> e321f011 msr CPSR_c, #17 ; 0x11
-0+68 <[^>]*> e1a00000 ? nop[ ]+\(mov r0,r0\)
-0+6c <[^>]*> e1a00000 ? nop[ ]+\(mov r0,r0\)
+0+64 <[^>]*> e321f011 msr CPSR_c, #17
+0+68 <[^>]*> e1a00000 ? nop[ ]+; \(mov r0, r0\)
+0+6c <[^>]*> e1a00000 ? nop[ ]+; \(mov r0, r0\)