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

Debugger/CPUWidget: Make "Go to in Memory View" open the Memory View

This commit is contained in:
Silent 2024-04-07 23:21:00 +02:00 committed by refractionpcsx2
parent 272c0369f1
commit 91f16ae45a
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pcsx2-qt/Debugger/CpuWidget.cpp
View File

@ -57,8 +57,8 @@ CpuWidget::CpuWidget(QWidget* parent, DebugInterface& cpu)
connect(m_ui.memoryviewWidget, &MemoryViewWidget::gotoInDisasm, m_ui.disassemblyWidget, &DisassemblyWidget::gotoAddress); connect(m_ui.memoryviewWidget, &MemoryViewWidget::gotoInDisasm, m_ui.disassemblyWidget, &DisassemblyWidget::gotoAddress);
connect(m_ui.memoryviewWidget, &MemoryViewWidget::addToSavedAddresses, this, &CpuWidget::addAddressToSavedAddressesList); connect(m_ui.memoryviewWidget, &MemoryViewWidget::addToSavedAddresses, this, &CpuWidget::addAddressToSavedAddressesList);
connect(m_ui.registerWidget, &RegisterWidget::gotoInMemory, m_ui.memoryviewWidget, &MemoryViewWidget::gotoAddress); connect(m_ui.registerWidget, &RegisterWidget::gotoInMemory, this, &CpuWidget::onGotoInMemory);
connect(m_ui.disassemblyWidget, &DisassemblyWidget::gotoInMemory, m_ui.memoryviewWidget, &MemoryViewWidget::gotoAddress); connect(m_ui.disassemblyWidget, &DisassemblyWidget::gotoInMemory, this, &CpuWidget::onGotoInMemory);
connect(m_ui.memoryviewWidget, &MemoryViewWidget::VMUpdate, this, &CpuWidget::reloadCPUWidgets); connect(m_ui.memoryviewWidget, &MemoryViewWidget::VMUpdate, this, &CpuWidget::reloadCPUWidgets);
connect(m_ui.registerWidget, &RegisterWidget::VMUpdate, this, &CpuWidget::reloadCPUWidgets); connect(m_ui.registerWidget, &RegisterWidget::VMUpdate, this, &CpuWidget::reloadCPUWidgets);
@ -387,6 +387,12 @@ void CpuWidget::onBPListContextMenu(QPoint pos)
contextMenu->popup(m_ui.breakpointList->viewport()->mapToGlobal(pos)); contextMenu->popup(m_ui.breakpointList->viewport()->mapToGlobal(pos));
} }
void CpuWidget::onGotoInMemory(u32 address)
{
m_ui.memoryviewWidget->gotoAddress(address);
m_ui.tabWidget->setCurrentWidget(m_ui.tab_memory);
}
void CpuWidget::contextBPListCopy() void CpuWidget::contextBPListCopy()
{ {
const QItemSelectionModel* selModel = m_ui.breakpointList->selectionModel(); const QItemSelectionModel* selModel = m_ui.breakpointList->selectionModel();
@ -752,6 +758,7 @@ void CpuWidget::onFuncListContextMenu(QPoint pos)
QAction* gotoMemory = new QAction(tr("Go to in Memory View"), m_ui.listFunctions); QAction* gotoMemory = new QAction(tr("Go to in Memory View"), m_ui.listFunctions);
connect(gotoMemory, &QAction::triggered, [this] { connect(gotoMemory, &QAction::triggered, [this] {
m_ui.memoryviewWidget->gotoAddress(m_ui.listFunctions->selectedItems().first()->data(Qt::UserRole).toUInt()); m_ui.memoryviewWidget->gotoAddress(m_ui.listFunctions->selectedItems().first()->data(Qt::UserRole).toUInt());
m_ui.tabWidget->setCurrentWidget(m_ui.tab_memory);
}); });
m_funclistContextMenu->addAction(gotoMemory); m_funclistContextMenu->addAction(gotoMemory);
@ -827,6 +834,7 @@ void CpuWidget::onModuleTreeContextMenu(QPoint pos)
QAction* gotoMemory = new QAction(tr("Go to in Memory View"), m_ui.treeModules); QAction* gotoMemory = new QAction(tr("Go to in Memory View"), m_ui.treeModules);
connect(gotoMemory, &QAction::triggered, [this] { connect(gotoMemory, &QAction::triggered, [this] {
m_ui.memoryviewWidget->gotoAddress(m_ui.treeModules->selectedItems().first()->data(0, Qt::UserRole).toUInt()); m_ui.memoryviewWidget->gotoAddress(m_ui.treeModules->selectedItems().first()->data(0, Qt::UserRole).toUInt());
m_ui.tabWidget->setCurrentWidget(m_ui.tab_memory);
}); });
m_moduleTreeContextMenu->addAction(gotoMemory); m_moduleTreeContextMenu->addAction(gotoMemory);
} }

1
pcsx2-qt/Debugger/CpuWidget.h
View File

@ -42,6 +42,7 @@ public slots:
void updateBreakpoints(); void updateBreakpoints();
void onBPListDoubleClicked(const QModelIndex& index); void onBPListDoubleClicked(const QModelIndex& index);
void onBPListContextMenu(QPoint pos); void onBPListContextMenu(QPoint pos);
void onGotoInMemory(u32 address);
void contextBPListCopy(); void contextBPListCopy();
void contextBPListDelete(); void contextBPListDelete();