piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2024-11-14 13:27:41 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

use lots of PROT_NONE memory to reliably reserve virtual address space

Browse Source
This commit is contained in:
RSDuck 2024-10-30 00:04:55 +01:00
parent 2f6a740b65
commit 04fe90b437
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/ARMJIT_Memory.cpp
View File

@ -100,6 +100,9 @@
namespace melonDS namespace melonDS
{ {
static constexpr u64 AddrSpaceSize = 0x100000000;
static constexpr u64 VirtmemAreaSize = AddrSpaceSize * 2 + MemoryTotalSize;
using Platform::Log; using Platform::Log;
using Platform::LogLevel; using Platform::LogLevel;
@ -288,7 +291,7 @@ bool ARMJIT_Memory::UnmapFromRange(u32 addr, u32 num, u32 offset, u32 size) noex
#elif defined(_WIN32) #elif defined(_WIN32)
return UnmapViewOfFile(dst); return UnmapViewOfFile(dst);
#else #else
return munmap(dst, size) == 0; return mmap(dst, size, PROT_NONE, MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0) != MAP_FAILED;
#endif #endif
} }
@ -643,8 +646,6 @@ bool ARMJIT_Memory::FaultHandler(FaultDescription& faultDesc, melonDS::NDS& nds)
return false; return false;
} }
const u64 AddrSpaceSize = 0x100000000;
ARMJIT_Memory::ARMJIT_Memory(melonDS::NDS& nds) : NDS(nds) ARMJIT_Memory::ARMJIT_Memory(melonDS::NDS& nds) : NDS(nds)
{ {
#if defined(__SWITCH__) #if defined(__SWITCH__)
@ -689,15 +690,9 @@ ARMJIT_Memory::ARMJIT_Memory(melonDS::NDS& nds) : NDS(nds)
MapViewOfFileEx(MemoryFile, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, MemoryTotalSize, MemoryBase); MapViewOfFileEx(MemoryFile, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, MemoryTotalSize, MemoryBase);
#else #else
// this used to be allocated with three different mmaps MemoryBase = (u8*)mmap(NULL, VirtmemAreaSize, PROT_NONE, MAP_ANON | MAP_PRIVATE, -1, 0);
// The idea was to give the OS more freedom where to position the buffers, FastMem9Start = MemoryBase+MemoryTotalSize;
// but something was bad about this so instead we take this vmem eating monster FastMem7Start = static_cast<u8*>(FastMem9Start)+AddrSpaceSize;
// which seems to work better.
MemoryBase = (u8*)mmap(NULL, AddrSpaceSize*4, PROT_NONE, MAP_ANON | MAP_PRIVATE, -1, 0);
munmap(MemoryBase, AddrSpaceSize*4);
FastMem9Start = MemoryBase;
FastMem7Start = MemoryBase + AddrSpaceSize;
MemoryBase = MemoryBase + AddrSpaceSize*2;
#if defined(__ANDROID__) #if defined(__ANDROID__)
Libandroid = Platform::DynamicLibrary_Load("libandroid.so"); Libandroid = Platform::DynamicLibrary_Load("libandroid.so");
@ -791,7 +786,7 @@ ARMJIT_Memory::~ARMJIT_Memory() noexcept
#endif #endif
if (MemoryBase) if (MemoryBase)
{ {
munmap(MemoryBase, MemoryTotalSize); munmap(MemoryBase, VirtmemAreaSize);
MemoryBase = nullptr; MemoryBase = nullptr;
FastMem9Start = nullptr; FastMem9Start = nullptr;
FastMem7Start = nullptr; FastMem7Start = nullptr;