6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-07-09 10:29:25 +00:00
Code Issues Projects Releases Wiki Activity

[yaml2obj] Add support for specifying raw section content.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@183955 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Sean Silva 2013-06-13 22:20:01 +00:00
parent 45b812d1a7
commit 2a7e79a30f
4 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/llvm/Object/ELFYAML.h
View File

@ -54,6 +54,7 @@ struct Section {
ELF_SHT Type;
ELF_SHF Flags;
llvm::yaml::Hex64 Address;
object::yaml::BinaryRef Content;
};
struct Object {
FileHeader Header;

1
lib/Object/ELFYAML.cpp
View File

@ -266,6 +266,7 @@ void MappingTraits<ELFYAML::Section>::mapping(IO &IO,
IO.mapRequired("Type", Section.Type);
IO.mapOptional("Flags", Section.Flags, ELFYAML::ELF_SHF(0));
IO.mapOptional("Address", Section.Address, Hex64(0));
IO.mapOptional("Content", Section.Content);
}
void MappingTraits<ELFYAML::Object>::mapping(IO &IO, ELFYAML::Object &Object) {

7
test/Object/yaml2obj-elf-section-basic.yaml
View File

@ -1,4 +1,4 @@
# RUN: yaml2obj -format=elf %s | llvm-readobj -sections - | FileCheck %s
# RUN: yaml2obj -format=elf %s | llvm-readobj -sections -section-data - | FileCheck %s
!ELF
FileHeader:
Class: ELFCLASS64
@ -10,6 +10,7 @@ Sections:
Type: SHT_PROGBITS
Flags: [ SHF_ALLOC, SHF_EXECINSTR ]
Address: 0xDEADBEEF
Content: EBFE
# CHECK: Section {
# CHECK: Index: 0
@ -23,3 +24,7 @@ Sections:
# CHECK-NEXT: SHF_EXECINSTR (0x4)
# CHECK-NEXT: ]
# CHECK-NEXT: Address: 0xDEADBEEF
# CHECK: Size: 2
# CHECK: SectionData (
# CHECK-NEXT: 0000: EBFE
# CHECK-NEXT: )

33
tools/yaml2obj/yaml2elf.cpp
View File

@ -61,6 +61,21 @@ public:
}
};
// This class is used to build up a contiguous binary blob while keeping
// track of an offset in the output (which notionally begins at
// `InitialOffset`).
class ContiguousBlobAccumulator {
const uint64_t InitialOffset;
raw_svector_ostream OS;
public:
ContiguousBlobAccumulator(uint64_t InitialOffset_, SmallVectorImpl<char> &Buf)
: InitialOffset(InitialOffset_), OS(Buf) {}
raw_ostream &getOS() { return OS; }
uint64_t currentOffset() const { return InitialOffset + OS.tell(); }
void writeBlobToStream(raw_ostream &Out) { Out << OS.str(); }
};
template <class T>
static size_t vectorDataSize(const std::vector<T> &Vec) {
return Vec.size() * sizeof(T);
@ -124,6 +139,12 @@ static void writeELF(raw_ostream &OS, const ELFYAML::Object &Doc) {
Header.e_shstrndx = Sections.size();
StringTableBuilder StrTab;
SmallVector<char, 128> Buf;
// XXX: This offset is tightly coupled with the order that we write
// things to `OS`.
const size_t SectionContentBeginOffset =
Header.e_ehsize + Header.e_shentsize * Header.e_shnum;
ContiguousBlobAccumulator CBA(SectionContentBeginOffset, Buf);
std::vector<Elf_Shdr> SHeaders;
for (unsigned i = 0, e = Sections.size(); i != e; ++i) {
const ELFYAML::Section &Sec = Sections[i];
@ -133,8 +154,11 @@ static void writeELF(raw_ostream &OS, const ELFYAML::Object &Doc) {
SHeader.sh_type = Sec.Type;
SHeader.sh_flags = Sec.Flags;
SHeader.sh_addr = Sec.Address;
SHeader.sh_offset = 0;
SHeader.sh_size = 0;
SHeader.sh_offset = CBA.currentOffset();
SHeader.sh_size = Sec.Content.binary_size();
Sec.Content.writeAsBinary(CBA.getOS());
SHeader.sh_link = 0;
SHeader.sh_info = 0;
SHeader.sh_addralign = 1;
@ -149,8 +173,9 @@ static void writeELF(raw_ostream &OS, const ELFYAML::Object &Doc) {
StrTabSHeader.sh_type = SHT_STRTAB;
StrTabSHeader.sh_flags = 0;
StrTabSHeader.sh_addr = 0;
StrTabSHeader.sh_offset = Header.e_ehsize + Header.e_shentsize * Header.e_shnum;
StrTabSHeader.sh_offset = CBA.currentOffset();
StrTabSHeader.sh_size = StrTab.size();
StrTab.writeToStream(CBA.getOS());
StrTabSHeader.sh_link = 0;
StrTabSHeader.sh_info = 0;
StrTabSHeader.sh_addralign = 1;
@ -159,7 +184,7 @@ static void writeELF(raw_ostream &OS, const ELFYAML::Object &Doc) {
OS.write((const char *)&Header, sizeof(Header));
writeVectorData(OS, SHeaders);
OS.write((const char *)&StrTabSHeader, sizeof(StrTabSHeader));
StrTab.writeToStream(OS);
CBA.writeBlobToStream(OS);
}
int yaml2elf(llvm::raw_ostream &Out, llvm::MemoryBuffer *Buf) {