From ca0e73610056110e9a175c14dd82d6d616fd830f Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Mon, 29 Apr 2013 19:03:21 +0000 Subject: Use a RelocationRef instead of a relocation_iterator. No functionality change. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@180723 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp | 2 +- lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp | 10 +++++----- lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h | 2 +- lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h | 2 +- lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp | 8 ++++---- lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.h | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) (limited to 'lib/ExecutionEngine') diff --git a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp index d843e9a743..354795dc5f 100644 --- a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp +++ b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp @@ -154,7 +154,7 @@ ObjectImage *RuntimeDyldImpl::loadObject(ObjectBuffer *InputBuffer) { isFirstRelocation = false; } - processRelocationRef(SectionID, i, *obj, LocalSections, LocalSymbols, + processRelocationRef(SectionID, *i, *obj, LocalSections, LocalSymbols, Stubs); } } diff --git a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp index d52bcadd20..ef4a4050e9 100644 --- a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp +++ b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp @@ -600,17 +600,17 @@ void RuntimeDyldELF::resolveRelocation(const SectionEntry &Section, } void RuntimeDyldELF::processRelocationRef(unsigned SectionID, - relocation_iterator RelI, + RelocationRef RelI, ObjectImage &Obj, ObjSectionToIDMap &ObjSectionToID, const SymbolTableMap &Symbols, StubMap &Stubs) { uint64_t RelType; - Check(RelI->getType(RelType)); + Check(RelI.getType(RelType)); int64_t Addend; - Check(RelI->getAdditionalInfo(Addend)); + Check(RelI.getAdditionalInfo(Addend)); SymbolRef Symbol; - Check(RelI->getSymbol(Symbol)); + Check(RelI.getSymbol(Symbol)); // Obtain the symbol name which is referenced in the relocation StringRef TargetName; @@ -667,7 +667,7 @@ void RuntimeDyldELF::processRelocationRef(unsigned SectionID, } } uint64_t Offset; - Check(RelI->getOffset(Offset)); + Check(RelI.getOffset(Offset)); DEBUG(dbgs() << "\t\tSectionID: " << SectionID << " Offset: " << Offset diff --git a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h index 835b66fb51..2c04198ac0 100644 --- a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h +++ b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h @@ -71,7 +71,7 @@ protected: virtual void resolveRelocation(const RelocationEntry &RE, uint64_t Value); virtual void processRelocationRef(unsigned SectionID, - relocation_iterator RelI, + RelocationRef RelI, ObjectImage &Obj, ObjSectionToIDMap &ObjSectionToID, const SymbolTableMap &Symbols, diff --git a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h index d0022c196d..a02b19ca34 100644 --- a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h +++ b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h @@ -282,7 +282,7 @@ protected: /// \brief Parses the object file relocation and stores it to Relocations /// or SymbolRelocations (this depends on the object file type). virtual void processRelocationRef(unsigned SectionID, - relocation_iterator RelI, + RelocationRef RelI, ObjectImage &Obj, ObjSectionToIDMap &ObjSectionToID, const SymbolTableMap &Symbols, diff --git a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp index 9a6048c410..ddac59fd36 100644 --- a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp +++ b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp @@ -214,14 +214,14 @@ bool RuntimeDyldMachO::resolveARMRelocation(uint8_t *LocalAddress, } void RuntimeDyldMachO::processRelocationRef(unsigned SectionID, - relocation_iterator RelI, + RelocationRef RelI, ObjectImage &Obj, ObjSectionToIDMap &ObjSectionToID, const SymbolTableMap &Symbols, StubMap &Stubs) { const ObjectFile *OF = Obj.getObjectFile(); const MachOObjectFile *MachO = static_cast(OF); - macho::RelocationEntry RE = MachO->getRelocation(RelI->getRawDataRefImpl()); + macho::RelocationEntry RE = MachO->getRelocation(RelI.getRawDataRefImpl()); uint32_t RelType = MachO->getAnyRelocationType(RE); RelocationValueRef Value; @@ -233,7 +233,7 @@ void RuntimeDyldMachO::processRelocationRef(unsigned SectionID, if (isExtern) { // Obtain the symbol name which is referenced in the relocation SymbolRef Symbol; - RelI->getSymbol(Symbol); + RelI.getSymbol(Symbol); StringRef TargetName; Symbol.getName(TargetName); // First search for the symbol in the local symbol table @@ -277,7 +277,7 @@ void RuntimeDyldMachO::processRelocationRef(unsigned SectionID, } uint64_t Offset; - RelI->getOffset(Offset); + RelI.getOffset(Offset); if (Arch == Triple::arm && (RelType & 0xf) == macho::RIT_ARM_Branch24Bit) { // This is an ARM branch relocation, need to use a stub function. diff --git a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.h b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.h index c82b2f93ce..0fbfe038c8 100644 --- a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.h +++ b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.h @@ -49,7 +49,7 @@ protected: int64_t Addend); virtual void processRelocationRef(unsigned SectionID, - relocation_iterator RelI, + RelocationRef RelI, ObjectImage &Obj, ObjSectionToIDMap &ObjSectionToID, const SymbolTableMap &Symbols, -- cgit v1.2.3