Add ClearAllMemChecks to DebugInterface

Breakpoints have one, but memchecks don't, despite being cleared directly in the breakpoint window. Now DolphinWX should call the interface functions and not the direct functions of the breakpoints or memchecks for clearing.
dolphin-emu · Mar 6, 2014 · 610a6f9 · 610a6f9
1 parent 9632890
commit 610a6f9
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 2 deletions.
diff --git a/Source/Core/Common/DebugInterface.h b/Source/Core/Common/DebugInterface.h
@@ -18,6 +18,7 @@ class DebugInterface
 	virtual void ClearBreakpoint(unsigned int /*address*/){}
 	virtual void ClearAllBreakpoints() {}
 	virtual void ToggleBreakpoint(unsigned int /*address*/){}
+	virtual void ClearAllMemChecks() {}
 	virtual bool IsMemCheck(unsigned int /*address*/) {return false;}
 	virtual void ToggleMemCheck(unsigned int /*address*/){}
 	virtual unsigned int ReadMemory(unsigned int /*address*/){return 0;}

diff --git a/Source/Core/Core/Debugger/PPCDebugInterface.cpp b/Source/Core/Core/Debugger/PPCDebugInterface.cpp
@@ -121,6 +121,11 @@ void PPCDebugInterface::ToggleBreakpoint(unsigned int address)
 		PowerPC::breakpoints.Add(address);
 }
 
+void PPCDebugInterface::ClearAllMemChecks()
+{
+	PowerPC::memchecks.Clear();
+}
+
 bool PPCDebugInterface::IsMemCheck(unsigned int address)
 {
 	return (Memory::AreMemoryBreakpointsActivated()

diff --git a/Source/Core/Core/Debugger/PPCDebugInterface.h b/Source/Core/Core/Debugger/PPCDebugInterface.h
@@ -23,6 +23,7 @@ class PPCDebugInterface : public DebugInterface
 	virtual void ClearBreakpoint(unsigned int address) override;
 	virtual void ClearAllBreakpoints() override;
 	virtual void ToggleBreakpoint(unsigned int address) override;
+	virtual void ClearAllMemChecks() override;
 	virtual bool IsMemCheck(unsigned int address) override;
 	virtual void ToggleMemCheck(unsigned int address) override;
 	virtual unsigned int ReadMemory(unsigned int address) override;

diff --git a/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.cpp b/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.cpp
@@ -127,6 +127,11 @@ bool DSPDebugInterface::IsMemCheck(unsigned int address)
 	return false;
 }
 
+void DSPDebugInterface::ClearAllMemChecks()
+{
+	PanicAlert("MemCheck functionality not supported in DSP module.");
+}
+
 void DSPDebugInterface::ToggleMemCheck(unsigned int address)
 {
 	PanicAlert("MemCheck functionality not supported in DSP module.");

diff --git a/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h b/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h
@@ -23,6 +23,7 @@ class DSPDebugInterface : public DebugInterface
 	virtual void ClearBreakpoint(unsigned int address);
 	virtual void ClearAllBreakpoints();
 	virtual void ToggleBreakpoint(unsigned int address);
+	virtual void ClearAllMemChecks();
 	virtual bool IsMemCheck(unsigned int address);
 	virtual void ToggleMemCheck(unsigned int address);
 	virtual unsigned int ReadMemory(unsigned int address);

diff --git a/Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp b/Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp
@@ -153,8 +153,9 @@ void CBreakPointWindow::OnSelectBP(wxListEvent& event)
 // Clear all breakpoints and memchecks
 void CBreakPointWindow::OnClear(wxCommandEvent& WXUNUSED(event))
 {
-	PowerPC::breakpoints.Clear();
-	PowerPC::memchecks.Clear();
+	PowerPC::debug_interface.ClearAllBreakpoints();
+	PowerPC::debug_interface.ClearAllMemChecks();
+
 	NotifyUpdate();
 }