small logging fix
This commit is contained in:
georgemoralis
parent
07d1387bfe
commit
5c28ff9ee2
|
|
@ -1,12 +1,15 @@
|
|||
#include "Elf.h"
|
||||
#include "spdlog/spdlog.h"
|
||||
#include "spdlog/sinks/basic_file_sink.h"
|
||||
#include <spdlog/sinks/stdout_color_sinks.h>
|
||||
#include <spdlog/pattern_formatter.h>
|
||||
#include <magic_enum.hpp>
|
||||
#include <fmt/core.h>
|
||||
|
||||
#include <Util/log.h>
|
||||
#include <debug.h>
|
||||
#include <fmt/core.h>
|
||||
#include <spdlog/pattern_formatter.h>
|
||||
#include <spdlog/sinks/stdout_color_sinks.h>
|
||||
|
||||
#include <magic_enum.hpp>
|
||||
|
||||
#include "spdlog/sinks/basic_file_sink.h"
|
||||
#include "spdlog/spdlog.h"
|
||||
|
||||
constexpr bool debug_elf = true;
|
||||
|
||||
|
|
@ -17,21 +20,16 @@ struct magic_enum::customize::enum_range<e_type_s> {
|
|||
// (max - min) must be less than UINT16_MAX.
|
||||
};
|
||||
|
||||
Elf::~Elf()
|
||||
{
|
||||
Reset();
|
||||
}
|
||||
Elf::~Elf() { Reset(); }
|
||||
|
||||
static self_header* load_self(FsFile& f)
|
||||
{
|
||||
static self_header* load_self(FsFile& f) {
|
||||
// read self header
|
||||
auto* self = new self_header;
|
||||
f.Read(self, sizeof(self_header));
|
||||
return self;
|
||||
}
|
||||
|
||||
static self_segment_header* load_self_segments(FsFile& f, u16 num)
|
||||
{
|
||||
static self_segment_header* load_self_segments(FsFile& f, u16 num) {
|
||||
auto* segs = new self_segment_header[num];
|
||||
|
||||
f.Read(segs, sizeof(self_segment_header) * num);
|
||||
|
|
@ -39,8 +37,7 @@ static self_segment_header* load_self_segments(FsFile& f, u16 num)
|
|||
return segs;
|
||||
}
|
||||
|
||||
static elf_header* load_elf_header(FsFile& f)
|
||||
{
|
||||
static elf_header* load_elf_header(FsFile& f) {
|
||||
auto* m_elf_header = new elf_header;
|
||||
|
||||
f.Read(m_elf_header, sizeof(elf_header));
|
||||
|
|
@ -48,8 +45,7 @@ static elf_header* load_elf_header(FsFile& f)
|
|||
return m_elf_header;
|
||||
}
|
||||
|
||||
static elf_program_header* load_program_header(FsFile& f, u64 offset, u16 num)
|
||||
{
|
||||
static elf_program_header* load_program_header(FsFile& f, u64 offset, u16 num) {
|
||||
auto* phdr = new elf_program_header[num];
|
||||
|
||||
f.Seek(offset, fsSeekMode::fsSeekSet);
|
||||
|
|
@ -58,8 +54,7 @@ static elf_program_header* load_program_header(FsFile& f, u64 offset, u16 num)
|
|||
return phdr;
|
||||
}
|
||||
|
||||
static elf_section_header* load_section_header(FsFile& f, u64 offset, u16 num)
|
||||
{
|
||||
static elf_section_header* load_section_header(FsFile& f, u64 offset, u16 num) {
|
||||
if (num == 0) // just in case we don't have section headers
|
||||
{
|
||||
return nullptr;
|
||||
|
|
@ -75,8 +70,7 @@ static elf_section_header* load_section_header(FsFile& f, u64 offset, u16 num)
|
|||
|
||||
void Elf::Reset() // reset all variables
|
||||
{
|
||||
if (m_f != nullptr)
|
||||
{
|
||||
if (m_f != nullptr) {
|
||||
m_f->Close();
|
||||
delete m_f;
|
||||
}
|
||||
|
|
@ -95,8 +89,7 @@ void Elf::Reset()//reset all variables
|
|||
m_self_id_header = nullptr;
|
||||
}
|
||||
|
||||
void Elf::Open(const std::string& file_name)
|
||||
{
|
||||
void Elf::Open(const std::string& file_name) {
|
||||
Reset(); // reset all variables
|
||||
|
||||
m_f = new FsFile;
|
||||
|
|
@ -105,14 +98,11 @@ void Elf::Open(const std::string& file_name)
|
|||
m_self = load_self(*m_f);
|
||||
|
||||
bool isself = isSelfFile();
|
||||
if (!isself)
|
||||
{
|
||||
if (!isself) {
|
||||
delete m_self;
|
||||
m_self = nullptr;
|
||||
m_f->Seek(0, fsSeekMode::fsSeekSet); // it is not an self file move to the start of file
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
m_self_segments = load_self_segments(*m_f, m_self->segment_count);
|
||||
}
|
||||
|
||||
|
|
@ -120,66 +110,56 @@ void Elf::Open(const std::string& file_name)
|
|||
|
||||
m_elf_header = load_elf_header(*m_f);
|
||||
|
||||
if (!isElfFile())
|
||||
{
|
||||
if (!isElfFile()) {
|
||||
delete m_elf_header;
|
||||
m_elf_header = nullptr;
|
||||
}
|
||||
|
||||
if (m_elf_header != nullptr)
|
||||
{
|
||||
if (m_elf_header != nullptr) {
|
||||
m_elf_phdr = load_program_header(*m_f, elfheader_pos + m_elf_header->e_phoff, m_elf_header->e_phnum);
|
||||
m_elf_shdr = load_section_header(*m_f, elfheader_pos + m_elf_header->e_shoff, m_elf_header->e_shnum);
|
||||
}
|
||||
if (isself && m_elf_header != nullptr)
|
||||
{
|
||||
if (isself && m_elf_header != nullptr) {
|
||||
u64 header_size = 0;
|
||||
header_size += sizeof(self_header);
|
||||
header_size += sizeof(self_segment_header) * m_self->segment_count;
|
||||
header_size += sizeof(elf_header);
|
||||
header_size += m_elf_header->e_phnum * m_elf_header->e_phentsize;
|
||||
header_size += m_elf_header->e_shnum * m_elf_header->e_shentsize;
|
||||
header_size += 15; header_size &= ~15; // align
|
||||
header_size += 15;
|
||||
header_size &= ~15; // align
|
||||
|
||||
if (m_elf_header->e_ehsize - header_size >= sizeof(elf_program_id_header))
|
||||
{
|
||||
if (m_elf_header->e_ehsize - header_size >= sizeof(elf_program_id_header)) {
|
||||
m_f->Seek(header_size, fsSeekMode::fsSeekSet);
|
||||
|
||||
m_self_id_header = new elf_program_id_header;
|
||||
m_f->Read(m_self_id_header, sizeof(elf_program_id_header));
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
DebugDump();
|
||||
}
|
||||
|
||||
bool Elf::isSelfFile() const
|
||||
{
|
||||
if (m_f == nullptr)
|
||||
{
|
||||
bool Elf::isSelfFile() const {
|
||||
if (m_f == nullptr) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (m_self == nullptr)
|
||||
{
|
||||
if (m_self == nullptr) {
|
||||
return false; // if we can't load self header return false
|
||||
}
|
||||
|
||||
if (m_self->magic != self_header::signature)
|
||||
{
|
||||
if (m_self->magic != self_header::signature) {
|
||||
printf("Not a SELF file. Magic file mismatched! current = 0x%08X required = 0x%08X\n", m_self->magic, self_header::signature);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (m_self->version != 0x00 || m_self->mode != 0x01 || m_self->endian != 0x01 || m_self->attributes != 0x12)
|
||||
{
|
||||
if (m_self->version != 0x00 || m_self->mode != 0x01 || m_self->endian != 0x01 || m_self->attributes != 0x12) {
|
||||
printf("Unknown SELF file\n");
|
||||
return false;
|
||||
}
|
||||
|
||||
if (m_self->category != 0x01 || m_self->program_type != 0x01)
|
||||
{
|
||||
if (m_self->category != 0x01 || m_self->program_type != 0x01) {
|
||||
printf("Unknown SELF file\n");
|
||||
return false;
|
||||
}
|
||||
|
|
@ -187,79 +167,67 @@ bool Elf::isSelfFile() const
|
|||
return true;
|
||||
}
|
||||
|
||||
bool Elf::isElfFile() const
|
||||
{
|
||||
if (m_f == nullptr)
|
||||
{
|
||||
bool Elf::isElfFile() const {
|
||||
if (m_f == nullptr) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (m_elf_header == nullptr)
|
||||
{
|
||||
if (m_elf_header == nullptr) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (m_elf_header->e_ident.magic[EI_MAG0] != ELFMAG0 || m_elf_header->e_ident.magic[EI_MAG1] != ELFMAG1 || m_elf_header->e_ident.magic[EI_MAG2] != ELFMAG2 ||
|
||||
m_elf_header->e_ident.magic[EI_MAG3] != ELFMAG3)
|
||||
{
|
||||
if (m_elf_header->e_ident.magic[EI_MAG0] != ELFMAG0 || m_elf_header->e_ident.magic[EI_MAG1] != ELFMAG1 ||
|
||||
m_elf_header->e_ident.magic[EI_MAG2] != ELFMAG2 || m_elf_header->e_ident.magic[EI_MAG3] != ELFMAG3) {
|
||||
printf("ERROR:Not an ELF file magic is wrong!\n");
|
||||
return false;
|
||||
}
|
||||
if (m_elf_header->e_ident.ei_class != ELF_CLASS_64)
|
||||
{
|
||||
if (m_elf_header->e_ident.ei_class != ELF_CLASS_64) {
|
||||
printf("ERROR:e_ident[EI_CLASS] expected 0x02 is (0x%x)\n", m_elf_header->e_ident.ei_class);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (m_elf_header->e_ident.ei_data != ELF_DATA_2LSB)
|
||||
{
|
||||
if (m_elf_header->e_ident.ei_data != ELF_DATA_2LSB) {
|
||||
printf("ERROR:e_ident[EI_DATA] expected 0x01 is (0x%x)\n", m_elf_header->e_ident.ei_data);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (m_elf_header->e_ident.ei_version != ELF_VERSION_CURRENT)
|
||||
{
|
||||
if (m_elf_header->e_ident.ei_version != ELF_VERSION_CURRENT) {
|
||||
printf("ERROR:e_ident[EI_VERSION] expected 0x01 is (0x%x)\n", m_elf_header->e_ident.ei_version);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (m_elf_header->e_ident.ei_osabi != ELF_OSABI_FREEBSD)
|
||||
{
|
||||
if (m_elf_header->e_ident.ei_osabi != ELF_OSABI_FREEBSD) {
|
||||
printf("ERROR:e_ident[EI_OSABI] expected 0x09 is (0x%x)\n", m_elf_header->e_ident.ei_osabi);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (m_elf_header->e_ident.ei_abiversion != ELF_ABI_VERSION_AMDGPU_HSA_V2)
|
||||
{
|
||||
if (m_elf_header->e_ident.ei_abiversion != ELF_ABI_VERSION_AMDGPU_HSA_V2) {
|
||||
printf("ERROR:e_ident[EI_ABIVERSION] expected 0x00 is (0x%x)\n", m_elf_header->e_ident.ei_abiversion);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (m_elf_header->e_type != ET_SCE_DYNEXEC && m_elf_header->e_type != ET_SCE_DYNAMIC)
|
||||
{
|
||||
if (m_elf_header->e_type != ET_SCE_DYNEXEC && m_elf_header->e_type != ET_SCE_DYNAMIC) {
|
||||
printf("ERROR:e_type expected 0xFE10 OR 0xFE18 is (%04x)\n", m_elf_header->e_type);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (m_elf_header->e_machine != EM_X86_64)
|
||||
{
|
||||
if (m_elf_header->e_machine != EM_X86_64) {
|
||||
printf("ERROR:e_machine expected 0x3E is (%04x)\n", m_elf_header->e_machine);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (m_elf_header->e_version != EV_CURRENT)
|
||||
{
|
||||
if (m_elf_header->e_version != EV_CURRENT) {
|
||||
printf("ERROR:m_elf_header->e_version expected 0x01 is (0x%x)\n", m_elf_header->e_version);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (m_elf_header->e_phentsize != sizeof(elf_program_header))
|
||||
{
|
||||
if (m_elf_header->e_phentsize != sizeof(elf_program_header)) {
|
||||
printf("ERROR:e_phentsize (%d) != sizeof(elf_program_header)\n", m_elf_header->e_phentsize);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (m_elf_header->e_shentsize > 0 && m_elf_header->e_shentsize != sizeof(elf_section_header)) //commercial games doesn't appear to have section headers
|
||||
if (m_elf_header->e_shentsize > 0 &&
|
||||
m_elf_header->e_shentsize != sizeof(elf_section_header)) // commercial games doesn't appear to have section headers
|
||||
{
|
||||
printf("ERROR:e_shentsize (%d) != sizeof(elf_section_header)\n", m_elf_header->e_shentsize);
|
||||
return false;
|
||||
|
|
@ -272,8 +240,7 @@ void Elf::DebugDump() {
|
|||
if (m_self != nullptr) { // if we load elf instead
|
||||
spdlog::info(SElfHeaderStr());
|
||||
spdlog::info("\n");
|
||||
for (u16 i = 0; i < m_self->segment_count; i++)
|
||||
{
|
||||
for (u16 i = 0; i < m_self->segment_count; i++) {
|
||||
spdlog::info(SELFSegHeader(i));
|
||||
}
|
||||
spdlog::info("\n");
|
||||
|
|
@ -281,19 +248,15 @@ void Elf::DebugDump() {
|
|||
|
||||
spdlog::info(ElfHeaderStr());
|
||||
|
||||
if (m_elf_header->e_phentsize > 0)
|
||||
{
|
||||
if (m_elf_header->e_phentsize > 0) {
|
||||
spdlog::info("Program headers:\n");
|
||||
for (u16 i = 0; i < m_elf_header->e_phnum; i++)
|
||||
{
|
||||
for (u16 i = 0; i < m_elf_header->e_phnum; i++) {
|
||||
spdlog::info(ElfPHeaderStr(i));
|
||||
}
|
||||
}
|
||||
if (m_elf_header->e_shentsize > 0)
|
||||
{
|
||||
if (m_elf_header->e_shentsize > 0) {
|
||||
spdlog::info("Section headers:\n");
|
||||
for (u16 i = 0; i < m_elf_header->e_shnum; i++)
|
||||
{
|
||||
for (u16 i = 0; i < m_elf_header->e_shnum; i++) {
|
||||
spdlog::info("--- shdr {} --\n", i);
|
||||
spdlog::info("sh_name ........: {}\n", (m_elf_shdr + i)->sh_name);
|
||||
spdlog::info("sh_type ........: {:#010x}\n", (m_elf_shdr + i)->sh_type);
|
||||
|
|
@ -307,26 +270,21 @@ void Elf::DebugDump() {
|
|||
spdlog::info("sh_entsize .....: {:#018x}\n", (m_elf_shdr + i)->sh_entsize);
|
||||
}
|
||||
}
|
||||
if (m_self_id_header != nullptr)
|
||||
{
|
||||
if (m_self_id_header != nullptr) {
|
||||
spdlog::info("SELF info:\n");
|
||||
spdlog::info("auth id ............: {:#018x}\n", m_self_id_header->authid);
|
||||
auto program_type = magic_enum::enum_cast<program_type_es>(m_self_id_header->program_type);
|
||||
if (program_type.has_value())
|
||||
{
|
||||
if (program_type.has_value()) {
|
||||
spdlog::info("program type .......: {}\n", magic_enum::enum_name(program_type.value()));
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
spdlog::info("program type UNK....: {:#018x}\n", (int)m_self_id_header->program_type);
|
||||
}
|
||||
spdlog::info("app version ........: {:#018x}\n", m_self_id_header->appver);
|
||||
spdlog::info("fw version .........: {:#018x}\n", m_self_id_header->firmver);
|
||||
spdlog::info("digest..............: 0x");
|
||||
for (int i = 0; i < 32; i++) spdlog::info("{:02x}", m_self_id_header->digest[i]);
|
||||
spdlog::info("\n");
|
||||
std::string digest;
|
||||
for (int i = 0; i < 32; i++) digest += fmt::format("{:02X}", m_self_id_header->digest[i]);
|
||||
spdlog::info("digest..............: 0x{}\n",digest);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
std::string Elf::SElfHeaderStr() {
|
||||
|
|
@ -349,8 +307,7 @@ std::string Elf::SElfHeaderStr() {
|
|||
return header;
|
||||
}
|
||||
|
||||
std::string Elf::SELFSegHeader(u16 no)
|
||||
{
|
||||
std::string Elf::SELFSegHeader(u16 no) {
|
||||
auto segment_header = m_self_segments[no];
|
||||
std::string header = fmt::format("====== SEGMENT HEADER {} ========\n", no);
|
||||
header += fmt::format("flags ............: {:#018x}\n", segment_header.flags);
|
||||
|
|
@ -360,67 +317,56 @@ std::string Elf::SELFSegHeader(u16 no)
|
|||
return header;
|
||||
}
|
||||
|
||||
std::string Elf::ElfHeaderStr()
|
||||
{
|
||||
std::string Elf::ElfHeaderStr() {
|
||||
std::string header = fmt::format("======= Elf header ===========\n");
|
||||
header += fmt::format("ident ............: 0x");
|
||||
for (auto i : m_elf_header->e_ident.magic)
|
||||
{
|
||||
for (auto i : m_elf_header->e_ident.magic) {
|
||||
header += fmt::format("{:02X}", i);
|
||||
}
|
||||
header += fmt::format("\n");
|
||||
|
||||
auto ident_class = magic_enum::enum_cast<ident_class_es>(m_elf_header->e_ident.ei_class);
|
||||
if (ident_class.has_value())
|
||||
{
|
||||
if (ident_class.has_value()) {
|
||||
header += fmt::format("ident class.......: {}\n", magic_enum::enum_name(ident_class.value()));
|
||||
}
|
||||
|
||||
auto ident_data = magic_enum::enum_cast<ident_endian_es>(m_elf_header->e_ident.ei_data);
|
||||
if (ident_data.has_value())
|
||||
{
|
||||
if (ident_data.has_value()) {
|
||||
header += fmt::format("ident data .......: {}\n", magic_enum::enum_name(ident_data.value()));
|
||||
}
|
||||
|
||||
auto ident_version = magic_enum::enum_cast<ident_version_es>(m_elf_header->e_ident.ei_version);
|
||||
if (ident_version.has_value())
|
||||
{
|
||||
if (ident_version.has_value()) {
|
||||
header += fmt::format("ident version.....: {}\n", magic_enum::enum_name(ident_version.value()));
|
||||
}
|
||||
|
||||
auto ident_osabi = magic_enum::enum_cast<ident_osabi_es>(m_elf_header->e_ident.ei_osabi);
|
||||
if (ident_osabi.has_value())
|
||||
{
|
||||
if (ident_osabi.has_value()) {
|
||||
header += fmt::format("ident osabi .....: {}\n", magic_enum::enum_name(ident_osabi.value()));
|
||||
}
|
||||
|
||||
auto ident_abiversion = magic_enum::enum_cast<ident_abiversion_es>(m_elf_header->e_ident.ei_abiversion);
|
||||
if (ident_abiversion.has_value())
|
||||
{
|
||||
if (ident_abiversion.has_value()) {
|
||||
header += fmt::format("ident abiversion..: {}\n", magic_enum::enum_name(ident_abiversion.value()));
|
||||
}
|
||||
|
||||
header += fmt::format("ident UNK ........: 0x");
|
||||
for (auto i : m_elf_header->e_ident.pad)
|
||||
{
|
||||
for (auto i : m_elf_header->e_ident.pad) {
|
||||
header += fmt::format("{:02X}", i);
|
||||
}
|
||||
header += fmt::format("\n");
|
||||
|
||||
auto type = magic_enum::enum_cast<e_type_s>(m_elf_header->e_type);
|
||||
if (type.has_value())
|
||||
{
|
||||
if (type.has_value()) {
|
||||
header += fmt::format("type ............: {}\n", magic_enum::enum_name(type.value()));
|
||||
}
|
||||
|
||||
auto machine = magic_enum::enum_cast<e_machine_es>(m_elf_header->e_machine);
|
||||
if (machine.has_value())
|
||||
{
|
||||
if (machine.has_value()) {
|
||||
header += fmt::format("machine ..........: {}\n", magic_enum::enum_name(machine.value()));
|
||||
}
|
||||
auto version = magic_enum::enum_cast<e_version_es>(m_elf_header->e_version);
|
||||
if (version.has_value())
|
||||
{
|
||||
if (version.has_value()) {
|
||||
header += fmt::format("version ..........: {}\n", magic_enum::enum_name(version.value()));
|
||||
}
|
||||
header += fmt::format("entry ............: {:#018x}\n", m_elf_header->e_entry);
|
||||
|
|
@ -438,46 +384,26 @@ std::string Elf::ElfHeaderStr()
|
|||
|
||||
std::string Elf::ElfPheaderTypeStr(u32 type) {
|
||||
switch (type) {
|
||||
case PT_NULL:
|
||||
return "Null";
|
||||
case PT_LOAD:
|
||||
return "Loadable";
|
||||
case PT_DYNAMIC:
|
||||
return "Dynamic";
|
||||
case PT_INTERP:
|
||||
return "Interpreter Path";
|
||||
case PT_NOTE:
|
||||
return "Note";
|
||||
case PT_SHLIB:
|
||||
return "Section Header Library";
|
||||
case PT_PHDR:
|
||||
return "Program Header";
|
||||
case PT_TLS:
|
||||
return "Thread-Local Storage";
|
||||
case PT_NUM:
|
||||
return "Defined Sections Number";
|
||||
case PT_SCE_RELA:
|
||||
return "SCE Relative";
|
||||
case PT_SCE_DYNLIBDATA:
|
||||
return "SCE Dynamic Library Data";
|
||||
case PT_SCE_PROCPARAM:
|
||||
return "SCE Processor Parameters";
|
||||
case PT_SCE_MODULE_PARAM:
|
||||
return "SCE Module Parameters";
|
||||
case PT_SCE_RELRO:
|
||||
return "SCE Read-Only After Relocation";
|
||||
case PT_GNU_EH_FRAME:
|
||||
return "GNU Entry Header Frame";
|
||||
case PT_GNU_STACK:
|
||||
return "GNU Stack (executability)";
|
||||
case PT_GNU_RELRO:
|
||||
return "GNU Read-Only After Relocation";
|
||||
case PT_SCE_COMMENT:
|
||||
return "SCE Comment";
|
||||
case PT_SCE_LIBVERSION:
|
||||
return "SCE Library Version";
|
||||
default:
|
||||
return "Unknown Section";
|
||||
case PT_NULL: return "Null";
|
||||
case PT_LOAD: return "Loadable";
|
||||
case PT_DYNAMIC: return "Dynamic";
|
||||
case PT_INTERP: return "Interpreter Path";
|
||||
case PT_NOTE: return "Note";
|
||||
case PT_SHLIB: return "Section Header Library";
|
||||
case PT_PHDR: return "Program Header";
|
||||
case PT_TLS: return "Thread-Local Storage";
|
||||
case PT_NUM: return "Defined Sections Number";
|
||||
case PT_SCE_RELA: return "SCE Relative";
|
||||
case PT_SCE_DYNLIBDATA: return "SCE Dynamic Library Data";
|
||||
case PT_SCE_PROCPARAM: return "SCE Processor Parameters";
|
||||
case PT_SCE_MODULE_PARAM: return "SCE Module Parameters";
|
||||
case PT_SCE_RELRO: return "SCE Read-Only After Relocation";
|
||||
case PT_GNU_EH_FRAME: return "GNU Entry Header Frame";
|
||||
case PT_GNU_STACK: return "GNU Stack (executability)";
|
||||
case PT_GNU_RELRO: return "GNU Read-Only After Relocation";
|
||||
case PT_SCE_COMMENT: return "SCE Comment";
|
||||
case PT_SCE_LIBVERSION: return "SCE Library Version";
|
||||
default: return "Unknown Section";
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -490,14 +416,12 @@ std::string Elf::ElfPheaderFlagsStr(u32 flags) {
|
|||
return flg;
|
||||
}
|
||||
|
||||
std::string Elf::ElfPHeaderStr(u16 no)
|
||||
{
|
||||
std::string Elf::ElfPHeaderStr(u16 no) {
|
||||
std::string header = fmt::format("====== PROGRAM HEADER {} ========\n", no);
|
||||
header += fmt::format("p_type ....: {}\n", ElfPheaderTypeStr((m_elf_phdr + no)->p_type));
|
||||
|
||||
auto flags = magic_enum::enum_cast<elf_program_flags>((m_elf_phdr + no)->p_flags);
|
||||
if (flags.has_value())
|
||||
{
|
||||
if (flags.has_value()) {
|
||||
header += fmt::format("p_flags ...: {}\n", magic_enum::enum_name(flags.value()));
|
||||
}
|
||||
// header += fmt::format("p_flags ...: {:#010x}\n", (m_elf_phdr + no)->p_flags);
|
||||
|
|
@ -510,21 +434,16 @@ std::string Elf::ElfPHeaderStr(u16 no)
|
|||
return header;
|
||||
}
|
||||
|
||||
void Elf::LoadSegment(u64 virtual_addr, u64 file_offset, u64 size)
|
||||
{
|
||||
if (m_self!=nullptr)
|
||||
{
|
||||
for (uint16_t i = 0; i < m_self->segment_count; i++)
|
||||
{
|
||||
void Elf::LoadSegment(u64 virtual_addr, u64 file_offset, u64 size) {
|
||||
if (m_self != nullptr) {
|
||||
for (uint16_t i = 0; i < m_self->segment_count; i++) {
|
||||
const auto& seg = m_self_segments[i];
|
||||
|
||||
if (seg.IsBlocked())
|
||||
{
|
||||
if (seg.IsBlocked()) {
|
||||
auto phdr_id = seg.GetId();
|
||||
const auto& phdr = m_elf_phdr[phdr_id];
|
||||
|
||||
if (file_offset >= phdr.p_offset && file_offset < phdr.p_offset + phdr.p_filesz)
|
||||
{
|
||||
if (file_offset >= phdr.p_offset && file_offset < phdr.p_offset + phdr.p_filesz) {
|
||||
auto offset = file_offset - phdr.p_offset;
|
||||
m_f->Seek(offset + seg.file_offset, fsSeekMode::fsSeekSet);
|
||||
m_f->Read(reinterpret_cast<void*>(static_cast<uintptr_t>(virtual_addr)), size);
|
||||
|
|
@ -533,16 +452,11 @@ void Elf::LoadSegment(u64 virtual_addr, u64 file_offset, u64 size)
|
|||
}
|
||||
}
|
||||
BREAKPOINT(); // hmm we didn't return something...
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
// it's elf file
|
||||
m_f->Seek(file_offset, fsSeekMode::fsSeekSet);
|
||||
m_f->Read(reinterpret_cast<void*>(static_cast<uintptr_t>(virtual_addr)), size);
|
||||
}
|
||||
}
|
||||
|
||||
u64 Elf::GetElfEntry()
|
||||
{
|
||||
return m_elf_header->e_entry;
|
||||
}
|
||||
u64 Elf::GetElfEntry() { return m_elf_header->e_entry; }
|
||||
|
|
|
|||
Loading…
Reference in New Issue