diff options
Diffstat (limited to 'lib/DebugInfo/DWARFDebugAranges.h')
-rw-r--r-- | lib/DebugInfo/DWARFDebugAranges.h | 49 |
1 files changed, 22 insertions, 27 deletions
diff --git a/lib/DebugInfo/DWARFDebugAranges.h b/lib/DebugInfo/DWARFDebugAranges.h index a5da2137ef..cbd7d53ab6 100644 --- a/lib/DebugInfo/DWARFDebugAranges.h +++ b/lib/DebugInfo/DWARFDebugAranges.h @@ -21,44 +21,39 @@ class DWARFContext; class DWARFDebugAranges { public: struct Range { - explicit Range(uint64_t lo = -1ULL, uint64_t hi = -1ULL, - uint32_t off = -1U) - : LoPC(lo), Length(hi-lo), Offset(off) {} - - void clear() { - LoPC = -1ULL; - Length = 0; - Offset = -1U; - } + explicit Range(uint64_t LowPC = -1ULL, uint64_t HighPC = -1ULL, + uint32_t CUOffset = -1U) + : LowPC(LowPC), Length(HighPC - LowPC), CUOffset(CUOffset) {} - void setHiPC(uint64_t HiPC) { - if (HiPC == -1ULL || HiPC <= LoPC) + void setHighPC(uint64_t HighPC) { + if (HighPC == -1ULL || HighPC <= LowPC) Length = 0; else - Length = HiPC - LoPC; + Length = HighPC - LowPC; } - uint64_t HiPC() const { + uint64_t HighPC() const { if (Length) - return LoPC + Length; + return LowPC + Length; return -1ULL; } - bool isValidRange() const { return Length > 0; } + bool containsAddress(uint64_t Address) const { + return LowPC <= Address && Address < HighPC(); + } - static bool SortedOverlapCheck(const Range &curr_range, - const Range &next_range, uint32_t n) { - if (curr_range.Offset != next_range.Offset) - return false; - return curr_range.HiPC() + n >= next_range.LoPC; + bool operator <(const Range &other) const { + return LowPC < other.LowPC; } - bool contains(const Range &range) const { - return LoPC <= range.LoPC && range.HiPC() <= HiPC(); + static bool SortedOverlapCheck(const Range &Left, const Range &Right) { + if (Left.CUOffset != Right.CUOffset) + return false; + return Left.HighPC() >= Right.LowPC; } void dump(raw_ostream &OS) const; - uint64_t LoPC; // Start of address range - uint32_t Length; // End of address range (not including this address) - uint32_t Offset; // Offset of the compile unit or die + uint64_t LowPC; // Start of address range. + uint32_t Length; // End of address range (not including this address). + uint32_t CUOffset; // Offset of the compile unit or die. }; void clear() { @@ -68,9 +63,9 @@ public: void extract(DataExtractor DebugArangesData); void generate(DWARFContext *CTX); - // Use appendRange multiple times and then call sort. + // Use appendRange multiple times and then call sortAndMinimize. void appendRange(uint32_t CUOffset, uint64_t LowPC, uint64_t HighPC); - void sort(bool Minimize, uint32_t OverlapSize); + void sortAndMinimize(); void dump(raw_ostream &OS) const; uint32_t findAddress(uint64_t Address) const; |