catto
/
shadPS4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

parsing elf header and improved debug printing

This commit is contained in:
georgemoralis 2023-03-31 20:27:06 +03:00
parent 730f9ecdbb
commit e37e047c0e
2 changed files with 89 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
emulator/Loader/Elf.cpp
View File

@ -1,6 +1,11 @@
#include "Elf.h" #include "Elf.h"
Elf::~Elf()
{
Reset();
}
static self_header* load_self(FsFile& f) static self_header* load_self(FsFile& f)
{ {
//read self header //read self header
@ -22,11 +27,11 @@ static self_segment_header* load_self_segments(FsFile& f, u16 num)
static elf_header* load_elf_header(FsFile& f) static elf_header* load_elf_header(FsFile& f)
{ {
auto* ehdr = new elf_header; auto* m_elf_header = new elf_header;
f.Read(ehdr, sizeof(elf_header)); f.Read(m_elf_header, sizeof(elf_header));
return ehdr; 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)
@ -54,8 +59,25 @@ static elf_section_header* load_section_header(FsFile& f, u64 offset, u16 num)
return shdr; return shdr;
} }
void Elf::Reset()//reset all variables
{
if (m_f != nullptr)
{
m_f->Close();
delete m_f;
}
delete m_self;
delete m_elf_header;
delete[] m_self_segments;
m_self = nullptr;
m_self_segments = nullptr;
m_elf_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; m_f = new FsFile;
m_f->Open(file_name, fsOpenMode::fsRead); m_f->Open(file_name, fsOpenMode::fsRead);
@ -72,6 +94,10 @@ void Elf::Open(const std::string& file_name)
m_self_segments = load_self_segments(*m_f, m_self->segment_count); m_self_segments = load_self_segments(*m_f, m_self->segment_count);
} }
auto elfheader_pos = m_f->Tell();//get the entry pos for elf file
m_elf_header = load_elf_header(*m_f);
DebugDump(); DebugDump();
} }
@ -110,21 +136,21 @@ bool Elf::isSelfFile() const
void Elf::DebugDump() { void Elf::DebugDump() {
printf("SELF header:\n"); printf("SELF header:\n");
printf(" magic ..............: 0x%08X\n", m_self->magic); printf(" magic ..............: 0x%08" PRIx32 "\n", m_self->magic);
printf(" version .........: %d\n", m_self->version); printf(" version .........: %" PRIu8 "\n", m_self->version);
printf(" mode .........: 0x%X\n", m_self->mode); printf(" mode .........: 0x%02" PRIx8 "\n", m_self->mode);
printf(" endian .........: %d\n", m_self->endian); printf(" endian .........: %" PRIu8 "\n", m_self->endian);
printf(" attributes .........: 0x%X\n", m_self->attributes); printf(" attributes .........: 0x%02" PRIx8 "\n", m_self->attributes);
printf(" category .........: 0x%X\n", m_self->category); printf(" category .........: 0x%02" PRIx8 "\n", m_self->category);
printf(" program_type........: 0x%X\n", m_self->program_type); printf(" program_type........: 0x%02" PRIx8 "\n", m_self->program_type);
printf(" padding1 ...........: 0x%04X\n", m_self->padding1); printf(" padding1 ...........: 0x%04" PRIx16 "\n", m_self->padding1);
printf(" header size ........: 0x%X\n", m_self->header_size); printf(" header size ........: %" PRIu16 "\n", m_self->header_size);
printf(" meta size .....: %u\n", m_self->meta_size); printf(" meta size .....: %" PRIu16 "\n", m_self->meta_size);
printf(" file size ..........: %u\n", m_self->file_size); printf(" file size ..........: %" PRIu32 "\n", m_self->file_size);
printf(" padding2 ...........: 0x%08X\n", m_self->padding2); printf(" padding2 ...........: 0x%08" PRIx32 "\n", m_self->padding2);
printf(" segment count ......: %u\n", m_self->segment_count); printf(" segment count ......: %" PRIu16 "\n", m_self->segment_count);
printf(" unknown 1A .........: 0x%04X\n", m_self->unknown1A); printf(" unknown 1A .........: 0x%04" PRIx16 "\n", m_self->unknown1A);
printf(" padding3 ...........: 0x%04X\n", m_self->padding3); printf(" padding3 ...........: 0x%04" PRIx16 "\n", m_self->padding3);
printf("\n"); printf("\n");
printf("SELF segments:\n"); printf("SELF segments:\n");
@ -133,10 +159,33 @@ void Elf::DebugDump() {
{ {
auto segment_header = m_self_segments[i]; auto segment_header = m_self_segments[i];
printf(" [%d]\n", i); printf(" [%d]\n", i);
printf(" flags ............: 0x%llx\n", segment_header.flags); printf(" flags ............: 0x%016" PRIx64 "\n", segment_header.flags);
printf(" file offset ......: 0x%llx\n", segment_header.file_offset); printf(" file offset ......: 0x%016" PRIx64 "\n", segment_header.file_offset);
printf(" file size ........: %llu\n", segment_header.file_size); printf(" file size ........: %" PRIu64 "\n", segment_header.file_size);
printf(" memory size ......: %llu\n", segment_header.memory_size); printf(" memory size ......: %" PRIu64 "\n", segment_header.memory_size);
} }
printf("\n"); printf("\n");
printf("Elf header:\n");
printf(" ident .........: 0x");
for (auto i : m_elf_header->e_ident)
{
printf("%02x", i);
}
printf("\n");
printf(" type .........: 0x%04" PRIx16 "\n", m_elf_header->e_type);
printf(" machine .......: 0x%04" PRIx16 "\n", m_elf_header->e_machine);
printf(" version .......: 0x%08" PRIx32 "\n", m_elf_header->e_version);
printf(" entry .........: 0x%016" PRIx64 "\n", m_elf_header->e_entry);
printf(" phoff .........: 0x%016" PRIx64 "\n", m_elf_header->e_phoff);
printf(" shoff .........: 0x%016" PRIx64 "\n", m_elf_header->e_shoff);
printf(" flags .........: 0x%08" PRIx32 "\n", m_elf_header->e_flags);
printf(" ehsize ........: 0x%04" PRIx16 "\n", m_elf_header->e_ehsize);
printf(" phentsize .....: 0x%04" PRIx16 "\n", m_elf_header->e_phentsize);
printf(" phnum .........: %" PRIu16 "\n", m_elf_header->e_phnum);
printf(" shentsize .....: 0x%04" PRIx16 "\n", m_elf_header->e_shentsize);
printf(" shnum .........: %" PRIu16 "\n", m_elf_header->e_shnum);
printf(" shstrndx ......: %" PRIu16 "\n", m_elf_header->e_shstrndx);
} }

18
emulator/Loader/Elf.h
View File

@ -1,5 +1,6 @@
#pragma once #pragma once
#include <string> #include <string>
#include <inttypes.h>
#include "../types.h" #include "../types.h"
#include "../Core/FsFile.h" #include "../Core/FsFile.h"
@ -32,6 +33,16 @@ struct self_segment_header
u64 memory_size; u64 memory_size;
}; };
constexpr int EI_MAG0 = 0;/* e_ident[] indexes */
constexpr int EI_MAG2 = 2;
constexpr int EI_MAG3 = 3;
constexpr int EI_CLASS = 4;
constexpr int EI_DATA = 5;
constexpr int EI_VERSION = 6;
constexpr int EI_OSABI = 7;
constexpr int EI_PAD = 8;
struct elf_header struct elf_header
{ {
u08 e_ident[16]; /* ELF identification */ u08 e_ident[16]; /* ELF identification */
@ -79,12 +90,19 @@ struct elf_section_header
class Elf class Elf
{ {
public: public:
Elf() = default;
virtual ~Elf();
void Open(const std::string & file_name); void Open(const std::string & file_name);
bool isSelfFile() const; bool isSelfFile() const;
void DebugDump(); void DebugDump();
private: private:
void Reset();
FsFile* m_f = nullptr; FsFile* m_f = nullptr;
self_header* m_self = nullptr; self_header* m_self = nullptr;
self_segment_header* m_self_segments = nullptr; self_segment_header* m_self_segments = nullptr;
elf_header* m_elf_header = nullptr;
}; };