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

Core: Reserve data and code areas together 

They need to stay near each other for the x86 JIT to work
This commit is contained in:
TellowKrinkle 2024-08-21 02:50:48 -05:00
parent 6c262b8ef3
commit ece5ff3cee
1 changed files with 16 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
pcsx2/Memory.cpp
View File

@ -49,9 +49,6 @@ namespace Ps2MemSize
namespace SysMemory namespace SysMemory
{ {
static u8* TryAllocateVirtualMemory(const char* name, void* file_handle, uptr base, size_t size);
static u8* AllocateVirtualMemory(const char* name, void* file_handle, size_t size, size_t offset_from_base);
static bool AllocateMemoryMap(); static bool AllocateMemoryMap();
static void DumpMemoryMap(); static void DumpMemoryMap();
static void ReleaseMemoryMap(); static void ReleaseMemoryMap();
@ -59,6 +56,7 @@ namespace SysMemory
static u8* s_data_memory; static u8* s_data_memory;
static void* s_data_memory_file_handle; static void* s_data_memory_file_handle;
static u8* s_code_memory; static u8* s_code_memory;
static std::unique_ptr<SharedMemoryMappingArea> s_memory_mapping_area;
} // namespace SysMemory } // namespace SysMemory
static void memAllocate(); static void memAllocate();
@ -86,45 +84,6 @@ namespace HostMemoryMap
} }
} // namespace HostMemoryMap } // namespace HostMemoryMap
u8* SysMemory::TryAllocateVirtualMemory(const char* name, void* file_handle, uptr base, size_t size)
{
u8* baseptr;
if (file_handle)
baseptr = static_cast<u8*>(HostSys::MapSharedMemory(file_handle, 0, (void*)base, size, PageAccess_ReadWrite()));
else
baseptr = static_cast<u8*>(HostSys::Mmap((void*)base, size, PageAccess_Any()));
if (!baseptr)
return nullptr;
if (base != 0 && (uptr)baseptr != base)
{
if (file_handle)
{
if (baseptr)
HostSys::UnmapSharedMemory(baseptr, size);
}
else
{
if (baseptr)
HostSys::Munmap(baseptr, size);
}
return nullptr;
}
DevCon.WriteLn(Color_Gray, "%-32s @ 0x%016" PRIXPTR " -> 0x%016" PRIXPTR " %s", name,
baseptr, (uptr)baseptr + size, fmt::format("[{}mb]", size / _1mb).c_str());
return baseptr;
}
u8* SysMemory::AllocateVirtualMemory(const char* name, void* file_handle, size_t size, size_t offset_from_base)
{
return TryAllocateVirtualMemory(name, file_handle, 0, size);
}
bool SysMemory::AllocateMemoryMap() bool SysMemory::AllocateMemoryMap()
{ {
s_data_memory_file_handle = HostSys::CreateSharedMemory(HostSys::GetFileMappingName("pcsx2").c_str(), HostMemoryMap::MainSize); s_data_memory_file_handle = HostSys::CreateSharedMemory(HostSys::GetFileMappingName("pcsx2").c_str(), HostMemoryMap::MainSize);
@ -135,16 +94,23 @@ bool SysMemory::AllocateMemoryMap()
return false; return false;
} }
if ((s_data_memory = AllocateVirtualMemory("Data Memory", s_data_memory_file_handle, HostMemoryMap::MainSize, 0)) == nullptr) if (!(s_memory_mapping_area = SharedMemoryMappingArea::Create(HostMemoryMap::MainSize + HostMemoryMap::CodeSize, true)))
{ {
Host::ReportErrorAsync("Error", "Failed to map data memory at an acceptable location."); Host::ReportErrorAsync("Error", "Failed to map main memory.");
ReleaseMemoryMap(); ReleaseMemoryMap();
return false; return false;
} }
if ((s_code_memory = AllocateVirtualMemory("Code Memory", nullptr, HostMemoryMap::CodeSize, HostMemoryMap::MainSize)) == nullptr) if ((s_data_memory = s_memory_mapping_area->Map(s_data_memory_file_handle, 0, s_memory_mapping_area->BasePointer(), HostMemoryMap::MainSize, PageAccess_ReadWrite())) == nullptr)
{ {
Host::ReportErrorAsync("Error", "Failed to allocate code memory at an acceptable location."); Host::ReportErrorAsync("Error", "Failed to map data memory.");
ReleaseMemoryMap();
return false;
}
if ((s_code_memory = s_memory_mapping_area->Map(nullptr, 0, s_memory_mapping_area->OffsetPointer(HostMemoryMap::MainSize), HostMemoryMap::CodeSize, PageAccess_Any())) == nullptr)
{
Host::ReportErrorAsync("Error", "Failed to allocate code memory.");
ReleaseMemoryMap(); ReleaseMemoryMap();
return false; return false;
} }
@ -186,16 +152,18 @@ void SysMemory::ReleaseMemoryMap()
{ {
if (s_code_memory) if (s_code_memory)
{ {
HostSys::Munmap(s_code_memory, HostMemoryMap::CodeSize); s_memory_mapping_area->Unmap(s_code_memory, HostMemoryMap::CodeSize);
s_code_memory = nullptr; s_code_memory = nullptr;
} }
if (s_data_memory) if (s_data_memory)
{ {
HostSys::UnmapSharedMemory(s_data_memory, HostMemoryMap::MainSize); s_memory_mapping_area->Unmap(s_data_memory, HostMemoryMap::MainSize);
s_data_memory = nullptr; s_data_memory = nullptr;
} }
s_memory_mapping_area.reset();
if (s_data_memory_file_handle) if (s_data_memory_file_handle)
{ {
HostSys::DestroySharedMemory(s_data_memory_file_handle); HostSys::DestroySharedMemory(s_data_memory_file_handle);