mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2025-03-07 11:59:09 +00:00
[yaml2obj][ELF] Add the section name -> section index map to State.
One of the key things that the YAML format abstracts over is the use of section numbers for referencing sections. Instead, textual section names are used, which yaml2obj then translates into appropriate section numbers. (Technically ELF doesn't care about section names (only section numbers), but since this is a testing tool, readability counts). This simplifies using section names as symbolic references in various parts of the code. An upcoming commit will use this to allow symbols to reference sections. llvm-svn: 184467
This commit is contained in:
parent
695308b067
commit
b36f148890
@ -150,18 +150,21 @@ class ELFState {
|
||||
/// \brief The ELF file header.
|
||||
Elf_Ehdr &Header;
|
||||
|
||||
SectionNameToIdxMap &SN2I;
|
||||
|
||||
public:
|
||||
|
||||
ELFState(Elf_Ehdr &Header_, ContiguousBlobAccumulator &Accum,
|
||||
unsigned DotStrtabSecNo_)
|
||||
unsigned DotStrtabSecNo_, SectionNameToIdxMap &SN2I_)
|
||||
: DotStrtab(), DotStrtabSecNo(DotStrtabSecNo_),
|
||||
SectionContentAccum(Accum), Header(Header_) {}
|
||||
SectionContentAccum(Accum), Header(Header_), SN2I(SN2I_) {}
|
||||
|
||||
unsigned getDotStrTabSecNo() const { return DotStrtabSecNo; }
|
||||
StringTableBuilder &getStringTable() { return DotStrtab; }
|
||||
ContiguousBlobAccumulator &getSectionContentAccum() {
|
||||
return SectionContentAccum;
|
||||
}
|
||||
SectionNameToIdxMap &getSN2I() { return SN2I; }
|
||||
};
|
||||
} // end anonymous namespace
|
||||
|
||||
@ -252,8 +255,6 @@ static int writeELF(raw_ostream &OS, const ELFYAML::Object &Doc) {
|
||||
const size_t SectionContentBeginOffset =
|
||||
Header.e_ehsize + Header.e_shentsize * Header.e_shnum;
|
||||
ContiguousBlobAccumulator CBA(SectionContentBeginOffset);
|
||||
ELFState<ELFT> State(Header, CBA, DotStrtabSecNo);
|
||||
|
||||
SectionNameToIdxMap SN2I;
|
||||
for (unsigned i = 0, e = Sections.size(); i != e; ++i) {
|
||||
StringRef Name = Sections[i].Name;
|
||||
@ -267,6 +268,8 @@ static int writeELF(raw_ostream &OS, const ELFYAML::Object &Doc) {
|
||||
}
|
||||
}
|
||||
|
||||
ELFState<ELFT> State(Header, CBA, DotStrtabSecNo, SN2I);
|
||||
|
||||
StringTableBuilder SHStrTab;
|
||||
std::vector<Elf_Shdr> SHeaders;
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user