From f009d368111c21a56ad670d58a5b385cb89c54ce Mon Sep 17 00:00:00 2001 From: Eladash Date: Sat, 13 Feb 2021 18:35:43 +0200 Subject: [PATCH] Update log messages of PPU/SPU hashes and patches applied --- rpcs3/Emu/Cell/PPUModule.cpp | 44 +++++++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/rpcs3/Emu/Cell/PPUModule.cpp b/rpcs3/Emu/Cell/PPUModule.cpp index 3ad5626537..daa18c55bd 100644 --- a/rpcs3/Emu/Cell/PPUModule.cpp +++ b/rpcs3/Emu/Cell/PPUModule.cpp @@ -782,7 +782,14 @@ static void ppu_check_patch_spu_images(const ppu_segment& seg) } } - ppu_loader.success("SPU executable hash: %s (<- %u)%s", hash, applied.size(), dump); + if (applied.empty()) + { + ppu_loader.warning("SPU executable hash: %s%s", hash, dump); + } + else + { + ppu_loader.success("SPU executable hash: %s (<- %u)%s", hash, applied.size(), dump); + } } } @@ -1115,7 +1122,14 @@ std::shared_ptr ppu_load_prx(const ppu_prx_object& elf, const std::stri applied += _applied; - ppu_loader.success("PRX library hash: %s (<- %u)", hash_seg, _applied.size()); + if (_applied.empty()) + { + ppu_loader.warning("PRX hash of %s[%u]: %s", prx->name, i, hash_seg); + } + else + { + ppu_loader.success("PRX hash of %s[%u]: %s (<- %u)", prx->name, i, hash_seg, _applied.size()); + } } // Embedded SPU elf patching @@ -1332,7 +1346,14 @@ bool ppu_load_exec(const ppu_exec_object& elf) applied += g_fxo->get()->apply(Emu.GetTitleID() + '-' + hash, vm::g_base_addr); } - ppu_loader.success("PPU executable hash: %s (<- %u)", hash, applied.size()); + if (applied.empty()) + { + ppu_loader.warning("PPU executable hash: %s", hash); + } + else + { + ppu_loader.success("PPU executable hash: %s (<- %u)", hash, applied.size()); + } // Initialize HLE modules ppu_initialize_modules(link); @@ -1781,6 +1802,10 @@ std::pair, CellError> ppu_load_overlay(const ppu_ex const auto ovlm = std::make_shared(); + // Set path (TODO) + ovlm->name = path.substr(path.find_last_of('/') + 1); + ovlm->path = path; + u32 end = 0; // Allocate memory at fixed positions @@ -1888,7 +1913,14 @@ std::pair, CellError> ppu_load_overlay(const ppu_ex ppu_check_patch_spu_images(seg); } - ppu_loader.success("OVL executable hash: %s (<- %u)", hash, applied.size()); + if (applied.empty()) + { + ppu_loader.warning("OVL hash of %s: %s", ovlm->name, hash); + } + else + { + ppu_loader.success("OVL hash of %s: %s (<- %u)", ovlm->name, hash, applied.size()); + } // Load other programs for (auto& prog : elf.progs) @@ -1981,10 +2013,6 @@ std::pair, CellError> ppu_load_overlay(const ppu_ex // Validate analyser results (not required) ovlm->validate(0); - // Set path (TODO) - ovlm->name = path.substr(path.find_last_of('/') + 1); - ovlm->path = path; - idm::import_existing(ovlm); try_spawn_ppu_if_exclusive_program(*ovlm);