diff options
author | danzel <danzel@localhost.geek.nz> | 2017-08-29 10:39:55 +0200 |
---|---|---|
committer | danzel <danzel@localhost.geek.nz> | 2017-08-29 10:39:55 +0200 |
commit | 826606479682234c98e4dfa6e616e637a28d4fcc (patch) | |
tree | be6cbcc451182e0ec9801470b9c454e94ba124c5 /src | |
parent | Merge pull request #2839 from Subv/global_kernel_lock (diff) | |
download | yuzu-826606479682234c98e4dfa6e616e637a28d4fcc.tar yuzu-826606479682234c98e4dfa6e616e637a28d4fcc.tar.gz yuzu-826606479682234c98e4dfa6e616e637a28d4fcc.tar.bz2 yuzu-826606479682234c98e4dfa6e616e637a28d4fcc.tar.lz yuzu-826606479682234c98e4dfa6e616e637a28d4fcc.tar.xz yuzu-826606479682234c98e4dfa6e616e637a28d4fcc.tar.zst yuzu-826606479682234c98e4dfa6e616e637a28d4fcc.zip |
Diffstat (limited to 'src')
-rw-r--r-- | src/core/hle/lock.cpp | 2 | ||||
-rw-r--r-- | src/core/hle/lock.h | 2 | ||||
-rw-r--r-- | src/core/hle/svc.cpp | 2 | ||||
-rw-r--r-- | src/core/memory.cpp | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/lock.cpp b/src/core/hle/lock.cpp index 082f689c8..1c24c7ce9 100644 --- a/src/core/hle/lock.cpp +++ b/src/core/hle/lock.cpp @@ -7,5 +7,5 @@ #include <core/hle/lock.h> namespace HLE { -std::mutex g_hle_lock; +std::recursive_mutex g_hle_lock; } diff --git a/src/core/hle/lock.h b/src/core/hle/lock.h index 8265621e1..5c99fe996 100644 --- a/src/core/hle/lock.h +++ b/src/core/hle/lock.h @@ -14,5 +14,5 @@ namespace HLE { * to the emulated memory is not protected by this mutex, and should be avoided in any threads other * than the CPU thread. */ -extern std::mutex g_hle_lock; +extern std::recursive_mutex g_hle_lock; } // namespace HLE diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp index b98938cb4..dfc36748c 100644 --- a/src/core/hle/svc.cpp +++ b/src/core/hle/svc.cpp @@ -1334,7 +1334,7 @@ void CallSVC(u32 immediate) { MICROPROFILE_SCOPE(Kernel_SVC); // Lock the global kernel mutex when we enter the kernel HLE. - std::lock_guard<std::mutex> lock(HLE::g_hle_lock); + std::lock_guard<std::recursive_mutex> lock(HLE::g_hle_lock); const FunctionDef* info = GetSVCInfo(immediate); if (info) { diff --git a/src/core/memory.cpp b/src/core/memory.cpp index a3c5f4a9d..097bc5b47 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp @@ -183,7 +183,7 @@ T Read(const VAddr vaddr) { } // 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); + std::lock_guard<std::recursive_mutex> lock(HLE::g_hle_lock); PageType type = current_page_table->attributes[vaddr >> PAGE_BITS]; switch (type) { @@ -224,7 +224,7 @@ void Write(const VAddr vaddr, const T data) { } // 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); + std::lock_guard<std::recursive_mutex> lock(HLE::g_hle_lock); PageType type = current_page_table->attributes[vaddr >> PAGE_BITS]; switch (type) { |