From f484927ed03a1943a83f8781e598e07c056cc82a Mon Sep 17 00:00:00 2001
From: Subv <subv2112@gmail.com>
Date: Fri, 21 Jul 2017 00:34:47 -0500
Subject: [PATCH] Kernel/Memory: Acquire the global HLE lock when a memory
 read/write operation falls outside of the fast path, for it might perform an
 MMIO operation.

---
 src/core/memory.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/core/memory.cpp b/src/core/memory.cpp
index 9024f4922..72cbf2ec7 100644
--- a/src/core/memory.cpp
+++ b/src/core/memory.cpp
@@ -9,6 +9,7 @@
 #include "common/logging/log.h"
 #include "common/swap.h"
 #include "core/hle/kernel/process.h"
+#include "core/hle/lock.h"
 #include "core/memory.h"
 #include "core/memory_setup.h"
 #include "core/mmio.h"
@@ -187,6 +188,9 @@ T Read(const VAddr vaddr) {
         return value;
     }
 
+    // The memory access might do an MMIO or cached access, so we have to lock the HLE kernel state
+    std::lock_guard<std::mutex> lock(HLE::g_hle_lock);
+
     PageType type = current_page_table->attributes[vaddr >> PAGE_BITS];
     switch (type) {
     case PageType::Unmapped:
@@ -226,6 +230,9 @@ void Write(const VAddr vaddr, const T data) {
         return;
     }
 
+    // The memory access might do an MMIO or cached access, so we have to lock the HLE kernel state
+    std::lock_guard<std::mutex> lock(HLE::g_hle_lock);
+
     PageType type = current_page_table->attributes[vaddr >> PAGE_BITS];
     switch (type) {
     case PageType::Unmapped:
@@ -722,4 +729,4 @@ VAddr PhysicalToVirtualAddress(const PAddr addr) {
     return addr | 0x80000000;
 }
 
-} // namespace
+} // namespace Memory