mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-07-08 16:01:42 +12:00
Qt/Utilities: Merge memory viewer with searcher
This commit is contained in:
parent
9ab4802d07
commit
f5b9d86e42
9 changed files with 381 additions and 306 deletions
|
@ -2,7 +2,6 @@
|
|||
#include "register_editor_dialog.h"
|
||||
#include "instruction_editor_dialog.h"
|
||||
#include "memory_viewer_panel.h"
|
||||
#include "memory_string_searcher.h"
|
||||
#include "gui_settings.h"
|
||||
#include "debugger_list.h"
|
||||
#include "breakpoint_list.h"
|
||||
|
@ -290,7 +289,6 @@ void debugger_frame::keyPressEvent(QKeyEvent* event)
|
|||
QLabel* l = new QLabel(tr(
|
||||
"Keys Ctrl+G: Go to typed address."
|
||||
"\nKeys Ctrl+B: Open breakpoints settings."
|
||||
"\nKeys Ctrl+S: Search memory string utility."
|
||||
"\nKeys Alt+S: Capture SPU images of selected SPU."
|
||||
"\nKeys Alt+R: Load last saved SPU state capture."
|
||||
"\nKey D: SPU MFC commands logger, MFC debug setting must be enabled."
|
||||
|
@ -351,20 +349,6 @@ void debugger_frame::keyPressEvent(QKeyEvent* event)
|
|||
open_breakpoints_settings();
|
||||
return;
|
||||
}
|
||||
case Qt::Key_S:
|
||||
{
|
||||
if (m_disasm && (cpu->id_type() == 2 || cpu->id_type() == 1))
|
||||
{
|
||||
if (cpu->id_type() == 2)
|
||||
{
|
||||
// Save shared pointer to shared memory handle, ensure the destructor will not be called until the SPUDisAsm is destroyed
|
||||
static_cast<SPUDisAsm*>(m_disasm.get())->set_shm(static_cast<const spu_thread*>(cpu)->shm);
|
||||
}
|
||||
|
||||
idm::make<memory_searcher_handle>(this, m_disasm, cpu->id_type() == 2 ? cpu->get_name() : "");
|
||||
}
|
||||
return;
|
||||
}
|
||||
default: break;
|
||||
}
|
||||
}
|
||||
|
@ -638,8 +622,14 @@ void debugger_frame::keyPressEvent(QKeyEvent* event)
|
|||
if (event->isAutoRepeat())
|
||||
return;
|
||||
|
||||
if (m_disasm && cpu->id_type() == 2)
|
||||
{
|
||||
// Save shared pointer to shared memory handle, ensure the destructor will not be called until the SPUDisAsm is destroyed
|
||||
static_cast<SPUDisAsm*>(m_disasm.get())->set_shm(static_cast<const spu_thread*>(cpu)->shm);
|
||||
}
|
||||
|
||||
// Memory viewer
|
||||
idm::make<memory_viewer_handle>(this, pc, make_check_cpu(cpu));
|
||||
idm::make<memory_viewer_handle>(this, m_disasm, pc, make_check_cpu(cpu));
|
||||
return;
|
||||
}
|
||||
case Qt::Key_F10:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue