citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

Merge pull request #4630 from wwylele/memory-no-lock 

Memory: don't lock hle mutex in memory read/write
This commit is contained in:
Weiyi Wang 2019-02-25 10:23:23 -05:00 committed by GitHub
parent 5f10cc412f 7074dab2da
commit 206413ba7b
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
View File

@ -182,9 +182,6 @@ T MemorySystem::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 = impl->current_page_table->attributes[vaddr >> PAGE_BITS]; PageType type = impl->current_page_table->attributes[vaddr >> PAGE_BITS];
switch (type) { switch (type) {
case PageType::Unmapped: case PageType::Unmapped:
@ -219,9 +216,6 @@ void MemorySystem::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 = impl->current_page_table->attributes[vaddr >> PAGE_BITS]; PageType type = impl->current_page_table->attributes[vaddr >> PAGE_BITS];
switch (type) { switch (type) {
case PageType::Unmapped: case PageType::Unmapped: