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

Debugger: fix Run to Here 

Now it actually does what it says on the name, instead of creating a breapoint and doing nothing else (not even updating the widget).
Also, it now can't be selected if emulation isn't running.
Closes https://bugs.dolphin-emu.org/issues/13532
This commit is contained in:
Martino Fontana 2024-06-15 11:23:50 +02:00
parent 8235c38df7
commit 037de1ce92
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/Debugger/DebugInterface.h
View File

@ -99,7 +99,7 @@ public:
virtual u32 GetPC() const { return 0; } virtual u32 GetPC() const { return 0; }
virtual void SetPC(u32 /*address*/) {} virtual void SetPC(u32 /*address*/) {}
virtual void Step() {} virtual void Step() {}
virtual void RunToBreakpoint() {} virtual void RunTo(u32 /*address*/) {}
virtual u32 GetColor(const CPUThreadGuard* /*guard*/, u32 /*address*/) const virtual u32 GetColor(const CPUThreadGuard* /*guard*/, u32 /*address*/) const
{ {
return 0xFFFFFFFF; return 0xFFFFFFFF;

6
Source/Core/Core/Debugger/PPCDebugInterface.cpp
View File

@ -20,6 +20,7 @@
#include "Core/Config/MainSettings.h" #include "Core/Config/MainSettings.h"
#include "Core/Core.h" #include "Core/Core.h"
#include "Core/Debugger/OSThread.h" #include "Core/Debugger/OSThread.h"
#include "Core/HW/CPU.h"
#include "Core/HW/DSP.h" #include "Core/HW/DSP.h"
#include "Core/PatchEngine.h" #include "Core/PatchEngine.h"
#include "Core/PowerPC/MMU.h" #include "Core/PowerPC/MMU.h"
@ -502,8 +503,11 @@ void PPCDebugInterface::SetPC(u32 address)
m_system.GetPPCState().pc = address; m_system.GetPPCState().pc = address;
} }
void PPCDebugInterface::RunToBreakpoint() void PPCDebugInterface::RunTo(u32 address)
{ {
auto& breakpoints = m_system.GetPowerPC().GetBreakPoints();
breakpoints.Add(address, true);
m_system.GetCPU().SetStepping(false);
} }
std::shared_ptr<Core::NetworkCaptureLogger> PPCDebugInterface::NetworkLogger() std::shared_ptr<Core::NetworkCaptureLogger> PPCDebugInterface::NetworkLogger()

2
Source/Core/Core/Debugger/PPCDebugInterface.h
View File

@ -100,7 +100,7 @@ public:
u32 GetPC() const override; u32 GetPC() const override;
void SetPC(u32 address) override; void SetPC(u32 address) override;
void Step() override {} void Step() override {}
void RunToBreakpoint() override; void RunTo(u32 address) override;
u32 GetColor(const Core::CPUThreadGuard* guard, u32 address) const override; u32 GetColor(const Core::CPUThreadGuard* guard, u32 address) const override;
std::string_view GetDescription(u32 address) const override; std::string_view GetDescription(u32 address) const override;

10
Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp
View File

@ -594,7 +594,7 @@ void CodeViewWidget::OnContextMenu()
menu->addAction(tr("Set symbol &end address"), this, &CodeViewWidget::OnSetSymbolEndAddress); menu->addAction(tr("Set symbol &end address"), this, &CodeViewWidget::OnSetSymbolEndAddress);
menu->addSeparator(); menu->addSeparator();
menu->addAction(tr("Run &To Here"), this, &CodeViewWidget::OnRunToHere); auto* run_to_action = menu->addAction(tr("Run &To Here"), this, &CodeViewWidget::OnRunToHere);
auto* function_action = auto* function_action =
menu->addAction(tr("&Add function"), this, &CodeViewWidget::OnAddFunction); menu->addAction(tr("&Add function"), this, &CodeViewWidget::OnAddFunction);
auto* ppc_action = menu->addAction(tr("PPC vs Host"), this, &CodeViewWidget::OnPPCComparison); auto* ppc_action = menu->addAction(tr("PPC vs Host"), this, &CodeViewWidget::OnPPCComparison);
@ -645,8 +645,8 @@ void CodeViewWidget::OnContextMenu()
follow_branch_action->setEnabled(follow_branch_enabled); follow_branch_action->setEnabled(follow_branch_enabled);
for (auto* action : for (auto* action :
{copy_address_action, copy_line_action, copy_hex_action, function_action, ppc_action, {copy_address_action, copy_line_action, copy_hex_action, function_action, run_to_action,
insert_blr_action, insert_nop_action, replace_action, assemble_action}) ppc_action, insert_blr_action, insert_nop_action, replace_action, assemble_action})
{ {
action->setEnabled(running); action->setEnabled(running);
} }
@ -869,9 +869,7 @@ void CodeViewWidget::OnRunToHere()
{ {
const u32 addr = GetContextAddress(); const u32 addr = GetContextAddress();
m_system.GetPowerPC().GetDebugInterface().AddBreakpoint(addr); m_system.GetPowerPC().GetDebugInterface().RunTo(addr);
m_system.GetPowerPC().GetDebugInterface().RunToBreakpoint();
Update();
} }
void CodeViewWidget::OnPPCComparison() void CodeViewWidget::OnPPCComparison()