[lld] r245880 - Add support for reading files with more than 0xff00 sections.

Sean Silva via llvm-commits llvm-commits at lists.llvm.org
Fri Sep 4 20:09:21 PDT 2015


Can you use .rept for this?

On Mon, Aug 24, 2015 at 2:43 PM, Rafael Espindola via llvm-commits <
llvm-commits at lists.llvm.org> wrote:

> Author: rafael
> Date: Mon Aug 24 16:43:25 2015
> New Revision: 245880
>
> URL: http://llvm.org/viewvc/llvm-project?rev=245880&view=rev
> Log:
> Add support for reading files with more than 0xff00 sections.
>
> Added:
>     lld/trunk/test/elf2/many-sections.s
> Modified:
>     lld/trunk/ELF/InputFiles.cpp
>     lld/trunk/ELF/InputFiles.h
>
> Modified: lld/trunk/ELF/InputFiles.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/InputFiles.cpp?rev=245880&r1=245879&r2=245880&view=diff
>
> ==============================================================================
> --- lld/trunk/ELF/InputFiles.cpp (original)
> +++ lld/trunk/ELF/InputFiles.cpp Mon Aug 24 16:43:25 2015
> @@ -46,6 +46,12 @@ template <class ELFT> void elf2::ObjectF
>      case SHT_SYMTAB:
>        Symtab = &Sec;
>        break;
> +    case SHT_SYMTAB_SHNDX: {
> +      ErrorOr<ArrayRef<Elf_Word>> ErrorOrTable =
> ELFObj->getSHNDXTable(Sec);
> +      error(ErrorOrTable);
> +      SymtabSHNDX = *ErrorOrTable;
> +      break;
> +    }
>      case SHT_STRTAB:
>      case SHT_NULL:
>      case SHT_RELA:
> @@ -82,7 +88,11 @@ SymbolBody *elf2::ObjectFile<ELFT>::crea
>    ErrorOr<StringRef> NameOrErr = Sym->getName(StringTable);
>    error(NameOrErr.getError());
>    StringRef Name = *NameOrErr;
> -  uint16_t SecIndex = Sym->st_shndx;
> +
> +  uint32_t SecIndex = Sym->st_shndx;
> +  if (SecIndex == SHN_XINDEX)
> +    SecIndex = ELFObj->getExtendedSymbolTableIndex(Sym, Symtab,
> SymtabSHNDX);
> +
>    switch (Sym->getBinding()) {
>    default:
>      error("unexpected binding");
>
> Modified: lld/trunk/ELF/InputFiles.h
> URL:
> http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/InputFiles.h?rev=245880&r1=245879&r2=245880&view=diff
>
> ==============================================================================
> --- lld/trunk/ELF/InputFiles.h (original)
> +++ lld/trunk/ELF/InputFiles.h Mon Aug 24 16:43:25 2015
> @@ -65,6 +65,7 @@ template <class ELFT> class ObjectFile :
>    typedef typename llvm::object::ELFFile<ELFT>::Elf_Sym Elf_Sym;
>    typedef typename llvm::object::ELFFile<ELFT>::Elf_Shdr Elf_Shdr;
>    typedef typename llvm::object::ELFFile<ELFT>::Elf_Sym_Range
> Elf_Sym_Range;
> +  typedef typename llvm::object::ELFFile<ELFT>::Elf_Word Elf_Word;
>
>  public:
>    bool isCompatibleWith(const ObjectFileBase &Other) const override;
> @@ -102,6 +103,7 @@ private:
>    std::vector<SectionChunk<ELFT> *> Chunks;
>
>    const Elf_Shdr *Symtab = nullptr;
> +  ArrayRef<Elf_Word> SymtabSHNDX;
>  };
>
>  } // namespace elf2
>
> Added: lld/trunk/test/elf2/many-sections.s
> URL:
> http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/many-sections.s?rev=245880&view=auto
>
> ==============================================================================
> --- lld/trunk/test/elf2/many-sections.s (added)
> +++ lld/trunk/test/elf2/many-sections.s Mon Aug 24 16:43:25 2015
> @@ -0,0 +1,113 @@
> +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o %t
> +// RUN: llvm-readobj -t %t | FileCheck --check-prefix=LINKED %s
> +
> +// Verify that the symbol _start is in a section with an index >=
> SHN_LORESERVE.
> +// CHECK:      Name: _start
> +// CHECK-NEXT: Value: 0x0
> +// CHECK-NEXT: Size: 0
> +// CHECK-NEXT: Binding: Global
> +// CHECK-NEXT: Type: None
> +// CHECK-NEXT: Other: 0
> +// CHECK-NEXT: Section: dm (0xFF00)
> +
> +
> +// RUN: lld -flavor gnu2 %t -o %t2
> +// RUN: llvm-readobj -t %t2 | FileCheck --check-prefix=LINKED %s
> +
> +// Test that _start is in the correct section.
> +// LINKED:      Name: _start
> +// LINKED-NEXT: Value: 0x0
> +// LINKED-NEXT: Size: 0
> +// LINKED-NEXT: Binding: Global
> +// LINKED-NEXT: Type: None
> +// LINKED-NEXT: Other: 0
> +// LINKED-NEXT: Section: dm
> +
> +.macro gen_sections4 x
> +        .section a\x
> +        .section b\x
> +        .section c\x
> +        .section d\x
> +.endm
> +
> +.macro gen_sections8 x
> +        gen_sections4 a\x
> +        gen_sections4 b\x
> +.endm
> +
> +.macro gen_sections16 x
> +        gen_sections8 a\x
> +        gen_sections8 b\x
> +.endm
> +
> +.macro gen_sections32 x
> +        gen_sections16 a\x
> +        gen_sections16 b\x
> +.endm
> +
> +.macro gen_sections64 x
> +        gen_sections32 a\x
> +        gen_sections32 b\x
> +.endm
> +
> +.macro gen_sections128 x
> +        gen_sections64 a\x
> +        gen_sections64 b\x
> +.endm
> +
> +.macro gen_sections256 x
> +        gen_sections128 a\x
> +        gen_sections128 b\x
> +.endm
> +
> +.macro gen_sections512 x
> +        gen_sections256 a\x
> +        gen_sections256 b\x
> +.endm
> +
> +.macro gen_sections1024 x
> +        gen_sections512 a\x
> +        gen_sections512 b\x
> +.endm
> +
> +.macro gen_sections2048 x
> +        gen_sections1024 a\x
> +        gen_sections1024 b\x
> +.endm
> +
> +.macro gen_sections4096 x
> +        gen_sections2048 a\x
> +        gen_sections2048 b\x
> +.endm
> +
> +.macro gen_sections8192 x
> +        gen_sections4096 a\x
> +        gen_sections4096 b\x
> +.endm
> +
> +.macro gen_sections16384 x
> +        gen_sections8192 a\x
> +        gen_sections8192 b\x
> +.endm
> +
> +.macro gen_sections32768 x
> +        gen_sections16384 a\x
> +        gen_sections16384 b\x
> +.endm
> +
> +gen_sections32768 a
> +gen_sections16384 b
> +gen_sections8192 c
> +gen_sections4096 d
> +gen_sections2048 e
> +gen_sections1024 f
> +gen_sections512 g
> +gen_sections128 h
> +gen_sections64 i
> +gen_sections32 j
> +gen_sections16 k
> +gen_sections8 l
> +gen_sections4 m
> +
> +.global _start
> +_start:
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20150904/c6c40694/attachment.html>


More information about the llvm-commits mailing list