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

Debugger: Show constant-formed attribute of register value

This commit is contained in:
Eladash 2022-05-08 13:40:21 +03:00 committed by Ivan
parent 4479d99a9a
commit d77c9139ad
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -848,7 +848,15 @@ std::string ppu_thread::dump_regs() const
// Fixup for syscall arguments
if (current_function && i >= 3 && i <= 10) reg = syscall_args[i - 3];
fmt::append(ret, "r%d%s: 0x%-8llx", i, i <= 9 ? " " : "", reg);
auto [is_const, const_value] = dis_asm.try_get_const_gpr_value(i, cia);
if (const_value != reg)
{
// Expectation of pretictable code path has not been met (such as a branch directly to the instruction)
is_const = false;
}
fmt::append(ret, "r%d%s%s 0x%-8llx", i, i <= 9 ? " " : "", is_const ? "©" : ":", reg);
constexpr u32 max_str_len = 32;
constexpr u32 hex_count = 8;

12
rpcs3/Emu/Cell/SPUThread.cpp
View File

@ -1040,10 +1040,18 @@ std::string spu_thread::dump_regs() const
for (u32 i = 0; i < 128; i++, ret += '\n')
{
fmt::append(ret, "%s: ", spu_reg_name[i]);
const auto r = gpr[i];
auto [is_const, const_value] = dis_asm.try_get_const_value(i, pc);
if (const_value != r)
{
// Expectation of pretictable code path has not been met (such as a branch directly to the instruction)
is_const = false;
}
fmt::append(ret, "%s%s ", spu_reg_name[i], is_const ? "©" : ":");
if (auto [size, dst, src] = SPUDisAsm::try_get_insert_mask_info(r); size)
{
// Special: insertion masks