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

[DWARF parser] Cleanup code in DWARFDebugAbbrev.

Browse Source 
No functionality change.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@207274 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Alexey Samsonov
2014-04-25 21:10:56 +00:00
parent d761cc1dfa
commit bfd66f57da
3 changed files with 73 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
lib/DebugInfo/DWARFDebugAbbrev.cpp
View File

@ -12,24 +12,36 @@
#include "llvm/Support/raw_ostream.h"
using namespace llvm;
bool DWARFAbbreviationDeclarationSet::extract(DataExtractor data,
uint32_t* offset_ptr) {
const uint32_t beginOffset = *offset_ptr;
Offset = beginOffset;
DWARFAbbreviationDeclarationSet::DWARFAbbreviationDeclarationSet() {
clear();
DWARFAbbreviationDeclaration abbrevDeclaration;
uint32_t prevAbbrAode = 0;
while (abbrevDeclaration.extract(data, offset_ptr)) {
Decls.push_back(abbrevDeclaration);
if (IdxOffset == 0) {
IdxOffset = abbrevDeclaration.getCode();
}
void DWARFAbbreviationDeclarationSet::clear() {
Offset = 0;
FirstAbbrCode = 0;
Decls.clear();
}
bool DWARFAbbreviationDeclarationSet::extract(DataExtractor Data,
uint32_t *OffsetPtr) {
clear();
const uint32_t BeginOffset = *OffsetPtr;
Offset = BeginOffset;
DWARFAbbreviationDeclaration AbbrDecl;
uint32_t PrevAbbrCode = 0;
while (AbbrDecl.extract(Data, OffsetPtr)) {
Decls.push_back(AbbrDecl);
if (FirstAbbrCode == 0) {
FirstAbbrCode = AbbrDecl.getCode();
} else {
if (prevAbbrAode + 1 != abbrevDeclaration.getCode())
IdxOffset = UINT32_MAX;// Out of order indexes, we can't do O(1) lookups
if (PrevAbbrCode + 1 != AbbrDecl.getCode()) {
// Codes are not consecutive, can't do O(1) lookups.
FirstAbbrCode = UINT32_MAX;
}
}
prevAbbrAode = abbrevDeclaration.getCode();
PrevAbbrCode = AbbrDecl.getCode();
}
return beginOffset != *offset_ptr;
return BeginOffset != *OffsetPtr;
}
void DWARFAbbreviationDeclarationSet::dump(raw_ostream &OS) const {
@ -37,49 +49,50 @@ void DWARFAbbreviationDeclarationSet::dump(raw_ostream &OS) const {
Decl.dump(OS);
}
const DWARFAbbreviationDeclaration*
DWARFAbbreviationDeclarationSet::getAbbreviationDeclaration(uint32_t abbrCode)
const {
if (IdxOffset == UINT32_MAX) {
const DWARFAbbreviationDeclaration *
DWARFAbbreviationDeclarationSet::getAbbreviationDeclaration(
uint32_t AbbrCode) const {
if (FirstAbbrCode == UINT32_MAX) {
for (const auto &Decl : Decls) {
if (Decl.getCode() == abbrCode)
if (Decl.getCode() == AbbrCode)
return &Decl;
}
} else {
uint32_t idx = abbrCode - IdxOffset;
if (idx < Decls.size())
return &Decls[idx];
return nullptr;
}
return nullptr;
if (AbbrCode < FirstAbbrCode || AbbrCode >= FirstAbbrCode + Decls.size())
return nullptr;
return &Decls[AbbrCode - FirstAbbrCode];
}
DWARFDebugAbbrev::DWARFDebugAbbrev() :
AbbrevCollMap(),
PrevAbbrOffsetPos(AbbrevCollMap.end()) {}
DWARFDebugAbbrev::DWARFDebugAbbrev() {
clear();
}
void DWARFDebugAbbrev::clear() {
AbbrDeclSets.clear();
PrevAbbrOffsetPos = AbbrDeclSets.end();
}
void DWARFDebugAbbrev::parse(DataExtractor data) {
uint32_t offset = 0;
void DWARFDebugAbbrev::extract(DataExtractor Data) {
clear();
while (data.isValidOffset(offset)) {
uint32_t initial_cu_offset = offset;
DWARFAbbreviationDeclarationSet abbrevDeclSet;
if (abbrevDeclSet.extract(data, &offset))
AbbrevCollMap[initial_cu_offset] = abbrevDeclSet;
else
uint32_t Offset = 0;
DWARFAbbreviationDeclarationSet AbbrDecls;
while (Data.isValidOffset(Offset)) {
uint32_t CUAbbrOffset = Offset;
if (!AbbrDecls.extract(Data, &Offset))
break;
AbbrDeclSets[CUAbbrOffset] = AbbrDecls;
}
PrevAbbrOffsetPos = AbbrevCollMap.end();
}
void DWARFDebugAbbrev::dump(raw_ostream &OS) const {
if (AbbrevCollMap.empty()) {
if (AbbrDeclSets.empty()) {
OS << "< EMPTY >\n";
return;
}
for (const auto &I : AbbrevCollMap) {
for (const auto &I : AbbrDeclSets) {
OS << format("Abbrev table for offset: 0x%8.8" PRIx64 "\n", I.first);
I.second.dump(OS);
}
@ -87,13 +100,12 @@ void DWARFDebugAbbrev::dump(raw_ostream &OS) const {
const DWARFAbbreviationDeclarationSet*
DWARFDebugAbbrev::getAbbreviationDeclarationSet(uint64_t CUAbbrOffset) const {
DWARFAbbreviationDeclarationCollMapConstIter End = AbbrevCollMap.end();
const auto End = AbbrDeclSets.end();
if (PrevAbbrOffsetPos != End && PrevAbbrOffsetPos->first == CUAbbrOffset) {
return &(PrevAbbrOffsetPos->second);
}
DWARFAbbreviationDeclarationCollMapConstIter Pos =
AbbrevCollMap.find(CUAbbrOffset);
const auto Pos = AbbrDeclSets.find(CUAbbrOffset);
if (Pos != End) {
PrevAbbrOffsetPos = Pos;
return &(Pos->second);