Merge pull request #11554 from JosJuice/host-lock-cpu

DolphinQt: Properly lock CPU before accessing emulated memory

1 files changed, 8 insertions, 2 deletions

diff --git a/Source/Core/Common/Debug/CodeTrace.h b/Source/Core/Common/Debug/CodeTrace.h
index 4f2cb701f2..15ba67036b 100644
--- a/Source/Core/Common/Debug/CodeTrace.h
+++ b/Source/Core/Common/Debug/CodeTrace.h
@@ -10,6 +10,11 @@
 
 #include "Common/CommonTypes.h"
 
+namespace Core
+{
+class CPUThreadGuard;
+}
+
 struct InstructionAttributes
 {
   u32 address = 0;
@@ -63,11 +68,12 @@ public:
   };
 
   void SetRegTracked(const std::string& reg);
-  AutoStepResults AutoStepping(bool continue_previous = false, AutoStop stop_on = AutoStop::Always);
+  AutoStepResults AutoStepping(const Core::CPUThreadGuard& guard, bool continue_previous = false,
+                               AutoStop stop_on = AutoStop::Always);
 
 private:
   InstructionAttributes GetInstructionAttributes(const TraceOutput& line) const;
-  TraceOutput SaveCurrentInstruction() const;
+  TraceOutput SaveCurrentInstruction(const Core::CPUThreadGuard* guard) const;
   HitType TraceLogic(const TraceOutput& current_instr, bool first_hit = false);
 
   bool m_recording = false;