archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-20 11:21:43 +02:00
Code Issues Projects Releases Packages Wiki Activity

Add options for BreakpointWidget, WatchWidget, and CheatSearches to send address to Memory Widget

Browse source
This commit is contained in:
TryTwo 2022-05-27 17:34:47 -07:00
parent 70bf89fa59
commit 177dae6a1a
9 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Source/Core/DolphinQt/CheatSearchWidget.cpp
View file

@ -448,8 +448,12 @@ void CheatSearchWidget::OnAddressTableContextMenu()
if (m_address_table->selectedItems().isEmpty())
return;
auto* item = m_address_table->selectedItems()[0];
const u32 address = item->data(ADDRESS_TABLE_ADDRESS_ROLE).toUInt();
QMenu* menu = new QMenu(this);
menu->addAction(tr("Show in memory"), [this, address] { emit ShowMemory(address); });
menu->addAction(tr("Generate Action Replay Code"), this, &CheatSearchWidget::GenerateARCode);
menu->exec(QCursor::pos());

1
Source/Core/DolphinQt/CheatSearchWidget.h
View file

@ -41,6 +41,7 @@ public:
signals:
void ActionReplayCodeGenerated(const ActionReplay::ARCode& ar_code);
void ShowMemory(const u32 address);
private:
void CreateWidgets();

1
Source/Core/DolphinQt/CheatsManager.cpp
View file

@ -122,6 +122,7 @@ void CheatsManager::OnNewSessionCreated(const Cheats::CheatSearchSessionBase& se
if (m_ar_code)
m_ar_code->AddCode(ar_code);
});
w->connect(w, &CheatSearchWidget::ShowMemory, [this](u32 address) { emit ShowMemory(address); });
m_tab_widget->setCurrentIndex(tab_index);
}

1
Source/Core/DolphinQt/CheatsManager.h
View file

@ -35,6 +35,7 @@ public:
signals:
void OpenGeneralSettings();
void ShowMemory(u32 address);
private:
void CreateWidgets();

4
Source/Core/DolphinQt/Debugger/BreakpointWidget.cpp
View file

@ -18,6 +18,7 @@
#include "Core/PowerPC/PPCSymbolDB.h"
#include "Core/PowerPC/PowerPC.h"
#include "DolphinQt/Debugger/MemoryWidget.h"
#include "DolphinQt/Debugger/NewBreakpointDialog.h"
#include "DolphinQt/Resources.h"
#include "DolphinQt/Settings.h"
@ -355,13 +356,13 @@ void BreakpointWidget::OnContextMenu()
if (bp_iter == inst_breakpoints.end())
return;
menu->addAction(tr("Show in Code"), [this, bp_address] { emit ShowCode(bp_address); });
menu->addAction(bp_iter->is_enabled ? tr("Disable") : tr("Enable"), [this, &bp_address]() {
PowerPC::breakpoints.ToggleBreakPoint(bp_address);
emit BreakpointsChanged();
Update();
});
menu->addAction(tr("Go to"), [this, bp_address] { emit SelectedBreakpoint(bp_address); });
}
else
{
@ -372,6 +373,7 @@ void BreakpointWidget::OnContextMenu()
if (mb_iter == memory_breakpoints.end())
return;
menu->addAction(tr("Show in Memory"), [this, bp_address] { emit ShowMemory(bp_address); });
menu->addAction(mb_iter->is_enabled ? tr("Disable") : tr("Enable"), [this, &bp_address]() {
PowerPC::memchecks.ToggleBreakPoint(bp_address);

3
Source/Core/DolphinQt/Debugger/BreakpointWidget.h
View file

@ -31,7 +31,8 @@ public:
signals:
void BreakpointsChanged();
void SelectedBreakpoint(u32 address);
void ShowCode(u32 address);
void ShowMemory(u32 address);
protected:
void closeEvent(QCloseEvent*) override;

6
Source/Core/DolphinQt/Debugger/WatchWidget.cpp
View file

@ -310,6 +310,7 @@ void WatchWidget::ShowContextMenu()
if (row >= 0)
{
menu->addAction(tr("Show in Memory"), this, [this, row] { ShowInMemory(row); });
// i18n: This kind of "watch" is used for watching emulated memory.
// It's not related to timekeeping devices.
menu->addAction(tr("&Delete Watch"), this, [this, row] { DeleteWatch(row); });
@ -395,6 +396,11 @@ void WatchWidget::AddWatchBreakpoint(int row)
emit RequestMemoryBreakpoint(PowerPC::debug_interface.GetWatch(row).address);
}
void WatchWidget::ShowInMemory(int row)
{
emit ShowMemory(PowerPC::debug_interface.GetWatch(row).address);
}
void WatchWidget::AddWatch(QString name, u32 addr)
{
PowerPC::debug_interface.SetWatch(addr, name.toStdString());

3
Source/Core/DolphinQt/Debugger/WatchWidget.h
View file

@ -24,6 +24,7 @@ public:
void AddWatch(QString name, u32 addr);
signals:
void RequestMemoryBreakpoint(u32 addr);
void ShowMemory(u32 addr);
protected:
void closeEvent(QCloseEvent*) override;
@ -47,7 +48,7 @@ private:
void OnItemChanged(QTableWidgetItem* item);
void DeleteWatch(int row);
void AddWatchBreakpoint(int row);
void ShowInMemory(int row);
void UpdateIcons();
QAction* m_new;

6
Source/Core/DolphinQt/MainWindow.cpp
View file

@ -455,6 +455,7 @@ void MainWindow::CreateComponents()
};
connect(m_watch_widget, &WatchWidget::RequestMemoryBreakpoint, request_memory_breakpoint);
connect(m_watch_widget, &WatchWidget::ShowMemory, m_memory_widget, &MemoryWidget::SetAddress);
connect(m_register_widget, &RegisterWidget::RequestMemoryBreakpoint, request_memory_breakpoint);
connect(m_register_widget, &RegisterWidget::RequestWatch, request_watch);
connect(m_register_widget, &RegisterWidget::RequestViewInMemory, request_view_in_memory);
@ -480,10 +481,13 @@ void MainWindow::CreateComponents()
&CodeWidget::Update);
connect(m_breakpoint_widget, &BreakpointWidget::BreakpointsChanged, m_memory_widget,
&MemoryWidget::Update);
connect(m_breakpoint_widget, &BreakpointWidget::SelectedBreakpoint, [this](u32 address) {
connect(m_breakpoint_widget, &BreakpointWidget::ShowCode, [this](u32 address) {
if (Core::GetState() == Core::State::Paused)
m_code_widget->SetAddress(address, CodeViewWidget::SetAddressUpdate::WithDetailedUpdate);
});
connect(m_breakpoint_widget, &BreakpointWidget::ShowMemory, m_memory_widget,
&MemoryWidget::SetAddress);
connect(m_cheats_manager, &CheatsManager::ShowMemory, m_memory_widget, &MemoryWidget::SetAddress);
}
void MainWindow::ConnectMenuBar()