mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-21 18:29:46 +00:00
DWARFDebugArangeSet: remove dead code
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@193785 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
67b52144d2
commit
9e189f12e6
@ -20,32 +20,6 @@ void DWARFDebugArangeSet::clear() {
|
||||
ArangeDescriptors.clear();
|
||||
}
|
||||
|
||||
void DWARFDebugArangeSet::compact() {
|
||||
if (ArangeDescriptors.empty())
|
||||
return;
|
||||
|
||||
// Iterate through all arange descriptors and combine any ranges that
|
||||
// overlap or have matching boundaries. The ArangeDescriptors are assumed
|
||||
// to be in ascending order.
|
||||
uint32_t i = 0;
|
||||
while (i + 1 < ArangeDescriptors.size()) {
|
||||
if (ArangeDescriptors[i].getEndAddress() >= ArangeDescriptors[i+1].Address){
|
||||
// The current range ends at or exceeds the start of the next address
|
||||
// range. Compute the max end address between the two and use that to
|
||||
// make the new length.
|
||||
const uint64_t max_end_addr =
|
||||
std::max(ArangeDescriptors[i].getEndAddress(),
|
||||
ArangeDescriptors[i+1].getEndAddress());
|
||||
ArangeDescriptors[i].Length = max_end_addr - ArangeDescriptors[i].Address;
|
||||
// Now remove the next entry as it was just combined with the previous one
|
||||
ArangeDescriptors.erase(ArangeDescriptors.begin()+i+1);
|
||||
} else {
|
||||
// Discontiguous address range, just proceed to the next one.
|
||||
++i;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
bool
|
||||
DWARFDebugArangeSet::extract(DataExtractor data, uint32_t *offset_ptr) {
|
||||
if (data.isValidOffset(*offset_ptr)) {
|
||||
@ -126,26 +100,3 @@ void DWARFDebugArangeSet::dump(raw_ostream &OS) const {
|
||||
<< format(" 0x%*.*" PRIx64 ")\n",
|
||||
hex_width, hex_width, pos->getEndAddress());
|
||||
}
|
||||
|
||||
|
||||
namespace {
|
||||
class DescriptorContainsAddress {
|
||||
const uint64_t Address;
|
||||
public:
|
||||
DescriptorContainsAddress(uint64_t address) : Address(address) {}
|
||||
bool operator()(const DWARFDebugArangeSet::Descriptor &desc) const {
|
||||
return Address >= desc.Address && Address < (desc.Address + desc.Length);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
uint32_t DWARFDebugArangeSet::findAddress(uint64_t address) const {
|
||||
DescriptorConstIter end = ArangeDescriptors.end();
|
||||
DescriptorConstIter pos =
|
||||
std::find_if(ArangeDescriptors.begin(), end, // Range
|
||||
DescriptorContainsAddress(address)); // Predicate
|
||||
if (pos != end)
|
||||
return HeaderData.CuOffset;
|
||||
|
||||
return -1U;
|
||||
}
|
||||
|
@ -44,7 +44,6 @@ public:
|
||||
|
||||
private:
|
||||
typedef std::vector<Descriptor> DescriptorColl;
|
||||
typedef DescriptorColl::iterator DescriptorIter;
|
||||
typedef DescriptorColl::const_iterator DescriptorConstIter;
|
||||
|
||||
uint32_t Offset;
|
||||
@ -54,15 +53,11 @@ private:
|
||||
public:
|
||||
DWARFDebugArangeSet() { clear(); }
|
||||
void clear();
|
||||
void compact();
|
||||
bool extract(DataExtractor data, uint32_t *offset_ptr);
|
||||
void dump(raw_ostream &OS) const;
|
||||
|
||||
uint32_t getCompileUnitDIEOffset() const { return HeaderData.CuOffset; }
|
||||
uint32_t getOffsetOfNextEntry() const { return Offset + HeaderData.Length + 4; }
|
||||
uint32_t findAddress(uint64_t address) const;
|
||||
uint32_t getNumDescriptors() const { return ArangeDescriptors.size(); }
|
||||
const struct Header &getHeader() const { return HeaderData; }
|
||||
const Descriptor *getDescriptor(uint32_t i) const {
|
||||
if (i < ArangeDescriptors.size())
|
||||
return &ArangeDescriptors[i];
|
||||
|
Loading…
Reference in New Issue
Block a user