From d71017bc8631d0decd063b9aea11a0a5eb6c6ff9 Mon Sep 17 00:00:00 2001 From: George Rimar Date: Mon, 10 Jun 2019 09:57:29 +0000 Subject: [PATCH] [yaml2obj] - Remove helper methods that are probably excessive. NFC. These methods are used only once. One of them is not used at all. Differential revision: https://reviews.llvm.org/D63002 llvm-svn: 362925 --- llvm/tools/yaml2obj/yaml2elf.cpp | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/llvm/tools/yaml2obj/yaml2elf.cpp b/llvm/tools/yaml2obj/yaml2elf.cpp index 31923a4..be48478 100644 --- a/llvm/tools/yaml2obj/yaml2elf.cpp +++ b/llvm/tools/yaml2obj/yaml2elf.cpp @@ -178,19 +178,6 @@ class ELFState { ContiguousBlobAccumulator &CBA); std::vector implicitSectionNames() const; - // - SHT_NULL entry (placed first, i.e. 0'th entry) - // - symbol table (.symtab) (defaults to after last yaml section) - // - string table (.strtab) (defaults to after .symtab) - // - section header string table (.shstrtab) (defaults to after .strtab) - // - dynamic symbol table (.dynsym) (defaults to after .shstrtab) - // - dynamic string table (.dynstr) (defaults to after .dynsym) - unsigned getDotSymTabSecNo() const { return SN2I.get(".symtab"); } - unsigned getDotStrTabSecNo() const { return SN2I.get(".strtab"); } - unsigned getDotShStrTabSecNo() const { return SN2I.get(".shstrtab"); } - unsigned getDotDynSymSecNo() const { return SN2I.get(".dynsym"); } - unsigned getDotDynStrSecNo() const { return SN2I.get(".dynstr"); } - unsigned getSectionCount() const { return SN2I.size() + 1; } - ELFState(const ELFYAML::Object &D) : Doc(D) {} public: @@ -227,8 +214,8 @@ void ELFState::initELFHeader(Elf_Ehdr &Header) { // Immediately following the ELF header and program headers. Header.e_shoff = sizeof(Header) + sizeof(Elf_Phdr) * Doc.ProgramHeaders.size(); - Header.e_shnum = getSectionCount(); - Header.e_shstrndx = getDotShStrTabSecNo(); + Header.e_shnum = SN2I.size() + 1; + Header.e_shstrndx = SN2I.get(".shstrtab"); } template @@ -380,7 +367,7 @@ void ELFState::initSymtabSectionHeader(Elf_Shdr &SHeader, bool IsStatic = STType == SymtabType::Static; SHeader.sh_name = DotShStrtab.getOffset(IsStatic ? ".symtab" : ".dynsym"); SHeader.sh_type = IsStatic ? ELF::SHT_SYMTAB : ELF::SHT_DYNSYM; - SHeader.sh_link = IsStatic ? getDotStrTabSecNo() : getDotDynStrSecNo(); + SHeader.sh_link = IsStatic ? SN2I.get(".strtab") : SN2I.get(".dynstr"); if (!IsStatic) SHeader.sh_flags |= ELF::SHF_ALLOC; @@ -610,7 +597,7 @@ ELFState::writeSectionContent(Elf_Shdr &SHeader, // For relocation section set link to .symtab by default. if (Section.Link.empty()) - SHeader.sh_link = getDotSymTabSecNo(); + SHeader.sh_link = SN2I.get(".symtab"); unsigned Index = 0; if (!Section.RelocatableSec.empty() && -- 2.7.4