thirdpartymirrors/N64ModernRuntime
1
0
Fork 0
mirror of https://github.com/N64Recomp/N64ModernRuntime.git synced 2026-05-11 03:12:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix rdram allocation to only allow kseg0 accesses

Browse source
This commit is contained in:
Mr-Wiseguy 2024-10-26 20:11:16 -04:00
parent 3e39c2ec34
commit 75c055b1b8
2 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
librecomp/include/librecomp/addresses.hpp
View file

@ -6,8 +6,10 @@
#include "librecomp/recomp.h"
namespace recomp {
// 2GB (Addressable upper half of rdram)
constexpr size_t mem_size = 2U * 1024U * 1024U * 1024U;
// 512GB (kseg0 size)
constexpr size_t mem_size = 512U * 1024U * 1024U;
// 2GB (Addressable upper half of the address space)
constexpr size_t allocation_size = 2048U * 1024U * 1024U;
// We need a place in rdram to hold the PI handles, so pick an address in extended rdram
constexpr int32_t cart_handle = 0x80800000;
constexpr int32_t drive_handle = (int32_t)(cart_handle + sizeof(OSPiHandle));

23
librecomp/src/recomp.cpp
View file

@ -609,15 +609,30 @@ void recomp::start(
}
// Allocate rdram without comitting it. Use a platform-specific virtual allocation function
// that initializes to zero.
// that initializes to zero. Protect the region above the memory size to catch accesses to invalid addresses.
uint8_t* rdram;
bool alloc_failed;
#ifdef _WIN32
rdram = reinterpret_cast<uint8_t*>(VirtualAlloc(nullptr, mem_size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE));
rdram = reinterpret_cast<uint8_t*>(VirtualAlloc(nullptr, allocation_size, MEM_COMMIT | MEM_RESERVE, PAGE_NOACCESS));
DWORD old_protect = 0;
alloc_failed = (rdram == nullptr);
if (!alloc_failed) {
// VirtualProtect returns 0 on failure.
alloc_failed = (VirtualProtect(rdram, mem_size, PAGE_READWRITE, &old_protect) == 0);
if (alloc_failed) {
VirtualFree(rdram, 0, MEM_RELEASE);
}
}
#else
rdram = (uint8_t*)mmap(NULL, mem_size, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0);
rdram = (uint8_t*)mmap(NULL, allocation_size, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0);
alloc_failed = rdram == reinterpret_cast<uint8_t*>(MAP_FAILED);
if (!alloc_failed) {
// mprotect returns -1 on failure.
alloc_failed = (mprotect(rdram, mem_size, PROT_READ | PROT_WRITE) == -1);
if (alloc_failed) {
munmap(rdram, allocation_size);
}
}
#endif
if (alloc_failed) {
@ -659,7 +674,7 @@ void recomp::start(
free_failed = (VirtualFree(rdram, 0, MEM_RELEASE) == 0);
#else
// munmap returns -1 on failure.
free_failed = (munmap(rdram, mem_size) == -1);
free_failed = (munmap(rdram, allocation_size) == -1);
#endif
if (free_failed) {