Merge pull request #10075 from lioncash/memcheck

MMU: Don't truncate 64-bit values when calling Memcheck()

Source/Core/Core/PowerPC/BreakPoints.cpp

@@ -293,7 +293,7 @@ bool MemChecks::OverlapsMemcheck(u32 address, u32 length) const
   });
 }
 
-bool TMemCheck::Action(Common::DebugInterface* debug_interface, u32 value, u32 addr, bool write,
+bool TMemCheck::Action(Common::DebugInterface* debug_interface, u64 value, u32 addr, bool write,
                        size_t size, u32 pc)
 {
   if (!is_enabled)

Source/Core/Core/PowerPC/BreakPoints.h

@@ -40,7 +40,7 @@ struct TMemCheck
   u32 num_hits = 0;
 
   // returns whether to break
-  bool Action(Common::DebugInterface* dbg_interface, u32 value, u32 addr, bool write, size_t size,
+  bool Action(Common::DebugInterface* debug_interface, u64 value, u32 addr, bool write, size_t size,
               u32 pc);
 };
 

Source/Core/Core/PowerPC/MMU.cpp

@@ -499,23 +499,29 @@ TryReadResult<u32> HostTryReadInstruction(const u32 address, RequestedAddressSpa
   return TryReadResult<u32>();
 }
 
-static void Memcheck(u32 address, u32 var, bool write, size_t size)
-{
-  if (PowerPC::memchecks.HasAny())
-  {
-    TMemCheck* mc = PowerPC::memchecks.GetMemCheck(address, size);
-    if (mc)
+static void Memcheck(u32 address, u64 var, bool write, size_t size)
 {
+  if (!memchecks.HasAny())
+    return;
+
+  TMemCheck* mc = memchecks.GetMemCheck(address, size);
+  if (mc == nullptr)
+    return;
+
   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)
-      {
+
+  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,
@@ -523,10 +529,7 @@ static void Memcheck(u32 address, u32 var, bool write, size_t size)
   // 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;
-      }
-    }
-  }
+  ppcState.Exceptions |= EXCEPTION_DSI | EXCEPTION_FAKE_MEMCHECK_HIT;
 }
 
 u8 Read_U8(const u32 address)
@@ -553,7 +556,7 @@ u32 Read_U32(const u32 address)
 u64 Read_U64(const u32 address)
 {
   u64 var = ReadFromHardware<XCheckTLBFlag::Read, u64>(address);
-  Memcheck(address, (u32)var, false, 8);
+  Memcheck(address, var, false, 8);
   return var;
 }
 
@@ -676,7 +679,7 @@ void Write_U32_Swap(const u32 var, const u32 address)
 
 void Write_U64(const u64 var, const u32 address)
 {
-  Memcheck(address, (u32)var, true, 8);
+  Memcheck(address, var, true, 8);
   WriteToHardware<XCheckTLBFlag::Write>(address, static_cast<u32>(var >> 32), 4);
   WriteToHardware<XCheckTLBFlag::Write>(address + sizeof(u32), static_cast<u32>(var), 4);
 }