replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[DWARF parser] Use distinction between DW_AT_ranges_base and DW_AT_GNU_ranges_base instead of DWARF version 

llvm-svn: 210945
This commit is contained in:
Alexey Samsonov 2014-06-13 22:31:03 +00:00
parent be7c677008
commit aa90998c87
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
llvm/lib/DebugInfo/DWARFDebugInfoEntry.cpp
View File

@ -210,6 +210,16 @@ uint64_t DWARFDebugInfoEntryMinimal::getAttributeValueAsSectionOffset(
return Result.hasValue() ? Result.getValue() : FailValue; return Result.hasValue() ? Result.getValue() : FailValue;
} }
uint64_t
DWARFDebugInfoEntryMinimal::getRangesBaseAttribute(const DWARFUnit *U,
uint64_t FailValue) const {
uint64_t Result =
getAttributeValueAsSectionOffset(U, DW_AT_ranges_base, -1ULL);
if (Result != -1ULL)
return Result;
return getAttributeValueAsSectionOffset(U, DW_AT_GNU_ranges_base, FailValue);
}
bool DWARFDebugInfoEntryMinimal::getLowAndHighPC(const DWARFUnit *U, bool DWARFDebugInfoEntryMinimal::getLowAndHighPC(const DWARFUnit *U,
uint64_t &LowPC, uint64_t &LowPC,
uint64_t &HighPC) const { uint64_t &HighPC) const {

2
llvm/lib/DebugInfo/DWARFDebugInfoEntry.h
View File

@ -106,6 +106,8 @@ public:
const uint16_t Attr, const uint16_t Attr,
uint64_t FailValue) const; uint64_t FailValue) const;
uint64_t getRangesBaseAttribute(const DWARFUnit *U, uint64_t FailValue) const;
/// Retrieves DW_AT_low_pc and DW_AT_high_pc from CU. /// Retrieves DW_AT_low_pc and DW_AT_high_pc from CU.
/// Returns true if both attributes are present. /// Returns true if both attributes are present.
bool getLowAndHighPC(const DWARFUnit *U, uint64_t &LowPC, bool getLowAndHighPC(const DWARFUnit *U, uint64_t &LowPC,

13
llvm/lib/DebugInfo/DWARFUnit.cpp
View File

@ -225,12 +225,10 @@ size_t DWARFUnit::extractDIEsIfNeeded(bool CUDieOnly) {
setBaseAddress(BaseAddr); setBaseAddress(BaseAddr);
AddrOffsetSectionBase = DieArray[0].getAttributeValueAsSectionOffset( AddrOffsetSectionBase = DieArray[0].getAttributeValueAsSectionOffset(
this, DW_AT_GNU_addr_base, 0); this, DW_AT_GNU_addr_base, 0);
// Users of old DWARF may not know about DW_AT_ranges_base, so it is ignored RangeSectionBase = DieArray[0].getAttributeValueAsSectionOffset(
// for skeleton CU DIE (e.g. DW_AT_ranges are *not* relative to it). this, DW_AT_ranges_base, 0);
if (Version > 4) { // Don't fall back to DW_AT_GNU_ranges_base: it should be ignored for
RangeSectionBase = DieArray[0].getAttributeValueAsSectionOffset( // skeleton CU DIE, so that DWARF users not aware of it are not broken.
this, DW_AT_GNU_ranges_base, 0);
}
} }
setDIERelations(); setDIERelations();
@ -276,8 +274,7 @@ bool DWARFUnit::parseDWO() {
} }
// Share .debug_addr and .debug_ranges section with compile unit in .dwo // Share .debug_addr and .debug_ranges section with compile unit in .dwo
DWOCU->setAddrOffsetSection(AddrOffsetSection, AddrOffsetSectionBase); DWOCU->setAddrOffsetSection(AddrOffsetSection, AddrOffsetSectionBase);
uint32_t DWORangesBase = DieArray[0].getAttributeValueAsSectionOffset( uint32_t DWORangesBase = DieArray[0].getRangesBaseAttribute(this, 0);
this, DW_AT_GNU_ranges_base, 0);
DWOCU->setRangesSection(RangeSection, DWORangesBase); DWOCU->setRangesSection(RangeSection, DWORangesBase);
return true; return true;
} }