Просмотр исходного кода

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 лет назад
Родитель
Сommit
cc92c054ec
1 измененных файлов с 0 добавлено и 6 удалено
  1. 0 6
      src/core/memory.cpp

+ 0 - 6
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: