RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-31 20:51:52 +01:00
Code Issues Projects Releases Wiki Activity

Temporarily reverting 241765, 241768, and 241772 to unbreak the build bots.

Browse Source 
llvm-svn: 241781
This commit is contained in:
Adrian Prantl 2015-07-09 02:14:49 +00:00
parent 17080aa296
commit e71dc1d0ed
8 changed files with 27 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,6 @@
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/IntervalMap.h"
#include "llvm/ADT/PointerIntPair.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringSwitch.h"
@ -140,7 +139,6 @@ public:
typedef Elf_Verneed_Impl<ELFT> Elf_Verneed;
typedef Elf_Vernaux_Impl<ELFT> Elf_Vernaux;
typedef Elf_Versym_Impl<ELFT> Elf_Versym;
typedef Elf_Hash<ELFT> Elf_Hash;
typedef ELFEntityIterator<const Elf_Dyn> Elf_Dyn_Iter;
typedef iterator_range<Elf_Dyn_Iter> Elf_Dyn_Range;
typedef ELFEntityIterator<const Elf_Rela> Elf_Rela_Iter;
@ -178,7 +176,6 @@ private:
const Elf_Shdr *dot_symtab_sec = nullptr; // Symbol table section.
StringRef DynSymStrTab; // Dynnamic symbol string table.
const Elf_Shdr *DotDynSymSec = nullptr; // Dynamic symbol table section.
const Elf_Hash *HashTable = nullptr;
const Elf_Shdr *SymbolTableSectionHeaderIndex = nullptr;
DenseMap<const Elf_Sym *, ELF::Elf64_Word> ExtendedSymbolTable;
@ -232,8 +229,6 @@ private:
void LoadVersionNeeds(const Elf_Shdr *ec) const;
void LoadVersionMap() const;
void scanDynamicTable();
public:
template<typename T>
const T *getEntry(uint32_t Section, uint32_t Entry) const;
@ -242,7 +237,6 @@ public:
const Elf_Shdr *getDotSymtabSec() const { return dot_symtab_sec; }
const Elf_Shdr *getDotDynSymSec() const { return DotDynSymSec; }
const Elf_Hash *getHashTable() const { return HashTable; }
ErrorOr<StringRef> getStringTable(const Elf_Shdr *Section) const;
const char *getDynamicString(uintX_t Offset) const;
@ -584,10 +578,8 @@ ELFFile<ELFT>::ELFFile(StringRef Object, std::error_code &EC)
Header = reinterpret_cast<const Elf_Ehdr *>(base());
if (Header->e_shoff == 0) {
scanDynamicTable();
if (Header->e_shoff == 0)
return;
}
const uint64_t SectionTableOffset = Header->e_shoff;
@ -612,13 +604,6 @@ ELFFile<ELFT>::ELFFile(StringRef Object, std::error_code &EC)
for (const Elf_Shdr &Sec : sections()) {
switch (Sec.sh_type) {
case ELF::SHT_HASH:
if (HashTable) {
EC = object_error::parse_failed;
return;
}
HashTable = reinterpret_cast<const Elf_Hash *>(base() + Sec.sh_offset);
break;
case ELF::SHT_SYMTAB_SHNDX:
if (SymbolTableSectionHeaderIndex) {
// More than one .symtab_shndx!
@ -716,21 +701,7 @@ ELFFile<ELFT>::ELFFile(StringRef Object, std::error_code &EC)
}
}
scanDynamicTable();
EC = std::error_code();
}
template <class ELFT>
void ELFFile<ELFT>::scanDynamicTable() {
// Build load-address to file-offset map.
typedef IntervalMap<
uintX_t, uintptr_t,
IntervalMapImpl::NodeSizer<uintX_t, uintptr_t>::LeafSize,
IntervalMapHalfOpenInfo<uintX_t>> LoadMapT;
typename LoadMapT::Allocator Alloc;
LoadMapT LoadMap(Alloc);
// Scan program headers.
for (Elf_Phdr_Iter PhdrI = program_header_begin(),
PhdrE = program_header_end();
PhdrI != PhdrE; ++PhdrI) {
@ -738,36 +709,34 @@ void ELFFile<ELFT>::scanDynamicTable() {
DynamicRegion.Addr = base() + PhdrI->p_offset;
DynamicRegion.Size = PhdrI->p_filesz;
DynamicRegion.EntSize = sizeof(Elf_Dyn);
continue;
break;
}
if (PhdrI->p_type != ELF::PT_LOAD)
continue;
if (PhdrI->p_filesz == 0)
continue;
LoadMap.insert(PhdrI->p_vaddr, PhdrI->p_vaddr + PhdrI->p_filesz,
PhdrI->p_offset);
}
auto toMappedAddr = [&](uint64_t VAddr) -> const uint8_t * {
auto I = LoadMap.find(VAddr);
if (I == LoadMap.end())
return nullptr;
return base() + I.value() + (VAddr - I.start());
};
// Scan dynamic table.
for (Elf_Dyn_Iter DynI = dynamic_table_begin(), DynE = dynamic_table_end();
DynI != DynE; ++DynI) {
switch (DynI->d_tag) {
case ELF::DT_HASH:
if (HashTable)
continue;
HashTable =
reinterpret_cast<const Elf_Hash *>(toMappedAddr(DynI->getPtr()));
break;
case ELF::DT_RELA:
if (!DynRelaRegion.Addr)
DynRelaRegion.Addr = toMappedAddr(DynI->getPtr());
case ELF::DT_RELA: {
uint64_t VBase = 0;
const uint8_t *FBase = nullptr;
for (Elf_Phdr_Iter PhdrI = program_header_begin(),
PhdrE = program_header_end();
PhdrI != PhdrE; ++PhdrI) {
if (PhdrI->p_type != ELF::PT_LOAD)
continue;
if (DynI->getPtr() >= PhdrI->p_vaddr &&
DynI->getPtr() < PhdrI->p_vaddr + PhdrI->p_memsz) {
VBase = PhdrI->p_vaddr;
FBase = base() + PhdrI->p_offset;
break;
}
}
if (!VBase)
return;
DynRelaRegion.Addr = FBase + DynI->getPtr() - VBase;
break;
}
case ELF::DT_RELASZ:
DynRelaRegion.Size = DynI->getVal();
break;
@ -775,6 +744,8 @@ void ELFFile<ELFT>::scanDynamicTable() {
DynRelaRegion.EntSize = DynI->getVal();
}
}
EC = std::error_code();
}
template <class ELFT>

18
include/llvm/Object/ELFTypes.h
View File

@ -10,7 +10,6 @@
#ifndef LLVM_OBJECT_ELFTYPES_H
#define LLVM_OBJECT_ELFTYPES_H
#include "llvm/ADT/ArrayRef.h"
#include "llvm/Object/Error.h"
#include "llvm/Support/DataTypes.h"
#include "llvm/Support/ELF.h"
@ -464,23 +463,6 @@ struct Elf_Phdr_Impl<ELFType<TargetEndianness, true>> {
Elf_Xword p_align; // Segment alignment constraint
};
// ELFT needed for endianess.
template <class ELFT>
struct Elf_Hash {
LLVM_ELF_IMPORT_TYPES_ELFT(ELFT)
Elf_Word nbucket;
Elf_Word nchain;
ArrayRef<const Elf_Word> buckets() const {
return ArrayRef<const Elf_Word>(&nbucket + 2, &nbucket + 2 + nbucket);
}
ArrayRef<const Elf_Word> chains() const {
return ArrayRef<const Elf_Word>(&nbucket + 2 + nbucket,
&nbucket + 2 + nbucket + nchain);
}
};
// MIPS .reginfo section
template <class ELFT>
struct Elf_Mips_RegInfo;

BIN
test/Object/Inputs/no-section-table.so
View File

Binary file not shown.

8
test/Object/no-section-table.test
View File

@ -1,8 +0,0 @@
RUN: llvm-readobj %p/Inputs/no-section-table.so -hash-table | FileCheck %s
CHECK: HashTable {
CHECK: Num Buckets: 3
CHECK: Num Chains: 13
CHECK: Buckets: [12, 10, 11]
CHECK: Chains: [0, 0, 0, 0, 2, 3, 4, 0, 7, 5, 6, 8, 9]
CHECK: }

13
tools/llvm-readobj/ELFDumper.cpp
View File

@ -56,7 +56,6 @@ public:
void printDynamicTable() override;
void printNeededLibraries() override;
void printProgramHeaders() override;
void printHashTable() override;
void printAttributes() override;
void printMipsPLTGOT() override;
@ -1120,18 +1119,6 @@ void ELFDumper<ELFT>::printProgramHeaders() {
}
}
template <typename ELFT>
void ELFDumper<ELFT>::printHashTable() {
DictScope D(W, "HashTable");
auto HT = Obj->getHashTable();
if (!HT)
return;
W.printNumber("Num Buckets", HT->nbucket);
W.printNumber("Num Chains", HT->nchain);
W.printList("Buckets", HT->buckets());
W.printList("Chains", HT->chains());
}
template <class ELFT>
void ELFDumper<ELFT>::printAttributes() {
W.startLine() << "Attributes not implemented.\n";

1
tools/llvm-readobj/ObjDumper.h
View File

@ -37,7 +37,6 @@ public:
virtual void printDynamicTable() { }
virtual void printNeededLibraries() { }
virtual void printProgramHeaders() { }
virtual void printHashTable() { }
// Only implemented for ARM ELF at this time.
virtual void printAttributes() { }

4
tools/llvm-readobj/StreamWriter.h
View File

@ -181,8 +181,8 @@ public:
startLine() << Label << ": " << (Value ? "Yes" : "No") << '\n';
}
template <typename T>
void printList(StringRef Label, const T &List) {
template <typename T_>
void printList(StringRef Label, const SmallVectorImpl<T_> &List) {
startLine() << Label << ": [";
bool Comma = false;
for (const auto &Item : List) {

6
tools/llvm-readobj/llvm-readobj.cpp
View File

@ -127,10 +127,6 @@ namespace opts {
cl::opt<bool> ProgramHeaders("program-headers",
cl::desc("Display ELF program headers"));
// -hash-table
cl::opt<bool> HashTable("hash-table",
cl::desc("Display ELF hash table"));
// -expand-relocs
cl::opt<bool> ExpandRelocs("expand-relocs",
cl::desc("Expand each shown relocation to multiple lines"));
@ -304,8 +300,6 @@ static void dumpObject(const ObjectFile *Obj) {
Dumper->printNeededLibraries();
if (opts::ProgramHeaders)
Dumper->printProgramHeaders();
if (opts::HashTable)
Dumper->printHashTable();
if (Obj->getArch() == llvm::Triple::arm && Obj->isELF())
if (opts::ARMAttributes)
Dumper->printAttributes();