From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 0C7B7385735F for ; Sun, 2 Oct 2022 10:48:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0C7B7385735F Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664707693; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=o4YNnZbljK5JN4No41vyQ7sFExGtUSx29r00EOpGupo=; b=i9jO4nlptDWPufYV3OEJ3VUAzym6I1d023ZrP5MWDoaqiABtrKklPoyeYdCAs78RnFatJv +x4Yci39Spk4MYJ1RZQWxbhR52hZQmYZoBH2z7X9cz8Wf+GXohhSolDdgJOHghXXZUQ8wP F2ptzSRoN7twCuxEifRgIJiKmA0XaZA= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-633-i6FNPoQVP7SG_1uZkX8yQA-1; Sun, 02 Oct 2022 06:48:05 -0400 X-MC-Unique: i6FNPoQVP7SG_1uZkX8yQA-1 Received: by mail-wm1-f72.google.com with SMTP id f25-20020a7bc8d9000000b003b4768dcd9cso2096467wml.9 for ; Sun, 02 Oct 2022 03:48:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=o4YNnZbljK5JN4No41vyQ7sFExGtUSx29r00EOpGupo=; b=AEse3snDlT7wAgC22pYUnoidHUOJ2X4Wl8B498Vht4rw/lYWHxzcyhYxXmO/iiFIDJ 8SLEcFCatQoMmcWVzzs2iYfyYNsfbK9SeCiL9tT1QYNHx8sCe4GWW9PCfdQArD9H0iSS GblJDcwQ797XDKpa7ggCH921yI11gO4UwnAS5vPH2NNpAVU09oA9tQYMsdsKqycK0rWa YJMl+y9JEeN8yfibq6XpY3swsNvE22i9z65CWxUKq+NgHThZgZcg2hb4vrIVN3Puod4H aXe8wBoWH5c01z4GlpZ2KeAHMAVpaihOE12zUtHbZHOr8RypEV48nFOpmDRsqINbZ+Sh NPqQ== X-Gm-Message-State: ACrzQf2YruZJZQ5GobS2bv+WjmDah0N/uy9U4iCIMj3z3DVQf66EIdRz yeqdPo5xhjPobZ2p6t7mIyKp3hIiGoNbXXx1RgBCaMroGI9d1az/C4lVCxrbFI0JAempWrYq74p V9T8lxkJ1Wt6FfSK6ojUrfc9NQL9A5htB6yohFJuiMJzsjjoqXvvm7P5FFNGt1LKAlZfx2Q== X-Received: by 2002:a5d:4c44:0:b0:22e:3503:41bf with SMTP id n4-20020a5d4c44000000b0022e350341bfmr2040678wrt.0.1664707682368; Sun, 02 Oct 2022 03:48:02 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5lSJKcgz84KV9B+5RJmTgolC4d28T7Tc9fc9iBfp6eObupMZRhL9ZoK94rAq/g8BVCnBwKNw== X-Received: by 2002:a5d:4c44:0:b0:22e:3503:41bf with SMTP id n4-20020a5d4c44000000b0022e350341bfmr2040601wrt.0.1664707679494; Sun, 02 Oct 2022 03:47:59 -0700 (PDT) Received: from localhost (52.72.115.87.dyn.plus.net. [87.115.72.52]) by smtp.gmail.com with ESMTPSA id q63-20020a1c4342000000b003b4bd18a23bsm13121832wma.12.2022.10.02.03.47.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Oct 2022 03:47:58 -0700 (PDT) From: Andrew Burgess To: binutils@sourceware.org Cc: Andrew Burgess Subject: [PATCHv2 1/2] opcodes/arm: use '@' consistently for the comment character Date: Sun, 2 Oct 2022 11:47:51 +0100 Message-Id: X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-10.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_BARRACUDACENTRAL,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Looking at the ARM disassembler output, every comment seems to start with a ';' character, so I assumed this was the correct character to start an assembler comment. I then started a couple of places where there was no ';', but instead, just a '@' character. I thought that this was a case of a missing ';', and proposed a patch to add the missing characters. Turns out I was wrong, '@' is actually the ARM assembler comment character, while ';' is the statement separator. Thus this: nop ;@ comment is two statements, the first is the 'nop' instruction, while the second contains no instructions, just the '@ comment' comment text. This: nop @ comment is a single 'nop' instruction followed by a comment. And finally, this: nop ; comment is two statements, the first contains the 'nop' instruction, while the second contains the instruction 'comment', which obviously isn't actually an instruction at all. Why this matters is that, in the next commit, I would like to add libopcodes syntax styling support for ARM. The question then is how should the disassembler style the three cases above? As '@' is the actual comment start character then clearly the '@' and anything after it can be styled as a comment. But what about ';' in the second example? Style as text? Style as a comment? And the third example is event harder, what about the 'comment' text? Style as an instruction mnemonic? Style as text? Style as a comment? I think the only sensible answer is to move the disassembler to use '@' consistently as its comment character, and remove all the uses of ';'. Then, in the next commit, it's obvious what to do. There's obviously a *lot* of tests that get updated after this change. --- gas/testsuite/gas/arm/adr.d | 2 +- gas/testsuite/gas/arm/adrl.d | 20 +- gas/testsuite/gas/arm/arch4t-eabi.d | 8 +- gas/testsuite/gas/arm/arch4t.d | 8 +- gas/testsuite/gas/arm/arch7.d | 4 +- gas/testsuite/gas/arm/arch7a-mp.d | 6 +- gas/testsuite/gas/arm/arch7r-mp.d | 6 +- gas/testsuite/gas/arm/archv6t2.d | 10 +- gas/testsuite/gas/arm/archv8m-base.d | 12 +- gas/testsuite/gas/arm/archv8m-main-dsp-1.d | 12 +- gas/testsuite/gas/arm/archv8m-main.d | 12 +- gas/testsuite/gas/arm/arm3.d | 2 +- gas/testsuite/gas/arm/arm6.d | 4 +- gas/testsuite/gas/arm/arm7dm.d | 6 +- gas/testsuite/gas/arm/arm7t.d | 26 +- gas/testsuite/gas/arm/armv1.d | 8 +- gas/testsuite/gas/arm/armv7-a+virt.d | 4 +- .../gas/arm/armv8-2-fp16-scalar-ext.d | 8 +- .../gas/arm/armv8-2-fp16-scalar-thumb-ext.d | 8 +- .../gas/arm/armv8-2-fp16-scalar-thumb.d | 8 +- gas/testsuite/gas/arm/armv8-2-fp16-scalar.d | 8 +- gas/testsuite/gas/arm/armv8.1-m.main-fp.d | 70 +-- gas/testsuite/gas/arm/armv8.1-m.main-hp.d | 8 +- gas/testsuite/gas/arm/bl-local-2.d | 10 +- gas/testsuite/gas/arm/bl-local-v4t.d | 10 +- gas/testsuite/gas/arm/blx-bad.d | 14 +- gas/testsuite/gas/arm/blx-local-thumb.d | 10 +- gas/testsuite/gas/arm/blx-local.d | 12 +- gas/testsuite/gas/arm/branch-reloc.d | 10 +- gas/testsuite/gas/arm/ccs.d | 2 +- .../gas/arm/copro-arm_v2plus-arm_v2.d | 8 +- .../gas/arm/copro-arm_v5plus-arm_v5.d | 4 +- .../arm/copro-thumb_v6t2plus-thumb_v6t2-1.d | 4 +- .../arm/copro-thumb_v6t2plus-thumb_v6t2-2.d | 4 +- gas/testsuite/gas/arm/crc32-armv8-a-bad.d | 24 +- gas/testsuite/gas/arm/crc32-armv8-r-bad.d | 24 +- gas/testsuite/gas/arm/dis-data3.d | 2 +- gas/testsuite/gas/arm/el_segundo.d | 2 +- gas/testsuite/gas/arm/float.d | 2 +- gas/testsuite/gas/arm/group-reloc-alu.d | 160 ++--- gas/testsuite/gas/arm/group-reloc-ldrs.d | 240 ++++---- gas/testsuite/gas/arm/immed.d | 10 +- gas/testsuite/gas/arm/immed2.d | 2 +- gas/testsuite/gas/arm/inst.d | 36 +- gas/testsuite/gas/arm/iwmmxt.d | 2 +- gas/testsuite/gas/arm/ldconst.d | 42 +- gas/testsuite/gas/arm/ldr-global.d | 14 +- gas/testsuite/gas/arm/ldr-t.d | 16 +- gas/testsuite/gas/arm/ldr.d | 10 +- gas/testsuite/gas/arm/ldst-offset0.d | 6 +- gas/testsuite/gas/arm/ldst-pc.d | 8 +- gas/testsuite/gas/arm/m0-load-pseudo.d | 4 +- gas/testsuite/gas/arm/m23-load-pseudo.d | 4 +- gas/testsuite/gas/arm/m33-load-pseudo.d | 4 +- gas/testsuite/gas/arm/macro1.d | 6 +- gas/testsuite/gas/arm/mapdir.d | 4 +- gas/testsuite/gas/arm/mapmisc.d | 38 +- gas/testsuite/gas/arm/mapsecs.d | 10 +- gas/testsuite/gas/arm/mapshort-eabi.d | 10 +- gas/testsuite/gas/arm/mapshort-elf.d | 10 +- gas/testsuite/gas/arm/mask_1-armv8-a.d | 32 +- gas/testsuite/gas/arm/mask_1-armv8-r.d | 32 +- gas/testsuite/gas/arm/mrs-msr-arm-v6.d | 6 +- gas/testsuite/gas/arm/mrs-msr-arm-v7-a.d | 6 +- gas/testsuite/gas/arm/msr-imm.d | 268 ++++----- gas/testsuite/gas/arm/mve-vand.d | 94 +-- gas/testsuite/gas/arm/mve-vbic.d | 20 +- gas/testsuite/gas/arm/mve-vcvt-3.d | 80 +-- gas/testsuite/gas/arm/mve-vmov-1.d | 20 +- gas/testsuite/gas/arm/mve-vmov-2.d | 34 +- .../gas/arm/mve-vmov-vmvn-vorr-vbic.d | 64 +- gas/testsuite/gas/arm/mve-vmvn.d | 114 ++-- gas/testsuite/gas/arm/mve-vorn.d | 22 +- gas/testsuite/gas/arm/mve-vorr.d | 20 +- gas/testsuite/gas/arm/neon-cond-bad_t2.d | 4 +- gas/testsuite/gas/arm/neon-const.d | 516 ++++++++-------- gas/testsuite/gas/arm/neon-cov.d | 564 +++++++++--------- gas/testsuite/gas/arm/neon-ldst-rm.d | 4 +- gas/testsuite/gas/arm/neon-logic.d | 8 +- gas/testsuite/gas/arm/nops.d | 2 +- gas/testsuite/gas/arm/offset-1.d | 8 +- gas/testsuite/gas/arm/offset.d | 8 +- gas/testsuite/gas/arm/pr21458.d | 14 +- gas/testsuite/gas/arm/pr24907.d | 6 +- gas/testsuite/gas/arm/pr25235.d | 14 +- gas/testsuite/gas/arm/push-pop.d | 8 +- gas/testsuite/gas/arm/reg-alias.d | 6 +- gas/testsuite/gas/arm/relax_branch_align.d | 8 +- gas/testsuite/gas/arm/relax_load_align.d | 6 +- gas/testsuite/gas/arm/sp-pc-usage-t.d | 8 +- gas/testsuite/gas/arm/tcompat.d | 6 +- gas/testsuite/gas/arm/tcompat2.d | 8 +- gas/testsuite/gas/arm/thumb-eabi.d | 42 +- gas/testsuite/gas/arm/thumb-nop.d | 4 +- gas/testsuite/gas/arm/thumb.d | 42 +- gas/testsuite/gas/arm/thumb1_unified.d | 4 +- gas/testsuite/gas/arm/thumb2_add.d | 38 +- gas/testsuite/gas/arm/thumb2_invert.d | 24 +- gas/testsuite/gas/arm/thumb2_pool.d | 32 +- gas/testsuite/gas/arm/thumb2_relax.d | 52 +- gas/testsuite/gas/arm/thumb2_vpool.d | 158 ++--- gas/testsuite/gas/arm/thumb2_vpool_be.d | 158 ++--- gas/testsuite/gas/arm/thumb32.d | 186 +++--- gas/testsuite/gas/arm/thumbv6.d | 8 +- gas/testsuite/gas/arm/thumbv6k.d | 8 +- gas/testsuite/gas/arm/tls.d | 14 +- gas/testsuite/gas/arm/tls_vxworks.d | 6 +- gas/testsuite/gas/arm/udf.d | 24 +- gas/testsuite/gas/arm/unpredictable.d | 2 +- gas/testsuite/gas/arm/vfp-mov-enc.d | 18 +- gas/testsuite/gas/arm/vfp-neon-overlap.d | 8 +- gas/testsuite/gas/arm/vfp1.d | 6 +- gas/testsuite/gas/arm/vfp1xD.d | 76 +-- gas/testsuite/gas/arm/vfp1xD_t2.d | 70 +-- gas/testsuite/gas/arm/vfpv3-32drs.d | 6 +- gas/testsuite/gas/arm/vldconst.d | 246 ++++---- gas/testsuite/gas/arm/vldconst_be.d | 246 ++++---- gas/testsuite/gas/arm/vldr.d | 4 +- gas/testsuite/gas/arm/wince.d | 12 +- gas/testsuite/gas/arm/wince_inst.d | 36 +- gas/testsuite/gas/arm/xscale.d | 4 +- ld/testsuite/ld-arm/arm-app-abs32.d | 8 +- ld/testsuite/ld-arm/arm-app.d | 6 +- ld/testsuite/ld-arm/arm-be8.d | 2 +- ld/testsuite/ld-arm/arm-call.d | 8 +- ld/testsuite/ld-arm/arm-lib-plt32.d | 6 +- ld/testsuite/ld-arm/arm-lib.d | 6 +- ld/testsuite/ld-arm/arm-movwt.d | 40 +- ld/testsuite/ld-arm/arm-pic-veneer.d | 4 +- ld/testsuite/ld-arm/armthumb-lib.d | 16 +- ld/testsuite/ld-arm/attr-merge-wchar-24.d | 2 +- ld/testsuite/ld-arm/attr-merge-wchar-42.d | 2 +- ld/testsuite/ld-arm/callweak.d | 2 +- ld/testsuite/ld-arm/cortex-a8-far.d | 6 +- ld/testsuite/ld-arm/cortex-a8-fix-b-plt.d | 8 +- ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.d | 8 +- ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.d | 8 +- .../ld-arm/cortex-a8-fix-bl-rel-plt.d | 8 +- ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.d | 8 +- .../ld-arm/farcall-arm-arm-pic-veneer.d | 2 +- ld/testsuite/ld-arm/farcall-arm-arm.d | 2 +- ld/testsuite/ld-arm/farcall-arm-nacl-pic.d | 4 +- ld/testsuite/ld-arm/farcall-arm-nacl.d | 4 +- .../ld-arm/farcall-arm-thumb-blx-pic-veneer.d | 2 +- ld/testsuite/ld-arm/farcall-arm-thumb-blx.d | 2 +- .../ld-arm/farcall-arm-thumb-pic-veneer.d | 2 +- ld/testsuite/ld-arm/farcall-arm-thumb.d | 2 +- ld/testsuite/ld-arm/farcall-data-nacl.d | 4 +- ld/testsuite/ld-arm/farcall-data.d | 2 +- ld/testsuite/ld-arm/farcall-group-limit.d | 2 +- ld/testsuite/ld-arm/farcall-group-size2.d | 10 +- ld/testsuite/ld-arm/farcall-group.d | 10 +- ld/testsuite/ld-arm/farcall-mix.d | 10 +- ld/testsuite/ld-arm/farcall-mix2.d | 10 +- ld/testsuite/ld-arm/farcall-mixed-app-v5.d | 26 +- ld/testsuite/ld-arm/farcall-mixed-app.d | 26 +- ld/testsuite/ld-arm/farcall-mixed-app2.d | 28 +- ld/testsuite/ld-arm/farcall-mixed-lib-v4t.d | 36 +- ld/testsuite/ld-arm/farcall-mixed-lib.d | 24 +- .../ld-arm/farcall-thumb-arm-blx-pic-veneer.d | 2 +- ld/testsuite/ld-arm/farcall-thumb-arm-blx.d | 2 +- .../ld-arm/farcall-thumb-arm-pic-veneer.d | 2 +- ld/testsuite/ld-arm/farcall-thumb-arm.d | 2 +- .../farcall-thumb-thumb-blx-pic-veneer.d | 2 +- ld/testsuite/ld-arm/farcall-thumb-thumb-blx.d | 2 +- .../ld-arm/farcall-thumb-thumb-m-no-profile.d | 2 +- .../ld-arm/farcall-thumb-thumb-m-pic-veneer.d | 2 +- ld/testsuite/ld-arm/farcall-thumb-thumb-m.d | 2 +- .../ld-arm/farcall-thumb-thumb-pic-veneer.d | 2 +- ld/testsuite/ld-arm/farcall-thumb-thumb.d | 2 +- ld/testsuite/ld-arm/farcall-thumb2-purecode.d | 2 +- ld/testsuite/ld-arm/farcall-thumb2-thumb2-m.d | 2 +- ld/testsuite/ld-arm/fdpic-main-m.d | 16 +- ld/testsuite/ld-arm/fdpic-main.d | 16 +- ld/testsuite/ld-arm/fdpic-shared-m.d | 4 +- ld/testsuite/ld-arm/fdpic-shared.d | 4 +- ld/testsuite/ld-arm/fix-arm1176-off.d | 2 +- ld/testsuite/ld-arm/fix-arm1176-on.d | 2 +- ld/testsuite/ld-arm/gc-hidden-1.d | 2 +- ld/testsuite/ld-arm/group-relocs.d | 58 +- ld/testsuite/ld-arm/ifunc-1.dd | 50 +- ld/testsuite/ld-arm/ifunc-10.dd | 236 ++++---- ld/testsuite/ld-arm/ifunc-11.dd | 28 +- ld/testsuite/ld-arm/ifunc-12.dd | 28 +- ld/testsuite/ld-arm/ifunc-13.dd | 28 +- ld/testsuite/ld-arm/ifunc-14.dd | 42 +- ld/testsuite/ld-arm/ifunc-15.dd | 42 +- ld/testsuite/ld-arm/ifunc-16.dd | 36 +- ld/testsuite/ld-arm/ifunc-17.dd | 2 +- ld/testsuite/ld-arm/ifunc-2.dd | 146 ++--- ld/testsuite/ld-arm/ifunc-3.dd | 40 +- ld/testsuite/ld-arm/ifunc-4.dd | 236 ++++---- ld/testsuite/ld-arm/ifunc-5.dd | 26 +- ld/testsuite/ld-arm/ifunc-6.dd | 38 +- ld/testsuite/ld-arm/ifunc-7.dd | 18 +- ld/testsuite/ld-arm/ifunc-8.dd | 118 ++-- ld/testsuite/ld-arm/ifunc-9.dd | 56 +- .../jump-reloc-veneers-cond-long-backward.d | 2 +- .../ld-arm/jump-reloc-veneers-cond-long.d | 2 +- ld/testsuite/ld-arm/jump-reloc-veneers-long.d | 2 +- ld/testsuite/ld-arm/long-plt-format.d | 4 +- ld/testsuite/ld-arm/mixed-app-v5.d | 26 +- ld/testsuite/ld-arm/mixed-app.d | 26 +- ld/testsuite/ld-arm/mixed-lib.d | 12 +- ld/testsuite/ld-arm/movw-merge.d | 4 +- ld/testsuite/ld-arm/non-contiguous-arm2.d | 10 +- ld/testsuite/ld-arm/non-contiguous-arm3.d | 12 +- ld/testsuite/ld-arm/non-contiguous-arm5.d | 10 +- ld/testsuite/ld-arm/non-contiguous-arm6.d | 12 +- .../ld-arm/stm32l4xx-cannot-fix-far-ldm.d | 2 +- ld/testsuite/ld-arm/stm32l4xx-fix-ldm.d | 8 +- ld/testsuite/ld-arm/stm32l4xx-fix-vldm-dp.d | 2 +- ld/testsuite/ld-arm/stm32l4xx-fix-vldm.d | 2 +- ld/testsuite/ld-arm/thumb-plt.d | 4 +- ld/testsuite/ld-arm/thumb1-adds.d | 12 +- ld/testsuite/ld-arm/thumb1-movs.d | 10 +- ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad.d | 2 +- ld/testsuite/ld-arm/thumb2-bl-bad.d | 2 +- ld/testsuite/ld-arm/tls-app.d | 4 +- ld/testsuite/ld-arm/tls-descrelax-be32.d | 112 ++-- ld/testsuite/ld-arm/tls-descrelax-be8.d | 78 +-- ld/testsuite/ld-arm/tls-descrelax-v7.d | 78 +-- ld/testsuite/ld-arm/tls-descrelax.d | 112 ++-- ld/testsuite/ld-arm/tls-descseq.d | 20 +- ld/testsuite/ld-arm/tls-gdesc-neg.d | 14 +- ld/testsuite/ld-arm/tls-gdesc.d | 22 +- ld/testsuite/ld-arm/tls-gdierelax.d | 8 +- ld/testsuite/ld-arm/tls-gdierelax2.d | 10 +- ld/testsuite/ld-arm/tls-gdlerelax.d | 4 +- ld/testsuite/ld-arm/tls-lib-loc.d | 14 +- ld/testsuite/ld-arm/tls-lib.d | 4 +- ld/testsuite/ld-arm/tls-longplt-lib.d | 28 +- ld/testsuite/ld-arm/tls-longplt.d | 30 +- ld/testsuite/ld-arm/tls-thumb1.d | 36 +- ld/testsuite/ld-arm/vxworks1-lib.dd | 12 +- ld/testsuite/ld-arm/vxworks1.dd | 10 +- opcodes/arm-dis.c | 96 +-- 237 files changed, 3548 insertions(+), 3548 deletions(-) diff --git a/gas/testsuite/gas/arm/adr.d b/gas/testsuite/gas/arm/adr.d index 13722cd9cdd..817d7df1859 100644 --- a/gas/testsuite/gas/arm/adr.d +++ b/gas/testsuite/gas/arm/adr.d @@ -7,4 +7,4 @@ .*: +file format .*arm.* Disassembly of section .text: -0+ <.*> 824ff203 subhi pc, pc, #805306368 ; 0x30000000 +0+ <.*> 824ff203 subhi pc, pc, #805306368 @ 0x30000000 diff --git a/gas/testsuite/gas/arm/adrl.d b/gas/testsuite/gas/arm/adrl.d index b6011f1f89c..9657e0eec1a 100644 --- a/gas/testsuite/gas/arm/adrl.d +++ b/gas/testsuite/gas/arm/adrl.d @@ -9,20 +9,20 @@ Disassembly of section .text: ... 0+2000 <.*> e24f0008 sub r0, pc, #8 -0+2004 <.*> e2400c20 sub r0, r0, #32, 24 ; 0x2000 +0+2004 <.*> e2400c20 sub r0, r0, #32, 24 @ 0x2000 0+2008 <.*> e28f0020 add r0, pc, #32 -0+200c <.*> e2800c20 add r0, r0, #32, 24 ; 0x2000 +0+200c <.*> e2800c20 add r0, r0, #32, 24 @ 0x2000 0+2010 <.*> e24f0018 sub r0, pc, #24 -0+2014 <.*> e1a00000 nop ; \(mov r0, r0\) +0+2014 <.*> e1a00000 nop @ \(mov r0, r0\) 0+2018 <.*> e28f0008 add r0, pc, #8 -0+201c <.*> e1a00000 nop ; \(mov r0, r0\) +0+201c <.*> e1a00000 nop @ \(mov r0, r0\) 0+2020 <.*> 028f0000 addeq r0, pc, #0 -0+2024 <.*> e1a00000 nop ; \(mov r0, r0\) -0+2028 <.*> e24f0030 sub r0, pc, #48 ; 0x30 -0+202c <.*> e2400c20 sub r0, r0, #32, 24 ; 0x2000 -0+2030 <.*> e28f0c21 add r0, pc, #8448 ; 0x2100 -0+2034 <.*> e1a00000 nop ; \(mov r0, r0\) +0+2024 <.*> e1a00000 nop @ \(mov r0, r0\) +0+2028 <.*> e24f0030 sub r0, pc, #48 @ 0x30 +0+202c <.*> e2400c20 sub r0, r0, #32, 24 @ 0x2000 +0+2030 <.*> e28f0c21 add r0, pc, #8448 @ 0x2100 +0+2034 <.*> e1a00000 nop @ \(mov r0, r0\) ... -0+4030 <.*> e28fec01 add lr, pc, #256 ; 0x100 +0+4030 <.*> e28fec01 add lr, pc, #256 @ 0x100 ... ... diff --git a/gas/testsuite/gas/arm/arch4t-eabi.d b/gas/testsuite/gas/arm/arch4t-eabi.d index 66c0a4deb5c..3e3499d13ce 100644 --- a/gas/testsuite/gas/arm/arch4t-eabi.d +++ b/gas/testsuite/gas/arm/arch4t-eabi.d @@ -11,7 +11,7 @@ Disassembly of section .text: .*: R_ARM_V4BX.* 0+04 <[^>]+> 012fff11 ? bxeq r1 .*: R_ARM_V4BX.* -0+08 <[^>]+> e15f30b8 ? ldrh r3, \[pc, #-8\] ; 0+08 <[^>]+> +0+08 <[^>]+> e15f30b8 ? ldrh r3, \[pc, #-8\] @ 0+08 <[^>]+> 0+0c <[^>]+> e1d540f0 ? ldrsh r4, \[r5\] 0+10 <[^>]+> e19140d3 ? ldrsb r4, \[r1, r3\] 0+14 <[^>]+> e1b410f4 ? ldrsh r1, \[r4, r4\]! @@ -21,7 +21,7 @@ Disassembly of section .text: 0+24 <[^>]+> e1d32fdf ? ldrsb r2, \[r3, #255\].* 0+28 <[^>]+> e1541ffa ? ldrsh r1, \[r4, #-250\].* 0+2c <[^>]+> e1d51fd0 ? ldrsb r1, \[r5, #240\].* -0+30 <[^>]+> e1cf23b0 ? strh r2, \[pc, #48\] ; 0+68 <[^>]+> +0+30 <[^>]+> e1cf23b0 ? strh r2, \[pc, #48\] @ 0+68 <[^>]+> 0+34 <[^>]+> 11c330b0 ? strhne r3, \[r3\] 0+38 <[^>]+> e328f002 ? msr CPSR_f, #2 0+3c <[^>]+> e121f003 ? msr CPSR_c, r3 @@ -35,5 +35,5 @@ Disassembly of section .text: 0+5c <[^>]+> e164f00a ? msr SPSR_s, sl 0+60 <[^>]+> e168f00b ? msr SPSR_f, fp 0+64 <[^>]+> e169f00c ? msr SPSR_fc, ip -0+68 <[^>]+> e1a00000 ? nop ; \(mov r0, r0\) -0+6c <[^>]+> e1a00000 ? nop ; \(mov r0, r0\) +0+68 <[^>]+> e1a00000 ? nop @ \(mov r0, r0\) +0+6c <[^>]+> e1a00000 ? nop @ \(mov r0, r0\) diff --git a/gas/testsuite/gas/arm/arch4t.d b/gas/testsuite/gas/arm/arch4t.d index f00f2b8209e..d8b7439c656 100644 --- a/gas/testsuite/gas/arm/arch4t.d +++ b/gas/testsuite/gas/arm/arch4t.d @@ -9,7 +9,7 @@ Disassembly of section .text: 0+00 <[^>]+> e12fff10 ? bx r0 0+04 <[^>]+> 012fff11 ? bxeq r1 -0+08 <[^>]+> e15f30b8 ? ldrh r3, \[pc, #-8\] ; 0+08 <[^>]+> +0+08 <[^>]+> e15f30b8 ? ldrh r3, \[pc, #-8\] @ 0+08 <[^>]+> 0+0c <[^>]+> e1d540f0 ? ldrsh r4, \[r5\] 0+10 <[^>]+> e19140d3 ? ldrsb r4, \[r1, r3\] 0+14 <[^>]+> e1b410f4 ? ldrsh r1, \[r4, r4\]! @@ -19,7 +19,7 @@ Disassembly of section .text: 0+24 <[^>]+> e1d32fdf ? ldrsb r2, \[r3, #255\].* 0+28 <[^>]+> e1541ffa ? ldrsh r1, \[r4, #-250\].* 0+2c <[^>]+> e1d51fd0 ? ldrsb r1, \[r5, #240\].* -0+30 <[^>]+> e1cf23b0 ? strh r2, \[pc, #48\] ; 0+68 <[^>]+> +0+30 <[^>]+> e1cf23b0 ? strh r2, \[pc, #48\] @ 0+68 <[^>]+> 0+34 <[^>]+> 11c330b0 ? strhne r3, \[r3\] 0+38 <[^>]+> e328f002 ? msr CPSR_f, #2 0+3c <[^>]+> e121f003 ? msr CPSR_c, r3 @@ -33,6 +33,6 @@ Disassembly of section .text: 0+5c <[^>]+> e164f00a ? msr SPSR_s, sl 0+60 <[^>]+> e168f00b ? msr SPSR_f, fp 0+64 <[^>]+> e169f00c ? msr SPSR_fc, ip -0+68 <[^>]+> e1a00000 ? nop ; \(mov r0, r0\) -0+6c <[^>]+> e1a00000 ? nop ; \(mov r0, r0\) +0+68 <[^>]+> e1a00000 ? nop @ \(mov r0, r0\) +0+6c <[^>]+> e1a00000 ? nop @ \(mov r0, r0\) diff --git a/gas/testsuite/gas/arm/arch7.d b/gas/testsuite/gas/arm/arch7.d index a7149a62b39..c353b8ec21a 100644 --- a/gas/testsuite/gas/arm/arch7.d +++ b/gas/testsuite/gas/arm/arch7.d @@ -28,8 +28,8 @@ Disassembly of section .text: 0+050 <[^>]*> f995 f000 pli \[r5\] 0+054 <[^>]*> f995 ffff pli \[r5, #4095\].* 0+058 <[^>]*> f915 fcff pli \[r5, #-255\] -0+05c <[^>]*> f99f ffff pli \[pc, #4095\] ; 0+0105f <[^>]*> -0+060 <[^>]*> f91f ffff pli \[pc, #-4095\] ; f+ff065 <[^>]*> +0+05c <[^>]*> f99f ffff pli \[pc, #4095\] @ 0+0105f <[^>]*> +0+060 <[^>]*> f91f ffff pli \[pc, #-4095\] @ f+ff065 <[^>]*> 0+064 <[^>]*> f3af 80f0 dbg #0 0+068 <[^>]*> f3af 80ff dbg #15 0+06c <[^>]*> f3bf 8f5f dmb sy diff --git a/gas/testsuite/gas/arm/arch7a-mp.d b/gas/testsuite/gas/arm/arch7a-mp.d index 06042e297cc..2797d8abf74 100644 --- a/gas/testsuite/gas/arm/arch7a-mp.d +++ b/gas/testsuite/gas/arm/arch7a-mp.d @@ -9,8 +9,8 @@ Disassembly of section .text: 0[0-9a-f]+ <[^>]+> f590f000 pldw \[r0\] 0[0-9a-f]+ <[^>]+> f59ef000 pldw \[lr\] 0[0-9a-f]+ <[^>]+> f591f000 pldw \[r1\] -0[0-9a-f]+ <[^>]+> f590ffff pldw \[r0, #4095\] ; 0xfff -0[0-9a-f]+ <[^>]+> f510ffff pldw \[r0, #-4095\] ; 0xfffff001 +0[0-9a-f]+ <[^>]+> f590ffff pldw \[r0, #4095\] @ 0xfff +0[0-9a-f]+ <[^>]+> f510ffff pldw \[r0, #-4095\] @ 0xfffff001 0[0-9a-f]+ <[^>]+> f790f000 pldw \[r0, r0\] 0[0-9a-f]+ <[^>]+> f791f000 pldw \[r1, r0\] 0[0-9a-f]+ <[^>]+> f79ef000 pldw \[lr, r0\] @@ -20,7 +20,7 @@ Disassembly of section .text: 0[0-9a-f]+ <[^>]+> f8b0 f000 pldw \[r0\] 0[0-9a-f]+ <[^>]+> f8be f000 pldw \[lr\] 0[0-9a-f]+ <[^>]+> f8b1 f000 pldw \[r1\] -0[0-9a-f]+ <[^>]+> f8b0 ffff pldw \[r0, #4095\] ; 0xfff +0[0-9a-f]+ <[^>]+> f8b0 ffff pldw \[r0, #4095\] @ 0xfff 0[0-9a-f]+ <[^>]+> f830 fcff pldw \[r0, #-255\] 0[0-9a-f]+ <[^>]+> f830 f000 pldw \[r0, r0\] 0[0-9a-f]+ <[^>]+> f831 f000 pldw \[r1, r0\] diff --git a/gas/testsuite/gas/arm/arch7r-mp.d b/gas/testsuite/gas/arm/arch7r-mp.d index b6efd6a934e..45400c0c0ea 100644 --- a/gas/testsuite/gas/arm/arch7r-mp.d +++ b/gas/testsuite/gas/arm/arch7r-mp.d @@ -9,8 +9,8 @@ Disassembly of section .text: 0[0-9a-f]+ <[^>]+> f590f000 pldw \[r0\] 0[0-9a-f]+ <[^>]+> f59ef000 pldw \[lr\] 0[0-9a-f]+ <[^>]+> f591f000 pldw \[r1\] -0[0-9a-f]+ <[^>]+> f590ffff pldw \[r0, #4095\] ; 0xfff -0[0-9a-f]+ <[^>]+> f510ffff pldw \[r0, #-4095\] ; 0xfffff001 +0[0-9a-f]+ <[^>]+> f590ffff pldw \[r0, #4095\] @ 0xfff +0[0-9a-f]+ <[^>]+> f510ffff pldw \[r0, #-4095\] @ 0xfffff001 0[0-9a-f]+ <[^>]+> f790f000 pldw \[r0, r0\] 0[0-9a-f]+ <[^>]+> f791f000 pldw \[r1, r0\] 0[0-9a-f]+ <[^>]+> f79ef000 pldw \[lr, r0\] @@ -20,7 +20,7 @@ Disassembly of section .text: 0[0-9a-f]+ <[^>]+> f8b0 f000 pldw \[r0\] 0[0-9a-f]+ <[^>]+> f8be f000 pldw \[lr\] 0[0-9a-f]+ <[^>]+> f8b1 f000 pldw \[r1\] -0[0-9a-f]+ <[^>]+> f8b0 ffff pldw \[r0, #4095\] ; 0xfff +0[0-9a-f]+ <[^>]+> f8b0 ffff pldw \[r0, #4095\] @ 0xfff 0[0-9a-f]+ <[^>]+> f830 fcff pldw \[r0, #-255\] 0[0-9a-f]+ <[^>]+> f830 f000 pldw \[r0, r0\] 0[0-9a-f]+ <[^>]+> f831 f000 pldw \[r1, r0\] diff --git a/gas/testsuite/gas/arm/archv6t2.d b/gas/testsuite/gas/arm/archv6t2.d index 8769b3f3a18..cc6fbc0cc13 100644 --- a/gas/testsuite/gas/arm/archv6t2.d +++ b/gas/testsuite/gas/arm/archv6t2.d @@ -38,8 +38,8 @@ Disassembly of section .text: 0+78 <[^>]+> e3400000 movt r0, #0 0+7c <[^>]+> 13000000 movwne r0, #0 0+80 <[^>]+> e3009000 movw r9, #0 -0+84 <[^>]+> e3000999 movw r0, #2457 ; 0x999 -0+88 <[^>]+> e3090000 movw r0, #36864 ; 0x9000 +0+84 <[^>]+> e3000999 movw r0, #2457 @ 0x999 +0+88 <[^>]+> e3090000 movw r0, #36864 @ 0x9000 0+8c <[^>]+> e0f900b0 ldrht r0, \[r9\], #0 0+90 <[^>]+> e0f900f0 ldrsht r0, \[r9\], #0 0+94 <[^>]+> e0f900d0 ldrsbt r0, \[r9\], #0 @@ -51,8 +51,8 @@ Disassembly of section .text: 0+ac <[^>]+> e07099b9 ldrht r9, \[r0\], #-153.* 0+b0 <[^>]+> 10b090b9 ldrhtne r9, \[r0\], r9 0+b4 <[^>]+> 103090b9 ldrhtne r9, \[r0\], -r9 -0+b8 <[^>]+> 10f099b9 ldrhtne r9, \[r0\], #153 ; 0x99 -0+bc <[^>]+> 107099b9 ldrhtne r9, \[r0\], #-153 ; 0xffffff67 +0+b8 <[^>]+> 10f099b9 ldrhtne r9, \[r0\], #153 @ 0x99 +0+bc <[^>]+> 107099b9 ldrhtne r9, \[r0\], #-153 @ 0xffffff67 0+c0 <[^>]+> e02100b2 strht r0, \[r1\], -r2 0+c4 <[^>]+> 102100b2 strhtne r0, \[r1\], -r2 0+c8 <[^>]+> e0a100b2 strht r0, \[r1\], r2 @@ -61,4 +61,4 @@ Disassembly of section .text: 0+d4 <[^>]+> e06100b2 strht r0, \[r1\], #-2 0+d8 <[^>]+> 10e100b2 strhtne r0, \[r1\], #2 0+dc <[^>]+> 106100b2 strhtne r0, \[r1\], #-2 -0+e0 <[^>]+> e3009999 movw r9, #2457 ; 0x999 +0+e0 <[^>]+> e3009999 movw r9, #2457 @ 0x999 diff --git a/gas/testsuite/gas/arm/archv8m-base.d b/gas/testsuite/gas/arm/archv8m-base.d index 6075ee048a0..d956eb55e11 100644 --- a/gas/testsuite/gas/arm/archv8m-base.d +++ b/gas/testsuite/gas/arm/archv8m-base.d @@ -14,12 +14,12 @@ Disassembly of section .text: 0+.* <[^>]*> e849 f800 tt r8, r9 0+.* <[^>]*> e841 f040 ttt r0, r1 0+.* <[^>]*> e849 f840 ttt r8, r9 -0+.* <[^>]*> f24f 1023 movw r0, #61731 ; 0xf123 -0+.* <[^>]*> f24f 1823 movw r8, #61731 ; 0xf123 -0+.* <[^>]*> f24f 1823 movw r8, #61731 ; 0xf123 -0+.* <[^>]*> f24f 1823 movw r8, #61731 ; 0xf123 -0+.* <[^>]*> f2cf 1023 movt r0, #61731 ; 0xf123 -0+.* <[^>]*> f2cf 1823 movt r8, #61731 ; 0xf123 +0+.* <[^>]*> f24f 1023 movw r0, #61731 @ 0xf123 +0+.* <[^>]*> f24f 1823 movw r8, #61731 @ 0xf123 +0+.* <[^>]*> f24f 1823 movw r8, #61731 @ 0xf123 +0+.* <[^>]*> f24f 1823 movw r8, #61731 @ 0xf123 +0+.* <[^>]*> f2cf 1023 movt r0, #61731 @ 0xf123 +0+.* <[^>]*> f2cf 1823 movt r8, #61731 @ 0xf123 0+.* <[^>]*> b154 cbz r4, 0+.* <[^>]*> 0+.* <[^>]*> b94c cbnz r4, 0+.* <[^>]*> 0+.* <[^>]*> f000 b808 b.w 0+.* <[^>]*> diff --git a/gas/testsuite/gas/arm/archv8m-main-dsp-1.d b/gas/testsuite/gas/arm/archv8m-main-dsp-1.d index 8c2c12d0d1c..444d3005ac4 100644 --- a/gas/testsuite/gas/arm/archv8m-main-dsp-1.d +++ b/gas/testsuite/gas/arm/archv8m-main-dsp-1.d @@ -14,12 +14,12 @@ Disassembly of section .text: 0+.* <[^>]*> e849 f800 tt r8, r9 0+.* <[^>]*> e841 f040 ttt r0, r1 0+.* <[^>]*> e849 f840 ttt r8, r9 -0+.* <[^>]*> f24f 1023 movw r0, #61731 ; 0xf123 -0+.* <[^>]*> f24f 1823 movw r8, #61731 ; 0xf123 -0+.* <[^>]*> f24f 1823 movw r8, #61731 ; 0xf123 -0+.* <[^>]*> f24f 1823 movw r8, #61731 ; 0xf123 -0+.* <[^>]*> f2cf 1023 movt r0, #61731 ; 0xf123 -0+.* <[^>]*> f2cf 1823 movt r8, #61731 ; 0xf123 +0+.* <[^>]*> f24f 1023 movw r0, #61731 @ 0xf123 +0+.* <[^>]*> f24f 1823 movw r8, #61731 @ 0xf123 +0+.* <[^>]*> f24f 1823 movw r8, #61731 @ 0xf123 +0+.* <[^>]*> f24f 1823 movw r8, #61731 @ 0xf123 +0+.* <[^>]*> f2cf 1023 movt r0, #61731 @ 0xf123 +0+.* <[^>]*> f2cf 1823 movt r8, #61731 @ 0xf123 0+.* <[^>]*> b154 cbz r4, 0+.* <[^>]*> 0+.* <[^>]*> b94c cbnz r4, 0+.* <[^>]*> 0+.* <[^>]*> f000 b808 b.w 0+.* <[^>]*> diff --git a/gas/testsuite/gas/arm/archv8m-main.d b/gas/testsuite/gas/arm/archv8m-main.d index 0b76db10fbd..d5a0c9a16a1 100644 --- a/gas/testsuite/gas/arm/archv8m-main.d +++ b/gas/testsuite/gas/arm/archv8m-main.d @@ -14,12 +14,12 @@ Disassembly of section .text: 0+.* <[^>]*> e849 f800 tt r8, r9 0+.* <[^>]*> e841 f040 ttt r0, r1 0+.* <[^>]*> e849 f840 ttt r8, r9 -0+.* <[^>]*> f24f 1023 movw r0, #61731 ; 0xf123 -0+.* <[^>]*> f24f 1823 movw r8, #61731 ; 0xf123 -0+.* <[^>]*> f24f 1823 movw r8, #61731 ; 0xf123 -0+.* <[^>]*> f24f 1823 movw r8, #61731 ; 0xf123 -0+.* <[^>]*> f2cf 1023 movt r0, #61731 ; 0xf123 -0+.* <[^>]*> f2cf 1823 movt r8, #61731 ; 0xf123 +0+.* <[^>]*> f24f 1023 movw r0, #61731 @ 0xf123 +0+.* <[^>]*> f24f 1823 movw r8, #61731 @ 0xf123 +0+.* <[^>]*> f24f 1823 movw r8, #61731 @ 0xf123 +0+.* <[^>]*> f24f 1823 movw r8, #61731 @ 0xf123 +0+.* <[^>]*> f2cf 1023 movt r0, #61731 @ 0xf123 +0+.* <[^>]*> f2cf 1823 movt r8, #61731 @ 0xf123 0+.* <[^>]*> b154 cbz r4, 0+.* <[^>]*> 0+.* <[^>]*> b94c cbnz r4, 0+.* <[^>]*> 0+.* <[^>]*> f000 b808 b.w 0+.* <[^>]*> diff --git a/gas/testsuite/gas/arm/arm3.d b/gas/testsuite/gas/arm/arm3.d index c4a1001ba10..dd973ab7621 100644 --- a/gas/testsuite/gas/arm/arm3.d +++ b/gas/testsuite/gas/arm/arm3.d @@ -8,4 +8,4 @@ Disassembly of section .text: 0+0 <[^>]*> e1080091 ? swp r0, r1, \[r8\] 0+4 <[^>]*> e1423093 ? swpb r3, r3, \[r2\] 0+8 <[^>]*> a1454091 ? swpbge r4, r1, \[r5\] -0+c <[^>]*> e1a00000 ? nop ; \(mov r0, r0\) +0+c <[^>]*> e1a00000 ? nop @ \(mov r0, r0\) diff --git a/gas/testsuite/gas/arm/arm6.d b/gas/testsuite/gas/arm/arm6.d index 3fc0de8198b..27bd08ffbf9 100644 --- a/gas/testsuite/gas/arm/arm6.d +++ b/gas/testsuite/gas/arm/arm6.d @@ -8,12 +8,12 @@ Disassembly of section .text: 0+00 <[^>]+> e10f8000 ? mrs r8, CPSR 0+04 <[^>]+> e14f2000 ? mrs r2, SPSR 0+08 <[^>]+> e129f001 ? msr CPSR_fc, r1 -0+0c <[^>]+> 1328f20f ? msrne CPSR_f, #-268435456 ; 0xf0000000 +0+0c <[^>]+> 1328f20f ? msrne CPSR_f, #-268435456 @ 0xf0000000 0+10 <[^>]+> e168f008 ? msr SPSR_f, r8 0+14 <[^>]+> e169f009 ? msr SPSR_fc, r9 0+18 <[^>]+> e10f8000 ? mrs r8, CPSR 0+1c <[^>]+> e14f2000 ? mrs r2, SPSR 0+20 <[^>]+> e129f001 ? msr CPSR_fc, r1 -0+24 <[^>]+> 1328f20f ? msrne CPSR_f, #-268435456 ; 0xf0000000 +0+24 <[^>]+> 1328f20f ? msrne CPSR_f, #-268435456 @ 0xf0000000 0+28 <[^>]+> e168f008 ? msr SPSR_f, r8 0+2c <[^>]+> e169f009 ? msr SPSR_fc, r9 diff --git a/gas/testsuite/gas/arm/arm7dm.d b/gas/testsuite/gas/arm/arm7dm.d index 9411170dbdf..0cb31cde062 100644 --- a/gas/testsuite/gas/arm/arm7dm.d +++ b/gas/testsuite/gas/arm/arm7dm.d @@ -14,6 +14,6 @@ Disassembly of section .text: 0+18 <[^>]+> 00b92994 ? umlalseq r2, r9, r4, r9 0+1c <[^>]+> a0eaee98 ? smlalge lr, sl, r8, lr 0+20 <[^>]+> e322f000 ? msr CPSR_x, #0 -0+24 <[^>]+> e1a00000 ? nop ; \(mov r0, r0\) -0+28 <[^>]+> e1a00000 ? nop ; \(mov r0, r0\) -0+2c <[^>]+> e1a00000 ? nop ; \(mov r0, r0\) +0+24 <[^>]+> e1a00000 ? nop @ \(mov r0, r0\) +0+28 <[^>]+> e1a00000 ? nop @ \(mov r0, r0\) +0+2c <[^>]+> e1a00000 ? nop @ \(mov r0, r0\) diff --git a/gas/testsuite/gas/arm/arm7t.d b/gas/testsuite/gas/arm/arm7t.d index a16192bd078..451497d7a77 100644 --- a/gas/testsuite/gas/arm/arm7t.d +++ b/gas/testsuite/gas/arm/arm7t.d @@ -15,9 +15,9 @@ Disassembly of section .text: 0+14 <[^>]*> e1f100bc ? ldrh r0, \[r1, #12\]! 0+18 <[^>]*> e15100bc ? ldrh r0, \[r1, #-12\] 0+1c <[^>]*> e09100b2 ? ldrh r0, \[r1\], r2 -0+20 <[^>]*> e3a00cff ? mov r0, #65280 ; 0xff00 -0+24 <[^>]*> e1df0bb4 ? ldrh r0, \[pc, #180\] ; 0+e0 <[^>]*> -0+28 <[^>]*> e1df0abc ? ldrh r0, \[pc, #172\] ; 0+dc <[^>]*> +0+20 <[^>]*> e3a00cff ? mov r0, #65280 @ 0xff00 +0+24 <[^>]*> e1df0bb4 ? ldrh r0, \[pc, #180\] @ 0+e0 <[^>]*> +0+28 <[^>]*> e1df0abc ? ldrh r0, \[pc, #172\] @ 0+dc <[^>]*> 0+2c <[^>]*> e1c100b0 ? strh r0, \[r1\] 0+30 <[^>]*> e1e100b0 ? strh r0, \[r1, #0\]! 0+34 <[^>]*> e18100b2 ? strh r0, \[r1, r2\] @@ -26,7 +26,7 @@ Disassembly of section .text: 0+40 <[^>]*> e1e100bc ? strh r0, \[r1, #12\]! 0+44 <[^>]*> e14100bc ? strh r0, \[r1, #-12\] 0+48 <[^>]*> e08100b2 ? strh r0, \[r1\], r2 -0+4c <[^>]*> e1cf08b8 ? strh r0, \[pc, #136\] ; 0+dc <[^>]*> +0+4c <[^>]*> e1cf08b8 ? strh r0, \[pc, #136\] @ 0+dc <[^>]*> 0+50 <[^>]*> e1d100d0 ? ldrsb r0, \[r1\] 0+54 <[^>]*> e1f100d0 ? ldrsb r0, \[r1, #0\]! 0+58 <[^>]*> e19100d2 ? ldrsb r0, \[r1, r2\] @@ -35,8 +35,8 @@ Disassembly of section .text: 0+64 <[^>]*> e1f100dc ? ldrsb r0, \[r1, #12\]! 0+68 <[^>]*> e15100dc ? ldrsb r0, \[r1, #-12\] 0+6c <[^>]*> e09100d2 ? ldrsb r0, \[r1\], r2 -0+70 <[^>]*> e3a000de ? mov r0, #222 ; 0xde -0+74 <[^>]*> e1df06d0 ? ldrsb r0, \[pc, #96\] ; 0+dc <[^>]*> +0+70 <[^>]*> e3a000de ? mov r0, #222 @ 0xde +0+74 <[^>]*> e1df06d0 ? ldrsb r0, \[pc, #96\] @ 0+dc <[^>]*> 0+78 <[^>]*> e1d100f0 ? ldrsh r0, \[r1\] 0+7c <[^>]*> e1f100f0 ? ldrsh r0, \[r1, #0\]! 0+80 <[^>]*> e19100f2 ? ldrsh r0, \[r1, r2\] @@ -45,9 +45,9 @@ Disassembly of section .text: 0+8c <[^>]*> e1f100fc ? ldrsh r0, \[r1, #12\]! 0+90 <[^>]*> e15100fc ? ldrsh r0, \[r1, #-12\] 0+94 <[^>]*> e09100f2 ? ldrsh r0, \[r1\], r2 -0+98 <[^>]*> e3a00cff ? mov r0, #65280 ; 0xff00 -0+9c <[^>]*> e1df03fc ? ldrsh r0, \[pc, #60\] ; 0+e0 <[^>]*> -0+a0 <[^>]*> e1df03f4 ? ldrsh r0, \[pc, #52\] ; 0+dc <[^>]*> +0+98 <[^>]*> e3a00cff ? mov r0, #65280 @ 0xff00 +0+9c <[^>]*> e1df03fc ? ldrsh r0, \[pc, #60\] @ 0+e0 <[^>]*> +0+a0 <[^>]*> e1df03f4 ? ldrsh r0, \[pc, #52\] @ 0+dc <[^>]*> 0+a4 <[^>]*> e19100b2 ? ldrh r0, \[r1, r2\] 0+a8 <[^>]*> 119100b2 ? ldrhne r0, \[r1, r2\] 0+ac <[^>]*> 819100b2 ? ldrhhi r0, \[r1, r2\] @@ -60,11 +60,11 @@ Disassembly of section .text: 0+c8 <[^>]*> 119100d2 ? ldrsbne r0, \[r1, r2\] 0+cc <[^>]*> 819100d2 ? ldrsbhi r0, \[r1, r2\] 0+d0 <[^>]*> b19100d2 ? ldrsblt r0, \[r1, r2\] -0+d4 <[^>]*> e1df00f4 ? ldrsh r0, \[pc, #4\] ; 0+e0 <[^>]*> -0+d8 <[^>]*> e1df00f4 ? ldrsh r0, \[pc, #4\] ; 0+e4 <[^>]*> +0+d4 <[^>]*> e1df00f4 ? ldrsh r0, \[pc, #4\] @ 0+e0 <[^>]*> +0+d8 <[^>]*> e1df00f4 ? ldrsh r0, \[pc, #4\] @ 0+e4 <[^>]*> 0+dc <[^>]*> 00000000 ? .* [ ]*dc:.*fred 0+e0 <[^>]*> 0000c0de ? .* 0+e4 <[^>]*> 0000dead ? .* -0+e8 <[^>]*> e1a00000 ? nop[ ]+; \(mov r0, r0\) -0+ec <[^>]*> e1a00000 ? nop[ ]+; \(mov r0, r0\) +0+e8 <[^>]*> e1a00000 ? nop[ ]+@ \(mov r0, r0\) +0+ec <[^>]*> e1a00000 ? nop[ ]+@ \(mov r0, r0\) diff --git a/gas/testsuite/gas/arm/armv1.d b/gas/testsuite/gas/arm/armv1.d index ad8fc48f2d0..3ae310a2fb7 100644 --- a/gas/testsuite/gas/arm/armv1.d +++ b/gas/testsuite/gas/arm/armv1.d @@ -40,7 +40,7 @@ Disassembly of section .text: 0+74 <[^>]*> e1700000 ? cmn r0, r0 0+78 <[^>]*> e1700000 ? cmn r0, r0 0+7c <[^>]*> e170f000 ? cmnp r0, r0 -0+80 <[^>]*> e1a00000 ? nop[\s]+; \(mov r0, r0\) +0+80 <[^>]*> e1a00000 ? nop[\s]+@ \(mov r0, r0\) 0+84 <[^>]*> e1b00000 ? movs r0, r0 0+88 <[^>]*> e1e00000 ? mvn r0, r0 0+8c <[^>]*> e1f00000 ? mvns r0, r0 @@ -69,6 +69,6 @@ Disassembly of section .text: 0+e8 <[^>]*> e8100001 ? ldmda r0, {r0} 0+ec <[^>]*> e9100001 ? ldmdb r0, {r0} 0+f0 <[^>]*> e9900001 ? ldmib r0, {r0} -0+f4 <[^>]*> e1a00000 ? nop[\s]+; \(mov r0, r0\) -0+f8 <[^>]*> e1a00000 ? nop[\s]+; \(mov r0, r0\) -0+fc <[^>]*> e1a00000 ? nop[\s]+; \(mov r0, r0\) +0+f4 <[^>]*> e1a00000 ? nop[\s]+@ \(mov r0, r0\) +0+f8 <[^>]*> e1a00000 ? nop[\s]+@ \(mov r0, r0\) +0+fc <[^>]*> e1a00000 ? nop[\s]+@ \(mov r0, r0\) diff --git a/gas/testsuite/gas/arm/armv7-a+virt.d b/gas/testsuite/gas/arm/armv7-a+virt.d index 1e3224ceca2..b0893f2c6c4 100644 --- a/gas/testsuite/gas/arm/armv7-a+virt.d +++ b/gas/testsuite/gas/arm/armv7-a+virt.d @@ -6,7 +6,7 @@ Disassembly of section .text: 0[0-9a-f]+ <[^>]+> e1400070 hvc 0 -0[0-9a-f]+ <[^>]+> e14fff7f hvc 65535 ; 0xffff +0[0-9a-f]+ <[^>]+> e14fff7f hvc 65535 @ 0xffff 0[0-9a-f]+ <[^>]+> e160006e eret 0[0-9a-f]+ <[^>]+> e1001200 mrs r1, R8_usr 0[0-9a-f]+ <[^>]+> e1011200 mrs r1, R9_usr @@ -75,7 +75,7 @@ Disassembly of section .text: 0[0-9a-f]+ <[^>]+> e12ef301 msr ELR_hyp, r1 0[0-9a-f]+ <[^>]+> e16ef301 msr SPSR_hyp, r1 0[0-9a-f]+ <[^>]+> f7e0 8000 hvc #0 -0[0-9a-f]+ <[^>]+> f7ef 8fff hvc #65535 ; 0xffff +0[0-9a-f]+ <[^>]+> f7ef 8fff hvc #65535 @ 0xffff 0[0-9a-f]+ <[^>]+> f3de 8f00 subs pc, lr, #0 0[0-9a-f]+ <[^>]+> f3e0 8120 mrs r1, R8_usr 0[0-9a-f]+ <[^>]+> f3e1 8120 mrs r1, R9_usr diff --git a/gas/testsuite/gas/arm/armv8-2-fp16-scalar-ext.d b/gas/testsuite/gas/arm/armv8-2-fp16-scalar-ext.d index 0b5e4e4861c..7934fdb0544 100644 --- a/gas/testsuite/gas/arm/armv8-2-fp16-scalar-ext.d +++ b/gas/testsuite/gas/arm/armv8-2-fp16-scalar-ext.d @@ -10,13 +10,13 @@ Disassembly of section .text: 00000000 : 0: ee001910 vmov.f16 s0, r1 4: ee100990 vmov.f16 r0, s1 - 8: eeb00900 vmov.f16 s0, #0 ; 0x40000000 2.0 + 8: eeb00900 vmov.f16 s0, #0 @ 0x40000000 2.0 0000000c