RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-26 04:32:44 +01:00
Code Issues Projects Releases Wiki Activity

Simplify getStringTableIndex.

Browse Source 
The description in the ELF spec is just

---------------------------
If the section name string table section index is greater than or
equal to SHN_LORESERVE (0xff00), this member has the value SHN_XINDEX
(0xffff) and the actual index of the section name string table section
is contained in the sh_link field of the section header at index 0.
---------------------------

So we only have to check for it being SHN_XINDEX. Also, sh_link is
always 32 bits, so don't return an uintX_t.

llvm-svn: 285747
This commit is contained in:
Rafael Espindola 2016-11-01 20:56:15 +00:00
parent 3c52fdbd3d
commit 333ba0caaa
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/llvm/Object/ELF.h
View File

@ -154,7 +154,7 @@ public:
}
uint64_t getNumSections() const;
uintX_t getStringTableIndex() const;
uint32_t getStringTableIndex() const;
uint32_t getExtendedSymbolTableIndex(const Elf_Sym *Sym,
const Elf_Shdr *SymTab,
ArrayRef<Elf_Word> ShndxTable) const;
@ -299,14 +299,9 @@ uint64_t ELFFile<ELFT>::getNumSections() const {
return Header->e_shnum;
}
template <class ELFT>
typename ELFFile<ELFT>::uintX_t ELFFile<ELFT>::getStringTableIndex() const {
if (Header->e_shnum == ELF::SHN_UNDEF) {
if (Header->e_shstrndx == ELF::SHN_HIRESERVE)
return SectionHeaderTable->sh_link;
if (Header->e_shstrndx >= getNumSections())
return 0;
}
template <class ELFT> uint32_t ELFFile<ELFT>::getStringTableIndex() const {
if (Header->e_shstrndx == ELF::SHN_XINDEX)
return SectionHeaderTable->sh_link;
return Header->e_shstrndx;
}
@ -363,7 +358,7 @@ ELFFile<ELFT>::ELFFile(StringRef Object, std::error_code &EC)
}
// Get string table sections.
uintX_t StringTableIndex = getStringTableIndex();
uint32_t StringTableIndex = getStringTableIndex();
if (StringTableIndex) {
ErrorOr<const Elf_Shdr *> StrTabSecOrErr = getSection(StringTableIndex);
if ((EC = StrTabSecOrErr.getError()))