This is an archive of the discontinued LLVM Phabricator instance.

Differential D106912

[ARM] Fix llvm-objdump disassembly of armv7m object files.
ClosedPublic

Authored by efriedma on Jul 27 2021, 1:06 PM.

Details

Reviewers
peter.smith
dmgreen
MaskRay
SjoerdMeijer
jhenderson
Commits
rG4adcff0b7004: [ARM] Fix llvm-objdump disassembly of armv7m object files.
Summary

Apparently, the features were getting mixed up, so we'd try to disassemble in ARM mode. Fix sub-architecture detection to compute the correct triple if we're detecting it automatically, so the user doesn't need to pass --triple=thumb etc.

It's possible we should be somehow tying the "+thumb-mode" target feature more directly to Tag_CPU_arch_profile? But this seems to work reasonably well, anyway.

While I'm here, fix up the other llvm-objdump tests that were explicitly specifying an ARM triple; that shouldn't be necessary.

Diff Detail

Event Timeline

efriedma created this revision.Jul 27 2021, 1:06 PM
Herald added a reviewer: jhenderson. · View Herald TranscriptJul 27 2021, 1:06 PM
Herald added subscribers: danielkiss, rupprecht, hiraditya and 2 others. · View Herald Transcript
efriedma requested review of this revision.Jul 27 2021, 1:06 PM
Herald added a project: Restricted Project. · View Herald TranscriptJul 27 2021, 1:06 PM
Harbormaster completed remote builds in B116520: Diff 362149.Jul 27 2021, 3:00 PM
MaskRay accepted this revision.Jul 27 2021, 9:40 PM

Looks great!

This revision is now accepted and ready to land.Jul 27 2021, 9:40 PM
Closed by commit rG4adcff0b7004: [ARM] Fix llvm-objdump disassembly of armv7m object files. (authored by efriedma). · Explain WhyJul 28 2021, 11:43 AM
This revision was automatically updated to reflect the committed changes.
efriedma added a commit: rG4adcff0b7004: [ARM] Fix llvm-objdump disassembly of armv7m object files..

Revision Contents

PathSize
llvm/
lib/
Object/
11 lines
test/
tools/
llvm-objdump/
ELF/
ARM/
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
8 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines

Diff 362485

llvm/lib/Object/ELFObjectFile.cpp

Show First 20 Lines • Show All 532 Lines • ▼ Show 20 Lines case ARMBuildAttrs::v6KZ:
Triple += "v6kz"; Triple += "v6kz";
break; break;
case ARMBuildAttrs::v6T2: case ARMBuildAttrs::v6T2:
Triple += "v6t2"; Triple += "v6t2";
break; break;
case ARMBuildAttrs::v6K: case ARMBuildAttrs::v6K:
Triple += "v6k"; Triple += "v6k";
break; break;
case ARMBuildAttrs::v7: case ARMBuildAttrs::v7: {
Optional<unsigned> ArchProfileAttr =
Attributes.getAttributeValue(ARMBuildAttrs::CPU_arch_profile);
if (ArchProfileAttr.hasValue() &&
ArchProfileAttr.getValue() == ARMBuildAttrs::MicroControllerProfile)
Triple += "v7m";
else
Triple += "v7"; Triple += "v7";
break; break;
}
case ARMBuildAttrs::v6_M: case ARMBuildAttrs::v6_M:
Triple += "v6m"; Triple += "v6m";
break; break;
case ARMBuildAttrs::v6S_M: case ARMBuildAttrs::v6S_M:
Triple += "v6sm"; Triple += "v6sm";
break; break;
case ARMBuildAttrs::v7E_M: case ARMBuildAttrs::v7E_M:
Triple += "v7em"; Triple += "v7em";
▲ Show 20 Lines • Show All 98 Lines • Show Last 20 Lines

llvm/test/tools/llvm-objdump/ELF/ARM/v5t-subarch.s

@ RUN: llvm-mc < %s -triple armv5t-elf -filetype=obj | llvm-objdump --triple=arm -d - | FileCheck %s @ RUN: llvm-mc < %s -triple armv5t-elf -filetype=obj | llvm-objdump -d - | FileCheck %s
.arch armv5t .arch armv5t
clz: clz:
clz r0, r1 clz r0, r1
@ CHECK-LABEL: clz @ CHECK-LABEL: clz
@ CHECK: 11 0f 6f e1 @ CHECK: 11 0f 6f e1

llvm/test/tools/llvm-objdump/ELF/ARM/v5te-subarch.s

@ RUN: llvm-mc < %s -triple armv5te-elf -filetype=obj | llvm-objdump --triple=arm -d - | FileCheck %s @ RUN: llvm-mc < %s -triple armv5te-elf -filetype=obj | llvm-objdump -d - | FileCheck %s
.arch armv5te .arch armv5te
strd: strd:
strd r0, r1, [r2, +r3] strd r0, r1, [r2, +r3]
@ CHECK-LABEL strd @ CHECK-LABEL strd
@ CHECK: f3 00 82 e1 strd r0, r1, [r2, r3] @ CHECK: f3 00 82 e1 strd r0, r1, [r2, r3]

llvm/test/tools/llvm-objdump/ELF/ARM/v5tej-subarch.s

@ RUN: llvm-mc < %s -triple armv5tej-elf -filetype=obj | llvm-objdump --triple=arm -d - | FileCheck %s @ RUN: llvm-mc < %s -triple armv5tej-elf -filetype=obj | llvm-objdump -d - | FileCheck %s
bxj: bxj:
bxj r0 bxj r0
@ CHECK-LABEL: bxj @ CHECK-LABEL: bxj
@ CHECK: 20 ff 2f e1 bxj r0 @ CHECK: 20 ff 2f e1 bxj r0

llvm/test/tools/llvm-objdump/ELF/ARM/v6-neg-subfeatures.s

@ RUN: llvm-mc < %s -triple armv6 -mattr=+vfp2 -filetype=obj | llvm-objdump --triple=arm -d - | FileCheck %s @ RUN: llvm-mc < %s -triple armv6 -mattr=+vfp2 -filetype=obj | llvm-objdump -d - | FileCheck %s
.eabi_attribute Tag_FP_arch, 1 // VFP2 .eabi_attribute Tag_FP_arch, 1 // VFP2
vfp2: vfp2:
vadd.f32 s0, s1, s2 vadd.f32 s0, s1, s2
@CHECK-LABEL: vfp2 @CHECK-LABEL: vfp2
@CHECK-NOT: 81 0a 30 ee vadd.f32 s0, s1, s2 @CHECK-NOT: 81 0a 30 ee vadd.f32 s0, s1, s2
@CHECK: unknown @CHECK: unknown

llvm/test/tools/llvm-objdump/ELF/ARM/v6-subarch.s

@ RUN: llvm-mc < %s -triple armv6-elf -filetype=obj | llvm-objdump --triple=arm -d - | FileCheck %s @ RUN: llvm-mc < %s -triple armv6-elf -filetype=obj | llvm-objdump -d - | FileCheck %s
.arch armv6 .arch armv6
umaal: umaal:
umaal r0, r1, r2, r3 umaal r0, r1, r2, r3
@ CHECK-LABEL:umaal @ CHECK-LABEL:umaal
@ CHECK: 92 03 41 e0 umaal r0, r1, r2, r3 @ CHECK: 92 03 41 e0 umaal r0, r1, r2, r3

llvm/test/tools/llvm-objdump/ELF/ARM/v6-subfeatures.s

@ RUN: llvm-mc < %s -triple armv6 -mattr=+vfp2 -filetype=obj | llvm-objdump --triple=arm -d - | FileCheck %s @ RUN: llvm-mc < %s -triple armv6 -mattr=+vfp2 -filetype=obj | llvm-objdump -d - | FileCheck %s
.eabi_attribute Tag_FP_arch, 2 // VFP2 .eabi_attribute Tag_FP_arch, 2 // VFP2
vfp2: vfp2:
vadd.f32 s0, s1, s2 vadd.f32 s0, s1, s2
@CHECK-LABEL: vfp2 @CHECK-LABEL: vfp2
@CHECK: 81 0a 30 ee vadd.f32 s0, s1, s2 @CHECK: 81 0a 30 ee vadd.f32 s0, s1, s2

llvm/test/tools/llvm-objdump/ELF/ARM/v6k-subarch.s

@ RUN: llvm-mc < %s -triple armv6k-elf -filetype=obj | llvm-objdump --triple=arm -d - | FileCheck %s @ RUN: llvm-mc < %s -triple armv6k-elf -filetype=obj | llvm-objdump -d - | FileCheck %s
.arch armv6k .arch armv6k
clrex: clrex:
clrex clrex
@ CHECK-LABEL: clrex @ CHECK-LABEL: clrex
@ CHECK: 1f f0 7f f5 clrex @ CHECK: 1f f0 7f f5 clrex

llvm/test/tools/llvm-objdump/ELF/ARM/v6m-subarch.s

@ RUN: llvm-mc < %s -triple armv6m-elf -filetype=obj | llvm-objdump --triple=thumb -d - | FileCheck %s @ RUN: llvm-mc < %s -triple armv6m-elf -filetype=obj | llvm-objdump -d - | FileCheck %s
.arch armv6m .arch armv6m
dmb: dmb:
dmb dmb
@ CHECK-LABEL: dmb @ CHECK-LABEL: dmb
@ CHECK: bf f3 5f 8f dmb sy @ CHECK: bf f3 5f 8f dmb sy

llvm/test/tools/llvm-objdump/ELF/ARM/v6t2-subarch.s

@ RUN: llvm-mc < %s -triple armv6t2-elf -filetype=obj | llvm-objdump --triple=thumb -d - | FileCheck %s @ RUN: llvm-mc < %s -triple armv6t2-elf -filetype=obj | llvm-objdump -d - | FileCheck %s
.arch armv6t2 .arch armv6t2
.thumb .thumb
umaalt2: umaalt2:
umaal r0, r1, r2, r3 umaal r0, r1, r2, r3
@ CHECK-LABEL: umaalt2 @ CHECK-LABEL: umaalt2
@ CHECK: e2 fb 63 01 umaal r0, r1, r2, r3 @ CHECK: e2 fb 63 01 umaal r0, r1, r2, r3

llvm/test/tools/llvm-objdump/ELF/ARM/v7a-neg-subfeature.s

@ RUN: llvm-mc < %s -triple armv7a -mattr=+vfp3,+neon,+fp16,+hwdiv-arm,+hwdiv -filetype=obj | llvm-objdump --triple=arm -d - | FileCheck %s @ RUN: llvm-mc < %s -triple armv7a -mattr=+vfp3,+neon,+fp16,+hwdiv-arm,+hwdiv -filetype=obj | llvm-objdump -d - | FileCheck %s
@ RUN: llvm-mc < %s -triple armv7a -mattr=+vfp3,+neon,+fp16,+hwdiv-arm,+hwdiv -filetype=obj | llvm-objdump --triple=thumb -d - | FileCheck %s --check-prefix=CHECK-THUMB
.eabi_attribute Tag_FP_arch, 0 // disallow vfp .eabi_attribute Tag_FP_arch, 0 // disallow vfp
vfp2: vfp2:
vmla.f32 s0, s1, s2 vmla.f32 s0, s1, s2
@CHECK-LABEL: vfp2 @CHECK-LABEL: vfp2
@CHECK-NOT: 81 0a 00 ee vmla.f32 s0, s1, s2 @CHECK-NOT: 81 0a 00 ee vmla.f32 s0, s1, s2
@CHECK: unknown @CHECK: unknown
vfp3: vfp3:
vmov.f32 s0, #0.5 vmov.f32 s0, #0.5
@CHECK-LABEL: vfp3 @CHECK-LABEL: vfp3
@CHECK-NOT: 00 0a b6 ee vmov.f32 s0, #5.000000e-01 @CHECK-NOT: 00 0a b6 ee vmov.f32 s0, #5.000000e-01
@CHECK: unknown
neon: neon:
vmla.f32 d0, d1, d2 vmla.f32 d0, d1, d2
@CHECK-LABEL: neon @CHECK-LABEL: neon
@CHECK-NOT: 12 0d 01 f2 vmla.f32 d0, d1, d2 @CHECK-NOT: 12 0d 01 f2 vmla.f32 d0, d1, d2
@CHECK: unknown @CHECK: unknown
fp16: fp16:
vcvt.f32.f16 q0, d2 vcvt.f32.f16 q0, d2
@CHECK-LABEL: fp16 @CHECK-LABEL: fp16
@CHECK-NOT: 02 07 b6 f3 vcvt.f32.f16 q0, d2 @CHECK-NOT: 02 07 b6 f3 vcvt.f32.f16 q0, d2
@CHECK: unknown
div_arm: div_arm:
udiv r0, r1, r2 udiv r0, r1, r2
@CHECK-LABEL: div_arm @CHECK-LABEL: div_arm
@CHECK-NOT: 11 f2 30 e7 udiv r0, r1, r2 @CHECK-NOT: 11 f2 30 e7 udiv r0, r1, r2
@CHECK: unknown @CHECK: unknown
.thumb .thumb
div_thumb: div_thumb:
udiv r0, r1, r2 udiv r0, r1, r2
@CHECK-LABEL: div_thumb @CHECK-LABEL: div_thumb
@CHECK-THUMB-NOT: b1 fb f2 f0 udiv r0, r1, r2 @CHECK-NOT: b1 fb f2 f0 udiv r0, r1, r2
@CHECK: unknown

llvm/test/tools/llvm-objdump/ELF/ARM/v7a-subfeature.s

@ RUN: llvm-mc < %s -triple armv7a -mattr=+vfp3,+neon,+fp16,+hwdiv-arm -filetype=obj | llvm-objdump --triple=arm -d - | FileCheck %s @ RUN: llvm-mc < %s -triple armv7a -mattr=+vfp3,+neon,+fp16,+hwdiv-arm -filetype=obj | llvm-objdump -d - | FileCheck %s
.eabi_attribute Tag_FP_arch, 3 // VFP3 .eabi_attribute Tag_FP_arch, 3 // VFP3
.eabi_attribute Tag_Advanced_SIMD_arch, 2 // SIMDv1 with fp16 .eabi_attribute Tag_Advanced_SIMD_arch, 2 // SIMDv1 with fp16
.eabi_attribute Tag_DIV_use, 2 // permitted .eabi_attribute Tag_DIV_use, 2 // permitted
vfp2: vfp2:
vmla.f32 s0, s1, s2 vmla.f32 s0, s1, s2
Show All 27 Lines

llvm/test/tools/llvm-objdump/ELF/ARM/v7m-neg-subfeatures.s

@ RUN: llvm-mc < %s -triple armv7m -mattr=+vfp4 -filetype=obj | llvm-objdump --triple=thumb -d - | FileCheck %s @ RUN: llvm-mc < %s -triple armv7m -mattr=+vfp4 -filetype=obj | llvm-objdump -d - | FileCheck %s
.eabi_attribute Tag_CPU_arch, 10 // v7 .eabi_attribute Tag_CPU_arch, 10 // v7
.eabi_attribute Tag_FP_arch, 0 // VFP4 .eabi_attribute Tag_FP_arch, 0 // VFP4
.thumb .thumb
vfp2: vfp2:
vmla.f32 s0, s1, s2 vmla.f32 s0, s1, s2
Show All 9 Lines

llvm/test/tools/llvm-objdump/ELF/ARM/v7m-subarch.s

@ RUN: llvm-mc < %s -triple armv7m-elf -filetype=obj | llvm-objdump --triple=thumb -d - | FileCheck %s @ RUN: llvm-mc < %s -triple armv7m-elf -filetype=obj | llvm-objdump -d - | FileCheck %s
.arch armv7m .arch armv7m
umlal: umlal:
umlal r0, r1, r2, r3 umlal r0, r1, r2, r3
@ CHECK-LABEL: umlal @ CHECK-LABEL: umlal
@ CHECK: e2 fb 03 01 umlal r0, r1, r2, r3 @ CHECK: e2 fb 03 01 umlal r0, r1, r2, r3

llvm/test/tools/llvm-objdump/ELF/ARM/v7m-subfeatures.s

@ RUN: llvm-mc < %s -triple armv7m -mattr=+vfp4 -filetype=obj | llvm-objdump --triple=thumb -d - | FileCheck %s @ RUN: llvm-mc < %s -triple armv7m -mattr=+vfp4 -filetype=obj | llvm-objdump -d - | FileCheck %s
.eabi_attribute Tag_CPU_arch, 10 // v7 .eabi_attribute Tag_CPU_arch, 10 // v7
.eabi_attribute Tag_CPU_arch_profile, 0x4D // 'M' profile .eabi_attribute Tag_CPU_arch_profile, 0x4D // 'M' profile
.eabi_attribute Tag_FP_arch, 5 // VFP4 .eabi_attribute Tag_FP_arch, 5 // VFP4
.thumb .thumb
vfp2: vfp2:
vmla.f32 s0, s1, s2 vmla.f32 s0, s1, s2
Show All 17 Lines

llvm/test/tools/llvm-objdump/ELF/ARM/v8a-subarch.s

@ RUN: llvm-mc < %s -triple armv8a-elf -filetype=obj | llvm-objdump --triple=arm -d - | FileCheck %s @ RUN: llvm-mc < %s -triple armv8a-elf -filetype=obj | llvm-objdump -d - | FileCheck %s
.arch armv8a .arch armv8a
lda: lda:
lda r0, [r1] lda r0, [r1]
@ CHECK-LABEL:lda @ CHECK-LABEL:lda
@ CHECK: 9f 0c 91 e1 lda r0, [r1] @ CHECK: 9f 0c 91 e1 lda r0, [r1]

llvm/test/tools/llvm-objdump/ELF/ARM/v8r-subarch.s

@ RUN: llvm-mc < %s -triple armv8r-elf -filetype=obj | llvm-objdump --triple=arm -d - | FileCheck %s @ RUN: llvm-mc < %s -triple armv8r-elf -filetype=obj | llvm-objdump -d - | FileCheck %s
.eabi_attribute Tag_CPU_arch, 15 // v8_R .eabi_attribute Tag_CPU_arch, 15 // v8_R
.eabi_attribute Tag_CPU_arch_profile, 0x52 // 'R' profile .eabi_attribute Tag_CPU_arch_profile, 0x52 // 'R' profile
.arch armv8 .arch armv8
lda: lda:
lda r0, [r1] lda r0, [r1]
@ CHECK-LABEL:lda @ CHECK-LABEL:lda
@ CHECK: 9f 0c 91 e1 lda r0, [r1] @ CHECK: 9f 0c 91 e1 lda r0, [r1]