6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-13 22:24:07 +00:00
Code Issues Projects Releases Wiki Activity

[DebugInfo] Further simplify DWARFDebugAranges public interface

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@191813 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Alexey Samsonov
2013-10-02 07:12:47 +00:00
parent d243c19c1f
commit 3db24f52c5
3 changed files with 33 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/DebugInfo/DWARFContext.cpp
View File

@ -231,13 +231,7 @@ const DWARFDebugAranges *DWARFContext::getDebugAranges() {
if (Aranges) if (Aranges)
return Aranges.get(); return Aranges.get();
DataExtractor arangesData(getARangeSection(), isLittleEndian(), 0);
Aranges.reset(new DWARFDebugAranges()); Aranges.reset(new DWARFDebugAranges());
Aranges->extract(arangesData);
// Generate aranges from DIEs: even if .debug_aranges section is present,
// it may describe only a small subset of compilation units, so we need to
// manually build aranges for the rest of them.
Aranges->generate(this); Aranges->generate(this);
return Aranges.get(); return Aranges.get();
} }

37
lib/DebugInfo/DWARFDebugAranges.cpp
View File

@ -45,34 +45,31 @@ void DWARFDebugAranges::extract(DataExtractor DebugArangesData) {
appendRange(CUOffset, LowPC, HighPC); appendRange(CUOffset, LowPC, HighPC);
} }
} }
sortAndMinimize();
} }
void DWARFDebugAranges::generate(DWARFContext *CTX) { void DWARFDebugAranges::generate(DWARFContext *CTX) {
if (CTX) { clear();
const uint32_t num_compile_units = CTX->getNumCompileUnits(); if (!CTX)
for (uint32_t cu_idx = 0; cu_idx < num_compile_units; ++cu_idx) { return;
if (DWARFCompileUnit *cu = CTX->getCompileUnitAtIndex(cu_idx)) {
uint32_t CUOffset = cu->getOffset(); // Extract aranges from .debug_aranges section.
if (ParsedCUOffsets.insert(CUOffset).second) DataExtractor ArangesData(CTX->getARangeSection(), CTX->isLittleEndian(), 0);
cu->buildAddressRangeTable(this, true, CUOffset); extract(ArangesData);
}
// Generate aranges from DIEs: even if .debug_aranges section is present,
// it may describe only a small subset of compilation units, so we need to
// manually build aranges for the rest of them.
for (uint32_t i = 0, n = CTX->getNumCompileUnits(); i < n; ++i) {
if (DWARFCompileUnit *CU = CTX->getCompileUnitAtIndex(i)) {
uint32_t CUOffset = CU->getOffset();
if (ParsedCUOffsets.insert(CUOffset).second)
CU->buildAddressRangeTable(this, true, CUOffset);
} }
} }
sortAndMinimize(); sortAndMinimize();
} }
void DWARFDebugAranges::dump(raw_ostream &OS) const {
for (RangeCollIterator I = Aranges.begin(), E = Aranges.end(); I != E; ++I) {
I->dump(OS);
}
}
void DWARFDebugAranges::Range::dump(raw_ostream &OS) const {
OS << format("{0x%8.8x}: [0x%8.8" PRIx64 " - 0x%8.8" PRIx64 ")\n",
CUOffset, LowPC, HighPC());
}
void DWARFDebugAranges::appendRange(uint32_t CUOffset, uint64_t LowPC, void DWARFDebugAranges::appendRange(uint32_t CUOffset, uint64_t LowPC,
uint64_t HighPC) { uint64_t HighPC) {
if (!Aranges.empty()) { if (!Aranges.empty()) {

32
lib/DebugInfo/DWARFDebugAranges.h
View File

@ -20,6 +20,22 @@ class DWARFContext;
class DWARFDebugAranges { class DWARFDebugAranges {
public: public:
void clear() {
Aranges.clear();
ParsedCUOffsets.clear();
}
void generate(DWARFContext *CTX);
// Use appendRange multiple times and then call sortAndMinimize.
void appendRange(uint32_t CUOffset, uint64_t LowPC, uint64_t HighPC);
uint32_t findAddress(uint64_t Address) const;
private:
void extract(DataExtractor DebugArangesData);
void sortAndMinimize();
struct Range { struct Range {
explicit Range(uint64_t LowPC = -1ULL, uint64_t HighPC = -1ULL, explicit Range(uint64_t LowPC = -1ULL, uint64_t HighPC = -1ULL,
uint32_t CUOffset = -1U) uint32_t CUOffset = -1U)
@ -50,31 +66,15 @@ public:
return Left.HighPC() >= Right.LowPC; return Left.HighPC() >= Right.LowPC;
} }
void dump(raw_ostream &OS) const;
uint64_t LowPC; // Start of address range. uint64_t LowPC; // Start of address range.
uint32_t Length; // End of address range (not including this address). uint32_t Length; // End of address range (not including this address).
uint32_t CUOffset; // Offset of the compile unit or die. uint32_t CUOffset; // Offset of the compile unit or die.
}; };
void clear() {
Aranges.clear();
ParsedCUOffsets.clear();
}
void extract(DataExtractor DebugArangesData);
void generate(DWARFContext *CTX);
// Use appendRange multiple times and then call sortAndMinimize.
void appendRange(uint32_t CUOffset, uint64_t LowPC, uint64_t HighPC);
void sortAndMinimize();
void dump(raw_ostream &OS) const;
uint32_t findAddress(uint64_t Address) const;
typedef std::vector<Range> RangeColl; typedef std::vector<Range> RangeColl;
typedef RangeColl::const_iterator RangeCollIterator; typedef RangeColl::const_iterator RangeCollIterator;
typedef DenseSet<uint32_t> ParsedCUOffsetColl; typedef DenseSet<uint32_t> ParsedCUOffsetColl;
private:
RangeColl Aranges; RangeColl Aranges;
ParsedCUOffsetColl ParsedCUOffsets; ParsedCUOffsetColl ParsedCUOffsets;
}; };