mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-07-23 10:35:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

we can now start libc module

Browse Source
This commit is contained in:
georgemoralis 2024-01-01 16:43:40 +02:00
parent 62b2e57b6b
commit 6c724a8941
2 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/core/linker.cpp
View File

@ -66,7 +66,6 @@ Module* Linker::LoadModule(const std::string& elf_name) {
LoadModuleToMemory(&m); LoadModuleToMemory(&m);
LoadDynamicInfo(&m); LoadDynamicInfo(&m);
LoadSymbols(&m); LoadSymbols(&m);
Relocate(&m);
} else { } else {
m_modules.pop_back(); m_modules.pop_back();
return nullptr; // It is not a valid elf file //TODO check it why! return nullptr; // It is not a valid elf file //TODO check it why!
@ -491,6 +490,11 @@ static void relocate(u32 idx, elf_relocation* rel, Module* m, bool isJmpRel) {
} }
} }
void Linker::RelocateAll() {
for (auto& m : m_modules) {
Relocate(&m);
}
}
void Linker::Relocate(Module* m) { void Linker::Relocate(Module* m) {
u32 idx = 0; u32 idx = 0;
for (auto* rel = m->dynamic_info.relocation_table; for (auto* rel = m->dynamic_info.relocation_table;
@ -577,6 +581,27 @@ void Linker::Resolve(const std::string& name, int Symtype, Module* m, Loader::Sy
using exit_func_t = PS4_SYSV_ABI void (*)(); using exit_func_t = PS4_SYSV_ABI void (*)();
using entry_func_t = PS4_SYSV_ABI void (*)(EntryParams* params, exit_func_t atexit_func); using entry_func_t = PS4_SYSV_ABI void (*)(EntryParams* params, exit_func_t atexit_func);
using module_ini_func_t = PS4_SYSV_ABI int (*)(size_t args, const void* argp, module_func_t func);
static PS4_SYSV_ABI int run_module(uint64_t addr, size_t args, const void* argp, module_func_t func) {
return reinterpret_cast<module_ini_func_t>(addr)(args, argp, func);
}
int Linker::StartModule(Module* m, size_t args, const void* argp, module_func_t func) {
return run_module(m->dynamic_info.init_virtual_addr + m->base_virtual_addr, args, argp, func);
}
void Linker::StartAllModules() {
std::scoped_lock lock{m_mutex};
for (auto& m : m_modules) {
if (m.elf.IsSharedLib()) {
StartModule(&m, 0, nullptr, nullptr);
}
}
}
static PS4_SYSV_ABI void ProgramExitFunc() { fmt::print("exit function called\n"); } static PS4_SYSV_ABI void ProgramExitFunc() { fmt::print("exit function called\n"); }
static void run_main_entry(u64 addr, EntryParams* params, exit_func_t exit_func) { static void run_main_entry(u64 addr, EntryParams* params, exit_func_t exit_func) {
@ -604,6 +629,8 @@ static void run_main_entry(u64 addr, EntryParams* params, exit_func_t exit_func)
void Linker::Execute() { void Linker::Execute() {
Core::Libraries::LibKernel::pthreadInitSelfMainThread(); Core::Libraries::LibKernel::pthreadInitSelfMainThread();
RelocateAll();
StartAllModules();
EntryParams p{}; EntryParams p{};
p.argc = 1; p.argc = 1;
p.argv[0] = "eboot.bin"; // hmm should be ok? p.argv[0] = "eboot.bin"; // hmm should be ok?

7
src/core/linker.h
View File

@ -7,6 +7,8 @@
namespace Core { namespace Core {
using module_func_t = int (*)(size_t args, const void* argp);
struct DynamicModuleInfo; struct DynamicModuleInfo;
class Linker; class Linker;
@ -122,11 +124,14 @@ public:
void Relocate(Module* m); void Relocate(Module* m);
void Resolve(const std::string& name, int Symtype, Module* m, Loader::SymbolRecord* return_info); void Resolve(const std::string& name, int Symtype, Module* m, Loader::SymbolRecord* return_info);
void Execute(); void Execute();
void RelocateAll();
int StartModule(Module* m, size_t args, const void* argp, module_func_t func);
void StartAllModules();
private: private:
const ModuleInfo* FindModule(const Module& m, const std::string& id); const ModuleInfo* FindModule(const Module& m, const std::string& id);
const LibraryInfo* FindLibrary(const Module& program, const std::string& id); const LibraryInfo* FindLibrary(const Module& program, const std::string& id);
Module* Linker::FindModuleExp(const ModuleInfo& m, const LibraryInfo& l); Module* FindModuleExp(const ModuleInfo& m, const LibraryInfo& l);
std::vector<Module> m_modules; std::vector<Module> m_modules;
Loader::SymbolsResolver m_hle_symbols{}; Loader::SymbolsResolver m_hle_symbols{};