ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ppu: Log SELF header information and CIA of caller HLE functions

This commit is contained in:
Eladash 2020-01-03 07:38:30 +02:00 committed by Ani
parent 4e0070f16d
commit a7aef22754
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rpcs3/Emu/Cell/PPUModule.cpp
View File

@ -1163,7 +1163,7 @@ void ppu_load_exec(const ppu_exec_object& elf)
// Read control flags (0 if doesn't exist)
g_ps3_process_info.ctrl_flags1 = 0;
if (bool not_found = true)
if (bool not_found = g_ps3_process_info.self_info.valid)
{
for (const auto& ctrl : g_ps3_process_info.self_info.ctrl_info)
{
@ -1179,6 +1179,9 @@ void ppu_load_exec(const ppu_exec_object& elf)
g_ps3_process_info.ctrl_flags1 |= ctrl.control_flags.ctrl_flag1;
}
}
LOG_NOTICE(LOADER, "SELF header information found: ctrl_flags1=0x%x, authid=0x%llx",
g_ps3_process_info.ctrl_flags1, g_ps3_process_info.self_info.app_info.authid);
}
// Load other programs

3
rpcs3/Emu/Cell/PPUThread.cpp
View File

@ -831,7 +831,8 @@ void ppu_thread::fast_call(u32 addr, u32 rtoc)
g_tls_log_prefix = []
{
const auto _this = static_cast<ppu_thread*>(get_current_cpu_thread());
return fmt::format("%s [0x%08x]", thread_ctrl::get_name(), _this->cia);
return fmt::format("%s [0x%08x]", thread_ctrl::get_name(), !_this->current_function ?
_this->cia : static_cast<u32>(_this->lr) - 4);
};
auto at_ret = [&]()