This is an archive of the discontinued LLVM Phabricator instance.

Differential D62567

[llvm-readobj] -u: don't crash when dumping SHT_ARM_EXIDX if .symtab doesn't exist
ClosedPublic

Authored by MaskRay on May 28 2019, 10:21 PM.

Details

Reviewers
kongyi
alexander-shaposhnikov
Commits
rGed6fa44f236c: [llvm-readobj] -u: don't crash when dumping SHT_ARM_EXIDX if .symtab doesn't…
rL361929: [llvm-readobj] -u: don't crash when dumping SHT_ARM_EXIDX if .symtab doesn't…

Diff Detail

Repository
rL LLVM

Event Timeline

MaskRay created this revision.May 28 2019, 10:21 PM
Herald added a reviewer: alexander-shaposhnikov. · View Herald TranscriptMay 28 2019, 10:21 PM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: llvm-commits, rupprecht, kristof.beyls, javed.absar. · View Herald Transcript
Harbormaster completed remote builds in B32599: Diff 201822.May 28 2019, 10:24 PM
kongyi accepted this revision.May 28 2019, 10:56 PM

Thanks for fixing this!

This revision is now accepted and ready to land.May 28 2019, 10:56 PM
Closed by commit rL361929: [llvm-readobj] -u: don't crash when dumping SHT_ARM_EXIDX if .symtab doesn't… (authored by MaskRay). · Explain WhyMay 28 2019, 11:18 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
trunk/
test/
tools/
llvm-readobj/
ARM/
163 lines
tools/
llvm-readobj/
10 lines

Diff 201826

llvm/trunk/test/tools/llvm-readobj/ARM/unwind.s

@ RUN: llvm-mc -triple armv7-linux-eabi -filetype obj -o - %s \ @ RUN: llvm-mc -triple armv7-linux-eabi -filetype obj %s -o %t
@ RUN: | llvm-readobj -u | FileCheck %s @ RUN: llvm-readobj -u %t | FileCheck --check-prefixes=CHECK,SYM %s
@@ If .symtab doesn't exist, we can still dump some information.
@ RUN: llvm-objcopy --allow-broken-links --strip-all %t - | llvm-readobj -u - | FileCheck %s
.syntax unified .syntax unified
.cpu cortex-a8 .cpu cortex-a8
.fpu neon .fpu neon
.section .personality .section .personality
▲ Show 20 Lines • Show All 135 Lines • ▼ Show 20 Linesspare:
.fnend .fnend
@ CHECK: UnwindInformation { @ CHECK: UnwindInformation {
@ CHECK: UnwindIndexTable { @ CHECK: UnwindIndexTable {
@ CHECK: SectionName: .ARM.exidx.personality @ CHECK: SectionName: .ARM.exidx.personality
@ CHECK: Entries [ @ CHECK: Entries [
@ CHECK: Entry { @ CHECK: Entry {
@ CHECK: FunctionAddress: 0x0 @ CHECK: FunctionAddress: 0x0
@ CHECK: FunctionName: __personality @ SYM: FunctionName: __personality
@ CHECK: Model: Compact (Inline) @ CHECK: Model: Compact (Inline)
@ CHECK: PersonalityIndex: 0 @ CHECK: PersonalityIndex: 0
@ CHECK: Opcodes [ @ CHECK: Opcodes [
@ CHECK: 0xB0 ; finish @ CHECK: 0xB0 ; finish
@ CHECK: 0xB0 ; finish @ CHECK: 0xB0 ; finish
@ CHECK: 0xB0 ; finish @ CHECK: 0xB0 ; finish
@ CHECK: ] @ CHECK: ]
@ CHECK: } @ CHECK: }
@ CHECK: ] @ CHECK: ]
@ CHECK: } @ CHECK: }
@ CHECK: UnwindIndexTable { @ CHECK: UnwindIndexTable {
@ CHECK: SectionName: .ARM.exidx.personality0 @ CHECK: SectionName: .ARM.exidx.personality0
@ CHECK: Entries [ @ CHECK: Entries [
@ CHECK: Entry { @ CHECK: Entry {
@ CHECK: FunctionAddress: 0x0 @ CHECK: FunctionAddress: 0x0
@ CHECK: FunctionName: personality0 @ SYM: FunctionName: personality0
@ CHECK: Model: Compact (Inline) @ CHECK: Model: Compact (Inline)
@ CHECK: PersonalityIndex: 0 @ CHECK: PersonalityIndex: 0
@ CHECK: Opcodes [ @ CHECK: Opcodes [
@ CHECK: 0xB0 ; finish @ CHECK: 0xB0 ; finish
@ CHECK: 0xB0 ; finish @ CHECK: 0xB0 ; finish
@ CHECK: 0xB0 ; finish @ CHECK: 0xB0 ; finish
@ CHECK: ] @ CHECK: ]
@ CHECK: } @ CHECK: }
@ CHECK: ] @ CHECK: ]
@ CHECK: } @ CHECK: }
@ CHECK: UnwindIndexTable { @ CHECK: UnwindIndexTable {
@ CHECK: SectionName: .ARM.exidx.personality1 @ CHECK: SectionName: .ARM.exidx.personality1
@ CHECK: Entries [ @ CHECK: Entries [
@ CHECK: Entry { @ CHECK: Entry {
@ CHECK: FunctionAddress: 0x0 @ CHECK: FunctionAddress: 0x0
@ CHECK: FunctionName: personality1 @ SYM: FunctionName: personality1
@ CHECK: ExceptionHandlingTable: .ARM.extab.personality1 @ SYM: ExceptionHandlingTable: .ARM.extab.personality1
@ CHECK: TableEntryOffset: 0x0 @ SYM: TableEntryOffset: 0x0
@ CHECK: Model: Compact @ SYM: Model: Compact
@ CHECK: PersonalityIndex: 1 @ SYM: PersonalityIndex: 1
@ CHECK: Opcodes [ @ SYM: Opcodes [
@ CHECK: 0xB1 0x0F ; pop {r0, r1, r2, r3} @ SYM: 0xB1 0x0F ; pop {r0, r1, r2, r3}
@ CHECK: 0xA7 ; pop {r4, r5, r6, r7, r8, r9, r10, fp} @ SYM: 0xA7 ; pop {r4, r5, r6, r7, r8, r9, r10, fp}
@ CHECK: 0x3F ; vsp = vsp + 256 @ SYM: 0x3F ; vsp = vsp + 256
@ CHECK: 0xB0 ; finish @ SYM: 0xB0 ; finish
@ CHECK: 0xB0 ; finish @ SYM: 0xB0 ; finish
@ CHECK: ] @ SYM: ]
@ CHECK: } @ CHECK: }
@ CHECK: ] @ CHECK: ]
@ CHECK: } @ CHECK: }
@ CHECK: UnwindIndexTable { @ CHECK: UnwindIndexTable {
@ CHECK: SectionName: .ARM.exidx.custom_personality @ CHECK: SectionName: .ARM.exidx.custom_personality
@ CHECK: Entries [ @ CHECK: Entries [
@ CHECK: Entry { @ CHECK: Entry {
@ CHECK: FunctionAddress: 0x0 @ CHECK: FunctionAddress: 0x0
@ CHECK: FunctionName: custom_personality @ SYM: FunctionName: custom_personality
@ CHECK: ExceptionHandlingTable: .ARM.extab.custom_personality @ SYM: ExceptionHandlingTable: .ARM.extab.custom_personality
@ CHECK: TableEntryOffset: 0x0 @ SYM: TableEntryOffset: 0x0
@ CHECK: Model: Generic @ SYM: Model: Generic
@ CHECK: PersonalityRoutineAddress: 0x0 @ SYM: PersonalityRoutineAddress: 0x0
@ CHECK: } @ CHECK: }
@ CHECK: ] @ CHECK: ]
@ CHECK: } @ CHECK: }
@ CHECK: UnwindIndexTable { @ CHECK: UnwindIndexTable {
@ CHECK: SectionName: .ARM.exidx.opcodes @ CHECK: SectionName: .ARM.exidx.opcodes
@ CHECK: Entries [ @ CHECK: Entries [
@ CHECK: Entry { @ CHECK: Entry {
@ CHECK: FunctionAddress: 0x0 @ CHECK: FunctionAddress: 0x0
@ CHECK: FunctionName: opcodes @ SYM: FunctionName: opcodes
@ CHECK: Model: Compact (Inline) @ CHECK: Model: Compact (Inline)
@ CHECK: PersonalityIndex: 0 @ CHECK: PersonalityIndex: 0
@ CHECK: Opcodes [ @ CHECK: Opcodes [
@ CHECK: 0xC9 0x84 ; pop {d8, d9, d10, d11, d12} @ CHECK: 0xC9 0x84 ; pop {d8, d9, d10, d11, d12}
@ CHECK: 0xB0 ; finish @ CHECK: 0xB0 ; finish
@ CHECK: ] @ CHECK: ]
@ CHECK: } @ CHECK: }
@ CHECK: ] @ CHECK: ]
@ CHECK: } @ CHECK: }
@ CHECK: UnwindIndexTable { @ CHECK: UnwindIndexTable {
@ CHECK: SectionName: .ARM.exidx.multiple @ CHECK: SectionName: .ARM.exidx.multiple
@ CHECK: Entries [ @ CHECK: Entries [
@ CHECK: Entry { @ CHECK: Entry {
@ CHECK: FunctionAddress: 0x0 @ CHECK: FunctionAddress: 0x0
@ CHECK: FunctionName: function0 @ SYM: FunctionName: function0
@ CHECK: Model: Compact (Inline) @ CHECK: Model: Compact (Inline)
@ CHECK: PersonalityIndex: 0 @ CHECK: PersonalityIndex: 0
@ CHECK: Opcodes [ @ CHECK: Opcodes [
@ CHECK: 0xB0 ; finish @ CHECK: 0xB0 ; finish
@ CHECK: 0xB0 ; finish @ CHECK: 0xB0 ; finish
@ CHECK: 0xB0 ; finish @ CHECK: 0xB0 ; finish
@ CHECK: ] @ CHECK: ]
@ CHECK: } @ CHECK: }
@ CHECK: Entry { @ CHECK: Entry {
@ CHECK: FunctionAddress: 0x4 @ CHECK: FunctionAddress: 0x4
@ CHECK: FunctionName: function1 @ SYM: FunctionName: function1
@ CHECK: ExceptionHandlingTable: .ARM.extab.multiple @ SYM: ExceptionHandlingTable: .ARM.extab.multiple
@ CHECK: Model: Generic @ SYM: Model: Generic
@ CHECK: PersonalityRoutineAddress: 0x0 @ SYM: PersonalityRoutineAddress: 0x0
@ CHECK: } @ CHECK: }
@ CHECK: Entry { @ CHECK: Entry {
@ CHECK: FunctionAddress: 0x8 @ CHECK: FunctionAddress: 0x8
@ CHECK: FunctionName: function2 @ SYM: FunctionName: function2
@ CHECK: Model: Compact (Inline) @ CHECK: Model: Compact (Inline)
@ CHECK: PersonalityIndex: 0 @ CHECK: PersonalityIndex: 0
@ CHECK: Opcodes [ @ CHECK: Opcodes [
@ CHECK: 0xB0 ; finish @ CHECK: 0xB0 ; finish
@ CHECK: 0xB0 ; finish @ CHECK: 0xB0 ; finish
@ CHECK: 0xB0 ; finish @ CHECK: 0xB0 ; finish
@ CHECK: ] @ CHECK: ]
@ CHECK: } @ CHECK: }
@ CHECK: ] @ CHECK: ]
@ CHECK: } @ CHECK: }
@ CHECK: UnwindIndexTable { @ CHECK: UnwindIndexTable {
@ CHECK: SectionName: .ARM.exidx.raw @ CHECK: SectionName: .ARM.exidx.raw
@ CHECK: Entries [ @ CHECK: Entries [
@ CHECK: Opcodes [ @ SYM: Opcodes [
@ CHECK: 0xD7 ; pop {d8, d9, d10, d11, d12, d13, d14, d15} @ SYM: 0xD7 ; pop {d8, d9, d10, d11, d12, d13, d14, d15}
@ CHECK: 0xC9 0x02 ; pop {d0, d1, d2} @ SYM: 0xC9 0x02 ; pop {d0, d1, d2}
@ CHECK: 0xC8 0x02 ; pop {d16, d17, d18} @ SYM: 0xC8 0x02 ; pop {d16, d17, d18}
@ CHECK: 0xC7 0x03 ; pop {wCGR0, wCGR1} @ SYM: 0xC7 0x03 ; pop {wCGR0, wCGR1}
@ CHECK: 0xC6 0x02 ; pop {wR0, wR1, wR2} @ SYM: 0xC6 0x02 ; pop {wR0, wR1, wR2}
@ CHECK: 0xC2 ; pop {wR10, wR11, wR12} @ SYM: 0xC2 ; pop {wR10, wR11, wR12}
@ CHECK: 0xBA ; pop {d8, d9, d10} @ SYM: 0xBA ; pop {d8, d9, d10}
@ CHECK: 0xB3 0x12 ; pop {d1, d2, d3} @ SYM: 0xB3 0x12 ; pop {d1, d2, d3}
@ CHECK: 0xB2 0x80 0x04 ; vsp = vsp + 2564 @ SYM: 0xB2 0x80 0x04 ; vsp = vsp + 2564
@ CHECK: 0xB1 0x01 ; pop {r0} @ SYM: 0xB1 0x01 ; pop {r0}
@ CHECK: 0xB0 ; finish @ SYM: 0xB0 ; finish
@ CHECK: 0xA9 ; pop {r4, r5, lr} @ SYM: 0xA9 ; pop {r4, r5, lr}
@ CHECK: 0xA1 ; pop {r4, r5} @ SYM: 0xA1 ; pop {r4, r5}
@ CHECK: 0x91 ; vsp = r1 @ SYM: 0x91 ; vsp = r1
@ CHECK: 0x84 0xC0 ; pop {r10, fp, lr} @ SYM: 0x84 0xC0 ; pop {r10, fp, lr}
@ CHECK: 0x80 0xC0 ; pop {r10, fp} @ SYM: 0x80 0xC0 ; pop {r10, fp}
@ CHECK: 0x80 0x01 ; pop {r4} @ SYM: 0x80 0x01 ; pop {r4}
@ CHECK: 0x81 0x00 ; pop {ip} @ SYM: 0x81 0x00 ; pop {ip}
@ CHECK: 0x80 0x00 ; refuse to unwind @ SYM: 0x80 0x00 ; refuse to unwind
@ CHECK: 0x42 ; vsp = vsp - 12 @ SYM: 0x42 ; vsp = vsp - 12
@ CHECK: 0x02 ; vsp = vsp + 12 @ SYM: 0x02 ; vsp = vsp + 12
@ CHECK: ] @ SYM: ]
@ CHECK: ] @ CHECK: ]
@ CHECK: } @ CHECK: }
@ CHECK: UnwindIndexTable { @ CHECK: UnwindIndexTable {
@ CHECK: SectionName: .ARM.exidx.spare @ CHECK: SectionName: .ARM.exidx.spare
@ CHECK: Entries [ @ CHECK: Entries [
@ CHECK: Opcodes [ @ SYM: Opcodes [
@ CHECK: 0xD8 ; spare @ SYM: 0xD8 ; spare
@ CHECK: 0xD0 ; pop {d8} @ SYM: 0xD0 ; pop {d8}
@ CHECK: 0xCA ; spare @ SYM: 0xCA ; spare
@ CHECK: 0xC9 0x00 ; pop {d0} @ SYM: 0xC9 0x00 ; pop {d0}
@ CHECK: 0xC8 0x00 ; pop {d16} @ SYM: 0xC8 0x00 ; pop {d16}
@ CHECK: 0xC7 0x10 ; spare @ SYM: 0xC7 0x10 ; spare
@ CHECK: 0xC7 0x01 ; pop {wCGR0} @ SYM: 0xC7 0x01 ; pop {wCGR0}
@ CHECK: 0xC7 0x00 ; spare @ SYM: 0xC7 0x00 ; spare
@ CHECK: 0xC6 0x00 ; pop {wR0} @ SYM: 0xC6 0x00 ; pop {wR0}
@ CHECK: 0xC0 ; pop {wR10} @ SYM: 0xC0 ; pop {wR10}
@ CHECK: 0xB8 ; pop {d8} @ SYM: 0xB8 ; pop {d8}
@ CHECK: 0xB4 ; spare @ SYM: 0xB4 ; spare
@ CHECK: 0xB3 0x00 ; pop {d0} @ SYM: 0xB3 0x00 ; pop {d0}
@ CHECK: 0xB2 0x00 ; vsp = vsp + 516 @ SYM: 0xB2 0x00 ; vsp = vsp + 516
@ CHECK: 0xB1 0x10 ; spare @ SYM: 0xB1 0x10 ; spare
@ CHECK: 0xB1 0x01 ; pop {r0} @ SYM: 0xB1 0x01 ; pop {r0}
@ CHECK: 0xB1 0x00 ; spare @ SYM: 0xB1 0x00 ; spare
@ CHECK: 0xB0 ; finish @ SYM: 0xB0 ; finish
@ CHECK: 0xA8 ; pop {r4, lr} @ SYM: 0xA8 ; pop {r4, lr}
@ CHECK: 0xA0 ; pop {r4} @ SYM: 0xA0 ; pop {r4}
@ CHECK: 0x9F ; reserved (WiMMX MOVrr) @ SYM: 0x9F ; reserved (WiMMX MOVrr)
@ CHECK: 0x9D ; reserved (ARM MOVrr) @ SYM: 0x9D ; reserved (ARM MOVrr)
@ CHECK: 0x91 ; vsp = r1 @ SYM: 0x91 ; vsp = r1
@ CHECK: 0x88 0x00 ; pop {pc} @ SYM: 0x88 0x00 ; pop {pc}
@ CHECK: 0x80 0x00 ; refuse to unwind @ SYM: 0x80 0x00 ; refuse to unwind
@ CHECK: 0x40 ; vsp = vsp - 4 @ SYM: 0x40 ; vsp = vsp - 4
@ CHECK: 0x00 ; vsp = vsp + 4 @ SYM: 0x00 ; vsp = vsp + 4
@ CHECK: ] @ SYM: ]
@ CHECK: ] @ CHECK: ]
@ CHECK: } @ CHECK: }
@ CHECK: } @ CHECK: }

llvm/trunk/tools/llvm-readobj/ARMEHABIPrinter.h

Show First 20 Lines • Show All 359 Lines • ▼ Show 20 Lines
template <typename ET> template <typename ET>
const size_t PrinterContext<ET>::IndexTableEntrySize = 8; const size_t PrinterContext<ET>::IndexTableEntrySize = 8;
template <typename ET> template <typename ET>
ErrorOr<StringRef> ErrorOr<StringRef>
PrinterContext<ET>::FunctionAtAddress(unsigned Section, PrinterContext<ET>::FunctionAtAddress(unsigned Section,
uint64_t Address) const { uint64_t Address) const {
if (!Symtab)
return readobj_error::unknown_symbol;
auto StrTableOrErr = ELF->getStringTableForSymtab(*Symtab); auto StrTableOrErr = ELF->getStringTableForSymtab(*Symtab);
if (!StrTableOrErr) if (!StrTableOrErr)
error(StrTableOrErr.takeError()); error(StrTableOrErr.takeError());
StringRef StrTable = *StrTableOrErr; StringRef StrTable = *StrTableOrErr;
for (const Elf_Sym &Sym : unwrapOrError(ELF->symbols(Symtab))) for (const Elf_Sym &Sym : unwrapOrError(ELF->symbols(Symtab)))
if (Sym.st_shndx == Section && Sym.st_value == Address && if (Sym.st_shndx == Section && Sym.st_value == Address &&
Sym.getType() == ELF::STT_FUNC) { Sym.getType() == ELF::STT_FUNC) {
▲ Show 20 Lines • Show All 169 Lines • ▼ Show 20 Lines if (Word1 & 0x80000000) {
unsigned PersonalityIndex = (Word1 & 0x0f000000) >> 24; unsigned PersonalityIndex = (Word1 & 0x0f000000) >> 24;
SW.printNumber("PersonalityIndex", PersonalityIndex); SW.printNumber("PersonalityIndex", PersonalityIndex);
PrintOpcodes(Contents->data() + Entry * IndexTableEntrySize + 4, 3, 1); PrintOpcodes(Contents->data() + Entry * IndexTableEntrySize + 4, 3, 1);
} else { } else {
const Elf_Shdr *EHT = const Elf_Shdr *EHT =
FindExceptionTable(SectionIndex, Entry * IndexTableEntrySize + 4); FindExceptionTable(SectionIndex, Entry * IndexTableEntrySize + 4);
if (EHT)
if (auto Name = ELF->getSectionName(EHT)) if (auto Name = ELF->getSectionName(EHT))
SW.printString("ExceptionHandlingTable", *Name); SW.printString("ExceptionHandlingTable", *Name);
uint64_t TableEntryOffset = PREL31(Word1, IT->sh_addr); uint64_t TableEntryOffset = PREL31(Word1, IT->sh_addr);
SW.printHex("TableEntryOffset", TableEntryOffset); SW.printHex("TableEntryOffset", TableEntryOffset);
if (EHT)
PrintExceptionTable(IT, EHT, TableEntryOffset); PrintExceptionTable(IT, EHT, TableEntryOffset);
} }
} }
} }
template <typename ET> template <typename ET>
void PrinterContext<ET>::PrintUnwindInformation() const { void PrinterContext<ET>::PrintUnwindInformation() const {
DictScope UI(SW, "UnwindInformation"); DictScope UI(SW, "UnwindInformation");
Show All 20 Lines