This is an archive of the discontinued LLVM Phabricator instance.

Differential D82073

[ObjectYAML][ELF] Add support for emitting the .debug_info section.
ClosedPublic

Authored by Higuoxing on Jun 18 2020, 1:15 AM.

Details

Reviewers
jhenderson
grimar
MaskRay
• espindola
Commits
rG1cfdda57fa63: [ObjectYAML][ELF] Add support for emitting the .debug_info section.
Summary

This patch helps add support for emitting the .debug_info section to yaml2elf.

Diff Detail

Unit TestsFailed

TimeTest
170 mslinux > LLVM.tools/yaml2obj/ELF/DWARF::Unknown Unit Message ("")
610 mswindows > LLVM.tools/yaml2obj/ELF/DWARF::Unknown Unit Message ("")

Event Timeline

Higuoxing created this revision.Jun 18 2020, 1:15 AM
Herald added a reviewer: • espindola. · View Herald TranscriptJun 18 2020, 1:15 AM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: llvm-commits, hiraditya, emaste. · View Herald Transcript
Higuoxing marked an inline comment as done.Jun 18 2020, 1:25 AM
Higuoxing added inline comments.
llvm/test/tools/yaml2obj/ELF/DWARF/debug-info.yaml
457

In order not to bring too much difficulty. The common tests are very similar to the tests in other DWARF sections, except this one. The property of the .debug_abbrev section is overridden as well in this test.

jhenderson added inline comments.Jun 18 2020, 2:28 AM
llvm/test/tools/yaml2obj/ELF/DWARF/debug-info.yaml
191–192

You probably also want Version 4 and testing for different UnitType values.

198

To ensure there are no truncation issues, all these values probably should be the same width as their permissable data could be (e.g. 8 bytes for DW_FORM_data8, 4 for DW_FORM_data4 etc, so 0x1234567890abcdef, 0x12345678 etc).

232

FWIW, DW_FORM_flag_present doesn't have a corresponding value in .debug_info, so maybe you can omit it from here. It probably needs leaving in the .debug_abbrev table though.

457

I'm not sure I follow. What's the point of overriding .debug_abbrev too? It will at least need explaining in a comment.

Harbormaster failed remote builds in B60769: Diff 271602!Jun 18 2020, 2:42 AM
Higuoxing marked an inline comment as done.Jun 18 2020, 3:23 AM
Higuoxing added inline comments.
llvm/test/tools/yaml2obj/ELF/DWARF/debug-info.yaml
457

I want to test that yaml2obj is still able to overwrite the section header fields of the .debug_abbrev section when the .debug_info section exists. Does it make sense here?

jhenderson added inline comments.Jun 18 2020, 3:54 AM
llvm/test/tools/yaml2obj/ELF/DWARF/debug-info.yaml
457

Is there actually any interaction in the code between the .debug_abbrev and .debug_info header writing? If not, I don't think you need to test the combination.

Higuoxing updated this revision to Diff 271653.Jun 18 2020, 4:07 AM
Higuoxing marked 4 inline comments as done.

Address comments.

Thanks for reviewing!

llvm/test/tools/yaml2obj/ELF/DWARF/debug-info.yaml
457

There is not interaction between the .debug_abbrev and .debug_info except for reading forms from debug_abbrev when generating values. Thanks :-)

jhenderson accepted this revision.Jun 18 2020, 4:23 AM

Thanks, LGTM, but please give a chance for someone else to look.

This revision is now accepted and ready to land.Jun 18 2020, 4:23 AM
grimar accepted this revision.Jun 18 2020, 5:02 AM

I have nothing to add. LGTM.

Harbormaster failed remote builds in B60801: Diff 271653!Jun 18 2020, 5:57 AM
MaskRay accepted this revision.Jun 18 2020, 3:08 PM
Higuoxing updated this revision to Diff 271896.Jun 18 2020, 7:52 PM

Trying to make pre-merge check bots happy (Seems that there is an index-out-of-range error).

Higuoxing updated this revision to Diff 271900.Jun 18 2020, 8:07 PM

Rebase.

Higuoxing updated this revision to Diff 271901.Jun 18 2020, 8:08 PM

Rebase.

Higuoxing added a parent revision: D82139: [DWARFYAML][debug_info] Fix array index out of bounds error.Jun 18 2020, 8:09 PM
Harbormaster completed remote builds in B60926: Diff 271896.Jun 18 2020, 9:16 PM
Harbormaster failed remote builds in B60928: Diff 271900!Jun 18 2020, 9:48 PM
Harbormaster completed remote builds in B60929: Diff 271901.
jhenderson mentioned this in D81894: [llvm-readobj][COFF] add .llvm.call-graph-profile section dump.Jun 19 2020, 12:43 AM
Higuoxing added a child revision: D82173: [DWARFYAML][debug_info] Use 'AbbrCode' to index the abbreviation..Jun 19 2020, 3:05 AM
jhenderson mentioned this in D82139: [DWARFYAML][debug_info] Fix array index out of bounds error.Jun 19 2020, 3:18 AM
Higuoxing updated this revision to Diff 272008.Jun 19 2020, 4:27 AM

Add one empty entry to fallible compilation units.
Let's see if pre-merge bots are happy with this change.

Higuoxing removed a parent revision: D82139: [DWARFYAML][debug_info] Fix array index out of bounds error.Jun 19 2020, 4:28 AM
Higuoxing added a child revision: D82139: [DWARFYAML][debug_info] Fix array index out of bounds error.Jun 19 2020, 4:43 AM
Harbormaster completed remote builds in B60989: Diff 272008.Jun 19 2020, 5:53 AM
Higuoxing removed a child revision: D82173: [DWARFYAML][debug_info] Use 'AbbrCode' to index the abbreviation..Jun 19 2020, 6:30 AM
Closed by commit rG1cfdda57fa63: [ObjectYAML][ELF] Add support for emitting the .debug_info section. (authored by Higuoxing). · Explain WhyJun 19 2020, 9:39 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
lib/
ObjectYAML/
2 lines
2 lines
test/
tools/
yaml2obj/
ELF/
DWARF/
542 lines

Diff 271900

llvm/lib/ObjectYAML/DWARFYAML.cpp

Show All 30 LinesSetVector<StringRef> DWARFYAML::Data::getUsedSectionNames() const {
if (!DebugRanges.empty()) if (!DebugRanges.empty())
SecNames.insert("debug_ranges"); SecNames.insert("debug_ranges");
if (!DebugLines.empty()) if (!DebugLines.empty())
SecNames.insert("debug_line"); SecNames.insert("debug_line");
if (!DebugAddr.empty()) if (!DebugAddr.empty())
SecNames.insert("debug_addr"); SecNames.insert("debug_addr");
if (!AbbrevDecls.empty()) if (!AbbrevDecls.empty())
SecNames.insert("debug_abbrev"); SecNames.insert("debug_abbrev");
if (!CompileUnits.empty())
SecNames.insert("debug_info");
return SecNames; return SecNames;
} }
namespace yaml { namespace yaml {
void MappingTraits<DWARFYAML::Data>::mapping(IO &IO, DWARFYAML::Data &DWARF) { void MappingTraits<DWARFYAML::Data>::mapping(IO &IO, DWARFYAML::Data &DWARF) {
auto oldContext = IO.getContext(); auto oldContext = IO.getContext();
IO.setContext(&DWARF); IO.setContext(&DWARF);
▲ Show 20 Lines • Show All 179 Lines • Show Last 20 Lines

llvm/lib/ObjectYAML/ELFEmitter.cpp

Show First 20 Lines • Show All 935 Lines • ▼ Show 20 LinesExpected<uint64_t> emitDWARF(typename ELFT::Shdr &SHeader, StringRef Name,
else if (Name == ".debug_ranges") else if (Name == ".debug_ranges")
Err = DWARFYAML::emitDebugRanges(*OS, DWARF); Err = DWARFYAML::emitDebugRanges(*OS, DWARF);
else if (Name == ".debug_line") else if (Name == ".debug_line")
Err = DWARFYAML::emitDebugLine(*OS, DWARF); Err = DWARFYAML::emitDebugLine(*OS, DWARF);
else if (Name == ".debug_addr") else if (Name == ".debug_addr")
Err = DWARFYAML::emitDebugAddr(*OS, DWARF); Err = DWARFYAML::emitDebugAddr(*OS, DWARF);
else if (Name == ".debug_abbrev") else if (Name == ".debug_abbrev")
Err = DWARFYAML::emitDebugAbbrev(*OS, DWARF); Err = DWARFYAML::emitDebugAbbrev(*OS, DWARF);
else if (Name == ".debug_info")
Err = DWARFYAML::emitDebugInfo(*OS, DWARF);
else else
llvm_unreachable("unexpected emitDWARF() call"); llvm_unreachable("unexpected emitDWARF() call");
if (Err) if (Err)
return std::move(Err); return std::move(Err);
return CBA.tell() - BeginOffset; return CBA.tell() - BeginOffset;
} }
▲ Show 20 Lines • Show All 949 Lines • Show Last 20 Lines

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

  • This file was added.
## Test that yaml2obj emits .debug_info section.
## a) Generate the .debug_info section from the "DWARF" entry.
## Generate and verify a DWARF32 little endian .debug_info (DWARFv5) section.
# RUN: yaml2obj --docnum=1 -DENDIAN=ELFDATA2LSB %s -o %t1.le.o
# RUN: llvm-readobj --sections --section-data %t1.le.o | \
# RUN: FileCheck -DINDEX=2 -DNAME=15 -DOFFSET=0x9A -DSIZE=170 -DADDRALIGN=1 %s --check-prefixes=SHDR,DWARF32-LE-CONTENT
# SHDR: Index: [[INDEX]]
# SHDR-NEXT: Name: .debug_info ([[NAME]])
# SHDR-NEXT: Type: SHT_PROGBITS (0x1)
# SHDR-NEXT: Flags [ (0x0)
# SHDR-NEXT: ]
# SHDR-NEXT: Address: 0x0
# SHDR-NEXT: Offset: [[OFFSET]]
# SHDR-NEXT: Size: [[SIZE]]
# SHDR-NEXT: Link: 0
# SHDR-NEXT: Info: 0
# SHDR-NEXT: AddressAlignment: [[ADDRALIGN]]
# SHDR-NEXT: EntrySize: 0
# DWARF32-LE-CONTENT-NEXT: SectionData (
# DWARF32-LE-CONTENT-NEXT: 0000: 34120000 05000204 34120000 01785634
## ^------- unit_length (4-byte)
## ^--- version (2-byte)
## ^- unit_type (1-byte) DW_UT_type
## ^- address_size (1-byte)
## ^------- debug_abbrev_offset (4-byte)
## ^- abbreviation code (LEB128) 0x01
## ^----- Form: DW_FORM_addr (4-byte)
# DWARF32-LE-CONTENT-NEXT: 0010: 12020012 34020000 00123434 12785634
## --
## ^--- Form: DW_FORM_block2 size (2-byte)
## ^- ^- Form: DW_FORM_block2 body (2-byte)
## ^-------- Form: DW_FORM_block4 size (4-byte)
## ^-^- Form: DW_FORM_block4 body (2-byte)
## ^---- Form: DW_FORM_data2 (2-byte)
## ^----- Form: DW_FORM_data4 (4-byte)
# DWARF32-LE-CONTENT-NEXT: 0020: 12F0DEBC 9A785634 12616263 64000212
## --
## ^----------------- Form: DW_FORM_data8 (8-byte)
## ^---------- Form: DW_FORM_string "abcd\0"
## ^- Form: DW_FORM_block size (ULEB128)
## ^- Form: DW_FORM_block body (2-byte)
# DWARF32-LE-CONTENT-NEXT: 0030: 34021234 1201B424 78563412 B4247856
## ^- Form: DW_FORM_block body
## ^- Form: DW_FORM_block1 size (1-byte)
## ^-^- Form: DW_FORM_block1 body (2-byte)
## ^- Form: DW_FORM_data1 (1-byte)
## ^- Form: DW_FORM_flag (1-byte)
## ^--- Form: DW_FORM_sdata (SLEB128) 0x1234
## ^------- Form: DW_FORM_strp (4-byte)
## ^--- Form: DW_FORM_udata (ULEB128) 0x1234
## ^--- Form: DW_FORM_ref_addr (4-byte)
# DWARF32-LE-CONTENT-NEXT: 0040: 34121234 12785634 12F0DEBC 9A785634
## ----
## ^- Form: DW_FORM_ref1 (1-byte)
## ^---- Form: DW_FORM_ref2 (2-byte)
## ^-------- Form: DW_FORM_ref4 (4-byte)
## ^-------------- Form: DW_FORM_ref8 (8-byte)
# DWARF32-LE-CONTENT-NEXT: 0050: 12B42408 65666768 00341200 00021234
## --
## ^--- Form: DW_FORM_ref_udata (ULEB128) 0x1234
## ^- Form: DW_FORM_indirect (ULEB128) DW_FORM_string
## ^---------- "efgh\0"
## ^-------- Form: DW_FORM_sec_offset (4-byte)
## ^- Form: DW_FORM_exprloc size (ULEB128) 0x02
## ^-^- Form: DW_FORM_exprloc body (2-byte)
# DWARF32-LE-CONTENT-NEXT: 0060: 78563412 78563412 78563412 F0DEBC9A
## ^------- Form: DW_FORM_ref_sup4 (4-byte)
## ^------- Form: DW_FORM_strp_sup (4-byte)
## ^------- Form: DW_FORM_line_strp (4-byte)
## ^------- Form: DW_FORM_ref_sig8 (8-byte)
# DWARF32-LE-CONTENT-NEXT: 0070: 78563412 F0DEBC9A 78563412 12341278
## --------
## ^---------------- Form: DW_FORM_ref_sup8 (8-byte)
## ^- Form: DW_FORM_strx1 (1-byte)
## ^--- Form: DW_FORM_strx2 (2-byte)
## ^- Form: DW_FORM_strx4 (4-byte)
# DWARF32-LE-CONTENT-NEXT: 0080: 56341212 34127856 34123412 00000500
## ------
## ^- Form: DW_FORM_addrx1 (1-byte)
## ^--- From: DW_FORM_addrx2 (2-byte)
## ^-------- Form: DW_FORM_addrx4 (4-byte)
## ^-------- unit_length (4-byte)
## ^--- version (2-byte)
# DWARF32-LE-CONTENT-NEXT: 0090: 01043412 00007856 00000400 78560000
## ^- unit_type (1-byte) DW_UT_compile
## ^- address_size (4-byte)
## ^-------- debug_abbrev_offset (4-byte)
## ^-------- unit_length (4-byte)
## ^--- version (2-byte)
## ^------- debug_abbrev_offset (4-byte)
# DWARF32-LE-CONTENT-NEXT: 00A0: 04017856 34120200 1234
## ^- address_size (1-byte)
## ^- abbreviation code (ULEB128) 0x01
## ^-------- Form: DW_FORM_addr (4-byte)
## ^--- Form: DW_FORM_block2 size (2-byte)
## ^-^- Form: DW_FORM_block2 body (2-byte)
# DWARF32-LE-CONTENT-NEXT: )
--- !ELF
FileHeader:
Class: ELFCLASS64
Data: [[ENDIAN]]
Type: ET_EXEC
Machine: EM_X86_64
DWARF:
debug_abbrev:
- Code: 1
Tag: DW_TAG_compile_unit
Children: DW_CHILDREN_no
Attributes:
- Attribute: 0x01
Form: DW_FORM_addr ## 0x01
- Attribute: 0x01
Form: DW_FORM_block2 ## 0x03
- Attribute: 0x01
Form: DW_FORM_block4 ## 0x04
- Attribute: 0x01
Form: DW_FORM_data2 ## 0x05
- Attribute: 0x01
Form: DW_FORM_data4 ## 0x06
- Attribute: 0x01
Form: DW_FORM_data8 ## 0x07
- Attribute: 0x01
Form: DW_FORM_string ## 0x08
- Attribute: 0x01
Form: DW_FORM_block ## 0x09
- Attribute: 0x01
Form: DW_FORM_block1 ## 0x0a
- Attribute: 0x01
Form: DW_FORM_data1 ## 0x0b
- Attribute: 0x01
Form: DW_FORM_flag ## 0x0c
- Attribute: 0x01
Form: DW_FORM_sdata ## 0x0d
- Attribute: 0x01
Form: DW_FORM_strp ## 0x0e
- Attribute: 0x01
Form: DW_FORM_udata ## 0x0f
- Attribute: 0x01
Form: DW_FORM_ref_addr ## 0x10
- Attribute: 0x01
Form: DW_FORM_ref1 ## 0x11
- Attribute: 0x01
Form: DW_FORM_ref2 ## 0x12
- Attribute: 0x01
Form: DW_FORM_ref4 ## 0x13
- Attribute: 0x01
Form: DW_FORM_ref8 ## 0x14
- Attribute: 0x01
Form: DW_FORM_ref_udata ## 0x15
- Attribute: 0x01
Form: DW_FORM_indirect ## 0x16
- Attribute: 0x01
Form: DW_FORM_sec_offset ## 0x17
- Attribute: 0x01
Form: DW_FORM_exprloc ## 0x18
- Attribute: 0x01
Form: DW_FORM_strx ## 0x1a
- Attribute: 0x01
Form: DW_FORM_addrx ## 0x1b
- Attribute: 0x01
Form: DW_FORM_ref_sup4 ## 0x1c
- Attribute: 0x01
Form: DW_FORM_strp_sup ## 0x1d
- Attribute: 0x01
Form: DW_FORM_data16 ## 0x1e
- Attribute: 0x01
Form: DW_FORM_line_strp ## 0x1f
- Attribute: 0x01
Form: DW_FORM_ref_sig8 ## 0x20
- Attribute: 0x01
Form: DW_FORM_implicit_const ## 0x21
Value: 0x01
- Attribute: 0x01
Form: DW_FORM_loclistx ## 0x22
- Attribute: 0x01
Form: DW_FORM_rnglistx ## 0x23
- Attribute: 0x01
Form: DW_FORM_ref_sup8 ## 0x24
- Attribute: 0x01
Form: DW_FORM_strx1 ## 0x25
- Attribute: 0x01
Form: DW_FORM_strx2 ## 0x26
- Attribute: 0x01
Form: DW_FORM_strx3 ## 0x27
- Attribute: 0x01
Form: DW_FORM_strx4 ## 0x28
- Attribute: 0x01
jhendersonUnsubmitted
Done
ReplyInline Actions

You probably also want Version 4 and testing for different UnitType values.

jhenderson: You probably also want Version 4 and testing for different `UnitType` values.
Form: DW_FORM_addrx1 ## 0x29
- Attribute: 0x01
Form: DW_FORM_addrx2 ## 0x2a
- Attribute: 0x01
Form: DW_FORM_addrx3 ## 0x2b
- Attribute: 0x01
jhendersonUnsubmitted
Done
ReplyInline Actions

To ensure there are no truncation issues, all these values probably should be the same width as their permissable data could be (e.g. 8 bytes for DW_FORM_data8, 4 for DW_FORM_data4 etc, so 0x1234567890abcdef, 0x12345678 etc).

jhenderson: To ensure there are no truncation issues, all these values probably should be the same width as…
Form: DW_FORM_addrx4 ## 0x2c
debug_info:
- Length:
TotalLength: 0x1234
Version: 5
UnitType: DW_UT_type
AbbrOffset: 0x1234
AddrSize: 4
Entries:
- AbbrCode: 1
Values:
- Value: 0x12345678 ## DW_FORM_addr
- BlockData: ## DW_FORM_block2
- 0x12
- 0x34
- BlockData: ## DW_FORM_block4
- 0x12
- 0x34
- Value: 0x1234 ## DW_FORM_data2
- Value: 0x12345678 ## DW_FORM_data4
- Value: 0x123456789abcdef0 ## DW_FORM_data8
- CStr: abcd ## DW_FORM_string
- BlockData: ## DW_FORM_block
- 0x12
- 0x34
- BlockData: ## DW_FORM_block1
- 0x12
- 0x34
- Value: 0x12 ## DW_FORM_data1
- Value: 0x01 ## DW_FORM_flag
- Value: 0x1234 ## DW_FORM_sdata
- Value: 0x12345678 ## DW_FORM_strp
- Value: 0x1234 ## DW_FORM_udata
- Value: 0x12345678 ## DW_FORM_ref_addr
jhendersonUnsubmitted
Done
ReplyInline Actions

FWIW, DW_FORM_flag_present doesn't have a corresponding value in .debug_info, so maybe you can omit it from here. It probably needs leaving in the .debug_abbrev table though.

jhenderson: FWIW, DW_FORM_flag_present doesn't have a corresponding value in .debug_info, so maybe you can…
- Value: 0x12 ## DW_FORM_ref1
- Value: 0x1234 ## DW_FORM_ref2
- Value: 0x12345678 ## DW_FORM_ref4
- Value: 0x123456789abcdef0 ## DW_FORM_ref8
- Value: 0x1234 ## DW_FORM_ref_udata
- Value: 0x08 ## DW_FORM_indirect. The following value's form is 0x08, which is DW_FORM_string.
- CStr: efgh
- Value: 0x1234 ## DW_FORM_sec_offset
- BlockData: ## DW_FORM_exprloc
- 0x12
- 0x34
- Value: 0x1234 ## DW_FORM_strx (unimplemented)
- Value: 0x1234 ## DW_FORM_addrx (unimplemented)
- Value: 0x12345678 ## DW_FORM_ref_sup4
- Value: 0x12345678 ## DW_FORM_strp_sup
- Value: 0x1234 ## DW_FORM_data16 (unimplemented)
- Value: 0x12345678 ## DW_FORM_line_strp
- Value: 0x123456789abcdef0 ## DW_FORM_ref_sig8
- Value: 0x1234 ## DW_FORM_implicit_const (unimplemented)
- Value: 0x1234 ## DW_FORM_loclistx (unimplemented)
- Value: 0x1234 ## DW_FORM_rnglistx (unimplemented)
- Value: 0x123456789abcdef0 ## DW_FORM_ref_sup8
- Value: 0x12 ## DW_FORM_strx1
- Value: 0x1234 ## DW_FORM_strx2
- Value: 0x123456 ## DW_FORM_strx3 (unimplemented)
- Value: 0x12345678 ## DW_FORM_strx4
- Value: 0x12 ## DW_FORM_addrx1
- Value: 0x1234 ## DW_FORM_addrx2
- Value: 0x123456 ## DW_FORM_addrx3 (unimplemented)
- Value: 0x12345678 ## DW_FORM_addrx4
- Length:
TotalLength: 0x1234
Version: 5
## Test another unit type.
UnitType: DW_UT_compile
AbbrOffset: 0x1234
AddrSize: 4
Entries: []
- Length:
TotalLength: 0x5678
## Test DWARFv4
Version: 4
AbbrOffset: 0x5678
AddrSize: 4
Entries:
- AbbrCode: 1
Values:
- Value: 0x12345678 ## DW_FORM_addr
- BlockData: ## DW_FORM_block2
- 0x12
- 0x34
## Generate and verify a DWARF32 big endian .debug_info (DWARFv4) section.
# RUN: yaml2obj --docnum=1 -DENDIAN=ELFDATA2MSB %s -o %t1.be.o
# RUN: llvm-readobj --sections --section-data %t1.be.o | \
# RUN: FileCheck -DINDEX=2 -DNAME=15 -DOFFSET=0x9A -DSIZE=170 -DADDRALIGN=1 %s --check-prefixes=SHDR,DWARF32-BE-CONTENT
# DWARF32-BE-CONTENT-NEXT: SectionData (
# DWARF32-BE-CONTENT-NEXT: 0000: 00001234 00050204 00001234 01123456
## ^------- unit_length (4-byte)
## ^--- version (2-byte)
## ^- unit_type (1-byte) DW_UT_type
## ^- address_size (1-byte)
## ^------- debug_abbrev_offset (4-byte)
## ^- abbreviation code (LEB128) 0x01
## ^----- Form: DW_FORM_addr (4-byte)
# DWARF32-BE-CONTENT-NEXT: 0010: 78000212 34000000 02123412 34123456
## --
## ^--- Form: DW_FORM_block2 size (2-byte)
## ^- ^- Form: DW_FORM_block2 body (2-byte)
## ^-------- Form: DW_FORM_block4 size (4-byte)
## ^-^- Form: DW_FORM_block4 body (2-byte)
## ^---- Form: DW_FORM_data2 (2-byte)
## ^----- Form: DW_FORM_data4 (4-byte)
# DWARF32-BE-CONTENT-NEXT: 0020: 78123456 789ABCDE F0616263 64000212
## --
## ^----------------- Form: DW_FORM_data8 (8-byte)
## ^---------- Form: DW_FORM_string "abcd\0"
## ^- Form: DW_FORM_block size (ULEB128)
## ^- Form: DW_FORM_block body (2-byte)
# DWARF32-BE-CONTENT-NEXT: 0030: 34021234 1201B424 12345678 B4241234
## ^- Form: DW_FORM_block body
## ^- Form: DW_FORM_block1 size (1-byte)
## ^-^- Form: DW_FORM_block1 body (2-byte)
## ^- Form: DW_FORM_data1 (1-byte)
## ^- Form: DW_FORM_flag (1-byte)
## ^--- Form: DW_FORM_sdata (SLEB128) 0x1234
## ^------- Form: DW_FORM_strp (4-byte)
## ^--- Form: DW_FORM_udata (ULEB128) 0x1234
## ^--- Form: DW_FORM_ref_addr (4-byte)
# DWARF32-BE-CONTENT-NEXT: 0040: 56781212 34123456 78123456 789ABCDE
## ----
## ^- Form: DW_FORM_ref1 (1-byte)
## ^---- Form: DW_FORM_ref2 (2-byte)
## ^-------- Form: DW_FORM_ref4 (4-byte)
## ^-------------- Form: DW_FORM_ref8 (8-byte)
# DWARF32-BE-CONTENT-NEXT: 0050: F0B42408 65666768 00000012 34021234
## --
## ^--- Form: DW_FORM_ref_udata (ULEB128) 0x1234
## ^- Form: DW_FORM_indirect (ULEB128) DW_FORM_string
## ^---------- "efgh\0"
## ^-------- Form: DW_FORM_sec_offset (4-byte)
## ^- Form: DW_FORM_exprloc size (ULEB128) 0x02
## ^-^- Form: DW_FORM_exprloc body (2-byte)
# DWARF32-BE-CONTENT-NEXT: 0060: 12345678 12345678 12345678 12345678
## ^------- Form: DW_FORM_ref_sup4 (4-byte)
## ^------- Form: DW_FORM_strp_sup (4-byte)
## ^------- Form: DW_FORM_line_strp (4-byte)
## ^------- Form: DW_FORM_ref_sig8 (8-byte)
# DWARF32-BE-CONTENT-NEXT: 0070: 9ABCDEF0 12345678 9ABCDEF0 12123412
## --------
## ^---------------- Form: DW_FORM_ref_sup8 (8-byte)
## ^- Form: DW_FORM_strx1 (1-byte)
## ^--- Form: DW_FORM_strx2 (2-byte)
## ^- Form: DW_FORM_strx4 (4-byte)
# DWARF32-BE-CONTENT-NEXT: 0080: 34567812 12341234 56780000 12340005
## ------
## ^- Form: DW_FORM_addrx1 (1-byte)
## ^--- From: DW_FORM_addrx2 (2-byte)
## ^-------- Form: DW_FORM_addrx4 (4-byte)
## ^-------- unit_length (4-byte)
## ^--- version (2-byte)
# DWARF32-BE-CONTENT-NEXT: 0090: 01040000 12340000 56780004 00005678
## ^- unit_type (1-byte) DW_UT_compile
## ^- address_size (4-byte)
## ^-------- debug_abbrev_offset (4-byte)
## ^-------- unit_length (4-byte)
## ^--- version (2-byte)
## ^------- debug_abbrev_offset (4-byte)
# DWARF32-BE-CONTENT-NEXT: 00A0: 04011234 56780002 1234
## ^- address_size (1-byte)
## ^- abbreviation code (ULEB128) 0x01
## ^-------- Form: DW_FORM_addr (4-byte)
## ^--- Form: DW_FORM_block2 size (2-byte)
## ^-^- Form: DW_FORM_block2 body (2-byte)
# DWARF32-BE-CONTENT-NEXT: )
## b) Generate the .debug_info section from raw section content.
# RUN: yaml2obj --docnum=2 %s -o %t2.o
# RUN: llvm-readobj --sections --section-data %t2.o | \
# RUN: FileCheck -DINDEX=1 -DNAME=1 -DOFFSET=0x40 -DSIZE=3 -DADDRALIGN=0 %s --check-prefixes=SHDR,ARBITRARY-CONTENT
# ARBITRARY-CONTENT-NEXT: SectionData (
# ARBITRARY-CONTENT-NEXT: 0000: 112233
# ARBITRARY-CONTENT-NEXT: )
--- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
Type: ET_EXEC
Machine: EM_X86_64
Sections:
- Name: .debug_info
Type: SHT_PROGBITS
Content: "112233"
## c) Generate the .debug_info section when the "Size" is specified.
# RUN: yaml2obj --docnum=3 %s -o %t3.o
# RUN: llvm-readobj --sections --section-data %t3.o | \
# RUN: FileCheck -DINDEX=1 -DNAME=1 -DOFFSET=0x40 -DSIZE=16 -DADDRALIGN=0 %s --check-prefixes=SHDR,SIZE
# SIZE-NEXT: SectionData (
# SIZE-NEXT: 0000: 00000000 00000000 00000000 00000000
# SIZE-NEXT: )
--- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
Type: ET_EXEC
Machine: EM_X86_64
Sections:
- Name: .debug_info
Type: SHT_PROGBITS
Size: 0x10
## d) Test that yaml2obj emits an error message when both the "Size" and the
## "debug_info" entry are specified at the same time.
# RUN: not yaml2obj --docnum=4 %s 2>&1 | FileCheck %s --check-prefix=ERROR
# ERROR: yaml2obj: error: cannot specify section '.debug_info' contents in the 'DWARF' entry and the 'Content' or 'Size' in the 'Sections' entry at the same time
--- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
Type: ET_EXEC
Machine: EM_X86_64
Sections:
- Name: .debug_info
Type: SHT_PROGBITS
Size: 0x10
DWARF:
debug_abbrev:
- Code: 1
Tag: DW_TAG_compile_unit
Children: DW_CHILDREN_no
Attributes: []
debug_info:
- Length:
TotalLength: 0x1234
Version: 5
UnitType: DW_UT_type
AbbrOffset: 0x1234
AddrSize: 4
Entries: []
## e) Test that yaml2obj emits an error message when both the "Content" and the
## "debug_info" entry are specified at the same time.
# RUN: not yaml2obj --docnum=5 %s 2>&1 | FileCheck %s --check-prefix=ERROR
--- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
Type: ET_EXEC
Machine: EM_X86_64
Sections:
- Name: .debug_info
HiguoxingAuthorUnsubmitted
Done
ReplyInline Actions

In order not to bring too much difficulty. The common tests are very similar to the tests in other DWARF sections, except this one. The property of the .debug_abbrev section is overridden as well in this test.

Higuoxing: In order not to bring too much difficulty. The common tests are very similar to the tests in…
jhendersonUnsubmitted
Not Done
ReplyInline Actions

I'm not sure I follow. What's the point of overriding .debug_abbrev too? It will at least need explaining in a comment.

jhenderson: I'm not sure I follow. What's the point of overriding .debug_abbrev too? It will at least need…
HiguoxingAuthorUnsubmitted
Done
ReplyInline Actions

I want to test that yaml2obj is still able to overwrite the section header fields of the .debug_abbrev section when the .debug_info section exists. Does it make sense here?

Higuoxing: I want to test that `yaml2obj` is still able to overwrite the section header fields of the `.
jhendersonUnsubmitted
Not Done
ReplyInline Actions

Is there actually any interaction in the code between the .debug_abbrev and .debug_info header writing? If not, I don't think you need to test the combination.

jhenderson: Is there actually any interaction in the code between the .debug_abbrev and .debug_info header…
HiguoxingAuthorUnsubmitted
Done
ReplyInline Actions

There is not interaction between the .debug_abbrev and .debug_info except for reading forms from debug_abbrev when generating values. Thanks :-)

Higuoxing: There is not interaction between the `.debug_abbrev` and `.debug_info` except for reading forms…
Type: SHT_PROGBITS
Content: "00"
DWARF:
debug_abbrev:
- Code: 1
Tag: DW_TAG_compile_unit
Children: DW_CHILDREN_no
Attributes: []
debug_info:
- Length:
TotalLength: 0x1234
Version: 5
UnitType: DW_UT_type
AbbrOffset: 0x1234
AddrSize: 4
Entries: []
## f) Test that all the properties can be overridden by the section header when
## the "debug_info" entry doesn't exist.
# RUN: yaml2obj --docnum=6 %s -o %t6.o
# RUN: llvm-readelf --sections %t6.o | FileCheck %s --check-prefix=OVERRIDDEN
# OVERRIDDEN: [Nr] Name Type Address Off Size ES Flg Lk Inf Al
# OVERRIDDEN: [ 1] .debug_info STRTAB 0000000000002020 000050 00000d 01 A 2 1 2
# OVERRIDDEN-NEXT: [ 2] .sec STRTAB 0000000000000000 00005d 000000 00 0 0 0
--- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
Type: ET_EXEC
Machine: EM_X86_64
Sections:
- Name: .debug_info
Type: SHT_STRTAB ## SHT_PROGBITS by default.
Flags: [SHF_ALLOC] ## 0 by default.
Link: .sec ## 0 by default.
EntSize: 1 ## 0 by default.
Info: 1 ## 0 by default.
AddressAlign: 2 ## 0 by default.
Address: 0x2020 ## 0x00 by default.
Offset: 0x50 ## 0x40 for the first section.
Size: 0x0d ## Set the "Size" so that we can reuse the check tag "OVERRIDDEN".
- Name: .sec ## Linked by .debug_info.
Type: SHT_STRTAB
## g) Test that all the properties can be overridden by the section header when
## the "debug_info" entry exists.
# RUN: yaml2obj --docnum=7 %s -o %t7.o
# RUN: llvm-readelf --sections %t7.o | FileCheck %s --check-prefix=OVERRIDDEN
--- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
Type: ET_EXEC
Machine: EM_X86_64
Sections:
- Name: .debug_info
Type: SHT_STRTAB ## SHT_PROGBITS by default.
Flags: [SHF_ALLOC] ## 0 by default.
Link: .sec ## 0 by default.
EntSize: 1 ## 0 by default.
Info: 1 ## 0 by default.
AddressAlign: 2 ## 0 by default.
Address: 0x2020 ## 0x00 by default.
Offset: 0x50 ## 0x40 for the first section.
- Name: .sec ## Linked by .debug_info.
Type: SHT_STRTAB
DWARF:
debug_abbrev:
- Code: 1
Tag: DW_TAG_compile_unit
Children: DW_CHILDREN_no
Attributes: []
debug_info:
- Length:
TotalLength: 0x1234
Version: 5
UnitType: DW_UT_type
AbbrOffset: 0x1234
AddrSize: 4
Entries: []