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

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/PPUAnalyser.cpp
View file

@ -593,6 +593,8 @@ void ppu_module::analyse(u32 lib_toc, u32 entry)
// Grope for OPD section (TODO: optimization, better constraints)
for (const auto& seg : segs)
{
if (!seg.addr) continue;
for (vm::cptr<u32> ptr = vm::cast(seg.addr); ptr.addr() < seg.addr + seg.size; ptr++)
{
if (ptr[0] >= start && ptr[0] < end && ptr[0] % 4 == 0 && ptr[1] == toc)
@ -616,6 +618,8 @@ void ppu_module::analyse(u32 lib_toc, u32 entry)
// Find references indiscriminately
for (const auto& seg : segs)
{
if (!seg.addr) continue;
for (vm::cptr<u32> ptr = vm::cast(seg.addr); ptr.addr() < seg.addr + seg.size; ptr++)
{
const u32 value = *ptr;
@ -627,6 +631,8 @@ void ppu_module::analyse(u32 lib_toc, u32 entry)
for (const auto& _seg : segs)
{
if (!_seg.addr) continue;
if (value >= _seg.addr && value < _seg.addr + _seg.size)
{
addr_heap.emplace(value);