From 6f101c0a0c3f3ca826da80b615b8776207d1a8c3 Mon Sep 17 00:00:00 2001 From: Kingcom Date: Sat, 19 Jul 2014 10:53:40 +0200 Subject: [PATCH 1/7] Add small lines between four byte groups in the memory view and fix status bar text not being displayed --- pcsx2/gui/Debugger/CtrlDisassemblyView.cpp | 2 ++ pcsx2/gui/Debugger/CtrlMemView.cpp | 15 +++++++++++++++ pcsx2/gui/Debugger/DisassemblyDialog.cpp | 4 ++-- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/pcsx2/gui/Debugger/CtrlDisassemblyView.cpp b/pcsx2/gui/Debugger/CtrlDisassemblyView.cpp index 0d50b6f139..46f74d7020 100644 --- a/pcsx2/gui/Debugger/CtrlDisassemblyView.cpp +++ b/pcsx2/gui/Debugger/CtrlDisassemblyView.cpp @@ -145,6 +145,7 @@ void CtrlDisassemblyView::postEvent(wxEventType type, wxString text) { wxCommandEvent event( type, GetId() ); event.SetEventObject(this); + event.SetClientData(cpu); event.SetString(text); wxPostEvent(this,event); } @@ -153,6 +154,7 @@ void CtrlDisassemblyView::postEvent(wxEventType type, int value) { wxCommandEvent event( type, GetId() ); event.SetEventObject(this); + event.SetClientData(cpu); event.SetInt(value); wxPostEvent(this,event); } diff --git a/pcsx2/gui/Debugger/CtrlMemView.cpp b/pcsx2/gui/Debugger/CtrlMemView.cpp index c87c8bd598..b0cc085d16 100644 --- a/pcsx2/gui/Debugger/CtrlMemView.cpp +++ b/pcsx2/gui/Debugger/CtrlMemView.cpp @@ -94,6 +94,7 @@ void CtrlMemView::postEvent(wxEventType type, wxString text) { wxCommandEvent event( type, GetId() ); event.SetEventObject(this); + event.SetClientData(cpu); event.SetString(text); wxPostEvent(this,event); } @@ -102,6 +103,7 @@ void CtrlMemView::postEvent(wxEventType type, int value) { wxCommandEvent event( type, GetId() ); event.SetEventObject(this); + event.SetClientData(cpu); event.SetInt(value); wxPostEvent(this,event); } @@ -237,6 +239,19 @@ void CtrlMemView::render(wxDC& dc) } } } + + // TODO: make optional? + if (true) + { + dc.SetPen(wxColor(0xFFC0C0C0)); + dc.SetBrush(wxColor(0xFFC0C0C0)); + for (int i = 4; i < rowSize; i += 4) + { + int x = hexStart+i*3*charWidth-charWidth/2; + int y = (visibleRows+1)*rowHeight; + dc.DrawLine(x,0,x,y); + } + } } void CtrlMemView::onPopupClick(wxCommandEvent& evt) diff --git a/pcsx2/gui/Debugger/DisassemblyDialog.cpp b/pcsx2/gui/Debugger/DisassemblyDialog.cpp index f1a2ccf635..5cdd8591c9 100644 --- a/pcsx2/gui/Debugger/DisassemblyDialog.cpp +++ b/pcsx2/gui/Debugger/DisassemblyDialog.cpp @@ -354,8 +354,8 @@ void DisassemblyDialog::onDebuggerEvent(wxCommandEvent& evt) wxEventType type = evt.GetEventType(); if (type == debEVT_SETSTATUSBARTEXT) { - CtrlDisassemblyView* view = reinterpret_cast(evt.GetEventObject()); - if (view != NULL && view == currentCpu->getDisassembly()) + DebugInterface* cpu = reinterpret_cast(evt.GetClientData()); + if (cpu != NULL && cpu == currentCpu->getCpu()) GetStatusBar()->SetLabel(evt.GetString()); } else if (type == debEVT_UPDATELAYOUT) { From 30a5e31b66a8c1255f661c8c3338164faa545f95 Mon Sep 17 00:00:00 2001 From: Kingcom Date: Wed, 30 Jul 2014 19:01:48 +0200 Subject: [PATCH 2/7] Show the cycles passed in the debugger --- pcsx2/gui/Debugger/DisassemblyDialog.cpp | 20 ++++++++++++++++++++ pcsx2/gui/Debugger/DisassemblyDialog.h | 3 +++ 2 files changed, 23 insertions(+) diff --git a/pcsx2/gui/Debugger/DisassemblyDialog.cpp b/pcsx2/gui/Debugger/DisassemblyDialog.cpp index 5cdd8591c9..7b365c24f9 100644 --- a/pcsx2/gui/Debugger/DisassemblyDialog.cpp +++ b/pcsx2/gui/Debugger/DisassemblyDialog.cpp @@ -80,7 +80,12 @@ CpuTabPage::CpuTabPage(wxWindow* parent, DebugInterface* _cpu) // create register list and disassembly section wxBoxSizer* middleSizer = new wxBoxSizer(wxHORIZONTAL); + wxBoxSizer* miscStuffSizer = new wxBoxSizer(wxHORIZONTAL); + cyclesText = new wxStaticText(this,wxID_ANY,L""); + miscStuffSizer->Add(cyclesText,0,wxLEFT|wxTOP|wxBOTTOM,2); + wxBoxSizer* registerSizer = new wxBoxSizer(wxVERTICAL); + registerSizer->Add(miscStuffSizer,0); registerSizer->Add(registerList,1); middleSizer->Add(registerSizer,0,wxEXPAND|wxRIGHT,2); @@ -96,6 +101,9 @@ CpuTabPage::CpuTabPage(wxWindow* parent, DebugInterface* _cpu) mainSizer->Add(bottomTabs,1,wxEXPAND); mainSizer->Layout(); + + lastCycles = 0; + loadCycles(); } void CpuTabPage::setBottomTabPage(wxWindow* win) @@ -116,6 +124,15 @@ void CpuTabPage::update() Refresh(); } +void CpuTabPage::loadCycles() +{ + u32 cycles = cpu->getCycles(); + + wchar_t str[64]; + swprintf(str,64,L"Ctr: %u",cycles-lastCycles); + cyclesText->SetLabel(str); + lastCycles = cycles; +} DisassemblyDialog::DisassemblyDialog(wxWindow* parent): wxFrame( parent, wxID_ANY, L"Debugger", wxDefaultPosition,wxDefaultSize,wxRESIZE_BORDER|wxCLOSE_BOX|wxCAPTION|wxSYSTEM_MENU ), @@ -456,6 +473,9 @@ void DisassemblyDialog::setDebugMode(bool debugMode, bool switchPC) currentCpu->getDisassembly()->SetFocus(); CBreakPoints::SetBreakpointTriggered(false); } + + if (currentCpu != NULL) + currentCpu->loadCycles(); } else { breakRunButton->SetLabel(L"Break"); diff --git a/pcsx2/gui/Debugger/DisassemblyDialog.h b/pcsx2/gui/Debugger/DisassemblyDialog.h index f6c81e112c..920d99a534 100644 --- a/pcsx2/gui/Debugger/DisassemblyDialog.h +++ b/pcsx2/gui/Debugger/DisassemblyDialog.h @@ -41,6 +41,7 @@ public: wxNotebook* getBottomTabs() { return bottomTabs; }; void update(); void showMemoryView() { setBottomTabPage(memory); }; + void loadCycles(); private: void setBottomTabPage(wxWindow* win); DebugInterface* cpu; @@ -49,6 +50,8 @@ private: CtrlMemView* memory; wxNotebook* bottomTabs; BreakpointList* breakpointList; + wxStaticText* cyclesText; + u32 lastCycles; }; class DisassemblyDialog : public wxFrame From b37f6e9df18a921ec8ca9c67f06d7c69ef22599e Mon Sep 17 00:00:00 2001 From: Kingcom Date: Tue, 22 Jul 2014 22:36:50 +0200 Subject: [PATCH 3/7] Fix display of memory breakpoint enable status and add context menu to breakpoint list --- pcsx2/gui/Debugger/DebugEvents.cpp | 1 + pcsx2/gui/Debugger/DebugEvents.h | 1 + pcsx2/gui/Debugger/DebuggerLists.cpp | 80 +++++++++++++++++++++++- pcsx2/gui/Debugger/DebuggerLists.h | 5 ++ pcsx2/gui/Debugger/DisassemblyDialog.cpp | 5 ++ 5 files changed, 91 insertions(+), 1 deletion(-) diff --git a/pcsx2/gui/Debugger/DebugEvents.cpp b/pcsx2/gui/Debugger/DebugEvents.cpp index 40398d5217..8688f8f0f1 100644 --- a/pcsx2/gui/Debugger/DebugEvents.cpp +++ b/pcsx2/gui/Debugger/DebugEvents.cpp @@ -25,6 +25,7 @@ DEFINE_LOCAL_EVENT_TYPE( debEVT_MAPLOADED ) DEFINE_LOCAL_EVENT_TYPE( debEVT_STEPOVER ) DEFINE_LOCAL_EVENT_TYPE( debEVT_STEPINTO ) DEFINE_LOCAL_EVENT_TYPE( debEVT_UPDATE ) +DEFINE_LOCAL_EVENT_TYPE( debEVT_BREAKPOINTWINDOW ) bool parseExpression(const char* exp, DebugInterface* cpu, u64& dest) { diff --git a/pcsx2/gui/Debugger/DebugEvents.h b/pcsx2/gui/Debugger/DebugEvents.h index 21afcebe5b..15cd6ab583 100644 --- a/pcsx2/gui/Debugger/DebugEvents.h +++ b/pcsx2/gui/Debugger/DebugEvents.h @@ -26,5 +26,6 @@ DECLARE_LOCAL_EVENT_TYPE( debEVT_MAPLOADED, wxNewEventType() ) DECLARE_LOCAL_EVENT_TYPE( debEVT_STEPOVER, wxNewEventType() ) DECLARE_LOCAL_EVENT_TYPE( debEVT_STEPINTO, wxNewEventType() ) DECLARE_LOCAL_EVENT_TYPE( debEVT_UPDATE, wxNewEventType() ) +DECLARE_LOCAL_EVENT_TYPE( debEVT_BREAKPOINTWINDOW, wxNewEventType() ) bool executeExpressionWindow(wxWindow* parent, DebugInterface* cpu, u64& dest, const wxString& defaultValue = wxEmptyString); diff --git a/pcsx2/gui/Debugger/DebuggerLists.cpp b/pcsx2/gui/Debugger/DebuggerLists.cpp index 385ea94575..95895e9df3 100644 --- a/pcsx2/gui/Debugger/DebuggerLists.cpp +++ b/pcsx2/gui/Debugger/DebuggerLists.cpp @@ -47,10 +47,21 @@ void resizeListViewColumns(wxListCtrl* list, GenericListViewColumn* columns, int BEGIN_EVENT_TABLE(BreakpointList, wxWindow) EVT_SIZE(BreakpointList::sizeEvent) EVT_KEY_DOWN(BreakpointList::keydownEvent) + EVT_RIGHT_DOWN(BreakpointList::mouseEvent) + EVT_RIGHT_UP(BreakpointList::mouseEvent) + EVT_LIST_ITEM_RIGHT_CLICK(wxID_ANY,BreakpointList::listEvent) END_EVENT_TABLE() enum { BPL_TYPE, BPL_OFFSET, BPL_SIZELABEL, BPL_OPCODE, BPL_CONDITION, BPL_HITS, BPL_ENABLED, BPL_COLUMNCOUNT }; +enum BreakpointListMenuIdentifiers +{ + ID_BREAKPOINTLIST_ENABLE = 1, + ID_BREAKPOINTLIST_EDIT, + ID_BREAKPOINTLIST_ADDNEW, +}; + + GenericListViewColumn breakpointColumns[BPL_COLUMNCOUNT] = { { L"Type", 0.12f }, { L"Offset", 0.12f }, @@ -189,7 +200,7 @@ wxString BreakpointList::OnGetItemText(long item, long col) const case BPL_ENABLED: { if (isMemory) { - dest.Write(L"%s",displayedMemChecks_[index].cond & MEMCHECK_BREAK ? "true" : "false"); + dest.Write(L"%s",displayedMemChecks_[index].result & MEMCHECK_BREAK ? "true" : "false"); } else { dest.Write(L"%s",displayedBreakPoints_[index].enabled ? "true" : "false"); } @@ -352,3 +363,70 @@ void BreakpointList::postEvent(wxEventType type, int value) event.SetInt(value); wxPostEvent(this,event); } + +void BreakpointList::onPopupClick(wxCommandEvent& evt) +{ + int index = GetFirstSelected(); + switch (evt.GetId()) + { + case ID_BREAKPOINTLIST_ENABLE: + toggleEnabled(index); + break; + case ID_BREAKPOINTLIST_EDIT: + editBreakpoint(index); + break; + case ID_BREAKPOINTLIST_ADDNEW: + postEvent(debEVT_BREAKPOINTWINDOW,0); + break; + default: + wxMessageBox( L"Unimplemented.", L"Unimplemented.", wxICON_INFORMATION); + break; + } +} + +void BreakpointList::showMenu(wxPoint& pos) +{ + bool isMemory; + int index = getBreakpointIndex(GetFirstSelected(),isMemory); + + wxMenu menu; + if (index != -1) + { + menu.AppendCheckItem(ID_BREAKPOINTLIST_ENABLE, L"Enable"); + menu.Append(ID_BREAKPOINTLIST_EDIT, L"Edit"); + menu.AppendSeparator(); + + // check if the breakpoint is enabled + bool enabled; + if (isMemory) + enabled = (displayedMemChecks_[index].result & MEMCHECK_BREAK) != 0; + else + enabled = displayedBreakPoints_[index].enabled; + + menu.Check(ID_BREAKPOINTLIST_ENABLE,enabled); + } + + menu.Append(ID_BREAKPOINTLIST_ADDNEW, L"Add new"); + + menu.Connect(wxEVT_COMMAND_MENU_SELECTED, (wxObjectEventFunction)&BreakpointList::onPopupClick, NULL, this); + PopupMenu(&menu,pos); +} + +void BreakpointList::mouseEvent(wxMouseEvent& evt) +{ + wxEventType type = evt.GetEventType(); + + if (type == wxEVT_RIGHT_DOWN) + { + clickPos = evt.GetPosition(); + evt.Skip(); + } else if (type == wxEVT_RIGHT_UP) + { + showMenu(evt.GetPosition()); + } +} + +void BreakpointList::listEvent(wxListEvent& evt) +{ + showMenu(clickPos); +} \ No newline at end of file diff --git a/pcsx2/gui/Debugger/DebuggerLists.h b/pcsx2/gui/Debugger/DebuggerLists.h index cee8d51a34..53635be911 100644 --- a/pcsx2/gui/Debugger/DebuggerLists.h +++ b/pcsx2/gui/Debugger/DebuggerLists.h @@ -35,9 +35,12 @@ public: DECLARE_EVENT_TABLE() protected: wxString OnGetItemText(long item, long col) const; + void onPopupClick(wxCommandEvent& evt); void sizeEvent(wxSizeEvent& evt); void keydownEvent(wxKeyEvent& evt); + void mouseEvent(wxMouseEvent& evt); + void listEvent(wxListEvent& evt); private: int getBreakpointIndex(int itemIndex, bool& isMemory) const; int getTotalBreakpointCount(); @@ -46,9 +49,11 @@ private: void gotoBreakpointAddress(int itemIndex); void removeBreakpoint(int itemIndex); void postEvent(wxEventType type, int value); + void showMenu(wxPoint& pos); std::vector displayedBreakPoints_; std::vector displayedMemChecks_; DebugInterface* cpu; CtrlDisassemblyView* disasm; + wxPoint clickPos; }; diff --git a/pcsx2/gui/Debugger/DisassemblyDialog.cpp b/pcsx2/gui/Debugger/DisassemblyDialog.cpp index 7b365c24f9..83569a8c62 100644 --- a/pcsx2/gui/Debugger/DisassemblyDialog.cpp +++ b/pcsx2/gui/Debugger/DisassemblyDialog.cpp @@ -35,6 +35,7 @@ BEGIN_EVENT_TABLE(DisassemblyDialog, wxFrame) EVT_COMMAND( wxID_ANY, debEVT_STEPOVER, DisassemblyDialog::onDebuggerEvent ) EVT_COMMAND( wxID_ANY, debEVT_STEPINTO, DisassemblyDialog::onDebuggerEvent ) EVT_COMMAND( wxID_ANY, debEVT_UPDATE, DisassemblyDialog::onDebuggerEvent ) + EVT_COMMAND( wxID_ANY, debEVT_BREAKPOINTWINDOW, DisassemblyDialog::onDebuggerEvent ) EVT_CLOSE( DisassemblyDialog::onClose ) END_EVENT_TABLE() @@ -414,6 +415,10 @@ void DisassemblyDialog::onDebuggerEvent(wxCommandEvent& evt) } else if (type == debEVT_UPDATE) { update(); + } else if (type == debEVT_BREAKPOINTWINDOW) + { + wxCommandEvent evt; + onBreakpointClick(evt); } } From c4e89bea320a863d7e9221cbc9df5c65c9bdaee6 Mon Sep 17 00:00:00 2001 From: Kingcom Date: Tue, 29 Jul 2014 21:06:12 +0200 Subject: [PATCH 4/7] Add function list --- pcsx2/gui/Debugger/CtrlDisassemblyView.cpp | 2 +- pcsx2/gui/Debugger/CtrlMemView.cpp | 24 ++++++++++ pcsx2/gui/Debugger/CtrlMemView.h | 1 + pcsx2/gui/Debugger/CtrlRegisterList.cpp | 11 +++-- pcsx2/gui/Debugger/DisassemblyDialog.cpp | 55 ++++++++++++++++++++-- pcsx2/gui/Debugger/DisassemblyDialog.h | 8 ++++ 6 files changed, 92 insertions(+), 9 deletions(-) diff --git a/pcsx2/gui/Debugger/CtrlDisassemblyView.cpp b/pcsx2/gui/Debugger/CtrlDisassemblyView.cpp index 46f74d7020..e0ff4c6dcf 100644 --- a/pcsx2/gui/Debugger/CtrlDisassemblyView.cpp +++ b/pcsx2/gui/Debugger/CtrlDisassemblyView.cpp @@ -77,7 +77,7 @@ inline wxIcon _wxGetIconFromMemory(const unsigned char *data, int length) { } CtrlDisassemblyView::CtrlDisassemblyView(wxWindow* parent, DebugInterface* _cpu) - : wxWindow(parent,wxID_ANY,wxDefaultPosition,wxDefaultSize,wxWANTS_CHARS|wxBORDER|wxVSCROLL), cpu(_cpu) + : wxWindow(parent,wxID_ANY,wxDefaultPosition,wxDefaultSize,wxWANTS_CHARS||wxBORDER_SIMPLE|wxVSCROLL), cpu(_cpu) { manager.setCpu(cpu); windowStart = 0x100000; diff --git a/pcsx2/gui/Debugger/CtrlMemView.cpp b/pcsx2/gui/Debugger/CtrlMemView.cpp index b0cc085d16..064755542b 100644 --- a/pcsx2/gui/Debugger/CtrlMemView.cpp +++ b/pcsx2/gui/Debugger/CtrlMemView.cpp @@ -34,6 +34,10 @@ BEGIN_EVENT_TABLE(CtrlMemView, wxWindow) EVT_CHAR(CtrlMemView::charEvent) EVT_SET_FOCUS(CtrlMemView::focusEvent) EVT_KILL_FOCUS(CtrlMemView::focusEvent) + EVT_SCROLLWIN_LINEUP(CtrlMemView::scrollbarEvent) + EVT_SCROLLWIN_LINEDOWN(CtrlMemView::scrollbarEvent) + EVT_SCROLLWIN_PAGEUP(CtrlMemView::scrollbarEvent) + EVT_SCROLLWIN_PAGEDOWN(CtrlMemView::scrollbarEvent) END_EVENT_TABLE() enum MemoryViewMenuIdentifiers @@ -452,6 +456,26 @@ void CtrlMemView::charEvent(wxKeyEvent& evt) redraw(); } +void CtrlMemView::scrollbarEvent(wxScrollWinEvent& evt) +{ + int type = evt.GetEventType(); + if (type == wxEVT_SCROLLWIN_LINEUP) + { + scrollCursor(-rowSize); + } else if (type == wxEVT_SCROLLWIN_LINEDOWN) + { + scrollCursor(rowSize); + } else if (type == wxEVT_SCROLLWIN_PAGEUP) + { + scrollWindow(-GetClientSize().y/rowHeight); + } else if (type == wxEVT_SCROLLWIN_PAGEDOWN) + { + scrollWindow(GetClientSize().y/rowHeight); + } + + redraw(); +} + void CtrlMemView::scrollWindow(int lines) { windowStart += lines*rowSize; diff --git a/pcsx2/gui/Debugger/CtrlMemView.h b/pcsx2/gui/Debugger/CtrlMemView.h index 0869ee680b..562414d578 100644 --- a/pcsx2/gui/Debugger/CtrlMemView.h +++ b/pcsx2/gui/Debugger/CtrlMemView.h @@ -27,6 +27,7 @@ public: void paintEvent(wxPaintEvent & evt); void mouseEvent(wxMouseEvent& evt); void keydownEvent(wxKeyEvent& evt); + void scrollbarEvent(wxScrollWinEvent& evt); void charEvent(wxKeyEvent& evt); void redraw(); void gotoAddress(u32 address); diff --git a/pcsx2/gui/Debugger/CtrlRegisterList.cpp b/pcsx2/gui/Debugger/CtrlRegisterList.cpp index 9ad6d039e9..86b237caa8 100644 --- a/pcsx2/gui/Debugger/CtrlRegisterList.cpp +++ b/pcsx2/gui/Debugger/CtrlRegisterList.cpp @@ -41,7 +41,7 @@ enum DisassemblyMenuIdentifiers CtrlRegisterList::CtrlRegisterList(wxWindow* parent, DebugInterface* _cpu) - : wxWindow(parent,wxID_ANY,wxDefaultPosition,wxDefaultSize,wxWANTS_CHARS|wxBORDER), cpu(_cpu) + : wxWindow(parent,wxID_ANY,wxDefaultPosition,wxDefaultSize,wxWANTS_CHARS|wxBORDER_NONE), cpu(_cpu) { rowHeight = g_Conf->EmuOptions.Debugger.FontHeight+2; charWidth = g_Conf->EmuOptions.Debugger.FontWidth; @@ -194,12 +194,15 @@ void CtrlRegisterList::render(wxDC& dc) dc.SetBrush(wxBrush(wxColor(0xFFFFEFE8))); dc.SetPen(wxPen(wxColor(0xFF000000))); } + + if (i == cpu->getRegisterCategoryCount()-1) + piece += size.x-piece*cpu->getRegisterCategoryCount()-1; - dc.DrawRectangle(x-1,-1,piece+1,rowHeight+1); + dc.DrawRectangle(x,0,piece+1,rowHeight); // center text x += (piece-strlen(name)*charWidth)/2; - dc.DrawText(wxString(name,wxConvUTF8),x,1); + dc.DrawText(wxString(name,wxConvUTF8),x,2); } int nameStart = 17; @@ -484,7 +487,7 @@ void CtrlRegisterList::mouseEvent(wxMouseEvent& evt) if (y < rowHeight) { int piece = GetSize().x/cpu->getRegisterCategoryCount(); - int cat = x/piece; + int cat = std::min(x/piece,cpu->getRegisterCategoryCount()-1); if (cat != category) { diff --git a/pcsx2/gui/Debugger/DisassemblyDialog.cpp b/pcsx2/gui/Debugger/DisassemblyDialog.cpp index 83569a8c62..a5ae590670 100644 --- a/pcsx2/gui/Debugger/DisassemblyDialog.cpp +++ b/pcsx2/gui/Debugger/DisassemblyDialog.cpp @@ -36,9 +36,13 @@ BEGIN_EVENT_TABLE(DisassemblyDialog, wxFrame) EVT_COMMAND( wxID_ANY, debEVT_STEPINTO, DisassemblyDialog::onDebuggerEvent ) EVT_COMMAND( wxID_ANY, debEVT_UPDATE, DisassemblyDialog::onDebuggerEvent ) EVT_COMMAND( wxID_ANY, debEVT_BREAKPOINTWINDOW, DisassemblyDialog::onDebuggerEvent ) + EVT_COMMAND( wxID_ANY, debEVT_MAPLOADED, DisassemblyDialog::onDebuggerEvent ) EVT_CLOSE( DisassemblyDialog::onClose ) END_EVENT_TABLE() +BEGIN_EVENT_TABLE(CpuTabPage, wxPanel) + EVT_LISTBOX_DCLICK( wxID_ANY, CpuTabPage::listBoxHandler) +END_EVENT_TABLE() DebuggerHelpDialog::DebuggerHelpDialog(wxWindow* parent) : wxDialog(parent,wxID_ANY,L"Help") @@ -73,9 +77,11 @@ CpuTabPage::CpuTabPage(wxWindow* parent, DebugInterface* _cpu) wxBoxSizer* mainSizer = new wxBoxSizer(wxVERTICAL); SetSizer(mainSizer); + leftTabs = new wxNotebook(this,wxID_ANY); bottomTabs = new wxNotebook(this,wxID_ANY); disassembly = new CtrlDisassemblyView(this,cpu); - registerList = new CtrlRegisterList(this,cpu); + registerList = new CtrlRegisterList(leftTabs,cpu); + functionList = new wxListBox(leftTabs,wxID_ANY,wxDefaultPosition,wxDefaultSize,0,NULL,wxBORDER_NONE|wxLB_SORT); memory = new CtrlMemView(bottomTabs,cpu); // create register list and disassembly section @@ -84,10 +90,13 @@ CpuTabPage::CpuTabPage(wxWindow* parent, DebugInterface* _cpu) wxBoxSizer* miscStuffSizer = new wxBoxSizer(wxHORIZONTAL); cyclesText = new wxStaticText(this,wxID_ANY,L""); miscStuffSizer->Add(cyclesText,0,wxLEFT|wxTOP|wxBOTTOM,2); + + leftTabs->AddPage(registerList,L"Registers"); + leftTabs->AddPage(functionList,L"Functions"); wxBoxSizer* registerSizer = new wxBoxSizer(wxVERTICAL); registerSizer->Add(miscStuffSizer,0); - registerSizer->Add(registerList,1); + registerSizer->Add(leftTabs,1); middleSizer->Add(registerSizer,0,wxEXPAND|wxRIGHT,2); middleSizer->Add(disassembly,2,wxEXPAND); @@ -107,6 +116,37 @@ CpuTabPage::CpuTabPage(wxWindow* parent, DebugInterface* _cpu) loadCycles(); } +void CpuTabPage::reloadSymbolMap() +{ + functionList->Clear(); + + auto funcs = symbolMap.GetAllSymbols(ST_FUNCTION); + for (size_t i = 0; i < funcs.size(); i++) + { + wxString name = wxString(funcs[i].name.c_str(),wxConvUTF8); + functionList->Append(name,(void*)funcs[i].address); + } +} + +void CpuTabPage::listBoxHandler(wxCommandEvent& event) +{ + int index = functionList->GetSelection(); + if (event.GetEventObject() == functionList && index >= 0) + { + u32 pos = (u32) functionList->GetClientData(index); + postEvent(debEVT_GOTOINDISASM,pos); + } +} + +void CpuTabPage::postEvent(wxEventType type, int value) +{ + wxCommandEvent event( type, GetId() ); + event.SetEventObject(this); + event.SetClientData(cpu); + event.SetInt(value); + wxPostEvent(this,event); +} + void CpuTabPage::setBottomTabPage(wxWindow* win) { for (size_t i = 0; i < bottomTabs->GetPageCount(); i++) @@ -400,7 +440,8 @@ void DisassemblyDialog::onDebuggerEvent(wxCommandEvent& evt) { if (currentCpu != NULL) { - currentCpu->getDisassembly()->gotoAddress(r5900Debug.getPC()); + u32 pos = evt.GetInt(); + currentCpu->getDisassembly()->gotoAddress(pos); currentCpu->getDisassembly()->SetFocus(); update(); } @@ -419,6 +460,10 @@ void DisassemblyDialog::onDebuggerEvent(wxCommandEvent& evt) { wxCommandEvent evt; onBreakpointClick(evt); + } else if (type == debEVT_MAPLOADED) + { + eeTab->reloadSymbolMap(); + iopTab->reloadSymbolMap(); } } @@ -443,8 +488,10 @@ void DisassemblyDialog::update() void DisassemblyDialog::reset() { eeTab->getDisassembly()->clearFunctions(); + eeTab->reloadSymbolMap(); iopTab->getDisassembly()->clearFunctions(); -}; + iopTab->reloadSymbolMap(); +} void DisassemblyDialog::gotoPc() { diff --git a/pcsx2/gui/Debugger/DisassemblyDialog.h b/pcsx2/gui/Debugger/DisassemblyDialog.h index 920d99a534..aab77a9e2f 100644 --- a/pcsx2/gui/Debugger/DisassemblyDialog.h +++ b/pcsx2/gui/Debugger/DisassemblyDialog.h @@ -42,13 +42,21 @@ public: void update(); void showMemoryView() { setBottomTabPage(memory); }; void loadCycles(); + void reloadSymbolMap(); + + void listBoxHandler(wxCommandEvent& event); + DECLARE_EVENT_TABLE() private: void setBottomTabPage(wxWindow* win); + void postEvent(wxEventType type, int value); + DebugInterface* cpu; CtrlDisassemblyView* disassembly; CtrlRegisterList* registerList; + wxListBox* functionList; CtrlMemView* memory; wxNotebook* bottomTabs; + wxNotebook* leftTabs; BreakpointList* breakpointList; wxStaticText* cyclesText; u32 lastCycles; From 8d1e294b32df600d6252e75dd2e5eb132df9cb83 Mon Sep 17 00:00:00 2001 From: Kingcom Date: Tue, 29 Jul 2014 21:06:24 +0200 Subject: [PATCH 5/7] Also highlight registers accessed by memory opcodes --- pcsx2/gui/Debugger/CtrlDisassemblyView.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pcsx2/gui/Debugger/CtrlDisassemblyView.cpp b/pcsx2/gui/Debugger/CtrlDisassemblyView.cpp index e0ff4c6dcf..8ee13d1e69 100644 --- a/pcsx2/gui/Debugger/CtrlDisassemblyView.cpp +++ b/pcsx2/gui/Debugger/CtrlDisassemblyView.cpp @@ -77,7 +77,7 @@ inline wxIcon _wxGetIconFromMemory(const unsigned char *data, int length) { } CtrlDisassemblyView::CtrlDisassemblyView(wxWindow* parent, DebugInterface* _cpu) - : wxWindow(parent,wxID_ANY,wxDefaultPosition,wxDefaultSize,wxWANTS_CHARS||wxBORDER_SIMPLE|wxVSCROLL), cpu(_cpu) + : wxWindow(parent,wxID_ANY,wxDefaultPosition,wxDefaultSize,wxWANTS_CHARS|wxBORDER_SIMPLE|wxVSCROLL), cpu(_cpu) { manager.setCpu(cpu); windowStart = 0x100000; @@ -326,9 +326,18 @@ std::set CtrlDisassemblyView::getSelectedLineArguments() { p = nextp + 1; nextp = line.params.find(',', p); } + if (p < line.params.size()) { args.insert(line.params.substr(p)); } + + // check for registers in memory opcodes + p = line.params.find('('); + nextp = line.params.find(')'); + if (p != line.params.npos && nextp != line.params.npos && nextp > p) { + args.insert(line.params.substr(p+1, nextp - p - 1)); + } + } return args; From 15943eddb1cb10f16082e629ae3285bda62e6634 Mon Sep 17 00:00:00 2001 From: Kingcom Date: Tue, 29 Jul 2014 21:03:42 +0200 Subject: [PATCH 6/7] Fix string handling in breakpoint list --- pcsx2/gui/Debugger/DebuggerLists.cpp | 36 ++++++++++++++-------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pcsx2/gui/Debugger/DebuggerLists.cpp b/pcsx2/gui/Debugger/DebuggerLists.cpp index 95895e9df3..fc8b9d6274 100644 --- a/pcsx2/gui/Debugger/DebuggerLists.cpp +++ b/pcsx2/gui/Debugger/DebuggerLists.cpp @@ -120,19 +120,19 @@ wxString BreakpointList::OnGetItemText(long item, long col) const if (isMemory) { switch ((int)displayedMemChecks_[index].cond) { case MEMCHECK_READ: - dest.Write(L"Read"); + dest.Write("Read"); break; case MEMCHECK_WRITE: - dest.Write(L"Write"); + dest.Write("Write"); break; case MEMCHECK_READWRITE: - dest.Write(L"Read/Write"); + dest.Write("Read/Write"); break; case MEMCHECK_WRITE | MEMCHECK_WRITE_ONCHANGE: - dest.Write(L"Write Change"); + dest.Write("Write Change"); break; case MEMCHECK_READWRITE | MEMCHECK_WRITE_ONCHANGE: - dest.Write(L"Read/Write Change"); + dest.Write("Read/Write Change"); break; } } else { @@ -143,9 +143,9 @@ wxString BreakpointList::OnGetItemText(long item, long col) const case BPL_OFFSET: { if (isMemory) { - dest.Write(L"0x%08X",displayedMemChecks_[index].start); + dest.Write("0x%08X",displayedMemChecks_[index].start); } else { - dest.Write(L"0x%08X",displayedBreakPoints_[index].addr); + dest.Write("0x%08X",displayedBreakPoints_[index].addr); } } break; @@ -154,16 +154,16 @@ wxString BreakpointList::OnGetItemText(long item, long col) const if (isMemory) { auto mc = displayedMemChecks_[index]; if (mc.end == 0) - dest.Write(L"0x%08X",1); + dest.Write("0x%08X",1); else - dest.Write(L"0x%08X",mc.end-mc.start); + dest.Write("0x%08X",mc.end-mc.start); } else { const std::string sym = symbolMap.GetLabelString(displayedBreakPoints_[index].addr); if (!sym.empty()) { - dest.Write(L"%s",sym.c_str()); + dest.Write("%s",sym.c_str()); } else { - dest.Write(L"-"); + dest.Write("-"); } } } @@ -175,34 +175,34 @@ wxString BreakpointList::OnGetItemText(long item, long col) const } else { char temp[256]; disasm->getOpcodeText(displayedBreakPoints_[index].addr, temp); - dest.Write(L"%s",temp); + dest.Write("%s",temp); } } break; case BPL_CONDITION: { if (isMemory || displayedBreakPoints_[index].hasCond == false) { - dest.Write(L"-"); + dest.Write("-"); } else { - dest.Write(L"%s",displayedBreakPoints_[index].cond.expressionString); + dest.Write("%s",displayedBreakPoints_[index].cond.expressionString); } } break; case BPL_HITS: { if (isMemory) { - dest.Write(L"%d",displayedMemChecks_[index].numHits); + dest.Write("%d",displayedMemChecks_[index].numHits); } else { - dest.Write(L"-"); + dest.Write("-"); } } break; case BPL_ENABLED: { if (isMemory) { - dest.Write(L"%s",displayedMemChecks_[index].result & MEMCHECK_BREAK ? "true" : "false"); + dest.Write("%s",displayedMemChecks_[index].result & MEMCHECK_BREAK ? "true" : "false"); } else { - dest.Write(L"%s",displayedBreakPoints_[index].enabled ? "true" : "false"); + dest.Write("%s",displayedBreakPoints_[index].enabled ? "true" : "false"); } } break; From c79fe9a1e72ebfe2d19ff6806c66eaf34945ec12 Mon Sep 17 00:00:00 2001 From: Kingcom Date: Tue, 29 Jul 2014 22:16:06 +0200 Subject: [PATCH 7/7] Fix linux issues --- pcsx2/gui/Debugger/DebuggerLists.cpp | 2 +- pcsx2/gui/Debugger/DebuggerLists.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pcsx2/gui/Debugger/DebuggerLists.cpp b/pcsx2/gui/Debugger/DebuggerLists.cpp index fc8b9d6274..fb70350d23 100644 --- a/pcsx2/gui/Debugger/DebuggerLists.cpp +++ b/pcsx2/gui/Debugger/DebuggerLists.cpp @@ -384,7 +384,7 @@ void BreakpointList::onPopupClick(wxCommandEvent& evt) } } -void BreakpointList::showMenu(wxPoint& pos) +void BreakpointList::showMenu(const wxPoint& pos) { bool isMemory; int index = getBreakpointIndex(GetFirstSelected(),isMemory); diff --git a/pcsx2/gui/Debugger/DebuggerLists.h b/pcsx2/gui/Debugger/DebuggerLists.h index 53635be911..98f9537787 100644 --- a/pcsx2/gui/Debugger/DebuggerLists.h +++ b/pcsx2/gui/Debugger/DebuggerLists.h @@ -49,7 +49,7 @@ private: void gotoBreakpointAddress(int itemIndex); void removeBreakpoint(int itemIndex); void postEvent(wxEventType type, int value); - void showMenu(wxPoint& pos); + void showMenu(const wxPoint& pos); std::vector displayedBreakPoints_; std::vector displayedMemChecks_;