maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

llvm-dwarfdump: Factor out the printing of the section header (NFC) 

llvm-svn: 313370
This commit is contained in:
Adrian Prantl 2017-09-15 17:39:50 +00:00
parent 9d0052160f
commit 8416802ea4
3 changed files with 69 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/include/llvm/DebugInfo/DWARF/DWARFDebugPubTable.h
View File

@ -69,7 +69,7 @@ private:
public: public:
DWARFDebugPubTable(StringRef Data, bool LittleEndian, bool GnuStyle); DWARFDebugPubTable(StringRef Data, bool LittleEndian, bool GnuStyle);
void dump(StringRef Name, raw_ostream &OS) const; void dump(raw_ostream &OS) const;
ArrayRef<Set> getData() { return Sets; } ArrayRef<Set> getData() { return Sets; }
}; };

130
llvm/lib/DebugInfo/DWARF/DWARFContext.cpp
View File

@ -68,13 +68,11 @@ DWARFContext::DWARFContext(std::unique_ptr<const DWARFObject> DObj,
DWARFContext::~DWARFContext() = default; DWARFContext::~DWARFContext() = default;
static void dumpAccelSection(raw_ostream &OS, StringRef Name, static void dumpAccelSection(raw_ostream &OS, const DWARFObject &Obj,
const DWARFObject &Obj,
const DWARFSection &Section, const DWARFSection &Section,
StringRef StringSection, bool LittleEndian) { StringRef StringSection, bool LittleEndian) {
DWARFDataExtractor AccelSection(Obj, Section, LittleEndian, 0); DWARFDataExtractor AccelSection(Obj, Section, LittleEndian, 0);
DataExtractor StrData(StringSection, LittleEndian, 0); DataExtractor StrData(StringSection, LittleEndian, 0);
OS << "\n." << Name << " contents:\n";
DWARFAcceleratorTable Accel(AccelSection, StrData); DWARFAcceleratorTable Accel(AccelSection, StrData);
if (!Accel.extract()) if (!Accel.extract())
return; return;
@ -189,9 +187,6 @@ static void dumpStringOffsetsSection(raw_ostream &OS, StringRef SectionName,
const DWARFSection &StringOffsetsSection, const DWARFSection &StringOffsetsSection,
StringRef StringSection, bool LittleEndian, StringRef StringSection, bool LittleEndian,
unsigned MaxVersion) { unsigned MaxVersion) {
if (StringOffsetsSection.Data.empty())
return;
OS << "\n." << SectionName << " contents:\n";
// If we have at least one (compile or type) unit with DWARF v5 or greater, // If we have at least one (compile or type) unit with DWARF v5 or greater,
// we assume that the section is formatted like a DWARF v5 string offsets // we assume that the section is formatted like a DWARF v5 string offsets
// section. // section.
@ -236,32 +231,33 @@ void DWARFContext::dump(raw_ostream &OS, DIDumpOptions DumpOpts) {
// Print a header for each explicitly-requested section. // Print a header for each explicitly-requested section.
// Otherwise just print one for non-empty sections. // Otherwise just print one for non-empty sections.
bool Explicit = DumpType != DIDT_All && !IsDWO; bool Explicit = DumpType != DIDT_All && !IsDWO;
auto shouldDump = [&](unsigned DIDT_Section, StringRef Section) { auto shouldDump = [&](bool IsExplicit, const char *Name,
return (DumpType & DIDT_Section) && (Explicit || !Section.empty()); unsigned DIDT_Section, StringRef Section) {
bool Should = (DumpType & DIDT_Section) && (IsExplicit || !Section.empty());
if (Should)
OS << '\n' << Name << " contents:\n";
return Should;
}; };
// Only print empty .dwo section headers when dumping a .dwo file. // Only print empty .dwo section headers when dumping a .dwo file.
bool ExplicitDWO = Explicit && IsDWO; bool ExplicitDWO = Explicit && IsDWO;
auto shouldDumpDWO = [&](unsigned DIDT_Section, StringRef Section) {
return (DumpType & DIDT_Section) && (ExplicitDWO || !Section.empty());
};
// Dump individual sections. // Dump individual sections.
if (shouldDump(DIDT_DebugAbbrev, DObj->getAbbrevSection())) { if (shouldDump(Explicit, ".debug_abbrev", DIDT_DebugAbbrev,
OS << "\n.debug_abbrev contents:\n"; DObj->getAbbrevSection())) {
getDebugAbbrev()->dump(OS); getDebugAbbrev()->dump(OS);
} }
if (shouldDumpDWO(DIDT_DebugAbbrev, DObj->getAbbrevDWOSection())) { if (shouldDump(ExplicitDWO, ".debug_abbrev.dwo", DIDT_DebugAbbrev,
OS << "\n.debug_abbrev.dwo contents:\n"; DObj->getAbbrevDWOSection())) {
getDebugAbbrevDWO()->dump(OS); getDebugAbbrevDWO()->dump(OS);
} }
if (shouldDump(DIDT_DebugInfo, DObj->getInfoSection().Data)) { if (shouldDump(Explicit, ".debug_info", DIDT_DebugInfo,
OS << "\n.debug_info contents:\n"; DObj->getInfoSection().Data)) {
for (const auto &CU : compile_units()) for (const auto &CU : compile_units())
CU->dump(OS, DumpOpts); CU->dump(OS, DumpOpts);
} }
if (shouldDumpDWO(DIDT_DebugInfo, DObj->getInfoDWOSection().Data)) { if (shouldDump(ExplicitDWO, ".debug_info.dwo", DIDT_DebugInfo,
OS << "\n.debug_info.dwo contents:\n"; DObj->getInfoDWOSection().Data)) {
for (const auto &DWOCU : dwo_compile_units()) for (const auto &DWOCU : dwo_compile_units())
DWOCU->dump(OS, DumpOpts); DWOCU->dump(OS, DumpOpts);
} }
@ -281,17 +277,17 @@ void DWARFContext::dump(raw_ostream &OS, DIDumpOptions DumpOpts) {
} }
} }
if (shouldDump(DIDT_DebugLoc, DObj->getLocSection().Data)) { if (shouldDump(Explicit, ".debug_loc", DIDT_DebugLoc,
OS << "\n.debug_loc contents:\n"; DObj->getLocSection().Data)) {
getDebugLoc()->dump(OS, getRegisterInfo()); getDebugLoc()->dump(OS, getRegisterInfo());
} }
if (shouldDumpDWO(DIDT_DebugLoc, DObj->getLocDWOSection().Data)) { if (shouldDump(ExplicitDWO, ".debug_loc.dwo", DIDT_DebugLoc,
OS << "\n.debug_loc.dwo contents:\n"; DObj->getLocDWOSection().Data)) {
getDebugLocDWO()->dump(OS, getRegisterInfo()); getDebugLocDWO()->dump(OS, getRegisterInfo());
} }
if (shouldDump(DIDT_DebugFrames, DObj->getDebugFrameSection())) { if (shouldDump(Explicit, ".debug_frame", DIDT_DebugFrames,
OS << "\n.debug_frame contents:\n"; DObj->getDebugFrameSection())) {
getDebugFrame()->dump(OS); getDebugFrame()->dump(OS);
} }
if (DumpEH && !getEHFrame()->empty()) { if (DumpEH && !getEHFrame()->empty()) {
@ -306,8 +302,8 @@ void DWARFContext::dump(raw_ostream &OS, DIDumpOptions DumpOpts) {
} }
} }
if (shouldDump(DIDT_DebugAranges, DObj->getARangeSection())) { if (shouldDump(Explicit, ".debug_aranges", DIDT_DebugAranges,
OS << "\n.debug_aranges contents:\n"; DObj->getARangeSection())) {
uint32_t offset = 0; uint32_t offset = 0;
DataExtractor arangesData(DObj->getARangeSection(), isLittleEndian(), 0); DataExtractor arangesData(DObj->getARangeSection(), isLittleEndian(), 0);
DWARFDebugArangeSet set; DWARFDebugArangeSet set;
@ -316,8 +312,8 @@ void DWARFContext::dump(raw_ostream &OS, DIDumpOptions DumpOpts) {
} }
uint8_t savedAddressByteSize = 0; uint8_t savedAddressByteSize = 0;
if (shouldDump(DIDT_DebugLine, DObj->getLineSection().Data)) { if (shouldDump(Explicit, ".debug_line", DIDT_DebugLine,
OS << "\n.debug_line contents:\n"; DObj->getLineSection().Data)) {
for (const auto &CU : compile_units()) { for (const auto &CU : compile_units()) {
savedAddressByteSize = CU->getAddressByteSize(); savedAddressByteSize = CU->getAddressByteSize();
auto CUDIE = CU->getUnitDIE(); auto CUDIE = CU->getUnitDIE();
@ -339,8 +335,8 @@ void DWARFContext::dump(raw_ostream &OS, DIDumpOptions DumpOpts) {
savedAddressByteSize = CU->getAddressByteSize(); savedAddressByteSize = CU->getAddressByteSize();
break; break;
} }
if (shouldDumpDWO(DIDT_DebugLine, DObj->getLineDWOSection().Data)) { if (shouldDump(ExplicitDWO, ".debug_line.dwo", DIDT_DebugLine,
OS << "\n.debug_line.dwo contents:\n"; DObj->getLineDWOSection().Data)) {
unsigned stmtOffset = 0; unsigned stmtOffset = 0;
DWARFDataExtractor lineData(*DObj, DObj->getLineDWOSection(), DWARFDataExtractor lineData(*DObj, DObj->getLineDWOSection(),
isLittleEndian(), savedAddressByteSize); isLittleEndian(), savedAddressByteSize);
@ -351,18 +347,18 @@ void DWARFContext::dump(raw_ostream &OS, DIDumpOptions DumpOpts) {
} }
} }
if (shouldDump(DIDT_DebugCUIndex, DObj->getCUIndexSection())) { if (shouldDump(Explicit, ".debug_cu_index", DIDT_DebugCUIndex,
OS << "\n.debug_cu_index contents:\n"; DObj->getCUIndexSection())) {
getCUIndex().dump(OS); getCUIndex().dump(OS);
} }
if (shouldDump(DIDT_DebugTUIndex, DObj->getTUIndexSection())) { if (shouldDump(Explicit, ".debug_tu_index", DIDT_DebugTUIndex,
OS << "\n.debug_tu_index contents:\n"; DObj->getTUIndexSection())) {
getTUIndex().dump(OS); getTUIndex().dump(OS);
} }
if (shouldDump(DIDT_DebugStr, DObj->getStringSection())) { if (shouldDump(Explicit, ".debug_str", DIDT_DebugStr,
OS << "\n.debug_str contents:\n"; DObj->getStringSection())) {
DataExtractor strData(DObj->getStringSection(), isLittleEndian(), 0); DataExtractor strData(DObj->getStringSection(), isLittleEndian(), 0);
uint32_t offset = 0; uint32_t offset = 0;
uint32_t strOffset = 0; uint32_t strOffset = 0;
@ -371,8 +367,8 @@ void DWARFContext::dump(raw_ostream &OS, DIDumpOptions DumpOpts) {
strOffset = offset; strOffset = offset;
} }
} }
if (shouldDumpDWO(DIDT_DebugStr, DObj->getStringDWOSection())) { if (shouldDump(ExplicitDWO, ".debug_str.dwo", DIDT_DebugStr,
OS << "\n.debug_str.dwo contents:\n"; DObj->getStringDWOSection())) {
DataExtractor strDWOData(DObj->getStringDWOSection(), isLittleEndian(), 0); DataExtractor strDWOData(DObj->getStringDWOSection(), isLittleEndian(), 0);
uint32_t offset = 0; uint32_t offset = 0;
uint32_t strDWOOffset = 0; uint32_t strDWOOffset = 0;
@ -382,8 +378,8 @@ void DWARFContext::dump(raw_ostream &OS, DIDumpOptions DumpOpts) {
} }
} }
if (shouldDump(DIDT_DebugRanges, DObj->getRangeSection().Data)) { if (shouldDump(Explicit, ".debug_ranges", DIDT_DebugRanges,
OS << "\n.debug_ranges contents:\n"; DObj->getRangeSection().Data)) {
// In fact, different compile units may have different address byte // In fact, different compile units may have different address byte
// sizes, but for simplicity we just use the address byte size of the // sizes, but for simplicity we just use the address byte size of the
// last compile unit (there is no easy and fast way to associate address // last compile unit (there is no easy and fast way to associate address
@ -397,54 +393,62 @@ void DWARFContext::dump(raw_ostream &OS, DIDumpOptions DumpOpts) {
rangeList.dump(OS); rangeList.dump(OS);
} }
if (shouldDump(DIDT_DebugPubnames, DObj->getPubNamesSection())) if (shouldDump(Explicit, ".debug_pubnames", DIDT_DebugPubnames,
DObj->getPubNamesSection()))
DWARFDebugPubTable(DObj->getPubNamesSection(), isLittleEndian(), false) DWARFDebugPubTable(DObj->getPubNamesSection(), isLittleEndian(), false)
.dump("debug_pubnames", OS); .dump(OS);
if (shouldDump(DIDT_DebugPubtypes, DObj->getPubTypesSection())) if (shouldDump(Explicit, ".debug_pubtypes", DIDT_DebugPubtypes,
DObj->getPubTypesSection()))
DWARFDebugPubTable(DObj->getPubTypesSection(), isLittleEndian(), false) DWARFDebugPubTable(DObj->getPubTypesSection(), isLittleEndian(), false)
.dump("debug_pubtypes", OS); .dump(OS);
if (shouldDump(DIDT_DebugGnuPubnames, DObj->getGnuPubNamesSection())) if (shouldDump(Explicit, ".debug_gnu_pubnames", DIDT_DebugGnuPubnames,
DObj->getGnuPubNamesSection()))
DWARFDebugPubTable(DObj->getGnuPubNamesSection(), isLittleEndian(), DWARFDebugPubTable(DObj->getGnuPubNamesSection(), isLittleEndian(),
true /* GnuStyle */) true /* GnuStyle */)
.dump("debug_gnu_pubnames", OS); .dump(OS);
if (shouldDump(DIDT_DebugGnuPubtypes, DObj->getGnuPubTypesSection())) if (shouldDump(Explicit, ".debug_gnu_pubtypes", DIDT_DebugGnuPubtypes,
DObj->getGnuPubTypesSection()))
DWARFDebugPubTable(DObj->getGnuPubTypesSection(), isLittleEndian(), DWARFDebugPubTable(DObj->getGnuPubTypesSection(), isLittleEndian(),
true /* GnuStyle */) true /* GnuStyle */)
.dump("debug_gnu_pubtypes", OS); .dump(OS);
if (shouldDump(DIDT_DebugStrOffsets, DObj->getStringOffsetSection().Data)) if (shouldDump(Explicit, ".debug_str_offsets", DIDT_DebugStrOffsets,
DObj->getStringOffsetSection().Data))
dumpStringOffsetsSection( dumpStringOffsetsSection(
OS, "debug_str_offsets", *DObj, DObj->getStringOffsetSection(), OS, "debug_str_offsets", *DObj, DObj->getStringOffsetSection(),
DObj->getStringSection(), isLittleEndian(), getMaxVersion()); DObj->getStringSection(), isLittleEndian(), getMaxVersion());
if (shouldDumpDWO(DIDT_DebugStrOffsets, if (shouldDump(ExplicitDWO, ".debug_str_offsets.dwo", DIDT_DebugStrOffsets,
DObj->getStringOffsetDWOSection().Data)) DObj->getStringOffsetDWOSection().Data))
dumpStringOffsetsSection( dumpStringOffsetsSection(
OS, "debug_str_offsets.dwo", *DObj, DObj->getStringOffsetDWOSection(), OS, "debug_str_offsets.dwo", *DObj, DObj->getStringOffsetDWOSection(),
DObj->getStringDWOSection(), isLittleEndian(), getMaxVersion()); DObj->getStringDWOSection(), isLittleEndian(), getMaxVersion());
if (shouldDump(DIDT_GdbIndex, DObj->getGdbIndexSection())) { if (shouldDump(Explicit, ".gnu_index", DIDT_GdbIndex,
OS << "\n.gnu_index contents:\n"; DObj->getGdbIndexSection())) {
getGdbIndex().dump(OS); getGdbIndex().dump(OS);
} }
if (shouldDump(DIDT_AppleNames, DObj->getAppleNamesSection().Data)) if (shouldDump(Explicit, ".apple_names", DIDT_AppleNames,
dumpAccelSection(OS, "apple_names", *DObj, DObj->getAppleNamesSection(), DObj->getAppleNamesSection().Data))
dumpAccelSection(OS, *DObj, DObj->getAppleNamesSection(),
DObj->getStringSection(), isLittleEndian()); DObj->getStringSection(), isLittleEndian());
if (shouldDump(DIDT_AppleTypes, DObj->getAppleTypesSection().Data)) if (shouldDump(Explicit, ".apple_types", DIDT_AppleTypes,
dumpAccelSection(OS, "apple_types", *DObj, DObj->getAppleTypesSection(), DObj->getAppleTypesSection().Data))
dumpAccelSection(OS, *DObj, DObj->getAppleTypesSection(),
DObj->getStringSection(), isLittleEndian()); DObj->getStringSection(), isLittleEndian());
if (shouldDump(DIDT_AppleNamespaces, DObj->getAppleNamespacesSection().Data)) if (shouldDump(Explicit, ".apple_namespaces", DIDT_AppleNamespaces,
dumpAccelSection(OS, "apple_namespaces", *DObj, DObj->getAppleNamespacesSection().Data))
DObj->getAppleNamespacesSection(), dumpAccelSection(OS, *DObj, DObj->getAppleNamespacesSection(),
DObj->getStringSection(), isLittleEndian()); DObj->getStringSection(), isLittleEndian());
if (shouldDump(DIDT_AppleObjC, DObj->getAppleObjCSection().Data)) if (shouldDump(Explicit, ".apple_objc", DIDT_AppleObjC,
dumpAccelSection(OS, "apple_objc", *DObj, DObj->getAppleObjCSection(), DObj->getAppleObjCSection().Data))
dumpAccelSection(OS, *DObj, DObj->getAppleObjCSection(),
DObj->getStringSection(), isLittleEndian()); DObj->getStringSection(), isLittleEndian());
} }

3
llvm/lib/DebugInfo/DWARF/DWARFDebugPubTable.cpp
View File

@ -44,8 +44,7 @@ DWARFDebugPubTable::DWARFDebugPubTable(StringRef Data, bool LittleEndian,
} }
} }
void DWARFDebugPubTable::dump(StringRef Name, raw_ostream &OS) const { void DWARFDebugPubTable::dump(raw_ostream &OS) const {
OS << "\n." << Name << " contents:\n";
for (const Set &S : Sets) { for (const Set &S : Sets) {
OS << "length = " << format("0x%08x", S.Length); OS << "length = " << format("0x%08x", S.Length);
OS << " version = " << format("0x%04x", S.Version); OS << " version = " << format("0x%04x", S.Version);