ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12173 from AdmiralCurtiss/fixed-mapping-assert 

Common/MemArena: LazyMemoryRegion fixes.
This commit is contained in:
JosJuice 2023-09-07 19:28:46 +02:00 committed by GitHub
parent c0440df288 422bc7a627
commit cc01b4b997
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/Common/MemArenaAndroid.cpp
View File

@ -155,8 +155,11 @@ void* LazyMemoryRegion::Create(size_t size)
{ {
ASSERT(!m_memory); ASSERT(!m_memory);
if (size == 0)
return nullptr;
void* memory = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); void* memory = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
if (!memory) if (memory == MAP_FAILED)
{ {
NOTICE_LOG_FMT(MEMMAP, "Memory allocation of {} bytes failed.", size); NOTICE_LOG_FMT(MEMMAP, "Memory allocation of {} bytes failed.", size);
return nullptr; return nullptr;
@ -172,7 +175,9 @@ void LazyMemoryRegion::Clear()
{ {
ASSERT(m_memory); ASSERT(m_memory);
mmap(m_memory, m_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0); void* new_memory = mmap(m_memory, m_size, PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
ASSERT(new_memory == m_memory);
} }
void LazyMemoryRegion::Release() void LazyMemoryRegion::Release()

9
Source/Core/Common/MemArenaUnix.cpp
View File

@ -121,8 +121,11 @@ void* LazyMemoryRegion::Create(size_t size)
{ {
ASSERT(!m_memory); ASSERT(!m_memory);
if (size == 0)
return nullptr;
void* memory = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); void* memory = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
if (!memory) if (memory == MAP_FAILED)
{ {
NOTICE_LOG_FMT(MEMMAP, "Memory allocation of {} bytes failed.", size); NOTICE_LOG_FMT(MEMMAP, "Memory allocation of {} bytes failed.", size);
return nullptr; return nullptr;
@ -138,7 +141,9 @@ void LazyMemoryRegion::Clear()
{ {
ASSERT(m_memory); ASSERT(m_memory);
mmap(m_memory, m_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0); void* new_memory = mmap(m_memory, m_size, PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
ASSERT(new_memory == m_memory);
} }
void LazyMemoryRegion::Release() void LazyMemoryRegion::Release()

3
Source/Core/Common/MemArenaWin.cpp
View File

@ -445,6 +445,9 @@ void* LazyMemoryRegion::Create(size_t size)
{ {
ASSERT(!m_memory); ASSERT(!m_memory);
if (size == 0)
return nullptr;
void* memory = VirtualAlloc(nullptr, size, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); void* memory = VirtualAlloc(nullptr, size, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE);
if (!memory) if (!memory)
{ {