summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2019-03-05 00:44:53 +0100
committerGitHub <noreply@github.com>2019-03-05 00:44:53 +0100
commitcc92c054ec825c7b40518fdc90a0c9a307567303 (patch)
tree100134f312b1039bafa79bd3a9bf920e8d52d8be /src
parentMerge pull request #2165 from ReinUsesLisp/unbind-tex (diff)
parentMemory: don't lock hle mutex in memory read/write (diff)
downloadyuzu-cc92c054ec825c7b40518fdc90a0c9a307567303.tar
yuzu-cc92c054ec825c7b40518fdc90a0c9a307567303.tar.gz
yuzu-cc92c054ec825c7b40518fdc90a0c9a307567303.tar.bz2
yuzu-cc92c054ec825c7b40518fdc90a0c9a307567303.tar.lz
yuzu-cc92c054ec825c7b40518fdc90a0c9a307567303.tar.xz
yuzu-cc92c054ec825c7b40518fdc90a0c9a307567303.tar.zst
yuzu-cc92c054ec825c7b40518fdc90a0c9a307567303.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/memory.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/core/memory.cpp b/src/core/memory.cpp
index f809567b6..ec279cef8 100644
--- a/src/core/memory.cpp
+++ b/src/core/memory.cpp
@@ -171,9 +171,6 @@ 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::recursive_mutex> lock(HLE::g_hle_lock);
-
PageType type = current_page_table->attributes[vaddr >> PAGE_BITS];
switch (type) {
case PageType::Unmapped:
@@ -204,9 +201,6 @@ 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::recursive_mutex> lock(HLE::g_hle_lock);
-
PageType type = current_page_table->attributes[vaddr >> PAGE_BITS];
switch (type) {
case PageType::Unmapped: