RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-19 11:02:59 +02:00
Code Issues Projects Releases Wiki Activity

Remove getStaticSymbolName.

Browse Source 
Every user now keeps track of the correct string table to use.

llvm-svn: 242818
This commit is contained in:
Rafael Espindola 2015-07-21 18:04:29 +00:00
parent ae9b48df5a
commit 244e468fc1
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -388,7 +388,6 @@ public:
ErrorOr<const Elf_Shdr *> getSection(uint32_t Index) const;
const Elf_Sym *getSymbol(uint32_t index) const;
ErrorOr<StringRef> getStaticSymbolName(const Elf_Sym *Symb) const;
ErrorOr<StringRef> getDynamicSymbolName(const Elf_Sym *Symb) const;
ErrorOr<StringRef> getSectionName(const Elf_Shdr *Section) const;
@ -897,12 +896,6 @@ const char *ELFFile<ELFT>::getDynamicString(uintX_t Offset) const {
return (const char *)DynStrRegion.Addr + Offset;
}
template <class ELFT>
ErrorOr<StringRef>
ELFFile<ELFT>::getStaticSymbolName(const Elf_Sym *Symb) const {
return Symb->getName(DotStrtab);
}
template <class ELFT>
ErrorOr<StringRef>
ELFFile<ELFT>::getDynamicSymbolName(const Elf_Sym *Symb) const {

14
tools/obj2yaml/elf2yaml.cpp
View File

@ -27,7 +27,8 @@ class ELFDumper {
const object::ELFFile<ELFT> &Obj;
std::error_code dumpSymbol(const Elf_Sym *Sym, ELFYAML::Symbol &S);
std::error_code dumpSymbol(const Elf_Sym *Sym, StringRef StrTable,
ELFYAML::Symbol &S);
std::error_code dumpCommonSection(const Elf_Shdr *Shdr, ELFYAML::Section &S);
std::error_code dumpCommonRelocationSection(const Elf_Shdr *Shdr,
ELFYAML::RelocationSection &S);
@ -121,6 +122,12 @@ ErrorOr<ELFYAML::Object *> ELFDumper<ELFT>::dump() {
}
// Dump symbols
const Elf_Shdr *Symtab = Obj.getDotSymtabSec();
ErrorOr<StringRef> StrTableOrErr = Obj.getStringTableForSymtab(*Symtab);
if (std::error_code EC = StrTableOrErr.getError())
return EC;
StringRef StrTable = *StrTableOrErr;
bool IsFirstSym = true;
for (const Elf_Sym &Sym : Obj.symbols()) {
if (IsFirstSym) {
@ -129,7 +136,7 @@ ErrorOr<ELFYAML::Object *> ELFDumper<ELFT>::dump() {
}
ELFYAML::Symbol S;
if (std::error_code EC = ELFDumper<ELFT>::dumpSymbol(&Sym, S))
if (std::error_code EC = ELFDumper<ELFT>::dumpSymbol(&Sym, StrTable, S))
return EC;
switch (Sym.getBinding())
@ -153,13 +160,14 @@ ErrorOr<ELFYAML::Object *> ELFDumper<ELFT>::dump() {
template <class ELFT>
std::error_code ELFDumper<ELFT>::dumpSymbol(const Elf_Sym *Sym,
StringRef StrTable,
ELFYAML::Symbol &S) {
S.Type = Sym->getType();
S.Value = Sym->st_value;
S.Size = Sym->st_size;
S.Other = Sym->st_other;
ErrorOr<StringRef> NameOrErr = Obj.getStaticSymbolName(Sym);
ErrorOr<StringRef> NameOrErr = Sym->getName(StrTable);
if (std::error_code EC = NameOrErr.getError())
return EC;
S.Name = NameOrErr.get();