archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-07 23:41:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improved sprx boot (for devs only)

Browse source
This commit is contained in:
Nekotekina 2017-07-13 18:35:37 +03:00
parent 15fe8f1c51
commit d8abe75526
2 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

17
rpcs3/Emu/Cell/PPUModule.cpp
View file

@ -130,6 +130,11 @@ struct ppu_linkage_info
// Initialize static modules. // Initialize static modules.
static void ppu_initialize_modules(const std::shared_ptr<ppu_linkage_info>& link) static void ppu_initialize_modules(const std::shared_ptr<ppu_linkage_info>& link)
{ {
if (!link->modules.empty())
{
return;
}
ppu_initialize_syscalls(); ppu_initialize_syscalls();
const std::initializer_list<const ppu_static_module*> registered const std::initializer_list<const ppu_static_module*> registered
@ -674,6 +679,9 @@ std::shared_ptr<lv2_prx> ppu_load_prx(const ppu_prx_object& elf, const std::stri
// Access linkage information object // Access linkage information object
const auto link = fxm::get_always<ppu_linkage_info>(); const auto link = fxm::get_always<ppu_linkage_info>();
// Initialize HLE modules
ppu_initialize_modules(link);
for (const auto& prog : elf.progs) for (const auto& prog : elf.progs)
{ {
LOG_NOTICE(LOADER, "** Segment: p_type=0x%x, p_vaddr=0x%llx, p_filesz=0x%llx, p_memsz=0x%llx, flags=0x%x", prog.p_type, prog.p_vaddr, prog.p_filesz, prog.p_memsz, prog.p_flags); LOG_NOTICE(LOADER, "** Segment: p_type=0x%x, p_vaddr=0x%llx, p_filesz=0x%llx, p_memsz=0x%llx, flags=0x%x", prog.p_type, prog.p_vaddr, prog.p_filesz, prog.p_memsz, prog.p_flags);
@ -894,6 +902,15 @@ std::shared_ptr<lv2_prx> ppu_load_prx(const ppu_prx_object& elf, const std::stri
prx->epilogue.set(prx->specials[0x330F7005]); prx->epilogue.set(prx->specials[0x330F7005]);
prx->name = path.substr(path.find_last_of('/') + 1); prx->name = path.substr(path.find_last_of('/') + 1);
prx->path = path; prx->path = path;
if (Emu.IsReady() && fxm::import<ppu_module>([&] { return prx; }))
{
// Special loading mode
auto ppu = idm::make_ptr<ppu_thread>("test_thread", 0, 0x100000);
ppu->cmd_push({ppu_cmd::initialize, 0});
}
return prx; return prx;
} }

2
rpcs3/Emu/System.cpp
View file

@ -536,7 +536,7 @@ void Emulator::Load()
m_state = system_state::ready; m_state = system_state::ready;
GetCallbacks().on_ready(); GetCallbacks().on_ready();
vm::ps3::init(); vm::ps3::init();
ppu_load_prx(ppu_prx, ""); ppu_load_prx(ppu_prx, m_path);
} }
else if (spu_exec.open(elf_file) == elf_error::ok) else if (spu_exec.open(elf_file) == elf_error::ok)
{ {