This is an archive of the discontinued LLVM Phabricator instance.

Differential D81528

[DWARFYAML] Add support for emitting DWARF64 .debug_aranges section.
ClosedPublic

Authored by Higuoxing on Jun 9 2020, 9:07 PM.

Details

Reviewers
jhenderson
grimar
MaskRay
• espindola
Commits
rG502a2a80c2bf: [DWARFYAML] Add support for emitting DWARF64 .debug_aranges section.
Summary

The debug_info_offset(CuOffset) should be 64-bit width rather than 32-bit width in DWARF64 .debug_aranges section. This patch helps resolve it.

Diff Detail

Event Timeline

Higuoxing created this revision.Jun 9 2020, 9:07 PM
Herald added a reviewer: • espindola. · View Herald TranscriptJun 9 2020, 9:07 PM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: llvm-commits, hiraditya, aprantl, emaste. · View Herald Transcript
Harbormaster completed remote builds in B59732: Diff 269728.Jun 9 2020, 10:34 PM
jhenderson accepted this revision.Jun 10 2020, 2:31 AM

LGTM, thanks for the good work!

This revision is now accepted and ready to land.Jun 10 2020, 2:31 AM
Closed by commit rG502a2a80c2bf: [DWARFYAML] Add support for emitting DWARF64 .debug_aranges section. (authored by Higuoxing). · Explain WhyJun 10 2020, 5:48 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
lib/
ObjectYAML/
5 lines
test/
tools/
yaml2obj/
ELF/
DWARF/
110 lines

Diff 270011

llvm/lib/ObjectYAML/DWARFEmitter.cpp

Show First 20 Lines • Show All 100 Lines • ▼ Show 20 LinesError DWARFYAML::emitDebugAranges(raw_ostream &OS, const DWARFYAML::Data &DI) {
for (auto Range : DI.ARanges) { for (auto Range : DI.ARanges) {
auto HeaderStart = OS.tell(); auto HeaderStart = OS.tell();
if (Range.Format == dwarf::DWARF64) { if (Range.Format == dwarf::DWARF64) {
writeInteger((uint32_t)dwarf::DW_LENGTH_DWARF64, OS, DI.IsLittleEndian); writeInteger((uint32_t)dwarf::DW_LENGTH_DWARF64, OS, DI.IsLittleEndian);
writeInteger((uint64_t)Range.Length, OS, DI.IsLittleEndian); writeInteger((uint64_t)Range.Length, OS, DI.IsLittleEndian);
} else } else
writeInteger((uint32_t)Range.Length, OS, DI.IsLittleEndian); writeInteger((uint32_t)Range.Length, OS, DI.IsLittleEndian);
writeInteger((uint16_t)Range.Version, OS, DI.IsLittleEndian); writeInteger((uint16_t)Range.Version, OS, DI.IsLittleEndian);
if (Range.Format == dwarf::DWARF64)
writeInteger((uint64_t)Range.CuOffset, OS, DI.IsLittleEndian);
else
writeInteger((uint32_t)Range.CuOffset, OS, DI.IsLittleEndian); writeInteger((uint32_t)Range.CuOffset, OS, DI.IsLittleEndian);
writeInteger((uint8_t)Range.AddrSize, OS, DI.IsLittleEndian); writeInteger((uint8_t)Range.AddrSize, OS, DI.IsLittleEndian);
writeInteger((uint8_t)Range.SegSize, OS, DI.IsLittleEndian); writeInteger((uint8_t)Range.SegSize, OS, DI.IsLittleEndian);
auto HeaderSize = OS.tell() - HeaderStart; auto HeaderSize = OS.tell() - HeaderStart;
auto FirstDescriptor = alignTo(HeaderSize, Range.AddrSize * 2); auto FirstDescriptor = alignTo(HeaderSize, Range.AddrSize * 2);
ZeroFillBytes(OS, FirstDescriptor - HeaderSize); ZeroFillBytes(OS, FirstDescriptor - HeaderSize);
for (auto Descriptor : Range.Descriptors) { for (auto Descriptor : Range.Descriptors) {
▲ Show 20 Lines • Show All 322 Lines • Show Last 20 Lines

llvm/test/tools/yaml2obj/ELF/DWARF/debug-aranges.yaml

Show First 20 Lines • Show All 131 Lines • ▼ Show 20 Lines
## +---------------- Address (8-byte) 0x5678 ## +---------------- Address (8-byte) 0x5678
## ##
# DWARF-LE-CONTENT-NEXT: 0050: 00000000 00000000 00000000 00000000 # DWARF-LE-CONTENT-NEXT: 0050: 00000000 00000000 00000000 00000000
## | ## |
## +---------------------------------- Terminating entry ## +---------------------------------- Terminating entry
## ##
# DWARF-LE-CONTENT-NEXT: ) # DWARF-LE-CONTENT-NEXT: )
## Generate and verify a big endian DWARF64 .debug_aranges section.
# RUN: yaml2obj --docnum=1 -DENDIAN=ELFDATA2MSB -DFORMAT=DWARF64 %s -o %t.be.dwarf64.o
# RUN: llvm-readobj --sections --section-data %t.be.dwarf64.o | \
# RUN: FileCheck -DADDRALIGN=1 -DSIZE=120 %s --check-prefixes=DWARF-HEADER,DWARF64-BE-CONTENT
# DWARF64-BE-CONTENT-NEXT: SectionData (
# DWARF64-BE-CONTENT-NEXT: 0000: FFFFFFFF 00000000 0000002C 00020000
## | | | |
## | | | +--- CuOffset (8-byte) 0x00
## | | +--- Version (2-byte) 0x02
## | +---------------- Length (8-byte) 0x2c
## +------- DWARF64 Prefix (4-byte) UINT32_MAX
##
# DWARF64-BE-CONTENT-NEXT: 0010: 00000000 00000400 00001234 00000020
## | | | | |
## | | | | +------- Length (4-byte) 0x20
## | | | +------- Address (4-byte) 0x1234
## | | +- SegSize (1-byte) 0x00
## | +- AddrSize (1-byte) 0x04
## +------------ Lower bytes of CuOffset
##
# DWARF64-BE-CONTENT-NEXT: 0020: 00000000 00000000 FFFFFFFF 00000000
## | | +------- Length (8-byte) 0x2c
## | +------- DWARF64 Prefix
## +---------------- Terminating Entry (8-byte) 0x00
##
# DWARF64-BE-CONTENT-NEXT: 0030: 0000002C 00020000 00000000 00650800
## | | | | |
## | | | | +- SegSize (1-byte) 0x00
## | | | +- AddrSize (1-byte) 0x08
## | | +----------------- CuOffset (8-byte) 0x65
## | +--- Version (2-byte) 0x02
## +------- Lower bytes of Length
##
# DWARF64-BE-CONTENT-NEXT: 0040: 00000000 00000000 00000000 00005678
## | |
## | +---------------- Address (8-byte) 0x5678
## +---------------- Padding zeros (8-byte)
##
# DWARF64-BE-CONTENT-NEXT: 0050: 00000000 00000020 00000000 56780000
## | |
## | +---------------- Address (8-byte) 0x56780000
## +---------------- Length (8-byte) 0x20
##
# DWARF64-BE-CONTENT-NEXT: 0060: 00000000 00000010 00000000 00000000
## | |
## | +---------------- Terminating Entry (16-byte) 0x00
## +---------------- Length (8-byte) 0x10
##
# DWARF64-BE-CONTENT-NEXT: 0070: 00000000 00000000
## |
## +---------------- The last bytes of terminating entry.
# DWARF64-BE-CONTENT-NEXT: )
## Generate and verify a little endian DWARF64 .debug_aranges section.
# RUN: yaml2obj --docnum=1 -DENDIAN=ELFDATA2LSB -DFORMAT=DWARF64 %s -o %t.le.dwarf64.o
# RUN: llvm-readobj --sections --section-data %t.le.dwarf64.o | \
# RUN: FileCheck -DADDRALIGN=1 -DSIZE=120 %s --check-prefixes=DWARF-HEADER,DWARF64-LE-CONTENT
# DWARF64-LE-CONTENT-NEXT: SectionData (
# DWARF64-LE-CONTENT-NEXT: 0000: FFFFFFFF 2C000000 00000000 02000000
## | | | |
## | | | +--- CuOffset (8-byte) 0x00
## | | +--- Version (2-byte) 0x02
## | +---------------- Length (8-byte) 0x2c
## +------- DWARF64 Prefix (4-byte) UINT32_MAX
##
# DWARF64-LE-CONTENT-NEXT: 0010: 00000000 00000400 34120000 20000000
## | | | | |
## | | | | +------- Length (4-byte) 0x20
## | | | +------- Address (4-byte) 0x1234
## | | +- SegSize (1-byte) 0x00
## | +- AddrSize (1-byte) 0x04
## +------------ Lower bytes of CuOffset
##
# DWARF64-LE-CONTENT-NEXT: 0020: 00000000 00000000 FFFFFFFF 2C000000
## | | +------- Length (8-byte) 0x2c
## | +------- DWARF64 Prefix
## +---------------- Terminating Entry (8-byte) 0x00
##
# DWARF64-LE-CONTENT-NEXT: 0030: 00000000 02006500 00000000 00000800
## | | | | |
## | | | | +- SegSize (1-byte) 0x00
## | | | +- AddrSize (1-byte) 0x08
## | | +----------------- CuOffset (8-byte) 0x65
## | +--- Version (2-byte) 0x02
## +------- Lower bytes of Length
##
# DWARF64-LE-CONTENT-NEXT: 0040: 00000000 00000000 78560000 00000000
## | |
## | +---------------- Address (8-byte) 0x5678
## +---------------- Padding zeros (8-byte)
##
# DWARF64-LE-CONTENT-NEXT: 0050: 20000000 00000000 00007856 00000000
## | |
## | +---------------- Address (8-byte) 0x56780000
## +---------------- Length (8-byte) 0x20
##
# DWARF64-LE-CONTENT-NEXT: 0060: 10000000 00000000 00000000 00000000
## | |
## | +---------------- Terminating Entry (16-byte) 0x00
## +---------------- Length (8-byte) 0x10
##
# DWARF64-LE-CONTENT-NEXT: 0070: 00000000 00000000
## |
## +---------------- The last bytes of terminating entry.
# DWARF64-LE-CONTENT-NEXT: )
## b) Generate the .debug_aranges section from raw section content. ## b) Generate the .debug_aranges section from raw section content.
# RUN: yaml2obj --docnum=2 %s -o %t2.o # RUN: yaml2obj --docnum=2 %s -o %t2.o
# RUN: llvm-readobj --sections --section-data %t2.o | \ # RUN: llvm-readobj --sections --section-data %t2.o | \
# RUN: FileCheck %s -DADDRALIGN=0 -DSIZE=3 --check-prefixes=DWARF-HEADER,ARBITRARY-CONTENT # RUN: FileCheck %s -DADDRALIGN=0 -DSIZE=3 --check-prefixes=DWARF-HEADER,ARBITRARY-CONTENT
# ARBITRARY-CONTENT: SectionData ( # ARBITRARY-CONTENT: SectionData (
# ARBITRARY-CONTENT-NEXT: 0000: 112233 # ARBITRARY-CONTENT-NEXT: 0000: 112233
▲ Show 20 Lines • Show All 165 Lines • Show Last 20 Lines