SmallVector<char, 128> Buf;
raw_svector_ostream OS;
+ /// \returns The new offset.
+ uint64_t padToAlignment(unsigned Align) {
+ uint64_t CurrentOffset = InitialOffset + OS.tell();
+ uint64_t AlignedOffset = RoundUpToAlignment(CurrentOffset, Align);
+ for (; CurrentOffset != AlignedOffset; ++CurrentOffset)
+ OS.write('\0');
+ return AlignedOffset; // == CurrentOffset;
+ }
+
public:
ContiguousBlobAccumulator(uint64_t InitialOffset_)
: InitialOffset(InitialOffset_), Buf(), OS(Buf) {}
- raw_ostream &getOS() { return OS; }
- uint64_t currentOffset() const { return InitialOffset + OS.tell(); }
+ template <class Integer>
+ raw_ostream &getOSAndAlignedOffset(Integer &Offset, unsigned Align = 16) {
+ Offset = padToAlignment(Align);
+ return OS;
+ }
void writeBlobToStream(raw_ostream &Out) { Out << OS.str(); }
};
} // end anonymous namespace
StringTableBuilder &STB,
ContiguousBlobAccumulator &CBA) {
SHeader.sh_type = ELF::SHT_STRTAB;
- SHeader.sh_offset = CBA.currentOffset();
+ STB.writeToStream(CBA.getOSAndAlignedOffset(SHeader.sh_offset));
SHeader.sh_size = STB.size();
- STB.writeToStream(CBA.getOS());
SHeader.sh_addralign = 1;
}
};
} // end anonymous namespace
-// FIXME: This function is hideous. The hideous ELF type names are hideous.
-// Factor the ELF output into a class (templated on ELFT) and share some
-// typedefs.
+// FIXME: At this point it is fairly clear that we need to refactor these
+// static functions into methods of a class sharing some typedefs. These
+// ELF type names are insane.
+template <class ELFT>
+static void
+addSymbols(const std::vector<ELFYAML::Symbol> &Symbols, ELFState<ELFT> &State,
+ std::vector<typename object::ELFObjectFile<ELFT>::Elf_Sym> &Syms,
+ unsigned SymbolBinding) {
+ typedef typename object::ELFObjectFile<ELFT>::Elf_Sym Elf_Sym;
+ for (unsigned i = 0, e = Symbols.size(); i != e; ++i) {
+ const ELFYAML::Symbol &Sym = Symbols[i];
+ Elf_Sym Symbol;
+ zero(Symbol);
+ if (!Sym.Name.empty())
+ Symbol.st_name = State.getStringTable().addString(Sym.Name);
+ Symbol.setBindingAndType(SymbolBinding, Sym.Type);
+ if (!Sym.Section.empty()) {
+ unsigned Index;
+ if (State.getSN2I().lookupSection(Sym.Section, Index)) {
+ errs() << "error: Unknown section referenced: '" << Sym.Section
+ << "' by YAML symbol " << Sym.Name << ".\n";
+ exit(1);
+ }
+ Symbol.st_shndx = Index;
+ } // else Symbol.st_shndex == SHN_UNDEF (== 0), since it was zero'd earlier.
+ Symbol.st_value = Sym.Value;
+ Symbol.st_size = Sym.Size;
+ Syms.push_back(Symbol);
+ }
+}
+
template <class ELFT>
static void handleSymtabSectionHeader(
- const ELFYAML::Section &Sec, ELFState<ELFT> &State,
+ const ELFYAML::LocalGlobalWeakSymbols &Symbols, ELFState<ELFT> &State,
typename object::ELFObjectFile<ELFT>::Elf_Shdr &SHeader) {
typedef typename object::ELFObjectFile<ELFT>::Elf_Sym Elf_Sym;
// TODO: Ensure that a manually specified `Link` field is diagnosed as an
// error for SHT_SYMTAB.
SHeader.sh_link = State.getDotStrTabSecNo();
- // TODO: Once we handle symbol binding, this should be one greater than
- // symbol table index of the last local symbol.
- SHeader.sh_info = 0;
+ // One greater than symbol table index of the last local symbol.
+ SHeader.sh_info = Symbols.Local.size() + 1;
SHeader.sh_entsize = sizeof(Elf_Sym);
std::vector<Elf_Sym> Syms;
zero(Sym);
Syms.push_back(Sym);
}
- for (unsigned i = 0, e = Sec.Symbols.size(); i != e; ++i) {
- const ELFYAML::Symbol &Sym = Sec.Symbols[i];
- Elf_Sym Symbol;
- zero(Symbol);
- if (!Sym.Name.empty())
- Symbol.st_name = State.getStringTable().addString(Sym.Name);
- Symbol.setBindingAndType(Sym.Binding, Sym.Type);
- unsigned Index;
- if (State.getSN2I().lookupSection(Sym.Section, Index)) {
- errs() << "error: Unknown section referenced: '" << Sym.Section
- << "' by YAML symbol " << Sym.Name << ".\n";
- exit(1);
- }
- Symbol.st_shndx = Index;
- Syms.push_back(Symbol);
- }
+ addSymbols(Symbols.Local, State, Syms, ELF::STB_LOCAL);
+ addSymbols(Symbols.Global, State, Syms, ELF::STB_GLOBAL);
+ addSymbols(Symbols.Weak, State, Syms, ELF::STB_WEAK);
ContiguousBlobAccumulator &CBA = State.getSectionContentAccum();
- SHeader.sh_offset = CBA.currentOffset();
+ writeVectorData(CBA.getOSAndAlignedOffset(SHeader.sh_offset), Syms);
SHeader.sh_size = vectorDataSize(Syms);
- writeVectorData(CBA.getOS(), Syms);
}
template <class ELFT>
SHeader.sh_flags = Sec.Flags;
SHeader.sh_addr = Sec.Address;
- SHeader.sh_offset = CBA.currentOffset();
+ Sec.Content.writeAsBinary(CBA.getOSAndAlignedOffset(SHeader.sh_offset));
SHeader.sh_size = Sec.Content.binary_size();
- Sec.Content.writeAsBinary(CBA.getOS());
if (!Sec.Link.empty()) {
unsigned Index;
// (and setting sh_offset and sh_size) when going through this branch
// here.
if (Sec.Type == ELFYAML::ELF_SHT(SHT_SYMTAB))
- handleSymtabSectionHeader<ELFT>(Sec, State, SHeader);
+ handleSymtabSectionHeader<ELFT>(Sec.Symbols, State, SHeader);
SHeaders.push_back(SHeader);
}
zero(DotStrTabSHeader);
DotStrTabSHeader.sh_name = SHStrTab.addString(StringRef(".strtab"));
createStringTableSectionHeader(DotStrTabSHeader, State.getStringTable(), CBA);
+ SHeaders.push_back(DotStrTabSHeader);
// Section header string table header.
Elf_Shdr SHStrTabSHeader;
zero(SHStrTabSHeader);
createStringTableSectionHeader(SHStrTabSHeader, SHStrTab, CBA);
+ SHeaders.push_back(SHStrTabSHeader);
OS.write((const char *)&Header, sizeof(Header));
writeVectorData(OS, SHeaders);
- OS.write((const char *)&DotStrTabSHeader, sizeof(DotStrTabSHeader));
- OS.write((const char *)&SHStrTabSHeader, sizeof(SHStrTabSHeader));
CBA.writeBlobToStream(OS);
return 0;
}
+static bool is64Bit(const ELFYAML::Object &Doc) {
+ return Doc.Header.Class == ELFYAML::ELF_ELFCLASS(ELF::ELFCLASS64);
+}
+
+static bool isLittleEndian(const ELFYAML::Object &Doc) {
+ return Doc.Header.Data == ELFYAML::ELF_ELFDATA(ELF::ELFDATA2LSB);
+}
+
int yaml2elf(llvm::raw_ostream &Out, llvm::MemoryBuffer *Buf) {
yaml::Input YIn(Buf->getBuffer());
ELFYAML::Object Doc;
errs() << "yaml2obj: Failed to parse YAML file!\n";
return 1;
}
- if (Doc.Header.Class == ELFYAML::ELF_ELFCLASS(ELF::ELFCLASS64)) {
- if (Doc.Header.Data == ELFYAML::ELF_ELFDATA(ELF::ELFDATA2LSB))
- return writeELF<object::ELFType<support::little, 8, true> >(outs(), Doc);
+ using object::ELFType;
+ typedef ELFType<support::little, 8, true> LE64;
+ typedef ELFType<support::big, 8, true> BE64;
+ typedef ELFType<support::little, 4, false> LE32;
+ typedef ELFType<support::big, 4, false> BE32;
+ if (is64Bit(Doc)) {
+ if (isLittleEndian(Doc))
+ return writeELF<LE64>(outs(), Doc);
else
- return writeELF<object::ELFType<support::big, 8, true> >(outs(), Doc);
+ return writeELF<BE64>(outs(), Doc);
} else {
- if (Doc.Header.Data == ELFYAML::ELF_ELFDATA(ELF::ELFDATA2LSB))
- return writeELF<object::ELFType<support::little, 4, false> >(outs(), Doc);
+ if (isLittleEndian(Doc))
+ return writeELF<LE32>(outs(), Doc);
else
- return writeELF<object::ELFType<support::big, 4, false> >(outs(), Doc);
+ return writeELF<BE32>(outs(), Doc);
}
}
projects / oota-llvm.git / blobdiff