summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWeiyi Wang <wwylele@gmail.com>2019-02-08 16:43:06 +0100
committerfearlessTobi <thm.frey@gmail.com>2019-03-02 15:20:05 +0100
commit5159f4eee882027928098962cdcd71a0b56bfd38 (patch)
tree3f4898bdaeb0a06ee5c6f93f387423b5e933d572
parentMerge pull request #2182 from bunnei/my-wasted-friday (diff)
downloadyuzu-5159f4eee882027928098962cdcd71a0b56bfd38.tar
yuzu-5159f4eee882027928098962cdcd71a0b56bfd38.tar.gz
yuzu-5159f4eee882027928098962cdcd71a0b56bfd38.tar.bz2
yuzu-5159f4eee882027928098962cdcd71a0b56bfd38.tar.lz
yuzu-5159f4eee882027928098962cdcd71a0b56bfd38.tar.xz
yuzu-5159f4eee882027928098962cdcd71a0b56bfd38.tar.zst
yuzu-5159f4eee882027928098962cdcd71a0b56bfd38.zip
-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: