RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-04-12 20:48:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove duplicated code.

Browse Source 
Both ELFObjectFile and ELFFile had an implementation of getLoadName.

llvm-svn: 242725
This commit is contained in:
Rafael Espindola 2015-07-20 22:41:44 +00:00
parent 4828912a6a
commit 329a6aeab9
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -318,7 +318,6 @@ public:
uint8_t getBytesInAddress() const override;
StringRef getFileFormatName() const override;
unsigned getArch() const override;
StringRef getLoadName() const;
std::error_code getPlatformFlags(unsigned &Result) const override {
Result = EF.getHeader()->e_flags;
@ -779,19 +778,6 @@ section_iterator ELFObjectFile<ELFT>::section_end() const {
return section_iterator(SectionRef(toDRI(EF.section_end()), this));
}
template <class ELFT>
StringRef ELFObjectFile<ELFT>::getLoadName() const {
const Elf_Dyn *DI = EF.dynamic_table_begin();
const Elf_Dyn *DE = EF.dynamic_table_end();
while (DI != DE && DI->getTag() != ELF::DT_SONAME)
++DI;
if (DI != DE)
return EF.getDynamicString(DI->getVal());
return "";
}
template <class ELFT>
uint8_t ELFObjectFile<ELFT>::getBytesInAddress() const {
return ELFT::Is64Bits ? 8 : 4;

8
tools/llvm-readobj/llvm-readobj.cpp
View File

@ -253,13 +253,13 @@ static std::error_code createDumper(const ObjectFile *Obj, StreamWriter &Writer,
static StringRef getLoadName(const ObjectFile *Obj) {
if (auto *ELF = dyn_cast<ELF32LEObjectFile>(Obj))
return ELF->getLoadName();
return ELF->getELFFile()->getLoadName();
if (auto *ELF = dyn_cast<ELF64LEObjectFile>(Obj))
return ELF->getLoadName();
return ELF->getELFFile()->getLoadName();
if (auto *ELF = dyn_cast<ELF32BEObjectFile>(Obj))
return ELF->getLoadName();
return ELF->getELFFile()->getLoadName();
if (auto *ELF = dyn_cast<ELF64BEObjectFile>(Obj))
return ELF->getLoadName();
return ELF->getELFFile()->getLoadName();
llvm_unreachable("Not ELF");
}