piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 23:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4308 from aldelaro5/memcheck-gui-relabel

Browse Source 
Label debugger memchecks as "Memory Breakpoints" in the GUI
This commit is contained in:
Markus Wick
2016-10-06 21:29:14 +02:00
committed by GitHub
parent f028b7079e 549060c5b4
commit ff1d70d708
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Common/BreakPoints.cpp
View File

@ -214,7 +214,7 @@ bool TMemCheck::Action(DebugInterface* debug_interface, u32 iValue, u32 addr, bo
{ {
if (Log) if (Log)
{ {
NOTICE_LOG(MEMMAP, "CHK %08x (%s) %s%i %0*x at %08x (%s)", pc, NOTICE_LOG(MEMMAP, "MBP %08x (%s) %s%i %0*x at %08x (%s)", pc,
debug_interface->GetDescription(pc).c_str(), write ? "Write" : "Read", size * 8, debug_interface->GetDescription(pc).c_str(), write ? "Write" : "Read", size * 8,
size * 2, iValue, addr, debug_interface->GetDescription(addr).c_str()); size * 2, iValue, addr, debug_interface->GetDescription(addr).c_str());
} }

2
Source/Core/DolphinWX/Debugger/BreakpointView.cpp
View File

@ -63,7 +63,7 @@ void CBreakPointView::Repopulate()
{ {
wxString memcheck_on_str = StrToWxStr((rMemCheck.Break || rMemCheck.Log) ? "on" : " "); wxString memcheck_on_str = StrToWxStr((rMemCheck.Break || rMemCheck.Log) ? "on" : " ");
int item = InsertItem(0, memcheck_on_str); int item = InsertItem(0, memcheck_on_str);
SetItem(item, 1, StrToWxStr("MC")); SetItem(item, 1, StrToWxStr("MBP"));
Symbol* symbol = g_symbolDB.GetSymbolFromAddr(rMemCheck.StartAddress); Symbol* symbol = g_symbolDB.GetSymbolFromAddr(rMemCheck.StartAddress);
if (symbol) if (symbol)

6
Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp
View File

@ -53,7 +53,7 @@ public:
AddTool(ID_ADDBP, "+BP", m_Bitmaps[Toolbar_Add_BP]); AddTool(ID_ADDBP, "+BP", m_Bitmaps[Toolbar_Add_BP]);
Bind(wxEVT_TOOL, &CBreakPointWindow::OnAddBreakPoint, parent, ID_ADDBP); Bind(wxEVT_TOOL, &CBreakPointWindow::OnAddBreakPoint, parent, ID_ADDBP);
AddTool(ID_ADDMC, "+MC", m_Bitmaps[Toolbar_Add_MC]); AddTool(ID_ADDMC, "+MBP", m_Bitmaps[Toolbar_Add_MC]);
Bind(wxEVT_TOOL, &CBreakPointWindow::OnAddMemoryCheck, parent, ID_ADDMC); Bind(wxEVT_TOOL, &CBreakPointWindow::OnAddMemoryCheck, parent, ID_ADDMC);
AddTool(ID_LOAD, _("Load"), m_Bitmaps[Toolbar_Delete]); AddTool(ID_LOAD, _("Load"), m_Bitmaps[Toolbar_Delete]);
@ -167,7 +167,7 @@ void CBreakPointWindow::SaveAll()
ini.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + SConfig::GetInstance().GetUniqueID() + ".ini", ini.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + SConfig::GetInstance().GetUniqueID() + ".ini",
false); false);
ini.SetLines("BreakPoints", PowerPC::breakpoints.GetStrings()); ini.SetLines("BreakPoints", PowerPC::breakpoints.GetStrings());
ini.SetLines("MemoryChecks", PowerPC::memchecks.GetStrings()); ini.SetLines("MemoryBreakPoints", PowerPC::memchecks.GetStrings());
ini.Save(File::GetUserPath(D_GAMESETTINGS_IDX) + SConfig::GetInstance().GetUniqueID() + ".ini"); ini.Save(File::GetUserPath(D_GAMESETTINGS_IDX) + SConfig::GetInstance().GetUniqueID() + ".ini");
} }
@ -196,7 +196,7 @@ void CBreakPointWindow::LoadAll()
PowerPC::breakpoints.AddFromStrings(newbps); PowerPC::breakpoints.AddFromStrings(newbps);
} }
if (ini.GetLines("MemoryChecks", &newmcs, false)) if (ini.GetLines("MemoryBreakPoints", &newmcs, false))
{ {
PowerPC::memchecks.Clear(); PowerPC::memchecks.Clear();
PowerPC::memchecks.AddFromStrings(newmcs); PowerPC::memchecks.AddFromStrings(newmcs);

2
Source/Core/DolphinWX/Debugger/MemoryCheckDlg.cpp
View File

@ -17,7 +17,7 @@
#include "DolphinWX/WxUtils.h" #include "DolphinWX/WxUtils.h"
MemoryCheckDlg::MemoryCheckDlg(CBreakPointWindow* parent) MemoryCheckDlg::MemoryCheckDlg(CBreakPointWindow* parent)
: wxDialog(parent, wxID_ANY, _("Add a Memory Check")), m_parent(parent) : wxDialog(parent, wxID_ANY, _("Add a Memory Breakpoint")), m_parent(parent)
{ {
Bind(wxEVT_BUTTON, &MemoryCheckDlg::OnOK, this, wxID_OK); Bind(wxEVT_BUTTON, &MemoryCheckDlg::OnOK, this, wxID_OK);
Bind(wxEVT_RADIOBUTTON, &MemoryCheckDlg::OnRadioButtonClick, this); Bind(wxEVT_RADIOBUTTON, &MemoryCheckDlg::OnRadioButtonClick, this);

2
Source/Core/DolphinWX/Debugger/MemoryWindow.cpp
View File

@ -117,7 +117,7 @@ CMemoryWindow::CMemoryWindow(wxWindow* parent, wxWindowID id, const wxPoint& pos
wxDefaultSize, data_type_options, 1); wxDefaultSize, data_type_options, 1);
wxStaticBoxSizer* const memcheck_options_sizer = wxStaticBoxSizer* const memcheck_options_sizer =
new wxStaticBoxSizer(wxVERTICAL, this, "Memory check options"); new wxStaticBoxSizer(wxVERTICAL, this, "Memory breakpoint options");
memcheck_options_sizer->Add(rdbReadWrite = new wxRadioButton(this, IDM_MEMCHECK_OPTIONS_CHANGE, memcheck_options_sizer->Add(rdbReadWrite = new wxRadioButton(this, IDM_MEMCHECK_OPTIONS_CHANGE,
"Read and Write", wxDefaultPosition, "Read and Write", wxDefaultPosition,
wxDefaultSize, wxRB_GROUP)); wxDefaultSize, wxRB_GROUP));