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

PRX loader: Fix libfs_155.sprx loading

Browse source 
Fix relocations' segments referencing when there are "empty" (memsize=0) LOAD segments.
This commit is contained in:
Eladash 2020-12-14 08:03:49 +02:00 • committed by Ivan
parent 03ad5c6830
commit 7eb16e13bb
6 changed files with 29 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rpcs3/Emu/Cell/PPUThread.cpp
View file

@ -2324,9 +2324,10 @@ extern void ppu_initialize(const ppu_module& info)
globals.emplace_back(fmt::format("__cptr%x", suffix), reinterpret_cast<u64>(vm::g_exec_addr));
// Initialize segments for relocations
for (u32 i = 0; i < info.segs.size(); i++)
for (u32 i = 0, num = 0; i < info.segs.size(); i++)
{
globals.emplace_back(fmt::format("__seg%u_%x", i, suffix), info.segs[i].addr);
if (!info.segs[i].addr) continue;
globals.emplace_back(fmt::format("__seg%u_%x", num++, suffix), info.segs[i].addr);
}
link_workload.emplace_back(obj_name, false);
@ -2490,6 +2491,7 @@ extern void ppu_initialize(const ppu_module& info)
for (const auto& seg : info.segs)
{
if (!seg.addr) continue;
*jit_mod.vars[index++] = seg.addr;
}
}