The-Homebrew-Cloud/wut
2
0
Fork 0
mirror of https://github.com/wiiu-env/wut.git synced 2025-02-02 23:12:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

elf2rpl: Process sections by type, not by name.

Browse Source
This commit is contained in:
James Benton 2018-05-24 23:48:33 +01:00
parent d6478d831e
commit 0a4a7c66b3
1 changed files with 95 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

226
tools/elf2rpl/main.cpp
View File

@ -180,7 +180,7 @@ fixBssNoBits(ElfFile &file)
* *
* Expected order: * Expected order:
* NULL section * NULL section
* >.syscall >.text * > .syscall > .text
* > .fexports * > .fexports
* > .rodata > .data > .module_id > .bss * > .rodata > .data > .module_id > .bss
* > .rela.fexports > .rela.text > .rela.rodata > .rela.data * > .rela.fexports > .rela.text > .rela.rodata > .rela.data
@ -194,69 +194,67 @@ reorderSectionIndex(ElfFile &file)
std::vector<std::size_t> sectionMap; std::vector<std::size_t> sectionMap;
sectionMap.push_back(0); sectionMap.push_back(0);
if (auto index = getSectionIndex(file, ".syscall"); index != -1) { // Code sections
sectionMap.push_back(index); for (auto i = 0u; i < file.sections.size(); ++i) {
} if (file.sections[i]->header.type == elf::SHT_PROGBITS &&
(file.sections[i]->header.flags & elf::SHF_EXECINSTR)) {
if (auto index = getSectionIndex(file, ".text"); index != -1) { sectionMap.push_back(i);
sectionMap.push_back(index);
}
if (auto index = getSectionIndex(file, ".fexports"); index != -1) {
sectionMap.push_back(index);
}
if (auto index = getSectionIndex(file, ".rodata"); index != -1) {
sectionMap.push_back(index);
}
if (auto index = getSectionIndex(file, ".data"); index != -1) {
sectionMap.push_back(index);
}
if (auto index = getSectionIndex(file, ".module_id"); index != -1) {
sectionMap.push_back(index);
}
if (auto index = getSectionIndex(file, ".bss"); index != -1) {
sectionMap.push_back(index);
}
if (auto index = getSectionIndex(file, ".rela.fexports"); index != -1) {
sectionMap.push_back(index);
}
if (auto index = getSectionIndex(file, ".rela.text"); index != -1) {
sectionMap.push_back(index);
}
if (auto index = getSectionIndex(file, ".rela.rodata"); index != -1) {
sectionMap.push_back(index);
}
if (auto index = getSectionIndex(file, ".rela.data"); index != -1) {
sectionMap.push_back(index);
}
// All .fimport_ and .dimport_
for (auto index = 0u; index < file.sections.size(); ++index) {
const auto &section = file.sections[index];
if (begins_with<std::string>(section->name, ".fimport_") ||
begins_with<std::string>(section->name, ".dimport_")) {
sectionMap.push_back(index);
} }
} }
if (auto index = getSectionIndex(file, ".symtab"); index != -1) { // RPL exports
sectionMap.push_back(index); for (auto i = 0u; i < file.sections.size(); ++i) {
if (file.sections[i]->header.type == elf::SHT_RPL_EXPORTS) {
sectionMap.push_back(i);
}
} }
if (auto index = getSectionIndex(file, ".strtab"); index != -1) { // Read only data
sectionMap.push_back(index); for (auto i = 0u; i < file.sections.size(); ++i) {
if (file.sections[i]->header.type == elf::SHT_PROGBITS &&
!(file.sections[i]->header.flags & elf::SHF_EXECINSTR) &&
!(file.sections[i]->header.flags & elf::SHF_WRITE)) {
sectionMap.push_back(i);
}
} }
if (auto index = getSectionIndex(file, ".shstrtab"); index != -1) { // Writable data
sectionMap.push_back(index); for (auto i = 0u; i < file.sections.size(); ++i) {
if (file.sections[i]->header.type == elf::SHT_PROGBITS &&
!(file.sections[i]->header.flags & elf::SHF_EXECINSTR) &&
(file.sections[i]->header.flags & elf::SHF_WRITE)) {
sectionMap.push_back(i);
}
}
// BSS
for (auto i = 0u; i < file.sections.size(); ++i) {
if (file.sections[i]->header.type == elf::SHT_NOBITS) {
sectionMap.push_back(i);
}
}
// Relocations
for (auto i = 0u; i < file.sections.size(); ++i) {
if (file.sections[i]->header.type == elf::SHT_REL ||
file.sections[i]->header.type == elf::SHT_RELA) {
sectionMap.push_back(i);
}
}
// RPL imports
for (auto i = 0u; i < file.sections.size(); ++i) {
if (file.sections[i]->header.type == elf::SHT_RPL_IMPORTS) {
sectionMap.push_back(i);
}
}
// Symtab and strtab
for (auto i = 0u; i < file.sections.size(); ++i) {
if (file.sections[i]->header.type == elf::SHT_SYMTAB ||
file.sections[i]->header.type == elf::SHT_STRTAB) {
sectionMap.push_back(i);
}
} }
if (sectionMap.size() != file.sections.size()) { if (sectionMap.size() != file.sections.size()) {
@ -807,36 +805,26 @@ calculateSectionOffsets(ElfFile &file)
offset += section->header.size; offset += section->header.size;
} }
if (auto section = getSectionByName(file, ".rodata")) { // Data sections
section->header.offset = offset; for (auto &section : file.sections) {
section->header.size = static_cast<uint32_t>(section->data.size()); if (section->header.type == elf::SHT_PROGBITS &&
offset += section->header.size; !(section->header.flags & elf::SHF_EXECINSTR)) {
section->header.offset = offset;
section->header.size = static_cast<uint32_t>(section->data.size());
offset += section->header.size;
}
} }
if (auto section = getSectionByName(file, ".data")) { // Exports
section->header.offset = offset; for (auto &section : file.sections) {
section->header.size = static_cast<uint32_t>(section->data.size()); if (section->header.type == elf::SHT_RPL_EXPORTS) {
offset += section->header.size; section->header.offset = offset;
} section->header.size = static_cast<uint32_t>(section->data.size());
offset += section->header.size;
if (auto section = getSectionByName(file, ".module_id")) { }
section->header.offset = offset;
section->header.size = static_cast<uint32_t>(section->data.size());
offset += section->header.size;
}
if (auto section = getSectionByName(file, ".fexports")) {
section->header.offset = offset;
section->header.size = static_cast<uint32_t>(section->data.size());
offset += section->header.size;
}
if (auto section = getSectionByName(file, ".dexports")) {
section->header.offset = offset;
section->header.size = static_cast<uint32_t>(section->data.size());
offset += section->header.size;
} }
// Imports
for (auto &section : file.sections) { for (auto &section : file.sections) {
if (section->header.type == elf::SHT_RPL_IMPORTS) { if (section->header.type == elf::SHT_RPL_IMPORTS) {
section->header.offset = offset; section->header.offset = offset;
@ -845,58 +833,34 @@ calculateSectionOffsets(ElfFile &file)
} }
} }
if (auto section = getSectionByName(file, ".symtab")) { // symtab & strtab
section->header.offset = offset; for (auto &section : file.sections) {
section->header.size = static_cast<uint32_t>(section->data.size()); if (section->header.type == elf::SHT_SYMTAB ||
offset += section->header.size; section->header.type == elf::SHT_STRTAB) {
section->header.offset = offset;
section->header.size = static_cast<uint32_t>(section->data.size());
offset += section->header.size;
}
} }
if (auto section = getSectionByName(file, ".strtab")) { // Code sections
section->header.offset = offset; for (auto &section : file.sections) {
section->header.size = static_cast<uint32_t>(section->data.size()); if (section->header.type == elf::SHT_PROGBITS &&
offset += section->header.size; (section->header.flags & elf::SHF_EXECINSTR)) {
section->header.offset = offset;
section->header.size = static_cast<uint32_t>(section->data.size());
offset += section->header.size;
}
} }
if (auto section = getSectionByName(file, ".shstrtab")) { // Relocation sections
section->header.offset = offset; for (auto &section : file.sections) {
section->header.size = static_cast<uint32_t>(section->data.size()); if (section->header.type == elf::SHT_REL ||
offset += section->header.size; section->header.type == elf::SHT_RELA) {
} section->header.offset = offset;
section->header.size = static_cast<uint32_t>(section->data.size());
if (auto section = getSectionByName(file, ".syscall")) { offset += section->header.size;
section->header.offset = offset; }
section->header.size = static_cast<uint32_t>(section->data.size());
offset += section->header.size;
}
if (auto section = getSectionByName(file, ".text")) {
section->header.offset = offset;
section->header.size = static_cast<uint32_t>(section->data.size());
offset += section->header.size;
}
if (auto section = getSectionByName(file, ".rela.fexports")) {
section->header.offset = offset;
section->header.size = static_cast<uint32_t>(section->data.size());
offset += section->header.size;
}
if (auto section = getSectionByName(file, ".rela.text")) {
section->header.offset = offset;
section->header.size = static_cast<uint32_t>(section->data.size());
offset += section->header.size;
}
if (auto section = getSectionByName(file, ".rela.rodata")) {
section->header.offset = offset;
section->header.size = static_cast<uint32_t>(section->data.size());
offset += section->header.size;
}
if (auto section = getSectionByName(file, ".rela.data")) {
section->header.offset = offset;
section->header.size = static_cast<uint32_t>(section->data.size());
offset += section->header.size;
} }
return true; return true;