From 613cae613a8c2ac34dd823f875ac4a6a0059db38 Mon Sep 17 00:00:00 2001 From: skidau Date: Sun, 19 Oct 2014 21:45:40 +1100 Subject: Added a RAM Watch window to the debugger Conflicts: Source/Core/Core/HW/Memmap.cpp Source/Core/Core/HW/Memmap.h Source/Core/DolphinWX/Debugger/CodeWindow.h --- Source/Core/DolphinWX/Debugger/MemoryView.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'Source/Core/DolphinWX/Debugger/MemoryView.cpp') diff --git a/Source/Core/DolphinWX/Debugger/MemoryView.cpp b/Source/Core/DolphinWX/Debugger/MemoryView.cpp index 0fd8f48746..f05c1b96fa 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryView.cpp +++ b/Source/Core/DolphinWX/Debugger/MemoryView.cpp @@ -38,6 +38,7 @@ enum IDM_COPYCODE, IDM_RUNTOHERE, IDM_DYNARECRESULTS, + IDM_WATCHADDRESS, IDM_TOGGLEMEMORY, IDM_VIEWASFP, IDM_VIEWASASCII, @@ -180,6 +181,11 @@ void CMemoryView::OnPopupMenu(wxCommandEvent& event) break; #endif + case IDM_WATCHADDRESS: + debugger->AddWatch(selection); + Refresh(); + break; + case IDM_TOGGLEMEMORY: memory ^= 1; Refresh(); @@ -215,6 +221,7 @@ void CMemoryView::OnMouseDownR(wxMouseEvent& event) menu->Append(IDM_COPYADDRESS, _("Copy &address")); menu->Append(IDM_COPYHEX, _("Copy &hex")); #endif + menu->Append(IDM_WATCHADDRESS, _("Add to &watch")); menu->Append(IDM_TOGGLEMEMORY, _("Toggle &memory")); wxMenu* viewAsSubMenu = new wxMenu; -- cgit v1.2.3 From d0a3bb765088b8d6f923ef62aac4761de332a12f Mon Sep 17 00:00:00 2001 From: skidau Date: Fri, 24 Oct 2014 00:47:00 +1100 Subject: Added "Add to watch" context menu items to the Memory and Register windows. Added "View memory" context menu item to the Register window. --- Source/Core/DolphinWX/Debugger/MemoryView.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'Source/Core/DolphinWX/Debugger/MemoryView.cpp') diff --git a/Source/Core/DolphinWX/Debugger/MemoryView.cpp b/Source/Core/DolphinWX/Debugger/MemoryView.cpp index f05c1b96fa..4effea6520 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryView.cpp +++ b/Source/Core/DolphinWX/Debugger/MemoryView.cpp @@ -25,10 +25,13 @@ #include "Common/DebugInterface.h" #include "Common/StringUtil.h" #include "Core/HW/Memmap.h" +#include "DolphinWX/Frame.h" #include "DolphinWX/Globals.h" #include "DolphinWX/WxUtils.h" +#include "DolphinWX/Debugger/CodeWindow.h" #include "DolphinWX/Debugger/DebuggerUIUtil.h" #include "DolphinWX/Debugger/MemoryView.h" +#include "DolphinWX/Debugger/WatchWindow.h" enum { @@ -162,6 +165,10 @@ void CMemoryView::OnScrollWheel(wxMouseEvent& event) void CMemoryView::OnPopupMenu(wxCommandEvent& event) { + CFrame* main_frame = (CFrame*)(GetParent()->GetParent()->GetParent()); + CCodeWindow* code_window = main_frame->g_pCodeWindow; + CWatchWindow* watch_window = code_window->m_WatchWindow; + #if wxUSE_CLIPBOARD wxTheClipboard->Open(); #endif @@ -183,6 +190,8 @@ void CMemoryView::OnPopupMenu(wxCommandEvent& event) case IDM_WATCHADDRESS: debugger->AddWatch(selection); + if (watch_window) + watch_window->NotifyUpdate(); Refresh(); break; -- cgit v1.2.3