Merge pull request #8669 from container1234/mbp

Breakpoints: Fix crash after clearing all memory breakpoints
dolphin-emu · Mar 15, 2020 · d297080 · d297080
2 parents 3c1f5c6 + 75a69b1
commit d297080
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/Source/Core/Core/PowerPC/BreakPoints.cpp b/Source/Core/Core/PowerPC/BreakPoints.cpp
@@ -196,6 +196,15 @@ void MemChecks::Remove(u32 address)
   });
 }
 
+void MemChecks::Clear()
+{
+  Core::RunAsCPUThread([&] {
+    m_mem_checks.clear();
+    JitInterface::ClearCache();
+    PowerPC::DBATUpdated();
+  });
+}
+
 TMemCheck* MemChecks::GetMemCheck(u32 address, size_t size)
 {
   const auto iter =

diff --git a/Source/Core/Core/PowerPC/BreakPoints.h b/Source/Core/Core/PowerPC/BreakPoints.h
@@ -88,7 +88,7 @@ class MemChecks
   bool OverlapsMemcheck(u32 address, u32 length) const;
   void Remove(u32 address);
 
-  void Clear() { m_mem_checks.clear(); }
+  void Clear();
   bool HasAny() const { return !m_mem_checks.empty(); }
 
 private: