diff --git a/rpcs3/Emu/Cell/RawSPUThread.cpp b/rpcs3/Emu/Cell/RawSPUThread.cpp index 4d05fab50f..205578e827 100644 --- a/rpcs3/Emu/Cell/RawSPUThread.cpp +++ b/rpcs3/Emu/Cell/RawSPUThread.cpp @@ -392,14 +392,35 @@ void spu_load_exec(const spu_exec_object& elf) const auto funcs = spu->discover_functions(0, { spu->ls , SPU_LS_SIZE }, true, umax); - for (u32 addr : funcs) + if (spu_log.notice && !funcs.empty()) { - spu_log.success("Found SPU function at: 0x%08x", addr); + std::string to_log; + + for (usz i = 0; i < funcs.size(); i++) + { + if (i == 0 && funcs.size() < 4) + { + // Skip newline in this case + to_log += ' '; + } + else if (i % 4 == 0) + { + to_log += '\n'; + } + else + { + to_log += ", "; + } + + fmt::append(to_log, "0x%05x", funcs[i]); + } + + spu_log.notice("Found SPU function(s) at:%s", to_log); } if (!funcs.empty()) { - spu_log.success("Found %u SPU functions", funcs.size()); + spu_log.success("Found %u SPU function(s)", funcs.size()); } } diff --git a/rpcs3/Emu/Cell/SPUCommonRecompiler.cpp b/rpcs3/Emu/Cell/SPUCommonRecompiler.cpp index ae509ce080..8b8c4ec0b2 100644 --- a/rpcs3/Emu/Cell/SPUCommonRecompiler.cpp +++ b/rpcs3/Emu/Cell/SPUCommonRecompiler.cpp @@ -543,12 +543,33 @@ extern void utilize_spu_data_segment(u32 vaddr, const void* ls_data_vaddr, u32 s return; } - for (u32 addr : obj.funcs) + if (spu_log.notice) { - spu_log.notice("Found SPU function at: 0x%05x", addr); + std::string to_log; + + for (usz i = 0; i < obj.funcs.size(); i++) + { + if (i == 0 && obj.funcs.size() < 4) + { + // Skip newline in this case + to_log += ' '; + } + else if (i % 4 == 0) + { + to_log += '\n'; + } + else + { + to_log += ", "; + } + + fmt::append(to_log, "0x%05x", obj.funcs[i]); + } + + spu_log.notice("Found SPU function(s) at:%s", to_log); } - spu_log.notice("Found %u SPU functions", obj.funcs.size()); + spu_log.success("Found %u SPU function(s)", obj.funcs.size()); g_fxo->get().precompile_funcs.push(std::move(obj)); }