CCF_100
/
yuzu-mirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2185 from FearlessTobi/port-4630 

Port citra-emu/citra#4630: "Memory: don't lock hle mutex in memory read/write"
master
bunnei 2019-03-04 18:44:53 +07:00 committed by GitHub
parent 07e13d6728 5159f4eee8
commit cc92c054ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/memory.cpp
Unescape Escape View File

@ -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: