maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Implement macho relocation iterators with section number + relocation number. 

This will make it possible to implement getRelocationAddress.

llvm-svn: 205587
This commit is contained in:
Rafael Espindola 2014-04-03 23:51:28 +00:00
parent 905b6d192c
commit 128b8111d7
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
llvm/lib/Object/MachOObjectFile.cpp
View File

@ -755,46 +755,31 @@ MachOObjectFile::sectionContainsSymbol(DataRefImpl Sec, DataRefImpl Symb,
} }
relocation_iterator MachOObjectFile::section_rel_begin(DataRefImpl Sec) const { relocation_iterator MachOObjectFile::section_rel_begin(DataRefImpl Sec) const {
uint32_t Offset;
if (is64Bit()) {
MachO::section_64 Sect = getSection64(Sec);
Offset = Sect.reloff;
} else {
MachO::section Sect = getSection(Sec);
Offset = Sect.reloff;
}
DataRefImpl Ret; DataRefImpl Ret;
Ret.p = reinterpret_cast<uintptr_t>(getPtr(this, Offset)); Ret.d.a = Sec.d.a;
Ret.d.b = 0;
return relocation_iterator(RelocationRef(Ret, this)); return relocation_iterator(RelocationRef(Ret, this));
} }
relocation_iterator relocation_iterator
MachOObjectFile::section_rel_end(DataRefImpl Sec) const { MachOObjectFile::section_rel_end(DataRefImpl Sec) const {
uint32_t Offset;
uint32_t Num; uint32_t Num;
if (is64Bit()) { if (is64Bit()) {
MachO::section_64 Sect = getSection64(Sec); MachO::section_64 Sect = getSection64(Sec);
Offset = Sect.reloff;
Num = Sect.nreloc; Num = Sect.nreloc;
} else { } else {
MachO::section Sect = getSection(Sec); MachO::section Sect = getSection(Sec);
Offset = Sect.reloff;
Num = Sect.nreloc; Num = Sect.nreloc;
} }
const MachO::any_relocation_info *P =
reinterpret_cast<const MachO::any_relocation_info *>(getPtr(this, Offset));
DataRefImpl Ret; DataRefImpl Ret;
Ret.p = reinterpret_cast<uintptr_t>(P + Num); Ret.d.a = Sec.d.a;
Ret.d.b = Num;
return relocation_iterator(RelocationRef(Ret, this)); return relocation_iterator(RelocationRef(Ret, this));
} }
void MachOObjectFile::moveRelocationNext(DataRefImpl &Rel) const { void MachOObjectFile::moveRelocationNext(DataRefImpl &Rel) const {
const MachO::any_relocation_info *P = ++Rel.d.b;
reinterpret_cast<const MachO::any_relocation_info *>(Rel.p);
Rel.p = reinterpret_cast<uintptr_t>(P + 1);
} }
error_code error_code
@ -1476,8 +1461,21 @@ MachOObjectFile::getVersionMinLoadCommand(const LoadCommandInfo &L) const {
MachO::any_relocation_info MachO::any_relocation_info
MachOObjectFile::getRelocation(DataRefImpl Rel) const { MachOObjectFile::getRelocation(DataRefImpl Rel) const {
const char *P = reinterpret_cast<const char *>(Rel.p); DataRefImpl Sec;
return getStruct<MachO::any_relocation_info>(this, P); Sec.d.a = Rel.d.a;
uint32_t Offset;
if (is64Bit()) {
MachO::section_64 Sect = getSection64(Sec);
Offset = Sect.reloff;
} else {
MachO::section Sect = getSection(Sec);
Offset = Sect.reloff;
}
auto P = reinterpret_cast<const MachO::any_relocation_info *>(
getPtr(this, Offset)) + Rel.d.b;
return getStruct<MachO::any_relocation_info>(
this, reinterpret_cast<const char *>(P));
} }
MachO::data_in_code_entry MachO::data_in_code_entry