From a8ebca4fc60ecea550c879ecfd6135f066645174 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Tue, 31 Aug 2021 11:30:55 -0400
Subject: [PATCH] MMU: Invert conditionals in Memcheck()

Lets us unindent code a little bit.
---
 Source/Core/Core/PowerPC/MMU.cpp | 51 +++++++++++++++++---------------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/Source/Core/Core/PowerPC/MMU.cpp b/Source/Core/Core/PowerPC/MMU.cpp
index 87cd6102d7..28915b660c 100644
--- a/Source/Core/Core/PowerPC/MMU.cpp
+++ b/Source/Core/Core/PowerPC/MMU.cpp
@@ -501,32 +501,35 @@ TryReadResult<u32> HostTryReadInstruction(const u32 address, RequestedAddressSpa
 
 static void Memcheck(u32 address, u32 var, bool write, size_t size)
 {
-  if (PowerPC::memchecks.HasAny())
+  if (!memchecks.HasAny())
+    return;
+
+  TMemCheck* mc = memchecks.GetMemCheck(address, size);
+  if (mc == nullptr)
+    return;
+
+  if (CPU::IsStepping())
   {
-    TMemCheck* mc = PowerPC::memchecks.GetMemCheck(address, size);
-    if (mc)
-    {
-      if (CPU::IsStepping())
-      {
-        // Disable when stepping so that resume works.
-        return;
-      }
-      mc->num_hits++;
-      bool pause = mc->Action(&PowerPC::debug_interface, var, address, write, size, PC);
-      if (pause)
-      {
-        CPU::Break();
-        // Fake a DSI so that all the code that tests for it in order to skip
-        // the rest of the instruction will apply.  (This means that
-        // watchpoints will stop the emulator before the offending load/store,
-        // not after like GDB does, but that's better anyway.  Just need to
-        // make sure resuming after that works.)
-        // It doesn't matter if ReadFromHardware triggers its own DSI because
-        // we'll take it after resuming.
-        PowerPC::ppcState.Exceptions |= EXCEPTION_DSI | EXCEPTION_FAKE_MEMCHECK_HIT;
-      }
-    }
+    // Disable when stepping so that resume works.
+    return;
   }
+
+  mc->num_hits++;
+
+  const bool pause = mc->Action(&debug_interface, var, address, write, size, PC);
+  if (!pause)
+    return;
+
+  CPU::Break();
+
+  // Fake a DSI so that all the code that tests for it in order to skip
+  // the rest of the instruction will apply.  (This means that
+  // watchpoints will stop the emulator before the offending load/store,
+  // not after like GDB does, but that's better anyway.  Just need to
+  // make sure resuming after that works.)
+  // It doesn't matter if ReadFromHardware triggers its own DSI because
+  // we'll take it after resuming.
+  ppcState.Exceptions |= EXCEPTION_DSI | EXCEPTION_FAKE_MEMCHECK_HIT;
 }
 
 u8 Read_U8(const u32 address)