Browse Source

Merge pull request #2185 from FearlessTobi/port-4630

Port citra-emu/citra#4630: "Memory: don't lock hle mutex in memory read/write"
bunnei 7 years ago
parent
commit
cc92c054ec
1 changed files with 0 additions and 6 deletions
  1. 0 6
      src/core/memory.cpp

+ 0 - 6
src/core/memory.cpp

@@ -171,9 +171,6 @@ T Read(const VAddr vaddr) {
         return value;
         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];
     PageType type = current_page_table->attributes[vaddr >> PAGE_BITS];
     switch (type) {
     switch (type) {
     case PageType::Unmapped:
     case PageType::Unmapped:
@@ -204,9 +201,6 @@ void Write(const VAddr vaddr, const T data) {
         return;
         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];
     PageType type = current_page_table->attributes[vaddr >> PAGE_BITS];
     switch (type) {
     switch (type) {
     case PageType::Unmapped:
     case PageType::Unmapped: