This is an archive of the discontinued LLVM Phabricator instance.

Differential D83749

[DWARFYAML] Add support for emitting value forms of strx, addrx, etc.
ClosedPublic

Authored by Higuoxing on Jul 14 2020, 12:31 AM.

Details

Reviewers
jhenderson
grimar
MaskRay
• espindola
Commits
rGb539f0122148: [DWARFYAML] Add support for emitting value forms of strx, addrx, etc.
Summary

This patch adds support for emitting value forms of DW_FORM_strx,
DW_FORM_addrx, DW_FORM_loclistx and DW_FORM_rnglistx.

Diff Detail

Event Timeline

Higuoxing created this revision.Jul 14 2020, 12:31 AM
Herald added a reviewer: • espindola. · View Herald TranscriptJul 14 2020, 12:31 AM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: llvm-commits, hiraditya, emaste. · View Herald Transcript
Harbormaster failed remote builds in B64109: Diff 277686!Jul 14 2020, 1:10 AM
jhenderson accepted this revision.Jul 14 2020, 1:41 AM

LGTM.

This revision is now accepted and ready to land.Jul 14 2020, 1:41 AM
Closed by commit rGb539f0122148: [DWARFYAML] Add support for emitting value forms of strx, addrx, etc. (authored by Higuoxing). · Explain WhyJul 14 2020, 4:06 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
lib/
ObjectYAML/
6 lines
test/
tools/
yaml2obj/
ELF/
DWARF/
144 lines

Diff 277767

llvm/lib/ObjectYAML/DWARFVisitor.cpp

Show First 20 Lines • Show All 110 Lines • ▼ Show 20 Lines for (auto &Entry : Unit.Entries) {
auto writeSize = FormVal->BlockData.size(); auto writeSize = FormVal->BlockData.size();
onValue((uint32_t)writeSize); onValue((uint32_t)writeSize);
onValue( onValue(
MemoryBufferRef(StringRef((const char *)&FormVal->BlockData[0], MemoryBufferRef(StringRef((const char *)&FormVal->BlockData[0],
FormVal->BlockData.size()), FormVal->BlockData.size()),
"")); ""));
break; break;
} }
case dwarf::DW_FORM_strx:
case dwarf::DW_FORM_addrx:
case dwarf::DW_FORM_rnglistx:
case dwarf::DW_FORM_loclistx:
onValue((uint64_t)FormVal->Value, /*LEB=*/true);
break;
case dwarf::DW_FORM_data1: case dwarf::DW_FORM_data1:
case dwarf::DW_FORM_ref1: case dwarf::DW_FORM_ref1:
case dwarf::DW_FORM_flag: case dwarf::DW_FORM_flag:
case dwarf::DW_FORM_strx1: case dwarf::DW_FORM_strx1:
case dwarf::DW_FORM_addrx1: case dwarf::DW_FORM_addrx1:
onValue((uint8_t)FormVal->Value); onValue((uint8_t)FormVal->Value);
break; break;
case dwarf::DW_FORM_data2: case dwarf::DW_FORM_data2:
▲ Show 20 Lines • Show All 64 Lines • Show Last 20 Lines

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

## Test that yaml2obj emits .debug_info section. ## Test that yaml2obj emits .debug_info section.
## a) Generate the .debug_info section from the "DWARF" entry. ## a) Generate the .debug_info section from the "DWARF" entry.
## Generate and verify a DWARF32 little endian .debug_info (DWARFv5) section. ## Generate and verify a DWARF32 little endian .debug_info (DWARFv5) section.
# RUN: yaml2obj --docnum=1 -DENDIAN=ELFDATA2LSB %s -o %t1.le.o # RUN: yaml2obj --docnum=1 -DENDIAN=ELFDATA2LSB %s -o %t1.le.o
# RUN: llvm-readobj --sections --section-data %t1.le.o | \ # RUN: llvm-readobj --sections --section-data %t1.le.o | \
# RUN: FileCheck -DINDEX=2 -DNAME=15 -DOFFSET=0x9B -DSIZE=171 -DADDRALIGN=1 %s --check-prefixes=SHDR,DWARF32-LE-CONTENT # RUN: FileCheck -DINDEX=2 -DNAME=15 -DOFFSET=0x9B -DSIZE=179 -DADDRALIGN=1 %s --check-prefixes=SHDR,DWARF32-LE-CONTENT
# SHDR: Index: [[INDEX]] # SHDR: Index: [[INDEX]]
# SHDR-NEXT: Name: .debug_info ([[NAME]]) # SHDR-NEXT: Name: .debug_info ([[NAME]])
# SHDR-NEXT: Type: SHT_PROGBITS (0x1) # SHDR-NEXT: Type: SHT_PROGBITS (0x1)
# SHDR-NEXT: Flags [ (0x0) # SHDR-NEXT: Flags [ (0x0)
# SHDR-NEXT: ] # SHDR-NEXT: ]
# SHDR-NEXT: Address: 0x0 # SHDR-NEXT: Address: 0x0
# SHDR-NEXT: Offset: [[OFFSET]] # SHDR-NEXT: Offset: [[OFFSET]]
▲ Show 20 Lines • Show All 44 Lines • ▼ Show 20 Lines
# DWARF32-LE-CONTENT-NEXT: 0050: 12B42408 65666768 00341200 00021234 # DWARF32-LE-CONTENT-NEXT: 0050: 12B42408 65666768 00341200 00021234
## -- ## --
## ^--- Form: DW_FORM_ref_udata (ULEB128) 0x1234 ## ^--- Form: DW_FORM_ref_udata (ULEB128) 0x1234
## ^- Form: DW_FORM_indirect (ULEB128) DW_FORM_string ## ^- Form: DW_FORM_indirect (ULEB128) DW_FORM_string
## ^---------- "efgh\0" ## ^---------- "efgh\0"
## ^-------- Form: DW_FORM_sec_offset (4-byte) ## ^-------- Form: DW_FORM_sec_offset (4-byte)
## ^- Form: DW_FORM_exprloc size (ULEB128) 0x02 ## ^- Form: DW_FORM_exprloc size (ULEB128) 0x02
## ^-^- Form: DW_FORM_exprloc body (2-byte) ## ^-^- Form: DW_FORM_exprloc body (2-byte)
# DWARF32-LE-CONTENT-NEXT: 0060: 78563412 78563412 78563412 F0DEBC9A # DWARF32-LE-CONTENT-NEXT: 0060: B424B424 78563412 78563412 78563412
## ^--- Form: DW_FORM_strx (ULEB128)
## ^--- Form: DW_FORM_addrx (ULEB128)
## ^------- Form: DW_FORM_ref_sup4 (4-byte) ## ^------- Form: DW_FORM_ref_sup4 (4-byte)
## ^------- Form: DW_FORM_strp_sup (4-byte) ## ^------- Form: DW_FORM_strp_sup (4-byte)
## ^------- Form: DW_FORM_line_strp (4-byte) ## ^------- Form: DW_FORM_line_strp (4-byte)
## ^------- Form: DW_FORM_ref_sig8 (8-byte) # DWARF32-LE-CONTENT-NEXT: 0070: F0DEBC9A 78563412 B424B424 F0DEBC9A
# DWARF32-LE-CONTENT-NEXT: 0070: 78563412 F0DEBC9A 78563412 12341278 ## ^---------------- Form: DW_FORM_ref_sig8 (8-byte)
## ^--- Form: DW_FORM_loclistx (ULEB128)
## ^--- Form: DW_FORM_rnglistx (ULEB128)
## ^------- Form: DW_FORM_ref_sup8 (8-byte)
# DWARF32-LE-CONTENT-NEXT: 0080: 78563412 12341278 56341212 34127856
## -------- ## --------
## ^---------------- Form: DW_FORM_ref_sup8 (8-byte)
## ^- Form: DW_FORM_strx1 (1-byte) ## ^- Form: DW_FORM_strx1 (1-byte)
## ^--- Form: DW_FORM_strx2 (2-byte) ## ^--- Form: DW_FORM_strx2 (2-byte)
## ^- Form: DW_FORM_strx4 (4-byte) ## ^-------- Form: DW_FORM_strx4 (4-byte)
# DWARF32-LE-CONTENT-NEXT: 0080: 56341212 34127856 34123412 00000500
## ------
## ^- Form: DW_FORM_addrx1 (1-byte) ## ^- Form: DW_FORM_addrx1 (1-byte)
## ^--- From: DW_FORM_addrx2 (2-byte) ## ^--- Form: DW_FORM_addrx2 (1-byte)
## ^-------- Form: DW_FORM_addrx4 (4-byte) ## ^--- Form: DW_FORM_addrx4 (4-byte)
# DWARF32-LE-CONTENT-NEXT: 0090: 34123412 00000500 01043412 00000078
## ----
## ^-------- unit_length (4-byte) ## ^-------- unit_length (4-byte)
## ^--- version (2-byte) ## ^--- version (2-byte)
# DWARF32-LE-CONTENT-NEXT: 0090: 01043412 00000078 56000004 00785600 ## ^- unit_type (1-byte)
## ^- unit_type (1-byte) DW_UT_compile ## ^- address_size (1-byte)
## ^- address_size (4-byte) ## ^-------- debug_abbrev_offset (4-byte)
## ^- abbrev code (ULEB128) 0x00
## ^- unit_length (4-byte)
# DWARF32-LE-CONTENT-NEXT: 00A0: 56000004 00785600 00040178 56341202
## ------
## ^---- version (2-byte)
## ^-------- debug_abbrev_offset (4-byte) ## ^-------- debug_abbrev_offset (4-byte)
## ^-------- unit_length (4-byte)
## ^--- version (2-byte)
## ^- abbreviation code (ULEB128)
## ^----- debug_abbrev_offset (4-byte)
# DWARF32-LE-CONTENT-NEXT: 00A0: 00040178 56341202 001234
## --
## ^- address_size (1-byte) ## ^- address_size (1-byte)
## ^- abbreviation code (ULEB128) 0x01 ## ^- abbrev code (ULEB128) 0x01
## ^-------- Form: DW_FORM_addr (4-byte) ## ^-------- Form: DW_FORM_addr
## ^---- Form: DW_FORM_block2 size (2-byte) ## ^- Form: DW_FORM_block2 size (2-byte)
# DWARF32-LE-CONTENT-NEXT: 00B0: 001234
## --
## ^-^- Form: DW_FORM_block2 body (2-byte) ## ^-^- Form: DW_FORM_block2 body (2-byte)
# DWARF32-LE-CONTENT-NEXT: ) # DWARF32-LE-CONTENT-NEXT: )
--- !ELF --- !ELF
FileHeader: FileHeader:
Class: ELFCLASS64 Class: ELFCLASS64
Data: [[ENDIAN]] Data: [[ENDIAN]]
Type: ET_EXEC Type: ET_EXEC
Machine: EM_X86_64 Machine: EM_X86_64
▲ Show 20 Lines • Show All 126 Lines • ▼ Show 20 Lines - Length: 0x1234
- Value: 0x123456789abcdef0 ## DW_FORM_ref8 - Value: 0x123456789abcdef0 ## DW_FORM_ref8
- Value: 0x1234 ## DW_FORM_ref_udata - Value: 0x1234 ## DW_FORM_ref_udata
- Value: 0x08 ## DW_FORM_indirect. The following value's form is 0x08, which is DW_FORM_string. - Value: 0x08 ## DW_FORM_indirect. The following value's form is 0x08, which is DW_FORM_string.
- CStr: efgh - CStr: efgh
- Value: 0x1234 ## DW_FORM_sec_offset - Value: 0x1234 ## DW_FORM_sec_offset
- BlockData: ## DW_FORM_exprloc - BlockData: ## DW_FORM_exprloc
- 0x12 - 0x12
- 0x34 - 0x34
- Value: 0x1234 ## DW_FORM_strx (unimplemented) - Value: 0x1234 ## DW_FORM_strx
- Value: 0x1234 ## DW_FORM_addrx (unimplemented) - Value: 0x1234 ## DW_FORM_addrx
- Value: 0x12345678 ## DW_FORM_ref_sup4 - Value: 0x12345678 ## DW_FORM_ref_sup4
- Value: 0x12345678 ## DW_FORM_strp_sup - Value: 0x12345678 ## DW_FORM_strp_sup
- Value: 0x1234 ## DW_FORM_data16 (unimplemented) - Value: 0x1234 ## DW_FORM_data16 (unimplemented)
- Value: 0x12345678 ## DW_FORM_line_strp - Value: 0x12345678 ## DW_FORM_line_strp
- Value: 0x123456789abcdef0 ## DW_FORM_ref_sig8 - Value: 0x123456789abcdef0 ## DW_FORM_ref_sig8
- Value: 0x1234 ## DW_FORM_implicit_const (unimplemented) - Value: 0x1234 ## DW_FORM_implicit_const (unimplemented)
- Value: 0x1234 ## DW_FORM_loclistx (unimplemented) - Value: 0x1234 ## DW_FORM_loclistx
- Value: 0x1234 ## DW_FORM_rnglistx (unimplemented) - Value: 0x1234 ## DW_FORM_rnglistx
- Value: 0x123456789abcdef0 ## DW_FORM_ref_sup8 - Value: 0x123456789abcdef0 ## DW_FORM_ref_sup8
- Value: 0x12 ## DW_FORM_strx1 - Value: 0x12 ## DW_FORM_strx1
- Value: 0x1234 ## DW_FORM_strx2 - Value: 0x1234 ## DW_FORM_strx2
- Value: 0x123456 ## DW_FORM_strx3 (unimplemented) - Value: 0x123456 ## DW_FORM_strx3 (unimplemented)
- Value: 0x12345678 ## DW_FORM_strx4 - Value: 0x12345678 ## DW_FORM_strx4
- Value: 0x12 ## DW_FORM_addrx1 - Value: 0x12 ## DW_FORM_addrx1
- Value: 0x1234 ## DW_FORM_addrx2 - Value: 0x1234 ## DW_FORM_addrx2
- Value: 0x123456 ## DW_FORM_addrx3 (unimplemented) - Value: 0x123456 ## DW_FORM_addrx3 (unimplemented)
Show All 19 Lines - Length: 0x5678
- BlockData: ## DW_FORM_block2 - BlockData: ## DW_FORM_block2
- 0x12 - 0x12
- 0x34 - 0x34
## Generate and verify a DWARF32 big endian .debug_info (DWARFv4) section. ## Generate and verify a DWARF32 big endian .debug_info (DWARFv4) section.
# RUN: yaml2obj --docnum=1 -DENDIAN=ELFDATA2MSB %s -o %t1.be.o # RUN: yaml2obj --docnum=1 -DENDIAN=ELFDATA2MSB %s -o %t1.be.o
# RUN: llvm-readobj --sections --section-data %t1.be.o | \ # RUN: llvm-readobj --sections --section-data %t1.be.o | \
# RUN: FileCheck -DINDEX=2 -DNAME=15 -DOFFSET=0x9B -DSIZE=171 -DADDRALIGN=1 %s --check-prefixes=SHDR,DWARF32-BE-CONTENT # RUN: FileCheck -DINDEX=2 -DNAME=15 -DOFFSET=0x9B -DSIZE=179 -DADDRALIGN=1 %s --check-prefixes=SHDR,DWARF32-BE-CONTENT
# DWARF32-BE-CONTENT-NEXT: SectionData ( # DWARF32-BE-CONTENT-NEXT: SectionData (
# DWARF32-BE-CONTENT-NEXT: 0000: 00001234 00050204 00001234 01123456 # DWARF32-BE-CONTENT-NEXT: 0000: 00001234 00050204 00001234 01123456
## ^------- unit_length (4-byte) ## ^------- unit_length (4-byte)
## ^--- version (2-byte) ## ^--- version (2-byte)
## ^- unit_type (1-byte) DW_UT_type ## ^- unit_type (1-byte) DW_UT_type
## ^- address_size (1-byte) ## ^- address_size (1-byte)
## ^------- debug_abbrev_offset (4-byte) ## ^------- debug_abbrev_offset (4-byte)
Show All 32 Lines
# DWARF32-BE-CONTENT-NEXT: 0050: F0B42408 65666768 00000012 34021234 # DWARF32-BE-CONTENT-NEXT: 0050: F0B42408 65666768 00000012 34021234
## -- ## --
## ^--- Form: DW_FORM_ref_udata (ULEB128) 0x1234 ## ^--- Form: DW_FORM_ref_udata (ULEB128) 0x1234
## ^- Form: DW_FORM_indirect (ULEB128) DW_FORM_string ## ^- Form: DW_FORM_indirect (ULEB128) DW_FORM_string
## ^---------- "efgh\0" ## ^---------- "efgh\0"
## ^-------- Form: DW_FORM_sec_offset (4-byte) ## ^-------- Form: DW_FORM_sec_offset (4-byte)
## ^- Form: DW_FORM_exprloc size (ULEB128) 0x02 ## ^- Form: DW_FORM_exprloc size (ULEB128) 0x02
## ^-^- Form: DW_FORM_exprloc body (2-byte) ## ^-^- Form: DW_FORM_exprloc body (2-byte)
# DWARF32-BE-CONTENT-NEXT: 0060: 12345678 12345678 12345678 12345678 # DWARF32-BE-CONTENT-NEXT: 0060: B424B424 12345678 12345678 12345678
## ^--- Form: DW_FORM_strx (ULEB128)
## ^--- Form: DW_FORM_addrx (ULEB128)
## ^------- Form: DW_FORM_ref_sup4 (4-byte) ## ^------- Form: DW_FORM_ref_sup4 (4-byte)
## ^------- Form: DW_FORM_strp_sup (4-byte) ## ^------- Form: DW_FORM_strp_sup (4-byte)
## ^------- Form: DW_FORM_line_strp (4-byte) ## ^------- Form: DW_FORM_line_strp (4-byte)
## ^------- Form: DW_FORM_ref_sig8 (8-byte) # DWARF32-BE-CONTENT-NEXT: 0070: 12345678 9ABCDEF0 B424B424 12345678
# DWARF32-BE-CONTENT-NEXT: 0070: 9ABCDEF0 12345678 9ABCDEF0 12123412 ## ^---------------- Form: DW_FORM_ref_sig8 (8-byte)
## ^--- Form: DW_FORM_loclistx (ULEB128)
## ^--- Form: DW_FORM_rnglistx (ULEB128)
## ^------- Form: DW_FORM_ref_sup8 (8-byte)
# DWARF32-BE-CONTENT-NEXT: 0080: 9ABCDEF0 12123412 34567812 12341234
## -------- ## --------
## ^---------------- Form: DW_FORM_ref_sup8 (8-byte)
## ^- Form: DW_FORM_strx1 (1-byte) ## ^- Form: DW_FORM_strx1 (1-byte)
## ^--- Form: DW_FORM_strx2 (2-byte) ## ^--- Form: DW_FORM_strx2 (2-byte)
## ^- Form: DW_FORM_strx4 (4-byte) ## ^-------- Form: DW_FORM_strx4 (4-byte)
# DWARF32-BE-CONTENT-NEXT: 0080: 34567812 12341234 56780000 12340005
## ------
## ^- Form: DW_FORM_addrx1 (1-byte) ## ^- Form: DW_FORM_addrx1 (1-byte)
## ^--- From: DW_FORM_addrx2 (2-byte) ## ^--- Form: DW_FORM_addrx2 (1-byte)
## ^-------- Form: DW_FORM_addrx4 (4-byte) ## ^--- Form: DW_FORM_addrx4 (4-byte)
# DWARF32-BE-CONTENT-NEXT: 0090: 56780000 12340005 01040000 12340000
## ----
## ^-------- unit_length (4-byte) ## ^-------- unit_length (4-byte)
## ^--- version (2-byte) ## ^--- version (2-byte)
# DWARF32-BE-CONTENT-NEXT: 0090: 01040000 12340000 00567800 04000056 ## ^- unit_type (1-byte)
## ^- unit_type (1-byte) DW_UT_compile ## ^- address_size (1-byte)
## ^- address_size (4-byte) ## ^-------- debug_abbrev_offset (4-byte)
## ^- abbrev code (ULEB128) 0x00
## ^- unit_length (4-byte)
# DWARF32-BE-CONTENT-NEXT: 00A0: 00567800 04000056 78040112 34567800
## ------
## ^---- version (2-byte)
## ^-------- debug_abbrev_offset (4-byte) ## ^-------- debug_abbrev_offset (4-byte)
## ^-------- unit_length (4-byte)
## ^--- version (2-byte)
## ^- abbreviation code (ULEB128)
## ^----- debug_abbrev_offset (4-byte)
# DWARF32-BE-CONTENT-NEXT: 00A0: 78040112 34567800 021234
## --
## ^- address_size (1-byte) ## ^- address_size (1-byte)
## ^- abbreviation code (ULEB128) 0x01 ## ^- abbrev code (ULEB128) 0x01
## ^-------- Form: DW_FORM_addr (4-byte) ## ^-------- Form: DW_FORM_addr
## ^---- Form: DW_FORM_block2 size (2-byte) ## ^- Form: DW_FORM_block2 size (2-byte)
# DWARF32-BE-CONTENT-NEXT: 00B0: 021234
## --
## ^-^- Form: DW_FORM_block2 body (2-byte) ## ^-^- Form: DW_FORM_block2 body (2-byte)
# DWARF32-BE-CONTENT-NEXT: ) # DWARF32-BE-CONTENT-NEXT: )
## b) Generate the .debug_info section from raw section content. ## b) Generate the .debug_info 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 -DINDEX=1 -DNAME=1 -DOFFSET=0x40 -DSIZE=3 -DADDRALIGN=0 %s --check-prefixes=SHDR,ARBITRARY-CONTENT # RUN: FileCheck -DINDEX=1 -DNAME=1 -DOFFSET=0x40 -DSIZE=3 -DADDRALIGN=0 %s --check-prefixes=SHDR,ARBITRARY-CONTENT
▲ Show 20 Lines • Show All 346 Lines • Show Last 20 Lines