6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-26 05:32:25 +00:00
Code Issues Projects Releases Wiki Activity

Object/COFF: Rename getXXX{Begin,End} -> xxx_{begin,end}.

Browse Source 
It is mentioned in the LLVM coding standard that _begin() and _end() suffixes
should be used.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@191569 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rui Ueyama 2013-09-27 21:47:05 +00:00
parent bdd92883dd
commit 29552222c2
8 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/llvm/Object/COFF.h
View File

@ -269,8 +269,8 @@ protected:
bool &Res) const; bool &Res) const;
virtual error_code sectionContainsSymbol(DataRefImpl Sec, DataRefImpl Symb, virtual error_code sectionContainsSymbol(DataRefImpl Sec, DataRefImpl Symb,
bool &Result) const; bool &Result) const;
virtual relocation_iterator getSectionRelBegin(DataRefImpl Sec) const; virtual relocation_iterator section_rel_begin(DataRefImpl Sec) const;
virtual relocation_iterator getSectionRelEnd(DataRefImpl Sec) const; virtual relocation_iterator section_rel_end(DataRefImpl Sec) const;
virtual error_code getRelocationNext(DataRefImpl Rel, virtual error_code getRelocationNext(DataRefImpl Rel,
RelocationRef &Res) const; RelocationRef &Res) const;
@ -311,8 +311,8 @@ public:
virtual unsigned getArch() const; virtual unsigned getArch() const;
virtual StringRef getLoadName() const; virtual StringRef getLoadName() const;
import_directory_iterator getImportDirectoryBegin() const; import_directory_iterator import_directory_begin() const;
import_directory_iterator getImportDirectoryEnd() const; import_directory_iterator import_directory_end() const;
error_code getHeader(const coff_file_header *&Res) const; error_code getHeader(const coff_file_header *&Res) const;
error_code getCOFFHeader(const coff_file_header *&Res) const; error_code getCOFFHeader(const coff_file_header *&Res) const;

8
include/llvm/Object/ELFObjectFile.h
View File

@ -87,8 +87,8 @@ protected:
virtual error_code isSectionReadOnlyData(DataRefImpl Sec, bool &Res) const; virtual error_code isSectionReadOnlyData(DataRefImpl Sec, bool &Res) const;
virtual error_code sectionContainsSymbol(DataRefImpl Sec, DataRefImpl Symb, virtual error_code sectionContainsSymbol(DataRefImpl Sec, DataRefImpl Symb,
bool &Result) const; bool &Result) const;
virtual relocation_iterator getSectionRelBegin(DataRefImpl Sec) const; virtual relocation_iterator section_rel_begin(DataRefImpl Sec) const;
virtual relocation_iterator getSectionRelEnd(DataRefImpl Sec) const; virtual relocation_iterator section_rel_end(DataRefImpl Sec) const;
virtual section_iterator getRelocatedSection(DataRefImpl Sec) const; virtual section_iterator getRelocatedSection(DataRefImpl Sec) const;
virtual error_code getRelocationNext(DataRefImpl Rel, virtual error_code getRelocationNext(DataRefImpl Rel,
@ -611,7 +611,7 @@ error_code ELFObjectFile<ELFT>::sectionContainsSymbol(DataRefImpl Sec,
template <class ELFT> template <class ELFT>
relocation_iterator relocation_iterator
ELFObjectFile<ELFT>::getSectionRelBegin(DataRefImpl Sec) const { ELFObjectFile<ELFT>::section_rel_begin(DataRefImpl Sec) const {
DataRefImpl RelData; DataRefImpl RelData;
uintptr_t SHT = reinterpret_cast<uintptr_t>(EF.begin_sections().get()); uintptr_t SHT = reinterpret_cast<uintptr_t>(EF.begin_sections().get());
RelData.d.a = (Sec.p - SHT) / EF.getHeader()->e_shentsize; RelData.d.a = (Sec.p - SHT) / EF.getHeader()->e_shentsize;
@ -621,7 +621,7 @@ ELFObjectFile<ELFT>::getSectionRelBegin(DataRefImpl Sec) const {
template <class ELFT> template <class ELFT>
relocation_iterator relocation_iterator
ELFObjectFile<ELFT>::getSectionRelEnd(DataRefImpl Sec) const { ELFObjectFile<ELFT>::section_rel_end(DataRefImpl Sec) const {
DataRefImpl RelData; DataRefImpl RelData;
uintptr_t SHT = reinterpret_cast<uintptr_t>(EF.begin_sections().get()); uintptr_t SHT = reinterpret_cast<uintptr_t>(EF.begin_sections().get());
const Elf_Shdr *S = reinterpret_cast<const Elf_Shdr *>(Sec.p); const Elf_Shdr *S = reinterpret_cast<const Elf_Shdr *>(Sec.p);

8
include/llvm/Object/MachO.h
View File

@ -89,8 +89,8 @@ public:
virtual error_code isSectionReadOnlyData(DataRefImpl Sec, bool &Res) const; virtual error_code isSectionReadOnlyData(DataRefImpl Sec, bool &Res) const;
virtual error_code sectionContainsSymbol(DataRefImpl Sec, DataRefImpl Symb, virtual error_code sectionContainsSymbol(DataRefImpl Sec, DataRefImpl Symb,
bool &Result) const; bool &Result) const;
virtual relocation_iterator getSectionRelBegin(DataRefImpl Sec) const; virtual relocation_iterator section_rel_begin(DataRefImpl Sec) const;
virtual relocation_iterator getSectionRelEnd(DataRefImpl Sec) const; virtual relocation_iterator section_rel_end(DataRefImpl Sec) const;
virtual error_code getRelocationNext(DataRefImpl Rel, virtual error_code getRelocationNext(DataRefImpl Rel,
RelocationRef &Res) const; RelocationRef &Res) const;
@ -129,8 +129,8 @@ public:
virtual StringRef getLoadName() const; virtual StringRef getLoadName() const;
relocation_iterator getSectionRelBegin(unsigned Index) const; relocation_iterator section_rel_begin(unsigned Index) const;
relocation_iterator getSectionRelEnd(unsigned Index) const; relocation_iterator section_rel_end(unsigned Index) const;
dice_iterator begin_dices() const; dice_iterator begin_dices() const;
dice_iterator end_dices() const; dice_iterator end_dices() const;

8
include/llvm/Object/ObjectFile.h
View File

@ -322,8 +322,8 @@ protected:
virtual error_code isSectionReadOnlyData(DataRefImpl Sec, bool &Res) const =0; virtual error_code isSectionReadOnlyData(DataRefImpl Sec, bool &Res) const =0;
virtual error_code sectionContainsSymbol(DataRefImpl Sec, DataRefImpl Symb, virtual error_code sectionContainsSymbol(DataRefImpl Sec, DataRefImpl Symb,
bool &Result) const = 0; bool &Result) const = 0;
virtual relocation_iterator getSectionRelBegin(DataRefImpl Sec) const = 0; virtual relocation_iterator section_rel_begin(DataRefImpl Sec) const = 0;
virtual relocation_iterator getSectionRelEnd(DataRefImpl Sec) const = 0; virtual relocation_iterator section_rel_end(DataRefImpl Sec) const = 0;
virtual section_iterator getRelocatedSection(DataRefImpl Sec) const; virtual section_iterator getRelocatedSection(DataRefImpl Sec) const;
// Same as above for RelocationRef. // Same as above for RelocationRef.
@ -528,11 +528,11 @@ inline error_code SectionRef::containsSymbol(SymbolRef S, bool &Result) const {
} }
inline relocation_iterator SectionRef::begin_relocations() const { inline relocation_iterator SectionRef::begin_relocations() const {
return OwningObject->getSectionRelBegin(SectionPimpl); return OwningObject->section_rel_begin(SectionPimpl);
} }
inline relocation_iterator SectionRef::end_relocations() const { inline relocation_iterator SectionRef::end_relocations() const {
return OwningObject->getSectionRelEnd(SectionPimpl); return OwningObject->section_rel_end(SectionPimpl);
} }
inline section_iterator SectionRef::getRelocatedSection() const { inline section_iterator SectionRef::getRelocatedSection() const {

8
lib/Object/COFFObjectFile.cpp
View File

@ -406,7 +406,7 @@ error_code COFFObjectFile::sectionContainsSymbol(DataRefImpl Sec,
return object_error::success; return object_error::success;
} }
relocation_iterator COFFObjectFile::getSectionRelBegin(DataRefImpl Sec) const { relocation_iterator COFFObjectFile::section_rel_begin(DataRefImpl Sec) const {
const coff_section *sec = toSec(Sec); const coff_section *sec = toSec(Sec);
DataRefImpl ret; DataRefImpl ret;
if (sec->NumberOfRelocations == 0) if (sec->NumberOfRelocations == 0)
@ -417,7 +417,7 @@ relocation_iterator COFFObjectFile::getSectionRelBegin(DataRefImpl Sec) const {
return relocation_iterator(RelocationRef(ret, this)); return relocation_iterator(RelocationRef(ret, this));
} }
relocation_iterator COFFObjectFile::getSectionRelEnd(DataRefImpl Sec) const { relocation_iterator COFFObjectFile::section_rel_end(DataRefImpl Sec) const {
const coff_section *sec = toSec(Sec); const coff_section *sec = toSec(Sec);
DataRefImpl ret; DataRefImpl ret;
if (sec->NumberOfRelocations == 0) if (sec->NumberOfRelocations == 0)
@ -630,13 +630,13 @@ StringRef COFFObjectFile::getLoadName() const {
return ""; return "";
} }
import_directory_iterator COFFObjectFile::getImportDirectoryBegin() const { import_directory_iterator COFFObjectFile::import_directory_begin() const {
DataRefImpl Imp; DataRefImpl Imp;
Imp.p = reinterpret_cast<uintptr_t>(ImportDirectory); Imp.p = reinterpret_cast<uintptr_t>(ImportDirectory);
return import_directory_iterator(ImportDirectoryEntryRef(Imp, this)); return import_directory_iterator(ImportDirectoryEntryRef(Imp, this));
} }
import_directory_iterator COFFObjectFile::getImportDirectoryEnd() const { import_directory_iterator COFFObjectFile::import_directory_end() const {
DataRefImpl Imp; DataRefImpl Imp;
if (ImportDirectory) { if (ImportDirectory) {
Imp.p = reinterpret_cast<uintptr_t>( Imp.p = reinterpret_cast<uintptr_t>(

12
lib/Object/MachOObjectFile.cpp
View File

@ -823,7 +823,7 @@ MachOObjectFile::sectionContainsSymbol(DataRefImpl Sec, DataRefImpl Symb,
return object_error::success; return object_error::success;
} }
relocation_iterator MachOObjectFile::getSectionRelBegin(DataRefImpl Sec) const { relocation_iterator MachOObjectFile::section_rel_begin(DataRefImpl Sec) const {
uint32_t Offset; uint32_t Offset;
if (is64Bit()) { if (is64Bit()) {
MachO::section_64 Sect = getSection64(Sec); MachO::section_64 Sect = getSection64(Sec);
@ -839,7 +839,7 @@ relocation_iterator MachOObjectFile::getSectionRelBegin(DataRefImpl Sec) const {
} }
relocation_iterator relocation_iterator
MachOObjectFile::getSectionRelEnd(DataRefImpl Sec) const { MachOObjectFile::section_rel_end(DataRefImpl Sec) const {
uint32_t Offset; uint32_t Offset;
uint32_t Num; uint32_t Num;
if (is64Bit()) { if (is64Bit()) {
@ -1331,16 +1331,16 @@ StringRef MachOObjectFile::getLoadName() const {
report_fatal_error("get_load_name() unimplemented in MachOObjectFile"); report_fatal_error("get_load_name() unimplemented in MachOObjectFile");
} }
relocation_iterator MachOObjectFile::getSectionRelBegin(unsigned Index) const { relocation_iterator MachOObjectFile::section_rel_begin(unsigned Index) const {
DataRefImpl DRI; DataRefImpl DRI;
DRI.d.a = Index; DRI.d.a = Index;
return getSectionRelBegin(DRI); return section_rel_begin(DRI);
} }
relocation_iterator MachOObjectFile::getSectionRelEnd(unsigned Index) const { relocation_iterator MachOObjectFile::section_rel_end(unsigned Index) const {
DataRefImpl DRI; DataRefImpl DRI;
DRI.d.a = Index; DRI.d.a = Index;
return getSectionRelEnd(DRI); return section_rel_end(DRI);
} }
dice_iterator MachOObjectFile::begin_dices() const { dice_iterator MachOObjectFile::begin_dices() const {

4
tools/llvm-objdump/COFFDump.cpp
View File

@ -232,8 +232,8 @@ static void printCOFFSymbolAddress(llvm::raw_ostream &Out,
static void printImportTables(const COFFObjectFile *Obj) { static void printImportTables(const COFFObjectFile *Obj) {
outs() << "The Import Tables:\n"; outs() << "The Import Tables:\n";
error_code ec; error_code ec;
for (import_directory_iterator i = Obj->getImportDirectoryBegin(), for (import_directory_iterator i = Obj->import_directory_begin(),
e = Obj->getImportDirectoryEnd(); e = Obj->import_directory_end();
i != e; i = i.increment(ec)) { i != e; i = i.increment(ec)) {
if (ec) if (ec)
return; return;

4
tools/macho-dump/macho-dump.cpp
View File

@ -97,8 +97,8 @@ static int DumpSectionData(const MachOObjectFile &Obj, unsigned Index,
outs() << " ('_relocations', [\n"; outs() << " ('_relocations', [\n";
unsigned RelNum = 0; unsigned RelNum = 0;
error_code EC; error_code EC;
for (relocation_iterator I = Obj.getSectionRelBegin(Index), for (relocation_iterator I = Obj.section_rel_begin(Index),
E = Obj.getSectionRelEnd(Index); I != E; I.increment(EC), ++RelNum) { E = Obj.section_rel_end(Index); I != E; I.increment(EC), ++RelNum) {
MachO::any_relocation_info RE = Obj.getRelocation(I->getRawDataRefImpl()); MachO::any_relocation_info RE = Obj.getRelocation(I->getRawDataRefImpl());
outs() << " # Relocation " << RelNum << "\n"; outs() << " # Relocation " << RelNum << "\n";
outs() << " (('word-0', " << format("0x%x", RE.r_word0) << "),\n"; outs() << " (('word-0', " << format("0x%x", RE.r_word0) << "),\n";