[llvm] r198850 - llvm-dwarfdump: type unit dwo support
David Blaikie
dblaikie at gmail.com
Wed Jan 8 21:08:24 PST 2014
Author: dblaikie
Date: Wed Jan 8 23:08:24 2014
New Revision: 198850
URL: http://llvm.org/viewvc/llvm-project?rev=198850&view=rev
Log:
llvm-dwarfdump: type unit dwo support
Modified:
llvm/trunk/include/llvm/DebugInfo/DIContext.h
llvm/trunk/lib/DebugInfo/DWARFContext.cpp
llvm/trunk/lib/DebugInfo/DWARFContext.h
llvm/trunk/tools/llvm-dwarfdump/llvm-dwarfdump.cpp
Modified: llvm/trunk/include/llvm/DebugInfo/DIContext.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/DIContext.h?rev=198850&r1=198849&r2=198850&view=diff
==============================================================================
--- llvm/trunk/include/llvm/DebugInfo/DIContext.h (original)
+++ llvm/trunk/include/llvm/DebugInfo/DIContext.h Wed Jan 8 23:08:24 2014
@@ -105,6 +105,7 @@ enum DIDumpType {
DIDT_Info,
DIDT_InfoDwo,
DIDT_Types,
+ DIDT_TypesDwo,
DIDT_Line,
DIDT_Loc,
DIDT_Ranges,
Modified: llvm/trunk/lib/DebugInfo/DWARFContext.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/DWARFContext.cpp?rev=198850&r1=198849&r2=198850&view=diff
==============================================================================
--- llvm/trunk/lib/DebugInfo/DWARFContext.cpp (original)
+++ llvm/trunk/lib/DebugInfo/DWARFContext.cpp Wed Jan 8 23:08:24 2014
@@ -91,6 +91,13 @@ void DWARFContext::dump(raw_ostream &OS,
getTypeUnitAtIndex(i)->dump(OS);
}
+ if (DumpType == DIDT_All || DumpType == DIDT_TypesDwo)
+ if (getNumDWOTypeUnits()) {
+ OS << "\n.debug_types.dwo contents:\n";
+ for (unsigned i = 0, e = getNumDWOTypeUnits(); i != e; ++i)
+ getDWOTypeUnitAtIndex(i)->dump(OS);
+ }
+
if (DumpType == DIDT_All || DumpType == DIDT_Loc) {
OS << "\n.debug_loc contents:\n";
getDebugLoc()->dump(OS);
@@ -333,6 +340,27 @@ void DWARFContext::parseDWOCompileUnits(
}
}
+void DWARFContext::parseDWOTypeUnits() {
+ const TypeSectionMap &Sections = getTypesDWOSections();
+ for (TypeSectionMap::const_iterator I = Sections.begin(), E = Sections.end();
+ I != E; ++I) {
+ uint32_t offset = 0;
+ const DataExtractor &DIData =
+ DataExtractor(I->second.Data, isLittleEndian(), 0);
+ while (DIData.isValidOffset(offset)) {
+ OwningPtr<DWARFTypeUnit> TU(new DWARFTypeUnit(
+ getDebugAbbrevDWO(), I->second.Data, getAbbrevDWOSection(),
+ getRangeDWOSection(), getStringDWOSection(),
+ getStringOffsetDWOSection(), getAddrSection(), &I->second.Relocs,
+ isLittleEndian()));
+ if (!TU->extract(DIData, &offset))
+ break;
+ DWOTUs.push_back(TU.take());
+ offset = DWOTUs.back()->getNextUnitOffset();
+ }
+ }
+}
+
namespace {
struct OffsetComparator {
bool operator()(const DWARFCompileUnit *LHS,
@@ -632,6 +660,8 @@ DWARFContextInMemory::DWARFContextInMemo
// Find debug_types data by section rather than name as there are
// multiple, comdat grouped, debug_types sections.
TypesSections[*i].Data = data;
+ } else if (name == "debug_types.dwo") {
+ TypesDWOSections[*i].Data = data;
}
section_iterator RelocatedSection = i->getRelocatedSection();
@@ -652,11 +682,14 @@ DWARFContextInMemory::DWARFContextInMemo
.Case("debug_line", &LineSection.Relocs)
.Default(0);
if (!Map) {
- if (RelSecName != "debug_types")
- continue;
// Find debug_types relocs by section rather than name as there are
// multiple, comdat grouped, debug_types sections.
- Map = &TypesSections[*RelocatedSection].Relocs;
+ if (RelSecName == "debug_types")
+ Map = &TypesSections[*RelocatedSection].Relocs;
+ else if (RelSecName == "debug_types.dwo")
+ Map = &TypesDWOSections[*RelocatedSection].Relocs;
+ else
+ continue;
}
if (i->begin_relocations() != i->end_relocations()) {
Modified: llvm/trunk/lib/DebugInfo/DWARFContext.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/DWARFContext.h?rev=198850&r1=198849&r2=198850&view=diff
==============================================================================
--- llvm/trunk/lib/DebugInfo/DWARFContext.h (original)
+++ llvm/trunk/lib/DebugInfo/DWARFContext.h Wed Jan 8 23:08:24 2014
@@ -38,6 +38,7 @@ class DWARFContext : public DIContext {
OwningPtr<DWARFDebugFrame> DebugFrame;
SmallVector<DWARFCompileUnit *, 1> DWOCUs;
+ SmallVector<DWARFTypeUnit *, 1> DWOTUs;
OwningPtr<DWARFDebugAbbrev> AbbrevDWO;
DWARFContext(DWARFContext &) LLVM_DELETED_FUNCTION;
@@ -53,6 +54,10 @@ class DWARFContext : public DIContext {
/// DWOCUs.
void parseDWOCompileUnits();
+ /// Read type units from the debug_types.dwo section and store them in
+ /// DWOTUs.
+ void parseDWOTypeUnits();
+
public:
struct Section {
StringRef Data;
@@ -89,6 +94,13 @@ public:
return DWOCUs.size();
}
+ /// Get the number of compile units in the DWO context.
+ unsigned getNumDWOTypeUnits() {
+ if (DWOTUs.empty())
+ parseDWOTypeUnits();
+ return DWOTUs.size();
+ }
+
/// Get the compile unit at the specified index for this compile unit.
DWARFCompileUnit *getCompileUnitAtIndex(unsigned index) {
if (CUs.empty())
@@ -110,6 +122,13 @@ public:
return DWOCUs[index];
}
+ /// Get the type unit at the specified index for the DWO type units.
+ DWARFTypeUnit *getDWOTypeUnitAtIndex(unsigned index) {
+ if (DWOTUs.empty())
+ parseDWOTypeUnits();
+ return DWOTUs[index];
+ }
+
/// Get a pointer to the parsed DebugAbbrev object.
const DWARFDebugAbbrev *getDebugAbbrev();
@@ -156,6 +175,7 @@ public:
// Sections for DWARF5 split dwarf proposal.
virtual const Section &getInfoDWOSection() = 0;
+ virtual const TypeSectionMap &getTypesDWOSections() = 0;
virtual StringRef getAbbrevDWOSection() = 0;
virtual StringRef getStringDWOSection() = 0;
virtual StringRef getStringOffsetDWOSection() = 0;
@@ -197,6 +217,7 @@ class DWARFContextInMemory : public DWAR
// Sections for DWARF5 split dwarf proposal.
Section InfoDWOSection;
+ TypeSectionMap TypesDWOSections;
StringRef AbbrevDWOSection;
StringRef StringDWOSection;
StringRef StringOffsetDWOSection;
@@ -226,6 +247,9 @@ public:
// Sections for DWARF5 split dwarf proposal.
virtual const Section &getInfoDWOSection() { return InfoDWOSection; }
+ virtual const TypeSectionMap &getTypesDWOSections() {
+ return TypesDWOSections;
+ }
virtual StringRef getAbbrevDWOSection() { return AbbrevDWOSection; }
virtual StringRef getStringDWOSection() { return StringDWOSection; }
virtual StringRef getStringOffsetDWOSection() {
Modified: llvm/trunk/tools/llvm-dwarfdump/llvm-dwarfdump.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-dwarfdump/llvm-dwarfdump.cpp?rev=198850&r1=198849&r2=198850&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-dwarfdump/llvm-dwarfdump.cpp (original)
+++ llvm/trunk/tools/llvm-dwarfdump/llvm-dwarfdump.cpp Wed Jan 8 23:08:24 2014
@@ -63,6 +63,7 @@ DumpType("debug-dump", cl::init(DIDT_All
clEnumValN(DIDT_Info, "info", ".debug_info"),
clEnumValN(DIDT_InfoDwo, "info.dwo", ".debug_info.dwo"),
clEnumValN(DIDT_Types, "types", ".debug_types"),
+ clEnumValN(DIDT_TypesDwo, "types.dwo", ".debug_types.dwo"),
clEnumValN(DIDT_Line, "line", ".debug_line"),
clEnumValN(DIDT_Loc, "loc", ".debug_loc"),
clEnumValN(DIDT_Frames, "frames", ".debug_frame"),
More information about the llvm-commits
mailing list