6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-09-18 12:25:47 +00:00
Code Issues Projects Releases Wiki Activity

[C++11] Introduce ObjectFile::sections().

Browse Source 
Summary:
This adds ObjectFile::section_iterator_range, that allows to write
range-based for-loops running over all sections of a given file.
Several files from lib/ are converted to the new interface. Similar fixes
should be applied to a variety of llvm-* tools.

Reviewers: rafael

Reviewed By: rafael

CC: llvm-commits

Differential Revision: http://llvm-reviews.chandlerc.com/D3069

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@203799 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Alexey Samsonov
2014-03-13 13:52:54 +00:00
parent f8909fa140
commit b920dfe02b
5 changed files with 63 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
lib/MC/MCObjectSymbolizer.cpp
View File

@@ -51,11 +51,11 @@ MCMachObjectSymbolizer::MCMachObjectSymbolizer(
: MCObjectSymbolizer(Ctx, RelInfo, MOOF), MOOF(MOOF), StubsStart(0),
StubsCount(0), StubSize(0), StubsIndSymIndex(0) {
for (section_iterator SI = MOOF->section_begin(), SE = MOOF->section_end();
SI != SE; ++SI) {
StringRef Name; SI->getName(Name);
for (const SectionRef &Section : MOOF->sections()) {
StringRef Name;
Section.getName(Name);
if (Name == "__stubs") {
SectionRef StubsSec = *SI;
SectionRef StubsSec = Section;
if (MOOF->is64Bit()) {
MachO::section_64 S = MOOF->getSection64(StubsSec.getRawDataRefImpl());
StubsIndSymIndex = S.reserved1;
@@ -230,40 +230,41 @@ const RelocationRef *MCObjectSymbolizer::findRelocationAt(uint64_t Addr) {
}
void MCObjectSymbolizer::buildSectionList() {
for (section_iterator SI = Obj->section_begin(), SE = Obj->section_end();
SI != SE; ++SI) {
bool RequiredForExec; SI->isRequiredForExecution(RequiredForExec);
for (const SectionRef &Section : Obj->sections()) {
bool RequiredForExec;
Section.isRequiredForExecution(RequiredForExec);
if (RequiredForExec == false)
continue;
uint64_t SAddr; SI->getAddress(SAddr);
uint64_t SSize; SI->getSize(SSize);
SortedSectionList::iterator It = std::lower_bound(SortedSections.begin(),
SortedSections.end(),
SAddr,
SectionStartsBefore);
uint64_t SAddr;
Section.getAddress(SAddr);
uint64_t SSize;
Section.getSize(SSize);
SortedSectionList::iterator It =
std::lower_bound(SortedSections.begin(), SortedSections.end(), SAddr,
SectionStartsBefore);
if (It != SortedSections.end()) {
uint64_t FoundSAddr; It->getAddress(FoundSAddr);
if (FoundSAddr < SAddr + SSize)
llvm_unreachable("Inserting overlapping sections");
}
SortedSections.insert(It, *SI);
SortedSections.insert(It, Section);
}
}
void MCObjectSymbolizer::buildRelocationByAddrMap() {
for (section_iterator SI = Obj->section_begin(), SE = Obj->section_end();
SI != SE; ++SI) {
section_iterator RelSecI = SI->getRelocatedSection();
for (const SectionRef &Section : Obj->sections()) {
section_iterator RelSecI = Section.getRelocatedSection();
if (RelSecI == Obj->section_end())
continue;
uint64_t StartAddr; RelSecI->getAddress(StartAddr);
uint64_t Size; RelSecI->getSize(Size);
bool RequiredForExec; RelSecI->isRequiredForExecution(RequiredForExec);
bool RequiredForExec;
RelSecI->isRequiredForExecution(RequiredForExec);
if (RequiredForExec == false || Size == 0)
continue;
for (relocation_iterator RI = SI->relocation_begin(),
RE = SI->relocation_end();
for (relocation_iterator RI = Section.relocation_begin(),
RE = Section.relocation_end();
RI != RE; ++RI) {
// FIXME: libObject is inconsistent regarding error handling. The
// overwhelming majority of methods always return object_error::success,