From 106116f4d63c5b8207f66345144b8a45ce82e6cb Mon Sep 17 00:00:00 2001 From: Richard Earnshaw Date: Sat, 21 Apr 2007 19:45:05 +0000 Subject: [PATCH] * gas/arm/arch4t.d: Convert to unified syntax. * gas/arm/archv6.d: Likewise. * gas/arm/archv6t2.d: Likewise. * gas/arm/arch3.d: Likewise. * gas/arm/arch7dm.d: Likewise. * gas/arm/arch7t.d: Likewise. * gas/arm/archv1.d: Likewise. * gas/arm/copro.d: Likewise. * gas/arm/inst.d: Likewise. * gas/arm/macro1.d: Likewise. * gas/arm/tcompat.d: Likewise. * gas/arm/wince_inst.d: Likewise. * gas/arm/xscale.d: Likewise. * gas/arm/thumb.d: White space cleanup. * gas/arm/thumb2_relax.d: Likewise. * gas/arm/thumb32.d: Likewise. --- gas/testsuite/ChangeLog | 20 ++++++++ gas/testsuite/gas/arm/arch4t.d | 8 +-- gas/testsuite/gas/arm/archv6.d | 96 ++++++++++++++++++------------------ gas/testsuite/gas/arm/archv6t2.d | 2 +- gas/testsuite/gas/arm/arm3.d | 2 +- gas/testsuite/gas/arm/arm7dm.d | 2 +- gas/testsuite/gas/arm/arm7t.d | 18 +++---- gas/testsuite/gas/arm/armv1.d | 8 +-- gas/testsuite/gas/arm/copro.d | 2 +- gas/testsuite/gas/arm/inst.d | 92 +++++++++++++++++----------------- gas/testsuite/gas/arm/macro1.d | 2 +- gas/testsuite/gas/arm/tcompat.d | 42 ++++++++-------- gas/testsuite/gas/arm/thumb.d | 8 +-- gas/testsuite/gas/arm/thumb2_relax.d | 2 +- gas/testsuite/gas/arm/thumb32.d | 6 +-- gas/testsuite/gas/arm/wince_inst.d | 20 ++++---- gas/testsuite/gas/arm/xscale.d | 8 +-- 17 files changed, 179 insertions(+), 159 deletions(-) diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index 5d24705d3e..4ba13fa170 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,23 @@ +2007-04-21 Richard Earnshaw + + * gas/arm/arch4t.d: Convert to unified syntax. + * gas/arm/archv6.d: Likewise. + * gas/arm/archv6t2.d: Likewise. + * gas/arm/arch3.d: Likewise. + * gas/arm/arch7dm.d: Likewise. + * gas/arm/arch7t.d: Likewise. + * gas/arm/archv1.d: Likewise. + * gas/arm/copro.d: Likewise. + * gas/arm/inst.d: Likewise. + * gas/arm/macro1.d: Likewise. + * gas/arm/tcompat.d: Likewise. + * gas/arm/wince_inst.d: Likewise. + * gas/arm/xscale.d: Likewise. + + * gas/arm/thumb.d: White space cleanup. + * gas/arm/thumb2_relax.d: Likewise. + * gas/arm/thumb32.d: Likewise. + 2007-04-20 Nathan Sidwell * gas/m68k/ctrl-1.d, gas/m68k/ctrl-1.s: New. diff --git a/gas/testsuite/gas/arm/arch4t.d b/gas/testsuite/gas/arm/arch4t.d index 0fdaa8fdec..f7e343f03b 100644 --- a/gas/testsuite/gas/arm/arch4t.d +++ b/gas/testsuite/gas/arm/arch4t.d @@ -11,14 +11,14 @@ Disassembly of section .text: 0+0c <[^>]+> e1d540f0 ? ldrsh r4, \[r5\] 0+10 <[^>]+> e19140d3 ? ldrsb r4, \[r1, r3\] 0+14 <[^>]+> e1b410f4 ? ldrsh r1, \[r4, r4\]! -0+18 <[^>]+> 011510d3 ? ldreqsb r1, \[r5, -r3\] -0+1c <[^>]+> 109620b7 ? ldrneh r2, \[r6\], r7 -0+20 <[^>]+> 309720f8 ? ldrccsh r2, \[r7\], r8 +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+30 <[^>]+> e1cf23b0 ? strh r2, \[pc, #48\] ; 0+68 <[^>]+> -0+34 <[^>]+> 11c330b0 ? strneh r3, \[r3\] +0+34 <[^>]+> 11c330b0 ? strhne r3, \[r3\] 0+38 <[^>]+> e328f002 ? msr CPSR_f, #2 ; 0x2 0+3c <[^>]+> e121f003 ? msr CPSR_c, r3 0+40 <[^>]+> e122f004 ? msr CPSR_x, r4 diff --git a/gas/testsuite/gas/arm/archv6.d b/gas/testsuite/gas/arm/archv6.d index bc0ee2e7df..6015a4707e 100644 --- a/gas/testsuite/gas/arm/archv6.d +++ b/gas/testsuite/gas/arm/archv6.d @@ -13,13 +13,13 @@ Disassembly of section .text: 0+014 <[^>]*> fc4570c3 ? mcrr2 0, 12, r7, r5, cr3 0+018 <[^>]*> fc5570c3 ? mrrc2 0, 12, r7, r5, cr3 0+01c <[^>]*> e6852018 ? pkhbt r2, r5, r8 -0+020 <[^>]*> e6852198 ? pkhbt r2, r5, r8, LSL #3 -0+024 <[^>]*> e6852198 ? pkhbt r2, r5, r8, LSL #3 -0+028 <[^>]*> 06852198 ? pkhbteq r2, r5, r8, LSL #3 +0+020 <[^>]*> e6852198 ? pkhbt r2, r5, r8, lsl #3 +0+024 <[^>]*> e6852198 ? pkhbt r2, r5, r8, lsl #3 +0+028 <[^>]*> 06852198 ? pkhbteq r2, r5, r8, lsl #3 0+02c <[^>]*> e6882015 ? pkhbt r2, r8, r5 -0+030 <[^>]*> e68521d8 ? pkhtb r2, r5, r8, ASR #3 -0+034 <[^>]*> e68521d8 ? pkhtb r2, r5, r8, ASR #3 -0+038 <[^>]*> 068521d8 ? pkhtbeq r2, r5, r8, ASR #3 +0+030 <[^>]*> e68521d8 ? pkhtb r2, r5, r8, asr #3 +0+034 <[^>]*> e68521d8 ? pkhtb r2, r5, r8, asr #3 +0+038 <[^>]*> 068521d8 ? pkhtbeq r2, r5, r8, asr #3 0+03c <[^>]*> e6242f17 ? qadd16 r2, r4, r7 0+040 <[^>]*> 16242f17 ? qadd16ne r2, r4, r7 0+044 <[^>]*> e6242f97 ? qadd8 r2, r4, r7 @@ -49,19 +49,19 @@ Disassembly of section .text: 0+0a4 <[^>]*> e6142f17 ? sadd16 r2, r4, r7 0+0a8 <[^>]*> 16142f17 ? sadd16ne r2, r4, r7 0+0ac <[^>]*> e6b42075 ? sxtah r2, r4, r5 -0+0b0 <[^>]*> e6b42475 ? sxtah r2, r4, r5, ROR #8 +0+0b0 <[^>]*> e6b42475 ? sxtah r2, r4, r5, ror #8 0+0b4 <[^>]*> 16b42075 ? sxtahne r2, r4, r5 -0+0b8 <[^>]*> 16b42475 ? sxtahne r2, r4, r5, ROR #8 +0+0b8 <[^>]*> 16b42475 ? sxtahne r2, r4, r5, ror #8 0+0bc <[^>]*> e6142f97 ? sadd8 r2, r4, r7 0+0c0 <[^>]*> 16142f97 ? sadd8ne r2, r4, r7 0+0c4 <[^>]*> e6842075 ? sxtab16 r2, r4, r5 -0+0c8 <[^>]*> e6842475 ? sxtab16 r2, r4, r5, ROR #8 +0+0c8 <[^>]*> e6842475 ? sxtab16 r2, r4, r5, ror #8 0+0cc <[^>]*> 16842075 ? sxtab16ne r2, r4, r5 -0+0d0 <[^>]*> 16842475 ? sxtab16ne r2, r4, r5, ROR #8 +0+0d0 <[^>]*> 16842475 ? sxtab16ne r2, r4, r5, ror #8 0+0d4 <[^>]*> e6a42075 ? sxtab r2, r4, r5 -0+0d8 <[^>]*> e6a42475 ? sxtab r2, r4, r5, ROR #8 +0+0d8 <[^>]*> e6a42475 ? sxtab r2, r4, r5, ror #8 0+0dc <[^>]*> 16a42075 ? sxtabne r2, r4, r5 -0+0e0 <[^>]*> 16a42475 ? sxtabne r2, r4, r5, ROR #8 +0+0e0 <[^>]*> 16a42475 ? sxtabne r2, r4, r5, ror #8 0+0e4 <[^>]*> e6142f37 ? saddaddx r2, r4, r7 0+0e8 <[^>]*> 16142f37 ? saddaddxne r2, r4, r7 0+0ec <[^>]*> e6821fb3 ? sel r1, r2, r3 @@ -119,8 +119,8 @@ Disassembly of section .text: 0+1bc <[^>]*> f8cd0510 ? srsia sp, #16 0+1c0 <[^>]*> f9ed0510 ? srsib sp!, #16 0+1c4 <[^>]*> e6a01012 ? ssat r1, #1, r2 -0+1c8 <[^>]*> e6a01152 ? ssat r1, #1, r2, ASR #2 -0+1cc <[^>]*> e6a01112 ? ssat r1, #1, r2, LSL #2 +0+1c8 <[^>]*> e6a01152 ? ssat r1, #1, r2, asr #2 +0+1cc <[^>]*> e6a01112 ? ssat r1, #1, r2, lsl #2 0+1d0 <[^>]*> e6a01f31 ? ssat16 r1, #1, r1 0+1d4 <[^>]*> d6a01f31 ? ssat16le r1, #1, r1 0+1d8 <[^>]*> e6142f77 ? ssub16 r2, r4, r7 @@ -131,34 +131,34 @@ Disassembly of section .text: 0+1ec <[^>]*> 16142f57 ? ssubaddxne r2, r4, r7 0+1f0 <[^>]*> e1831f92 ? strex r1, r2, \[r3\] 0+1f4 <[^>]*> 11831f92 ? strexne r1, r2, \[r3\] -0+1f8 <[^>]*> e6bf2075 ? sxth r2,r5 -0+1fc <[^>]*> e6bf2475 ? sxth r2,r5, ROR #8 -0+200 <[^>]*> 16bf2075 ? sxthne r2,r5 -0+204 <[^>]*> 16bf2475 ? sxthne r2,r5, ROR #8 -0+208 <[^>]*> e68f2075 ? sxtb16 r2,r5 -0+20c <[^>]*> e68f2475 ? sxtb16 r2,r5, ROR #8 -0+210 <[^>]*> 168f2075 ? sxtb16ne r2,r5 -0+214 <[^>]*> 168f2475 ? sxtb16ne r2,r5, ROR #8 -0+218 <[^>]*> e6af2075 ? sxtb r2,r5 -0+21c <[^>]*> e6af2475 ? sxtb r2,r5, ROR #8 -0+220 <[^>]*> 16af2075 ? sxtbne r2,r5 -0+224 <[^>]*> 16af2475 ? sxtbne r2,r5, ROR #8 +0+1f8 <[^>]*> e6bf2075 ? sxth r2, r5 +0+1fc <[^>]*> e6bf2475 ? sxth r2, r5, ror #8 +0+200 <[^>]*> 16bf2075 ? sxthne r2, r5 +0+204 <[^>]*> 16bf2475 ? sxthne r2, r5, ror #8 +0+208 <[^>]*> e68f2075 ? sxtb16 r2, r5 +0+20c <[^>]*> e68f2475 ? sxtb16 r2, r5, ror #8 +0+210 <[^>]*> 168f2075 ? sxtb16ne r2, r5 +0+214 <[^>]*> 168f2475 ? sxtb16ne r2, r5, ror #8 +0+218 <[^>]*> e6af2075 ? sxtb r2, r5 +0+21c <[^>]*> e6af2475 ? sxtb r2, r5, ror #8 +0+220 <[^>]*> 16af2075 ? sxtbne r2, r5 +0+224 <[^>]*> 16af2475 ? sxtbne r2, r5, ror #8 0+228 <[^>]*> e6542f17 ? uadd16 r2, r4, r7 0+22c <[^>]*> 16542f17 ? uadd16ne r2, r4, r7 0+230 <[^>]*> e6f32075 ? uxtah r2, r3, r5 -0+234 <[^>]*> e6f32475 ? uxtah r2, r3, r5, ROR #8 +0+234 <[^>]*> e6f32475 ? uxtah r2, r3, r5, ror #8 0+238 <[^>]*> 16f32075 ? uxtahne r2, r3, r5 -0+23c <[^>]*> 16f32475 ? uxtahne r2, r3, r5, ROR #8 +0+23c <[^>]*> 16f32475 ? uxtahne r2, r3, r5, ror #8 0+240 <[^>]*> e6542f97 ? uadd8 r2, r4, r7 0+244 <[^>]*> 16542f97 ? uadd8ne r2, r4, r7 0+248 <[^>]*> e6c32075 ? uxtab16 r2, r3, r5 -0+24c <[^>]*> e6c32475 ? uxtab16 r2, r3, r5, ROR #8 +0+24c <[^>]*> e6c32475 ? uxtab16 r2, r3, r5, ror #8 0+250 <[^>]*> 16c32075 ? uxtab16ne r2, r3, r5 -0+254 <[^>]*> 16c32475 ? uxtab16ne r2, r3, r5, ROR #8 +0+254 <[^>]*> 16c32475 ? uxtab16ne r2, r3, r5, ror #8 0+258 <[^>]*> e6e32075 ? uxtab r2, r3, r5 -0+25c <[^>]*> e6e32475 ? uxtab r2, r3, r5, ROR #8 +0+25c <[^>]*> e6e32475 ? uxtab r2, r3, r5, ror #8 0+260 <[^>]*> 16e32075 ? uxtabne r2, r3, r5 -0+264 <[^>]*> 16e32475 ? uxtabne r2, r3, r5, ROR #8 +0+264 <[^>]*> 16e32475 ? uxtabne r2, r3, r5, ror #8 0+268 <[^>]*> e6542f37 ? uaddsubx r2, r4, r7 0+26c <[^>]*> 16542f37 ? uaddsubxne r2, r4, r7 0+270 <[^>]*> e6742f17 ? uhadd16 r2, r4, r7 @@ -192,31 +192,31 @@ Disassembly of section .text: 0+2e0 <[^>]*> e7814312 ? usada8 r1, r2, r3, r4 0+2e4 <[^>]*> 17814312 ? usada8ne r1, r2, r3, r4 0+2e8 <[^>]*> e6ef1012 ? usat r1, #15, r2 -0+2ec <[^>]*> e6ef1252 ? usat r1, #15, r2, ASR #4 -0+2f0 <[^>]*> e6ef1212 ? usat r1, #15, r2, LSL #4 +0+2ec <[^>]*> e6ef1252 ? usat r1, #15, r2, asr #4 +0+2f0 <[^>]*> e6ef1212 ? usat r1, #15, r2, lsl #4 0+2f4 <[^>]*> e6ef1f32 ? usat16 r1, #15, r2 0+2f8 <[^>]*> d6ef1f32 ? usat16le r1, #15, r2 0+2fc <[^>]*> d6ef1012 ? usatle r1, #15, r2 -0+300 <[^>]*> d6ef1252 ? usatle r1, #15, r2, ASR #4 -0+304 <[^>]*> d6ef1212 ? usatle r1, #15, r2, LSL #4 +0+300 <[^>]*> d6ef1252 ? usatle r1, #15, r2, asr #4 +0+304 <[^>]*> d6ef1212 ? usatle r1, #15, r2, lsl #4 0+308 <[^>]*> e6542f77 ? usub16 r2, r4, r7 0+30c <[^>]*> 16542f77 ? usub16ne r2, r4, r7 0+310 <[^>]*> e6542ff7 ? usub8 r2, r4, r7 0+314 <[^>]*> 16542ff7 ? usub8ne r2, r4, r7 0+318 <[^>]*> e6542f57 ? usubaddx r2, r4, r7 0+31c <[^>]*> 16542f57 ? usubaddxne r2, r4, r7 -0+320 <[^>]*> e6ff2075 ? uxth r2,r5 -0+324 <[^>]*> e6ff2475 ? uxth r2,r5, ROR #8 -0+328 <[^>]*> 16ff2075 ? uxthne r2,r5 -0+32c <[^>]*> 16ff2475 ? uxthne r2,r5, ROR #8 -0+330 <[^>]*> e6cf2075 ? uxtb16 r2,r5 -0+334 <[^>]*> e6cf2475 ? uxtb16 r2,r5, ROR #8 -0+338 <[^>]*> 16cf2075 ? uxtb16ne r2,r5 -0+33c <[^>]*> 16cf2475 ? uxtb16ne r2,r5, ROR #8 -0+340 <[^>]*> e6ef2075 ? uxtb r2,r5 -0+344 <[^>]*> e6ef2475 ? uxtb r2,r5, ROR #8 -0+348 <[^>]*> 16ef2075 ? uxtbne r2,r5 -0+34c <[^>]*> 16ef2475 ? uxtbne r2,r5, ROR #8 +0+320 <[^>]*> e6ff2075 ? uxth r2, r5 +0+324 <[^>]*> e6ff2475 ? uxth r2, r5, ror #8 +0+328 <[^>]*> 16ff2075 ? uxthne r2, r5 +0+32c <[^>]*> 16ff2475 ? uxthne r2, r5, ror #8 +0+330 <[^>]*> e6cf2075 ? uxtb16 r2, r5 +0+334 <[^>]*> e6cf2475 ? uxtb16 r2, r5, ror #8 +0+338 <[^>]*> 16cf2075 ? uxtb16ne r2, r5 +0+33c <[^>]*> 16cf2475 ? uxtb16ne r2, r5, ror #8 +0+340 <[^>]*> e6ef2075 ? uxtb r2, r5 +0+344 <[^>]*> e6ef2475 ? uxtb r2, r5, ror #8 +0+348 <[^>]*> 16ef2075 ? uxtbne r2, r5 +0+34c <[^>]*> 16ef2475 ? uxtbne r2, r5, ror #8 0+350 <[^>]*> f10a00ca ? cpsie if,#10 0+354 <[^>]*> f10a00d5 ? cpsie if,#21 0+358 <[^>]*> f8cd0510 ? srsia sp, #16 diff --git a/gas/testsuite/gas/arm/archv6t2.d b/gas/testsuite/gas/arm/archv6t2.d index a1a4120e45..e6e57c843b 100644 --- a/gas/testsuite/gas/arm/archv6t2.d +++ b/gas/testsuite/gas/arm/archv6t2.d @@ -44,7 +44,7 @@ Disassembly of section .text: 0+90 <[^>]+> e0f900f0 ldrsht r0, \[r9\] 0+94 <[^>]+> e0f900d0 ldrsbt r0, \[r9\] 0+98 <[^>]+> e0e900b0 strht r0, \[r9\] -0+9c <[^>]+> 10f900b0 ldrneht r0, \[r9\] +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 diff --git a/gas/testsuite/gas/arm/arm3.d b/gas/testsuite/gas/arm/arm3.d index 06323b1c0c..41b6b7eb8f 100644 --- a/gas/testsuite/gas/arm/arm3.d +++ b/gas/testsuite/gas/arm/arm3.d @@ -7,5 +7,5 @@ Disassembly of section .text: 0+0 <[^>]*> e1080091 ? swp r0, r1, \[r8\] 0+4 <[^>]*> e1423093 ? swpb r3, r3, \[r2\] -0+8 <[^>]*> a1454091 ? swpgeb r4, r1, \[r5\] +0+8 <[^>]*> a1454091 ? swpbge r4, r1, \[r5\] 0+c <[^>]*> e1a00000 ? nop \(mov r0,r0\) diff --git a/gas/testsuite/gas/arm/arm7dm.d b/gas/testsuite/gas/arm/arm7dm.d index ef47ca6c66..43f64204e9 100644 --- a/gas/testsuite/gas/arm/arm7dm.d +++ b/gas/testsuite/gas/arm/arm7dm.d @@ -11,7 +11,7 @@ Disassembly of section .text: 0+0c <[^>]+> e0a10394 ? umlal r0, r1, r4, r3 0+10 <[^>]+> 10c10493 ? smullne r0, r1, r3, r4 0+14 <[^>]+> e0d01b99 ? smulls r1, r0, r9, fp -0+18 <[^>]+> 00b92994 ? umlaleqs r2, r9, r4, r9 +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\) diff --git a/gas/testsuite/gas/arm/arm7t.d b/gas/testsuite/gas/arm/arm7t.d index 754ae1d928..37abd7a778 100644 --- a/gas/testsuite/gas/arm/arm7t.d +++ b/gas/testsuite/gas/arm/arm7t.d @@ -49,17 +49,17 @@ Disassembly of section .text: 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 ? ldrneh r0, \[r1, r2\] -0+ac <[^>]*> 819100b2 ? ldrhih r0, \[r1, r2\] -0+b0 <[^>]*> b19100b2 ? ldrlth r0, \[r1, r2\] +0+a8 <[^>]*> 119100b2 ? ldrhne r0, \[r1, r2\] +0+ac <[^>]*> 819100b2 ? ldrhhi r0, \[r1, r2\] +0+b0 <[^>]*> b19100b2 ? ldrhlt r0, \[r1, r2\] 0+b4 <[^>]*> e19100f2 ? ldrsh r0, \[r1, r2\] -0+b8 <[^>]*> 119100f2 ? ldrnesh r0, \[r1, r2\] -0+bc <[^>]*> 819100f2 ? ldrhish r0, \[r1, r2\] -0+c0 <[^>]*> b19100f2 ? ldrltsh r0, \[r1, r2\] +0+b8 <[^>]*> 119100f2 ? ldrshne r0, \[r1, r2\] +0+bc <[^>]*> 819100f2 ? ldrshhi r0, \[r1, r2\] +0+c0 <[^>]*> b19100f2 ? ldrshlt r0, \[r1, r2\] 0+c4 <[^>]*> e19100d2 ? ldrsb r0, \[r1, r2\] -0+c8 <[^>]*> 119100d2 ? ldrnesb r0, \[r1, r2\] -0+cc <[^>]*> 819100d2 ? ldrhisb r0, \[r1, r2\] -0+d0 <[^>]*> b19100d2 ? ldrltsb r0, \[r1, r2\] +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+dc <[^>]*> 00000000 ? .* diff --git a/gas/testsuite/gas/arm/armv1.d b/gas/testsuite/gas/arm/armv1.d index 75f13204ff..99e8471e22 100644 --- a/gas/testsuite/gas/arm/armv1.d +++ b/gas/testsuite/gas/arm/armv1.d @@ -53,19 +53,19 @@ Disassembly of section .text: 0+a8 <[^>]*> e5c00000 ? strb r0, \[r0\] 0+ac <[^>]*> e4a10000 ? strt r0, \[r1\] 0+b0 <[^>]*> e4e10000 ? strbt r0, \[r1\] -0+b4 <[^>]*> e8800001 ? stmia r0, {r0} +0+b4 <[^>]*> e8800001 ? stm r0, {r0} 0+b8 <[^>]*> e9800001 ? stmib r0, {r0} 0+bc <[^>]*> e8000001 ? stmda r0, {r0} 0+c0 <[^>]*> e9000001 ? stmdb r0, {r0} 0+c4 <[^>]*> e9000001 ? stmdb r0, {r0} 0+c8 <[^>]*> e9800001 ? stmib r0, {r0} -0+cc <[^>]*> e8800001 ? stmia r0, {r0} +0+cc <[^>]*> e8800001 ? stm r0, {r0} 0+d0 <[^>]*> e8000001 ? stmda r0, {r0} -0+d4 <[^>]*> e8900001 ? ldmia r0, {r0} +0+d4 <[^>]*> e8900001 ? ldm r0, {r0} 0+d8 <[^>]*> e9900001 ? ldmib r0, {r0} 0+dc <[^>]*> e8100001 ? ldmda r0, {r0} 0+e0 <[^>]*> e9100001 ? ldmdb r0, {r0} -0+e4 <[^>]*> e8900001 ? ldmia r0, {r0} +0+e4 <[^>]*> e8900001 ? ldm r0, {r0} 0+e8 <[^>]*> e8100001 ? ldmda r0, {r0} 0+ec <[^>]*> e9100001 ? ldmdb r0, {r0} 0+f0 <[^>]*> e9900001 ? ldmib r0, {r0} diff --git a/gas/testsuite/gas/arm/copro.d b/gas/testsuite/gas/arm/copro.d index 8fb657b934..37d0f2d6fd 100644 --- a/gas/testsuite/gas/arm/copro.d +++ b/gas/testsuite/gas/arm/copro.d @@ -12,7 +12,7 @@ Disassembly of section .text: 0+008 <[^>]*> ed939500 cfldr32 mvfx9, \[r3\] 0+00c <[^>]*> edd1e108 ldfp f6, \[r1, #32\] 0+010 <[^>]*> 4db200ff ldcmi 0, cr0, \[r2, #1020\]! -0+014 <[^>]*> 5cf31710 ldcpll 7, cr1, \[r3\], #64 +0+014 <[^>]*> 5cf31710 ldclpl 7, cr1, \[r3\], #64 0+018 <[^>]*> ed1f8001 ldc 0, cr8, \[pc, #-4\] 0+01c <[^>]*> ed830500 cfstr32 mvfx0, \[r3\] 0+020 <[^>]*> edc0f302 stcl 3, cr15, \[r0, #8\] diff --git a/gas/testsuite/gas/arm/inst.d b/gas/testsuite/gas/arm/inst.d index fbf27b4ab8..4d56e8eca3 100644 --- a/gas/testsuite/gas/arm/inst.d +++ b/gas/testsuite/gas/arm/inst.d @@ -11,11 +11,11 @@ Disassembly of section .text: 0+000 <[^>]*> e3a00000 ? mov r0, #0 ; 0x0 0+004 <[^>]*> e1a01002 ? mov r1, r2 -0+008 <[^>]*> e1a03184 ? mov r3, r4, lsl #3 -0+00c <[^>]*> e1a05736 ? mov r5, r6, lsr r7 -0+010 <[^>]*> e1a08a59 ? mov r8, r9, asr sl -0+014 <[^>]*> e1a0bd1c ? mov fp, ip, lsl sp -0+018 <[^>]*> e1a0e06f ? mov lr, pc, rrx +0+008 <[^>]*> e1a03184 ? lsl r3, r4, #3 +0+00c <[^>]*> e1a05736 ? lsr r5, r6, r7 +0+010 <[^>]*> e1a08a59 ? asr r8, r9, sl +0+014 <[^>]*> e1a0bd1c ? lsl fp, ip, sp +0+018 <[^>]*> e1a0e06f ? rrx lr, pc 0+01c <[^>]*> e1a01002 ? mov r1, r2 0+020 <[^>]*> 01a02003 ? moveq r2, r3 0+024 <[^>]*> 11a04005 ? movne r4, r5 @@ -28,13 +28,13 @@ Disassembly of section .text: 0+040 <[^>]*> 41a03006 ? movmi r3, r6 0+044 <[^>]*> 51a07009 ? movpl r7, r9 0+048 <[^>]*> 61a01008 ? movvs r1, r8 -0+04c <[^>]*> 71a09fa1 ? movvc r9, r1, lsr #31 +0+04c <[^>]*> 71a09fa1 ? lsrvc r9, r1, #31 0+050 <[^>]*> 81a0800f ? movhi r8, pc 0+054 <[^>]*> 91a0f00e ? movls pc, lr 0+058 <[^>]*> 21a09008 ? movcs r9, r8 0+05c <[^>]*> 31a01003 ? movcc r1, r3 0+060 <[^>]*> e1b00008 ? movs r0, r8 -0+064 <[^>]*> 31b00007 ? movccs r0, r7 +0+064 <[^>]*> 31b00007 ? movscc r0, r7 0+068 <[^>]*> e281000a ? add r0, r1, #10 ; 0xa 0+06c <[^>]*> e0832004 ? add r2, r3, r4 0+070 <[^>]*> e0865287 ? add r5, r6, r7, lsl #5 @@ -114,11 +114,11 @@ Disassembly of section .text: 0+198 <[^>]*> e0000291 ? mul r0, r1, r2 0+19c <[^>]*> e0110392 ? muls r1, r2, r3 0+1a0 <[^>]*> 10000091 ? mulne r0, r1, r0 -0+1a4 <[^>]*> 90190798 ? mullss r9, r8, r7 +0+1a4 <[^>]*> 90190798 ? mulsls r9, r8, r7 0+1a8 <[^>]*> e021ba99 ? mla r1, r9, sl, fp 0+1ac <[^>]*> e033c994 ? mlas r3, r4, r9, ip 0+1b0 <[^>]*> b029d798 ? mlalt r9, r8, r7, sp -0+1b4 <[^>]*> a034e391 ? mlages r4, r1, r3, lr +0+1b4 <[^>]*> a034e391 ? mlasge r4, r1, r3, lr 0+1b8 <[^>]*> e5910000 ? ldr r0, \[r1\] 0+1bc <[^>]*> e7911002 ? ldr r1, \[r1, r2\] 0+1c0 <[^>]*> e7b32004 ? ldr r2, \[r3, r4\]! @@ -130,7 +130,7 @@ Disassembly of section .text: 0+1d8 <[^>]*> e6942425 ? ldr r2, \[r4\], r5, lsr #8 0+1dc <[^>]*> e51f0008 ? ldr r0, \[pc, #-8\] ; 0+1dc <[^>]*> 0+1e0 <[^>]*> e5d43000 ? ldrb r3, \[r4\] -0+1e4 <[^>]*> 14f85000 ? ldrnebt r5, \[r8\] +0+1e4 <[^>]*> 14f85000 ? ldrbtne r5, \[r8\] 0+1e8 <[^>]*> e5810000 ? str r0, \[r1\] 0+1ec <[^>]*> e7811002 ? str r1, \[r1, r2\] 0+1f0 <[^>]*> e7a43003 ? str r3, \[r4, r3\]! @@ -143,21 +143,21 @@ Disassembly of section .text: 0+20c <[^>]*> e50f1004 ? str r1, \[pc, #-4\] ; 0+210 <[^>]*> 0+210 <[^>]*> e5c71000 ? strb r1, \[r7\] 0+214 <[^>]*> e4e02000 ? strbt r2, \[r0\] -0+218 <[^>]*> e8900002 ? ldmia r0, {r1} -0+21c <[^>]*> 09920038 ? ldmeqib r2, {r3, r4, r5} +0+218 <[^>]*> e8900002 ? ldm r0, {r1} +0+21c <[^>]*> 09920038 ? ldmibeq r2, {r3, r4, r5} 0+220 <[^>]*> e853ffff ? ldmda r3, {r0, r1, r2, r3, r4, r5, r6, r7, r8, r9, sl, fp, ip, sp, lr, pc}\^ 0+224 <[^>]*> e93b05ff ? ldmdb fp!, {r0, r1, r2, r3, r4, r5, r6, r7, r8, sl} 0+228 <[^>]*> e99100f7 ? ldmib r1, {r0, r1, r2, r4, r5, r6, r7} -0+22c <[^>]*> e89201f8 ? ldmia r2, {r3, r4, r5, r6, r7, r8} +0+22c <[^>]*> e89201f8 ? ldm r2, {r3, r4, r5, r6, r7, r8} 0+230 <[^>]*> e9130003 ? ldmdb r3, {r0, r1} 0+234 <[^>]*> e8540300 ? ldmda r4, {r8, r9}\^ -0+238 <[^>]*> e8800002 ? stmia r0, {r1} -0+23c <[^>]*> 09820038 ? stmeqib r2, {r3, r4, r5} +0+238 <[^>]*> e8800002 ? stm r0, {r1} +0+23c <[^>]*> 09820038 ? stmibeq r2, {r3, r4, r5} 0+240 <[^>]*> e843ffff ? stmda r3, {r0, r1, r2, r3, r4, r5, r6, r7, r8, r9, sl, fp, ip, sp, lr, pc}\^ 0+244 <[^>]*> e92b05ff ? stmdb fp!, {r0, r1, r2, r3, r4, r5, r6, r7, r8, sl} 0+248 <[^>]*> e8010007 ? stmda r1, {r0, r1, r2} 0+24c <[^>]*> e9020018 ? stmdb r2, {r3, r4} -0+250 <[^>]*> e8830003 ? stmia r3, {r0, r1} +0+250 <[^>]*> e8830003 ? stm r3, {r0, r1} 0+254 <[^>]*> e9c40300 ? stmib r4, {r8, r9}\^ 0+258 <[^>]*> ef123456 ? (swi|svc) 0x00123456 0+25c <[^>]*> 2f000033 ? (swi|svc)cs 0x00000033 @@ -169,35 +169,35 @@ Disassembly of section .text: [ ]*268:.*_wibble.* 0+26c <[^>]*> da...... ? ble 0[0123456789abcdef]+ <[^>]*> [ ]*26c:.*testerfunc.* -0+270 <[^>]*> e1a01102 ? mov r1, r2, lsl #2 +0+270 <[^>]*> e1a01102 ? lsl r1, r2, #2 0+274 <[^>]*> e1a01002 ? mov r1, r2 -0+278 <[^>]*> e1a01f82 ? mov r1, r2, lsl #31 -0+27c <[^>]*> e1a01312 ? mov r1, r2, lsl r3 -0+280 <[^>]*> e1a01122 ? mov r1, r2, lsr #2 -0+284 <[^>]*> e1a01fa2 ? mov r1, r2, lsr #31 -0+288 <[^>]*> e1a01022 ? mov r1, r2, lsr #32 -0+28c <[^>]*> e1a01332 ? mov r1, r2, lsr r3 -0+290 <[^>]*> e1a01142 ? mov r1, r2, asr #2 -0+294 <[^>]*> e1a01fc2 ? mov r1, r2, asr #31 -0+298 <[^>]*> e1a01042 ? mov r1, r2, asr #32 -0+29c <[^>]*> e1a01352 ? mov r1, r2, asr r3 -0+2a0 <[^>]*> e1a01162 ? mov r1, r2, ror #2 -0+2a4 <[^>]*> e1a01fe2 ? mov r1, r2, ror #31 -0+2a8 <[^>]*> e1a01372 ? mov r1, r2, ror r3 -0+2ac <[^>]*> e1a01062 ? mov r1, r2, rrx -0+2b0 <[^>]*> e1a01102 ? mov r1, r2, lsl #2 +0+278 <[^>]*> e1a01f82 ? lsl r1, r2, #31 +0+27c <[^>]*> e1a01312 ? lsl r1, r2, r3 +0+280 <[^>]*> e1a01122 ? lsr r1, r2, #2 +0+284 <[^>]*> e1a01fa2 ? lsr r1, r2, #31 +0+288 <[^>]*> e1a01022 ? lsr r1, r2, #32 +0+28c <[^>]*> e1a01332 ? lsr r1, r2, r3 +0+290 <[^>]*> e1a01142 ? asr r1, r2, #2 +0+294 <[^>]*> e1a01fc2 ? asr r1, r2, #31 +0+298 <[^>]*> e1a01042 ? asr r1, r2, #32 +0+29c <[^>]*> e1a01352 ? asr r1, r2, r3 +0+2a0 <[^>]*> e1a01162 ? ror r1, r2, #2 +0+2a4 <[^>]*> e1a01fe2 ? ror r1, r2, #31 +0+2a8 <[^>]*> e1a01372 ? ror r1, r2, r3 +0+2ac <[^>]*> e1a01062 ? rrx r1, r2 +0+2b0 <[^>]*> e1a01102 ? lsl r1, r2, #2 0+2b4 <[^>]*> e1a01002 ? mov r1, r2 -0+2b8 <[^>]*> e1a01f82 ? mov r1, r2, lsl #31 -0+2bc <[^>]*> e1a01312 ? mov r1, r2, lsl r3 -0+2c0 <[^>]*> e1a01122 ? mov r1, r2, lsr #2 -0+2c4 <[^>]*> e1a01fa2 ? mov r1, r2, lsr #31 -0+2c8 <[^>]*> e1a01022 ? mov r1, r2, lsr #32 -0+2cc <[^>]*> e1a01332 ? mov r1, r2, lsr r3 -0+2d0 <[^>]*> e1a01142 ? mov r1, r2, asr #2 -0+2d4 <[^>]*> e1a01fc2 ? mov r1, r2, asr #31 -0+2d8 <[^>]*> e1a01042 ? mov r1, r2, asr #32 -0+2dc <[^>]*> e1a01352 ? mov r1, r2, asr r3 -0+2e0 <[^>]*> e1a01162 ? mov r1, r2, ror #2 -0+2e4 <[^>]*> e1a01fe2 ? mov r1, r2, ror #31 -0+2e8 <[^>]*> e1a01372 ? mov r1, r2, ror r3 -0+2ec <[^>]*> e1a01062 ? mov r1, r2, rrx +0+2b8 <[^>]*> e1a01f82 ? lsl r1, r2, #31 +0+2bc <[^>]*> e1a01312 ? lsl r1, r2, r3 +0+2c0 <[^>]*> e1a01122 ? lsr r1, r2, #2 +0+2c4 <[^>]*> e1a01fa2 ? lsr r1, r2, #31 +0+2c8 <[^>]*> e1a01022 ? lsr r1, r2, #32 +0+2cc <[^>]*> e1a01332 ? lsr r1, r2, r3 +0+2d0 <[^>]*> e1a01142 ? asr r1, r2, #2 +0+2d4 <[^>]*> e1a01fc2 ? asr r1, r2, #31 +0+2d8 <[^>]*> e1a01042 ? asr r1, r2, #32 +0+2dc <[^>]*> e1a01352 ? asr r1, r2, r3 +0+2e0 <[^>]*> e1a01162 ? ror r1, r2, #2 +0+2e4 <[^>]*> e1a01fe2 ? ror r1, r2, #31 +0+2e8 <[^>]*> e1a01372 ? ror r1, r2, r3 +0+2ec <[^>]*> e1a01062 ? rrx r1, r2 diff --git a/gas/testsuite/gas/arm/macro1.d b/gas/testsuite/gas/arm/macro1.d index 2384594fc5..c29bb62615 100644 --- a/gas/testsuite/gas/arm/macro1.d +++ b/gas/testsuite/gas/arm/macro1.d @@ -6,7 +6,7 @@ Disassembly of section .text: -0+0 <[^>]*> e8bd8030 ? ldmia sp!, {r4, r5, pc} +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\) diff --git a/gas/testsuite/gas/arm/tcompat.d b/gas/testsuite/gas/arm/tcompat.d index 47e9d89d9f..be7afae7a4 100644 --- a/gas/testsuite/gas/arm/tcompat.d +++ b/gas/testsuite/gas/arm/tcompat.d @@ -12,30 +12,30 @@ Disassembly of section .text: 0+04 <[^>]*> e1a09000 ? mov r9, r0 0+08 <[^>]*> e1a00009 ? mov r0, r9 0+0c <[^>]*> e1a0c00e ? mov ip, lr -0+10 <[^>]*> 91b09019 ? movlss r9, r9, lsl r0 -0+14 <[^>]*> 91a00910 ? movls r0, r0, lsl r9 -0+18 <[^>]*> e1b00880 ? movs r0, r0, lsl #17 -0+1c <[^>]*> e1a00889 ? mov r0, r9, lsl #17 -0+20 <[^>]*> 91b09039 ? movlss r9, r9, lsr r0 -0+24 <[^>]*> 91a00930 ? movls r0, r0, lsr r9 -0+28 <[^>]*> e1b008a0 ? movs r0, r0, lsr #17 -0+2c <[^>]*> e1a008a9 ? mov r0, r9, lsr #17 -0+30 <[^>]*> 91b09059 ? movlss r9, r9, asr r0 -0+34 <[^>]*> 91a00950 ? movls r0, r0, asr r9 -0+38 <[^>]*> e1b008c0 ? movs r0, r0, asr #17 -0+3c <[^>]*> e1a008c9 ? mov r0, r9, asr #17 -0+40 <[^>]*> 91b09079 ? movlss r9, r9, ror r0 -0+44 <[^>]*> 91a00970 ? movls r0, r0, ror r9 -0+48 <[^>]*> e1b008e0 ? movs r0, r0, ror #17 -0+4c <[^>]*> e1a008e9 ? mov r0, r9, ror #17 +0+10 <[^>]*> 91b09019 ? lslsls r9, r9, r0 +0+14 <[^>]*> 91a00910 ? lslls r0, r0, r9 +0+18 <[^>]*> e1b00880 ? lsls r0, r0, #17 +0+1c <[^>]*> e1a00889 ? lsl r0, r9, #17 +0+20 <[^>]*> 91b09039 ? lsrsls r9, r9, r0 +0+24 <[^>]*> 91a00930 ? lsrls r0, r0, r9 +0+28 <[^>]*> e1b008a0 ? lsrs r0, r0, #17 +0+2c <[^>]*> e1a008a9 ? lsr r0, r9, #17 +0+30 <[^>]*> 91b09059 ? asrsls r9, r9, r0 +0+34 <[^>]*> 91a00950 ? asrls r0, r0, r9 +0+38 <[^>]*> e1b008c0 ? asrs r0, r0, #17 +0+3c <[^>]*> e1a008c9 ? asr r0, r9, #17 +0+40 <[^>]*> 91b09079 ? rorsls r9, r9, r0 +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 ? rsblss r9, r9, #0 ; 0x0 -0+60 <[^>]*> e92d000e ? stmdb sp!, {r1, r2, r3} -0+64 <[^>]*> 992d8154 ? stmlsdb sp!, {r2, r4, r6, r8, pc} -0+68 <[^>]*> e8bd000e ? ldmia sp!, {r1, r2, r3} -0+6c <[^>]*> 98bd8154 ? ldmlsia sp!, {r2, r4, r6, r8, pc} +0+5c <[^>]*> 92799000 ? rsbsls r9, r9, #0 ; 0x0 +0+60 <[^>]*> e92d000e ? push {r1, r2, r3} +0+64 <[^>]*> 992d8154 ? pushls {r2, r4, r6, r8, pc} +0+68 <[^>]*> e8bd000e ? pop {r1, r2, r3} +0+6c <[^>]*> 98bd8154 ? popls {r2, r4, r6, r8, pc} 0+70 <[^>]*> e0000001 ? and r0, r0, r1 0+74 <[^>]*> e0200001 ? eor r0, r0, r1 0+78 <[^>]*> e0400001 ? sub r0, r0, r1 diff --git a/gas/testsuite/gas/arm/thumb.d b/gas/testsuite/gas/arm/thumb.d index d3f815a298..867733050f 100644 --- a/gas/testsuite/gas/arm/thumb.d +++ b/gas/testsuite/gas/arm/thumb.d @@ -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,11 +111,11 @@ 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 @@ -127,7 +127,7 @@ Disassembly of section \.text: 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 <[^>]+> diff --git a/gas/testsuite/gas/arm/thumb2_relax.d b/gas/testsuite/gas/arm/thumb2_relax.d index 48cd1f21f8..980f87a219 100644 --- a/gas/testsuite/gas/arm/thumb2_relax.d +++ b/gas/testsuite/gas/arm/thumb2_relax.d @@ -142,7 +142,7 @@ 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+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 diff --git a/gas/testsuite/gas/arm/thumb32.d b/gas/testsuite/gas/arm/thumb32.d index caa0aac6ac..1b602043df 100644 --- a/gas/testsuite/gas/arm/thumb32.d +++ b/gas/testsuite/gas/arm/thumb32.d @@ -63,9 +63,9 @@ 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 diff --git a/gas/testsuite/gas/arm/wince_inst.d b/gas/testsuite/gas/arm/wince_inst.d index 856691480b..e3f060d90d 100644 --- a/gas/testsuite/gas/arm/wince_inst.d +++ b/gas/testsuite/gas/arm/wince_inst.d @@ -36,7 +36,7 @@ Disassembly of section .text: 0+058 <[^>]*> 21a09008 ? movcs r9, r8 0+05c <[^>]*> 31a01003 ? movcc r1, r3 0+060 <[^>]*> e1b00008 ? movs r0, r8 -0+064 <[^>]*> 31b00007 ? movccs r0, r7 +0+064 <[^>]*> 31b00007 ? movscc r0, r7 0+068 <[^>]*> e281000a ? add r0, r1, #10 ; 0xa 0+06c <[^>]*> e0832004 ? add r2, r3, r4 0+070 <[^>]*> e0865287 ? add r5, r6, r7, lsl #5 @@ -116,11 +116,11 @@ Disassembly of section .text: 0+198 <[^>]*> e0000291 ? mul r0, r1, r2 0+19c <[^>]*> e0110392 ? muls r1, r2, r3 0+1a0 <[^>]*> 10000091 ? mulne r0, r1, r0 -0+1a4 <[^>]*> 90190798 ? mullss r9, r8, r7 +0+1a4 <[^>]*> 90190798 ? mulsls r9, r8, r7 0+1a8 <[^>]*> e021ba99 ? mla r1, r9, sl, fp 0+1ac <[^>]*> e033c994 ? mlas r3, r4, r9, ip 0+1b0 <[^>]*> b029d798 ? mlalt r9, r8, r7, sp -0+1b4 <[^>]*> a034e391 ? mlages r4, r1, r3, lr +0+1b4 <[^>]*> a034e391 ? mlasge r4, r1, r3, lr 0+1b8 <[^>]*> e5910000 ? ldr r0, \[r1\] 0+1bc <[^>]*> e7911002 ? ldr r1, \[r1, r2\] 0+1c0 <[^>]*> e7b32004 ? ldr r2, \[r3, r4\]! @@ -132,7 +132,7 @@ Disassembly of section .text: 0+1d8 <[^>]*> e6942425 ? ldr r2, \[r4\], r5, lsr #8 0+1dc <[^>]*> e51f0008 ? ldr r0, \[pc, #-8\] ; 0+1dc <[^>]*> 0+1e0 <[^>]*> e5d43000 ? ldrb r3, \[r4\] -0+1e4 <[^>]*> 14f85000 ? ldrnebt r5, \[r8\] +0+1e4 <[^>]*> 14f85000 ? ldrbtne r5, \[r8\] 0+1e8 <[^>]*> e5810000 ? str r0, \[r1\] 0+1ec <[^>]*> e7811002 ? str r1, \[r1, r2\] 0+1f0 <[^>]*> e7a43003 ? str r3, \[r4, r3\]! @@ -145,21 +145,21 @@ Disassembly of section .text: 0+20c <[^>]*> e50f1004 ? str r1, \[pc, #-4\] ; 0+210 <[^>]*> 0+210 <[^>]*> e5c71000 ? strb r1, \[r7\] 0+214 <[^>]*> e4e02000 ? strbt r2, \[r0\] -0+218 <[^>]*> e8900002 ? ldmia r0, {r1} -0+21c <[^>]*> 09920038 ? ldmeqib r2, {r3, r4, r5} +0+218 <[^>]*> e8900002 ? ldm r0, {r1} +0+21c <[^>]*> 09920038 ? ldmibeq r2, {r3, r4, r5} 0+220 <[^>]*> e853ffff ? ldmda r3, {r0, r1, r2, r3, r4, r5, r6, r7, r8, r9, sl, fp, ip, sp, lr, pc}\^ 0+224 <[^>]*> e93b05ff ? ldmdb fp!, {r0, r1, r2, r3, r4, r5, r6, r7, r8, sl} 0+228 <[^>]*> e99100f7 ? ldmib r1, {r0, r1, r2, r4, r5, r6, r7} -0+22c <[^>]*> e89201f8 ? ldmia r2, {r3, r4, r5, r6, r7, r8} +0+22c <[^>]*> e89201f8 ? ldm r2, {r3, r4, r5, r6, r7, r8} 0+230 <[^>]*> e9130003 ? ldmdb r3, {r0, r1} 0+234 <[^>]*> e8540300 ? ldmda r4, {r8, r9}\^ -0+238 <[^>]*> e8800002 ? stmia r0, {r1} -0+23c <[^>]*> 09820038 ? stmeqib r2, {r3, r4, r5} +0+238 <[^>]*> e8800002 ? stm r0, {r1} +0+23c <[^>]*> 09820038 ? stmibeq r2, {r3, r4, r5} 0+240 <[^>]*> e843ffff ? stmda r3, {r0, r1, r2, r3, r4, r5, r6, r7, r8, r9, sl, fp, ip, sp, lr, pc}\^ 0+244 <[^>]*> e92b05ff ? stmdb fp!, {r0, r1, r2, r3, r4, r5, r6, r7, r8, sl} 0+248 <[^>]*> e8010007 ? stmda r1, {r0, r1, r2} 0+24c <[^>]*> e9020018 ? stmdb r2, {r3, r4} -0+250 <[^>]*> e8830003 ? stmia r3, {r0, r1} +0+250 <[^>]*> e8830003 ? stm r3, {r0, r1} 0+254 <[^>]*> e9c40300 ? stmib r4, {r8, r9}\^ 0+258 <[^>]*> ef123456 ? (swi|svc) 0x00123456 0+25c <[^>]*> 2f000033 ? (swi|svc)cs 0x00000033 diff --git a/gas/testsuite/gas/arm/xscale.d b/gas/testsuite/gas/arm/xscale.d index fc38ba14e5..32ecf1f335 100644 --- a/gas/testsuite/gas/arm/xscale.d +++ b/gas/testsuite/gas/arm/xscale.d @@ -24,12 +24,12 @@ 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 ldreqd r2, \[r3, #120\] -0+48 <[^>]*> b10540d6 ldrltd r4, \[r5, -r6\] +0+44 <[^>]*> 01c327d8 ldrdeq r2, \[r3, #120\] +0+48 <[^>]*> b10540d6 ldrdlt r4, \[r5, -r6\] 0+4c <[^>]*> e16a88f9 strd r8, \[sl, #-137\]! 0+50 <[^>]*> e1ac00fd strd r0, \[ip, sp\]! -0+54 <[^>]*> 30ce21f0 strccd r2, \[lr\], #16 -0+58 <[^>]*> 708640f8 strvcd r4, \[r6\], r8 +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 -- 2.11.0