From 7cecb28bdf6443362a6ab20e0042ddb3b407ebec Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sun, 12 Feb 2023 11:07:11 +0100 Subject: DolphinQt: Properly lock CPU before accessing emulated memory This fixes a problem I was having where using frame advance with the debugger open would frequently cause panic alerts about invalid addresses due to the CPU thread changing MSR.DR while the host thread was trying to access memory. To aid in tracking down all the places where we weren't properly locking the CPU, I've created a new type (in Core.h) that you have to pass as a reference or pointer to functions that require running as the CPU thread. --- Source/Core/Common/Debug/Threads.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'Source/Core/Common/Debug/Threads.h') diff --git a/Source/Core/Common/Debug/Threads.h b/Source/Core/Common/Debug/Threads.h index 4d6c4354ac..e9aef96d26 100644 --- a/Source/Core/Common/Debug/Threads.h +++ b/Source/Core/Common/Debug/Threads.h @@ -11,6 +11,11 @@ #include "Common/CommonTypes.h" +namespace Core +{ +class CPUThreadGuard; +}; + namespace Common::Debug { struct PartialContext @@ -41,7 +46,7 @@ public: LWPThread, // devkitPro libogc thread }; - virtual PartialContext GetContext() const = 0; + virtual PartialContext GetContext(const Core::CPUThreadGuard& guard) const = 0; virtual u32 GetAddress() const = 0; virtual u16 GetState() const = 0; virtual bool IsSuspended() const = 0; @@ -53,8 +58,8 @@ public: virtual std::size_t GetStackSize() const = 0; virtual s32 GetErrno() const = 0; // Implementation specific, used to store arbitrary data - virtual std::string GetSpecific() const = 0; - virtual bool IsValid() const = 0; + virtual std::string GetSpecific(const Core::CPUThreadGuard& guard) const = 0; + virtual bool IsValid(const Core::CPUThreadGuard& guard) const = 0; }; using Threads = std::vector>; -- cgit v1.2.3