mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-25 22:08:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

memorycheckdlg: set the log, break, and range flags properly

Browse source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7241 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman 2011-02-25 10:07:24 +00:00
parent d7a9dc7df8
commit 1ea4b8045e
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Source/Core/DolphinWX/Src/Debugger/MemoryCheckDlg.cpp
View file

@ -41,7 +41,7 @@ MemoryCheckDlg::~MemoryCheckDlg()
void MemoryCheckDlg::CreateGUIControls() void MemoryCheckDlg::CreateGUIControls()
{ {
SetIcon(wxNullIcon); SetIcon(wxNullIcon);
SetSize(8,8,415,122); SetSize(8,8,470,122);
Center(); Center();
m_pButtonCancel = new wxButton(this, ID_CANCEL, _("Cancel"), wxPoint(248,64), wxSize(73,25), 0, wxDefaultValidator, _("Cancel")); m_pButtonCancel = new wxButton(this, ID_CANCEL, _("Cancel"), wxPoint(248,64), wxSize(73,25), 0, wxDefaultValidator, _("Cancel"));
@ -52,15 +52,17 @@ void MemoryCheckDlg::CreateGUIControls()
m_pWriteFlag = new wxCheckBox(this, ID_WRITE_FLAG, _("Write"), wxPoint(336,16), wxSize(57,17), 0, wxDefaultValidator, wxT("WxCheckBox1")); m_pWriteFlag = new wxCheckBox(this, ID_WRITE_FLAG, _("Write"), wxPoint(336,16), wxSize(57,17), 0, wxDefaultValidator, wxT("WxCheckBox1"));
m_log_flag = new wxCheckBox(this, ID_LOG_FLAG, _("Log"), wxPoint(420,33), wxSize(57,13), 0, wxDefaultValidator, wxT("WxCheckBox2"));
new wxStaticBox(this, ID_WXSTATICBOX2, _("Break On"), wxPoint(328,0), wxSize(73,57)); new wxStaticBox(this, ID_WXSTATICBOX2, _("Break On"), wxPoint(328,0), wxSize(73,57));
new wxStaticText(this, ID_WXSTATICTEXT2, _("End"), wxPoint(168,24), wxDefaultSize, 0, wxT("WxStaticText2")); new wxStaticText(this, ID_WXSTATICTEXT2, _("End"), wxPoint(168,24), wxDefaultSize, 0, wxT("WxStaticText2"));
new wxStaticText(this, ID_WXSTATICTEXT1, _("Start"), wxPoint(8,24), wxDefaultSize, 0, wxT("WxStaticText1")); new wxStaticText(this, ID_WXSTATICTEXT1, _("Start"), wxPoint(8,24), wxDefaultSize, 0, wxT("WxStaticText1"));
m_pEditStartAddress = new wxTextCtrl(this, ID_EDIT_START_ADDR, wxT("80000000"), wxPoint(40,24), wxSize(109,20), 0, wxDefaultValidator, wxT("WxEdit1")); m_pEditStartAddress = new wxTextCtrl(this, ID_EDIT_START_ADDR, wxT(""), wxPoint(40,24), wxSize(109,20), 0, wxDefaultValidator, wxT("WxEdit1"));
m_pEditEndAddress = new wxTextCtrl(this, ID_EDIT_END_ADDRESS, wxT("80000000"), wxPoint(200,24), wxSize(109,20), 0, wxDefaultValidator, wxT("WxEdit2")); m_pEditEndAddress = new wxTextCtrl(this, ID_EDIT_END_ADDRESS, wxT(""), wxPoint(200,24), wxSize(109,20), 0, wxDefaultValidator, wxT("WxEdit2"));
new wxStaticBox(this, ID_WXSTATICBOX1, _("Address Range"), wxPoint(0,0), wxSize(321,57)); new wxStaticBox(this, ID_WXSTATICBOX1, _("Address Range"), wxPoint(0,0), wxSize(321,57));
} }
@ -76,6 +78,7 @@ void MemoryCheckDlg::OnOK(wxCommandEvent& /*event*/)
wxString EndAddressString = m_pEditEndAddress->GetLineText(0); wxString EndAddressString = m_pEditEndAddress->GetLineText(0);
bool OnRead = m_pReadFlag->GetValue(); bool OnRead = m_pReadFlag->GetValue();
bool OnWrite = m_pWriteFlag->GetValue(); bool OnWrite = m_pWriteFlag->GetValue();
bool OnLog = m_log_flag->GetValue();
u32 StartAddress, EndAddress; u32 StartAddress, EndAddress;
if (AsciiToHex(StartAddressString.mb_str(), StartAddress) && if (AsciiToHex(StartAddressString.mb_str(), StartAddress) &&
@ -84,11 +87,12 @@ void MemoryCheckDlg::OnOK(wxCommandEvent& /*event*/)
TMemCheck MemCheck; TMemCheck MemCheck;
MemCheck.StartAddress = StartAddress; MemCheck.StartAddress = StartAddress;
MemCheck.EndAddress = EndAddress; MemCheck.EndAddress = EndAddress;
MemCheck.bRange = StartAddress != EndAddress;
MemCheck.OnRead = OnRead; MemCheck.OnRead = OnRead;
MemCheck.OnWrite = OnWrite; MemCheck.OnWrite = OnWrite;
MemCheck.Log = true; MemCheck.Log = OnLog;
MemCheck.Break = true; MemCheck.Break = OnRead || OnWrite;
PowerPC::memchecks.Add(MemCheck); PowerPC::memchecks.Add(MemCheck);
Host_UpdateBreakPointView(); Host_UpdateBreakPointView();

2
Source/Core/DolphinWX/Src/Debugger/MemoryCheckDlg.h
View file

@ -44,6 +44,7 @@ class MemoryCheckDlg : public wxDialog
wxButton* m_pButtonOK; wxButton* m_pButtonOK;
wxCheckBox* m_pReadFlag; wxCheckBox* m_pReadFlag;
wxCheckBox* m_pWriteFlag; wxCheckBox* m_pWriteFlag;
wxCheckBox* m_log_flag;
wxTextCtrl* m_pEditEndAddress; wxTextCtrl* m_pEditEndAddress;
wxTextCtrl* m_pEditStartAddress; wxTextCtrl* m_pEditStartAddress;
@ -61,6 +62,7 @@ class MemoryCheckDlg : public wxDialog
ID_WXSTATICTEXT1 = 1009, ID_WXSTATICTEXT1 = 1009,
ID_EDIT_START_ADDR = 1008, ID_EDIT_START_ADDR = 1008,
ID_WXSTATICBOX1 = 1007, ID_WXSTATICBOX1 = 1007,
ID_LOG_FLAG = 1007,
}; };
private: private: