mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-17 08:11:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Debugger: Fix instructions editor

Browse Source
This commit is contained in:
Eladash 2020-08-21 12:10:00 +03:00 committed by Megamouse
parent 6f42297b58
commit 3ce7fd7894
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -333,25 +333,40 @@ extern void ppu_remove_breakpoint(u32 addr)
extern bool ppu_patch(u32 addr, u32 value)
{
if (g_cfg.core.ppu_decoder == ppu_decoder_type::llvm && Emu.GetStatus() != system_state::ready)
if (addr % 4)
{
ppu_log.fatal("Patch failed at 0x%x: unanligned memory address.", addr);
return false;
}
vm::reader_lock rlock;
if (!vm::check_addr(addr, sizeof(value)))
{
ppu_log.fatal("Patch failed at 0x%x: invalid memory address.", addr);
return false;
}
const bool is_exec = vm::check_addr(addr, sizeof(value), vm::page_executable);
if (is_exec && g_cfg.core.ppu_decoder == ppu_decoder_type::llvm && !Emu.IsReady())
{
// TODO: support recompilers
ppu_log.fatal("Patch failed at 0x%x: LLVM recompiler is used.", addr);
return false;
}
if (!vm::try_access(addr, &value, sizeof(value), true))
{
ppu_log.fatal("Patch failed at 0x%x: invalid memory address.", addr);
return false;
}
*vm::get_super_ptr<u32>(addr) = value;
const u32 _break = ::narrow<u32>(reinterpret_cast<std::uintptr_t>(&ppu_break));
const u32 fallback = ::narrow<u32>(reinterpret_cast<std::uintptr_t>(&ppu_fallback));
if (ppu_ref<u32>(addr) != _break && ppu_ref<u32>(addr) != fallback)
if (is_exec)
{
ppu_ref(addr) = ppu_cache(addr);
if (ppu_ref<u32>(addr) != _break && ppu_ref<u32>(addr) != fallback)
{
ppu_ref(addr) = ppu_cache(addr);
}
}
return true;

3
rpcs3/rpcs3qt/debugger_frame.cpp
View File

@ -232,8 +232,7 @@ void debugger_frame::keyPressEvent(QKeyEvent* event)
return;
}
const u32 start_pc = m_debugger_list->m_pc - m_debugger_list->m_item_count * 4;
const u32 pc = start_pc + i * 4;
const u32 pc = m_debugger_list->m_pc + i * 4;
if (QApplication::keyboardModifiers() & Qt::ControlModifier)
{