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.
This commit is contained in:
		| @@ -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 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user