maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[yaml2obj] - Simplify. NFC. 

llvm-svn: 355832
This commit is contained in:
George Rimar 2019-03-11 16:10:02 +00:00
parent c416c52b07
commit 33e498b785
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
llvm/tools/yaml2obj/yaml2elf.cpp
View File

@ -133,8 +133,7 @@ class ELFState {
const ELFYAML::Object &Doc;
bool buildSectionIndex();
bool buildSymbolIndex(std::size_t &StartIndex,
const std::vector<ELFYAML::Symbol> &Symbols);
bool buildSymbolIndex(const ELFYAML::LocalGlobalWeakSymbols &);
void initELFHeader(Elf_Ehdr &Header);
void initProgramHeaders(std::vector<Elf_Phdr> &PHeaders);
bool initSectionHeaders(std::vector<Elf_Shdr> &SHeaders,
@ -779,16 +778,19 @@ template <class ELFT> bool ELFState<ELFT>::buildSectionIndex() {
}
template <class ELFT>
bool
ELFState<ELFT>::buildSymbolIndex(std::size_t &StartIndex,
const std::vector<ELFYAML::Symbol> &Symbols) {
for (const auto &Sym : Symbols) {
++StartIndex;
if (Sym.Name.empty())
continue;
if (SymN2I.addName(Sym.Name, StartIndex)) {
WithColor::error() << "Repeated symbol name: '" << Sym.Name << "'.\n";
return false;
bool ELFState<ELFT>::buildSymbolIndex(
const ELFYAML::LocalGlobalWeakSymbols &Symbols) {
std::size_t I = 0;
for (const std::vector<ELFYAML::Symbol> &V :
{Symbols.Local, Symbols.Global, Symbols.Weak}) {
for (const auto &Sym : V) {
++I;
if (Sym.Name.empty())
continue;
if (SymN2I.addName(Sym.Name, I)) {
WithColor::error() << "Repeated symbol name: '" << Sym.Name << "'.\n";
return false;
}
}
}
return true;
@ -846,10 +848,7 @@ int ELFState<ELFT>::writeELF(raw_ostream &OS, const ELFYAML::Object &Doc) {
if (!State.buildSectionIndex())
return 1;
std::size_t StartSymIndex = 0;
if (!State.buildSymbolIndex(StartSymIndex, Doc.Symbols.Local) ||
!State.buildSymbolIndex(StartSymIndex, Doc.Symbols.Global) ||
!State.buildSymbolIndex(StartSymIndex, Doc.Symbols.Weak))
if (!State.buildSymbolIndex(Doc.Symbols))
return 1;
Elf_Ehdr Header;