From 29552222c2e7cbeb37fcd15d247597467f7b8544 Mon Sep 17 00:00:00 2001 From: Rui Ueyama Date: Fri, 27 Sep 2013 21:47:05 +0000 Subject: Object/COFF: Rename getXXX{Begin,End} -> xxx_{begin,end}. 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 --- include/llvm/Object/COFF.h | 8 ++++---- include/llvm/Object/ELFObjectFile.h | 8 ++++---- include/llvm/Object/MachO.h | 8 ++++---- include/llvm/Object/ObjectFile.h | 8 ++++---- lib/Object/COFFObjectFile.cpp | 8 ++++---- lib/Object/MachOObjectFile.cpp | 12 ++++++------ tools/llvm-objdump/COFFDump.cpp | 4 ++-- tools/macho-dump/macho-dump.cpp | 4 ++-- 8 files changed, 30 insertions(+), 30 deletions(-) diff --git a/include/llvm/Object/COFF.h b/include/llvm/Object/COFF.h index 838e8f199a..67cc7c61b7 100644 --- a/include/llvm/Object/COFF.h +++ b/include/llvm/Object/COFF.h @@ -269,8 +269,8 @@ protected: bool &Res) const; virtual error_code sectionContainsSymbol(DataRefImpl Sec, DataRefImpl Symb, bool &Result) const; - virtual relocation_iterator getSectionRelBegin(DataRefImpl Sec) const; - virtual relocation_iterator getSectionRelEnd(DataRefImpl Sec) const; + virtual relocation_iterator section_rel_begin(DataRefImpl Sec) const; + virtual relocation_iterator section_rel_end(DataRefImpl Sec) const; virtual error_code getRelocationNext(DataRefImpl Rel, RelocationRef &Res) const; @@ -311,8 +311,8 @@ public: virtual unsigned getArch() const; virtual StringRef getLoadName() const; - import_directory_iterator getImportDirectoryBegin() const; - import_directory_iterator getImportDirectoryEnd() const; + import_directory_iterator import_directory_begin() const; + import_directory_iterator import_directory_end() const; error_code getHeader(const coff_file_header *&Res) const; error_code getCOFFHeader(const coff_file_header *&Res) const; diff --git a/include/llvm/Object/ELFObjectFile.h b/include/llvm/Object/ELFObjectFile.h index f799f7e26a..5022be552a 100644 --- a/include/llvm/Object/ELFObjectFile.h +++ b/include/llvm/Object/ELFObjectFile.h @@ -87,8 +87,8 @@ protected: virtual error_code isSectionReadOnlyData(DataRefImpl Sec, bool &Res) const; virtual error_code sectionContainsSymbol(DataRefImpl Sec, DataRefImpl Symb, bool &Result) const; - virtual relocation_iterator getSectionRelBegin(DataRefImpl Sec) const; - virtual relocation_iterator getSectionRelEnd(DataRefImpl Sec) const; + virtual relocation_iterator section_rel_begin(DataRefImpl Sec) const; + virtual relocation_iterator section_rel_end(DataRefImpl Sec) const; virtual section_iterator getRelocatedSection(DataRefImpl Sec) const; virtual error_code getRelocationNext(DataRefImpl Rel, @@ -611,7 +611,7 @@ error_code ELFObjectFile::sectionContainsSymbol(DataRefImpl Sec, template relocation_iterator -ELFObjectFile::getSectionRelBegin(DataRefImpl Sec) const { +ELFObjectFile::section_rel_begin(DataRefImpl Sec) const { DataRefImpl RelData; uintptr_t SHT = reinterpret_cast(EF.begin_sections().get()); RelData.d.a = (Sec.p - SHT) / EF.getHeader()->e_shentsize; @@ -621,7 +621,7 @@ ELFObjectFile::getSectionRelBegin(DataRefImpl Sec) const { template relocation_iterator -ELFObjectFile::getSectionRelEnd(DataRefImpl Sec) const { +ELFObjectFile::section_rel_end(DataRefImpl Sec) const { DataRefImpl RelData; uintptr_t SHT = reinterpret_cast(EF.begin_sections().get()); const Elf_Shdr *S = reinterpret_cast(Sec.p); diff --git a/include/llvm/Object/MachO.h b/include/llvm/Object/MachO.h index f3f391e07f..e91c260803 100644 --- a/include/llvm/Object/MachO.h +++ b/include/llvm/Object/MachO.h @@ -89,8 +89,8 @@ public: virtual error_code isSectionReadOnlyData(DataRefImpl Sec, bool &Res) const; virtual error_code sectionContainsSymbol(DataRefImpl Sec, DataRefImpl Symb, bool &Result) const; - virtual relocation_iterator getSectionRelBegin(DataRefImpl Sec) const; - virtual relocation_iterator getSectionRelEnd(DataRefImpl Sec) const; + virtual relocation_iterator section_rel_begin(DataRefImpl Sec) const; + virtual relocation_iterator section_rel_end(DataRefImpl Sec) const; virtual error_code getRelocationNext(DataRefImpl Rel, RelocationRef &Res) const; @@ -129,8 +129,8 @@ public: virtual StringRef getLoadName() const; - relocation_iterator getSectionRelBegin(unsigned Index) const; - relocation_iterator getSectionRelEnd(unsigned Index) const; + relocation_iterator section_rel_begin(unsigned Index) const; + relocation_iterator section_rel_end(unsigned Index) const; dice_iterator begin_dices() const; dice_iterator end_dices() const; diff --git a/include/llvm/Object/ObjectFile.h b/include/llvm/Object/ObjectFile.h index 6973c6713b..0ba4952273 100644 --- a/include/llvm/Object/ObjectFile.h +++ b/include/llvm/Object/ObjectFile.h @@ -322,8 +322,8 @@ protected: virtual error_code isSectionReadOnlyData(DataRefImpl Sec, bool &Res) const =0; virtual error_code sectionContainsSymbol(DataRefImpl Sec, DataRefImpl Symb, bool &Result) const = 0; - virtual relocation_iterator getSectionRelBegin(DataRefImpl Sec) const = 0; - virtual relocation_iterator getSectionRelEnd(DataRefImpl Sec) const = 0; + virtual relocation_iterator section_rel_begin(DataRefImpl Sec) const = 0; + virtual relocation_iterator section_rel_end(DataRefImpl Sec) const = 0; virtual section_iterator getRelocatedSection(DataRefImpl Sec) const; // 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 { - return OwningObject->getSectionRelBegin(SectionPimpl); + return OwningObject->section_rel_begin(SectionPimpl); } inline relocation_iterator SectionRef::end_relocations() const { - return OwningObject->getSectionRelEnd(SectionPimpl); + return OwningObject->section_rel_end(SectionPimpl); } inline section_iterator SectionRef::getRelocatedSection() const { diff --git a/lib/Object/COFFObjectFile.cpp b/lib/Object/COFFObjectFile.cpp index 463121c39f..67b8e6be78 100644 --- a/lib/Object/COFFObjectFile.cpp +++ b/lib/Object/COFFObjectFile.cpp @@ -406,7 +406,7 @@ error_code COFFObjectFile::sectionContainsSymbol(DataRefImpl Sec, 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); DataRefImpl ret; if (sec->NumberOfRelocations == 0) @@ -417,7 +417,7 @@ relocation_iterator COFFObjectFile::getSectionRelBegin(DataRefImpl Sec) const { 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); DataRefImpl ret; if (sec->NumberOfRelocations == 0) @@ -630,13 +630,13 @@ StringRef COFFObjectFile::getLoadName() const { return ""; } -import_directory_iterator COFFObjectFile::getImportDirectoryBegin() const { +import_directory_iterator COFFObjectFile::import_directory_begin() const { DataRefImpl Imp; Imp.p = reinterpret_cast(ImportDirectory); return import_directory_iterator(ImportDirectoryEntryRef(Imp, this)); } -import_directory_iterator COFFObjectFile::getImportDirectoryEnd() const { +import_directory_iterator COFFObjectFile::import_directory_end() const { DataRefImpl Imp; if (ImportDirectory) { Imp.p = reinterpret_cast( diff --git a/lib/Object/MachOObjectFile.cpp b/lib/Object/MachOObjectFile.cpp index c956c217e8..3040094f14 100644 --- a/lib/Object/MachOObjectFile.cpp +++ b/lib/Object/MachOObjectFile.cpp @@ -823,7 +823,7 @@ MachOObjectFile::sectionContainsSymbol(DataRefImpl Sec, DataRefImpl Symb, return object_error::success; } -relocation_iterator MachOObjectFile::getSectionRelBegin(DataRefImpl Sec) const { +relocation_iterator MachOObjectFile::section_rel_begin(DataRefImpl Sec) const { uint32_t Offset; if (is64Bit()) { MachO::section_64 Sect = getSection64(Sec); @@ -839,7 +839,7 @@ relocation_iterator MachOObjectFile::getSectionRelBegin(DataRefImpl Sec) const { } relocation_iterator -MachOObjectFile::getSectionRelEnd(DataRefImpl Sec) const { +MachOObjectFile::section_rel_end(DataRefImpl Sec) const { uint32_t Offset; uint32_t Num; if (is64Bit()) { @@ -1331,16 +1331,16 @@ StringRef MachOObjectFile::getLoadName() const { 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; 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; DRI.d.a = Index; - return getSectionRelEnd(DRI); + return section_rel_end(DRI); } dice_iterator MachOObjectFile::begin_dices() const { diff --git a/tools/llvm-objdump/COFFDump.cpp b/tools/llvm-objdump/COFFDump.cpp index ba26ff00d9..5f0bcbbc92 100644 --- a/tools/llvm-objdump/COFFDump.cpp +++ b/tools/llvm-objdump/COFFDump.cpp @@ -232,8 +232,8 @@ static void printCOFFSymbolAddress(llvm::raw_ostream &Out, static void printImportTables(const COFFObjectFile *Obj) { outs() << "The Import Tables:\n"; error_code ec; - for (import_directory_iterator i = Obj->getImportDirectoryBegin(), - e = Obj->getImportDirectoryEnd(); + for (import_directory_iterator i = Obj->import_directory_begin(), + e = Obj->import_directory_end(); i != e; i = i.increment(ec)) { if (ec) return; diff --git a/tools/macho-dump/macho-dump.cpp b/tools/macho-dump/macho-dump.cpp index 7ae5440eec..0dfbd5fa09 100644 --- a/tools/macho-dump/macho-dump.cpp +++ b/tools/macho-dump/macho-dump.cpp @@ -97,8 +97,8 @@ static int DumpSectionData(const MachOObjectFile &Obj, unsigned Index, outs() << " ('_relocations', [\n"; unsigned RelNum = 0; error_code EC; - for (relocation_iterator I = Obj.getSectionRelBegin(Index), - E = Obj.getSectionRelEnd(Index); I != E; I.increment(EC), ++RelNum) { + for (relocation_iterator I = Obj.section_rel_begin(Index), + E = Obj.section_rel_end(Index); I != E; I.increment(EC), ++RelNum) { MachO::any_relocation_info RE = Obj.getRelocation(I->getRawDataRefImpl()); outs() << " # Relocation " << RelNum << "\n"; outs() << " (('word-0', " << format("0x%x", RE.r_word0) << "),\n"; -- cgit v1.2.3