This is an archive of the discontinued LLVM Phabricator instance.

Differential D93621

[lldb][wasm] Parse DWO section names
ClosedPublic

Authored by pfaffe on Dec 21 2020, 2:06 AM.

Details

Reviewers
labath
Commits
rG7ad54d193871: [lldb][wasm] Parse DWO section names
Summary

Mirror ELF section parsing to support DWARF section names for
debug fission.

Diff Detail

Event Timeline

pfaffe created this revision.Dec 21 2020, 2:06 AM
Herald added subscribers: sunfish, sbc100. · View Herald TranscriptDec 21 2020, 2:06 AM
pfaffe requested review of this revision.Dec 21 2020, 2:06 AM
Herald added a project: Restricted Project. · View Herald TranscriptDec 21 2020, 2:06 AM
Herald added subscribers: lldb-commits, aheejin. · View Herald Transcript
Harbormaster completed remote builds in B83114: Diff 313043.Dec 21 2020, 2:33 AM
Herald added a subscriber: JDevlieghere. · View Herald TranscriptDec 21 2020, 2:33 AM
labath added a subscriber: labath.Dec 21 2020, 11:45 AM

It would be nice to "mirror" the test case (test/Shell/ObjectFile/ELF/section-types.yaml) too. Other than that, this is fine.

pfaffe updated this revision to Diff 313321.Dec 22 2020, 6:37 AM

Add the new dwo sections to the testcase.

pfaffe added a reviewer: labath.Dec 22 2020, 6:38 AM
Harbormaster completed remote builds in B83261: Diff 313321.Dec 22 2020, 7:41 AM
labath accepted this revision.Dec 27 2020, 2:28 AM
This revision is now accepted and ready to land.Dec 27 2020, 2:28 AM
pfaffe added a comment.Jan 12 2021, 8:07 AM

Thanks! Would you mind landing the change for me? I'm not a github comitter.

This revision was landed with ongoing or failed builds.Jan 13 2021, 11:53 PM
Closed by commit rG7ad54d193871: [lldb][wasm] Parse DWO section names (authored by pfaffe, committed by labath). · Explain Why
This revision was automatically updated to reflect the committed changes.
labath added a commit: rG7ad54d193871: [lldb][wasm] Parse DWO section names.

Revision Contents

PathSize
lldb/
source/
Plugins/
ObjectFile/
wasm/
61 lines
test/
Shell/
ObjectFile/
wasm/
100 lines

Diff 316577

lldb/source/Plugins/ObjectFile/wasm/ObjectFileWasm.cpp

Show First 20 Lines • Show All 247 Lines • ▼ Show 20 Lines
bool ObjectFileWasm::ParseHeader() { bool ObjectFileWasm::ParseHeader() {
// We already parsed the header during initialization. // We already parsed the header during initialization.
return true; return true;
} }
Symtab *ObjectFileWasm::GetSymtab() { return nullptr; } Symtab *ObjectFileWasm::GetSymtab() { return nullptr; }
static SectionType GetSectionTypeFromName(llvm::StringRef Name) {
if (Name.consume_front(".debug_") || Name.consume_front(".zdebug_")) {
return llvm::StringSwitch<SectionType>(Name)
.Case("abbrev", eSectionTypeDWARFDebugAbbrev)
.Case("abbrev.dwo", eSectionTypeDWARFDebugAbbrevDwo)
.Case("addr", eSectionTypeDWARFDebugAddr)
.Case("aranges", eSectionTypeDWARFDebugAranges)
.Case("cu_index", eSectionTypeDWARFDebugCuIndex)
.Case("frame", eSectionTypeDWARFDebugFrame)
.Case("info", eSectionTypeDWARFDebugInfo)
.Case("info.dwo", eSectionTypeDWARFDebugInfoDwo)
.Cases("line", "line.dwo", eSectionTypeDWARFDebugLine)
.Cases("line_str", "line_str.dwo", eSectionTypeDWARFDebugLineStr)
.Case("loc", eSectionTypeDWARFDebugLoc)
.Case("loc.dwo", eSectionTypeDWARFDebugLocDwo)
.Case("loclists", eSectionTypeDWARFDebugLocLists)
.Case("loclists.dwo", eSectionTypeDWARFDebugLocListsDwo)
.Case("macinfo", eSectionTypeDWARFDebugMacInfo)
.Cases("macro", "macro.dwo", eSectionTypeDWARFDebugMacro)
.Case("names", eSectionTypeDWARFDebugNames)
.Case("pubnames", eSectionTypeDWARFDebugPubNames)
.Case("pubtypes", eSectionTypeDWARFDebugPubTypes)
.Case("ranges", eSectionTypeDWARFDebugRanges)
.Case("rnglists", eSectionTypeDWARFDebugRngLists)
.Case("rnglists.dwo", eSectionTypeDWARFDebugRngListsDwo)
.Case("str", eSectionTypeDWARFDebugStr)
.Case("str.dwo", eSectionTypeDWARFDebugStrDwo)
.Case("str_offsets", eSectionTypeDWARFDebugStrOffsets)
.Case("str_offsets.dwo", eSectionTypeDWARFDebugStrOffsetsDwo)
.Case("tu_index", eSectionTypeDWARFDebugTuIndex)
.Case("types", eSectionTypeDWARFDebugTypes)
.Case("types.dwo", eSectionTypeDWARFDebugTypesDwo)
.Default(eSectionTypeOther);
}
return eSectionTypeOther;
}
void ObjectFileWasm::CreateSections(SectionList &unified_section_list) { void ObjectFileWasm::CreateSections(SectionList &unified_section_list) {
if (m_sections_up) if (m_sections_up)
return; return;
m_sections_up = std::make_unique<SectionList>(); m_sections_up = std::make_unique<SectionList>();
if (m_sect_infos.empty()) { if (m_sect_infos.empty()) {
DecodeSections(); DecodeSections();
Show All 11 Lines if (llvm::wasm::WASM_SEC_CODE == sect_info.id) {
section_name = ConstString("code"); section_name = ConstString("code");
// A code address in DWARF for WebAssembly is the offset of an // A code address in DWARF for WebAssembly is the offset of an
// instruction relative within the Code section of the WebAssembly file. // instruction relative within the Code section of the WebAssembly file.
// For this reason Section::GetFileAddress() must return zero for the // For this reason Section::GetFileAddress() must return zero for the
// Code section. // Code section.
vm_addr = 0; vm_addr = 0;
} else { } else {
section_type = section_type = GetSectionTypeFromName(sect_info.name.GetStringRef());
llvm::StringSwitch<SectionType>(sect_info.name.GetStringRef())
.Case(".debug_abbrev", eSectionTypeDWARFDebugAbbrev)
.Case(".debug_addr", eSectionTypeDWARFDebugAddr)
.Case(".debug_aranges", eSectionTypeDWARFDebugAranges)
.Case(".debug_cu_index", eSectionTypeDWARFDebugCuIndex)
.Case(".debug_frame", eSectionTypeDWARFDebugFrame)
.Case(".debug_info", eSectionTypeDWARFDebugInfo)
.Case(".debug_line", eSectionTypeDWARFDebugLine)
.Case(".debug_line_str", eSectionTypeDWARFDebugLineStr)
.Case(".debug_loc", eSectionTypeDWARFDebugLoc)
.Case(".debug_loclists", eSectionTypeDWARFDebugLocLists)
.Case(".debug_macinfo", eSectionTypeDWARFDebugMacInfo)
.Case(".debug_macro", eSectionTypeDWARFDebugMacro)
.Case(".debug_names", eSectionTypeDWARFDebugNames)
.Case(".debug_pubnames", eSectionTypeDWARFDebugPubNames)
.Case(".debug_pubtypes", eSectionTypeDWARFDebugPubTypes)
.Case(".debug_ranges", eSectionTypeDWARFDebugRanges)
.Case(".debug_rnglists", eSectionTypeDWARFDebugRngLists)
.Case(".debug_str", eSectionTypeDWARFDebugStr)
.Case(".debug_str_offsets", eSectionTypeDWARFDebugStrOffsets)
.Case(".debug_types", eSectionTypeDWARFDebugTypes)
.Default(eSectionTypeOther);
if (section_type == eSectionTypeOther) if (section_type == eSectionTypeOther)
continue; continue;
section_name = sect_info.name; section_name = sect_info.name;
if (!IsInMemory()) { if (!IsInMemory()) {
vm_size = 0; vm_size = 0;
vm_addr = 0; vm_addr = 0;
} }
} }
▲ Show 20 Lines • Show All 153 Lines • Show Last 20 Lines

lldb/test/Shell/ObjectFile/wasm/embedded-debug-sections.yaml

Show All 34 Lines
# CHECK: File size: 2 # CHECK: File size: 2
# CHECK: Name: .debug_str # CHECK: Name: .debug_str
# CHECK: Type: dwarf-str # CHECK: Type: dwarf-str
# CHECK: VM address: 0x0 # CHECK: VM address: 0x0
# CHECK: VM size: 0 # CHECK: VM size: 0
# CHECK: File size: 3 # CHECK: File size: 3
# CHECK: Name: .debug_abbrev.dwo
# CHECK: Type: dwarf-abbrev-dwo
# CHECK: VM address: 0x0
# CHECK: VM size: 0
# CHECK: File size: 4
# CHECK: Name: .debug_info.dwo
# CHECK: Type: dwarf-info-dwo
# CHECK: VM address: 0x0
# CHECK: VM size: 0
# CHECK: File size: 4
# CHECK: Name: .debug_line.dwo
# CHECK: Type: dwarf-line
# CHECK: VM address: 0x0
# CHECK: VM size: 0
# CHECK: File size: 4
# CHECK: Name: .debug_line_str.dwo
# CHECK: Type: dwarf-line-str
# CHECK: VM address: 0x0
# CHECK: VM size: 0
# CHECK: File size: 4
# CHECK: Name: .debug_loc.dwo
# CHECK: Type: dwarf-loc-dwo
# CHECK: VM address: 0x0
# CHECK: VM size: 0
# CHECK: File size: 4
# CHECK: Name: .debug_loclists.dwo
# CHECK: Type: dwarf-loclists-dwo
# CHECK: VM address: 0x0
# CHECK: VM size: 0
# CHECK: File size: 4
# CHECK: Name: .debug_macro.dwo
# CHECK: Type: dwarf-macro
# CHECK: VM address: 0x0
# CHECK: VM size: 0
# CHECK: File size: 4
# CHECK: Name: .debug_rnglists.dwo
# CHECK: Type: dwarf-rnglists-dwo
# CHECK: VM address: 0x0
# CHECK: VM size: 0
# CHECK: File size: 4
# CHECK: Name: .debug_str.dwo
# CHECK: Type: dwarf-str-dwo
# CHECK: VM address: 0x0
# CHECK: VM size: 0
# CHECK: File size: 4
# CHECK: Name: .debug_str_offsets.dwo
# CHECK: Type: dwarf-str-offsets-dwo
# CHECK: VM address: 0x0
# CHECK: VM size: 0
# CHECK: File size: 4
# CHECK: Name: .debug_types.dwo
# CHECK: Type: dwarf-types-dwo
# CHECK: VM address: 0x0
# CHECK: VM size: 0
# CHECK: File size: 4
--- !WASM --- !WASM
FileHeader: FileHeader:
Version: 0x00000001 Version: 0x00000001
Sections: Sections:
- Type: CODE - Type: CODE
Functions: Functions:
- Index: 0 - Index: 0
Locals: Locals:
- Type: I32 - Type: I32
Count: 6 Count: 6
Body: 238080808000210141102102200120026B21032003200036020C200328020C2104200328020C2105200420056C210620060F0B Body: 238080808000210141102102200120026B21032003200036020C200328020C2104200328020C2105200420056C210620060F0B
- Type: CUSTOM - Type: CUSTOM
Name: .debug_info Name: .debug_info
Payload: 4C00 Payload: 4C00
- Type: CUSTOM - Type: CUSTOM
Name: .debug_abbrev Name: .debug_abbrev
Payload: 0111 Payload: 0111
- Type: CUSTOM - Type: CUSTOM
Name: .debug_line Name: .debug_line
Payload: 5100 Payload: 5100
- Type: CUSTOM - Type: CUSTOM
Name: .debug_str Name: .debug_str
Payload: 636CFF Payload: 636CFF
- Type: CUSTOM
Name: .debug_abbrev.dwo
Payload: DEADBEEF
- Type: CUSTOM
Name: .debug_info.dwo
Payload: DEADBEEF
- Type: CUSTOM
Name: .debug_line.dwo
Payload: DEADBEEF
- Type: CUSTOM
Name: .debug_line_str.dwo
Payload: DEADBEEF
- Type: CUSTOM
Name: .debug_loc.dwo
Payload: DEADBEEF
- Type: CUSTOM
Name: .debug_loclists.dwo
Payload: DEADBEEF
- Type: CUSTOM
Name: .debug_macro.dwo
Payload: DEADBEEF
- Type: CUSTOM
Name: .debug_rnglists.dwo
Payload: DEADBEEF
- Type: CUSTOM
Name: .debug_str.dwo
Payload: DEADBEEF
- Type: CUSTOM
Name: .debug_str_offsets.dwo
Payload: DEADBEEF
- Type: CUSTOM
Name: .debug_types.dwo
Payload: DEADBEEF
... ...