summaryrefslogtreecommitdiff
path: root/Source/Core/Common/MemArenaWin.cpp
diff options
context:
space:
mode:
authorAdmiral H. Curtiss <pikachu025@gmail.com>2023-11-28 21:15:27 +0100
committerAdmiral H. Curtiss <pikachu025@gmail.com>2023-12-09 20:58:07 +0100
commiteb235d6ee30c0f15c775a08842aa070a7839b137 (patch)
tree927ae0cfd9a8b66ded9d4a6c077f3f76311525fc /Source/Core/Common/MemArenaWin.cpp
parent78d22d8003c3739d99759b4676e1f5da4366584c (diff)
Common/MemArenaWin: Move the advanced Windows memory function address initialization into its own struct and function so it can be reused.
Diffstat (limited to 'Source/Core/Common/MemArenaWin.cpp')
-rw-r--r--Source/Core/Common/MemArenaWin.cpp75
1 files changed, 41 insertions, 34 deletions
diff --git a/Source/Core/Common/MemArenaWin.cpp b/Source/Core/Common/MemArenaWin.cpp
index b147ced53f..03a8a463e4 100644
--- a/Source/Core/Common/MemArenaWin.cpp
+++ b/Source/Core/Common/MemArenaWin.cpp
@@ -49,48 +49,55 @@ struct WindowsMemoryRegion
}
};
-MemArena::MemArena()
+static bool InitWindowsMemoryFunctions(WindowsMemoryFunctions* functions)
{
- // Check if VirtualAlloc2 and MapViewOfFile3 are available, which provide functionality to reserve
- // a memory region no other allocation may occupy while still allowing us to allocate and map
- // stuff within it. If they're not available we'll instead fall back to the 'legacy' logic and
- // just hope that nothing allocates in our address range.
DynamicLibrary kernelBase{"KernelBase.dll"};
if (!kernelBase.IsOpen())
- return;
+ return false;
void* const ptr_IsApiSetImplemented = kernelBase.GetSymbolAddress("IsApiSetImplemented");
if (!ptr_IsApiSetImplemented)
- return;
+ return false;
if (!static_cast<PIsApiSetImplemented>(ptr_IsApiSetImplemented)("api-ms-win-core-memory-l1-1-6"))
- return;
+ return false;
- m_api_ms_win_core_memory_l1_1_6_handle.Open("api-ms-win-core-memory-l1-1-6.dll");
- m_kernel32_handle.Open("Kernel32.dll");
- if (!m_api_ms_win_core_memory_l1_1_6_handle.IsOpen() || !m_kernel32_handle.IsOpen())
+ functions->m_api_ms_win_core_memory_l1_1_6_handle.Open("api-ms-win-core-memory-l1-1-6.dll");
+ functions->m_kernel32_handle.Open("Kernel32.dll");
+ if (!functions->m_api_ms_win_core_memory_l1_1_6_handle.IsOpen() ||
+ !functions->m_kernel32_handle.IsOpen())
{
- m_api_ms_win_core_memory_l1_1_6_handle.Close();
- m_kernel32_handle.Close();
- return;
+ functions->m_api_ms_win_core_memory_l1_1_6_handle.Close();
+ functions->m_kernel32_handle.Close();
+ return false;
}
void* const address_VirtualAlloc2 =
- m_api_ms_win_core_memory_l1_1_6_handle.GetSymbolAddress("VirtualAlloc2FromApp");
+ functions->m_api_ms_win_core_memory_l1_1_6_handle.GetSymbolAddress("VirtualAlloc2FromApp");
void* const address_MapViewOfFile3 =
- m_api_ms_win_core_memory_l1_1_6_handle.GetSymbolAddress("MapViewOfFile3FromApp");
- void* const address_UnmapViewOfFileEx = m_kernel32_handle.GetSymbolAddress("UnmapViewOfFileEx");
+ functions->m_api_ms_win_core_memory_l1_1_6_handle.GetSymbolAddress("MapViewOfFile3FromApp");
+ void* const address_UnmapViewOfFileEx =
+ functions->m_kernel32_handle.GetSymbolAddress("UnmapViewOfFileEx");
if (address_VirtualAlloc2 && address_MapViewOfFile3 && address_UnmapViewOfFileEx)
{
- m_address_VirtualAlloc2 = address_VirtualAlloc2;
- m_address_MapViewOfFile3 = address_MapViewOfFile3;
- m_address_UnmapViewOfFileEx = address_UnmapViewOfFileEx;
- }
- else
- {
- // at least one function is not available, use legacy logic
- m_api_ms_win_core_memory_l1_1_6_handle.Close();
- m_kernel32_handle.Close();
+ functions->m_address_VirtualAlloc2 = address_VirtualAlloc2;
+ functions->m_address_MapViewOfFile3 = address_MapViewOfFile3;
+ functions->m_address_UnmapViewOfFileEx = address_UnmapViewOfFileEx;
+ return true;
}
+
+ // at least one function is not available, use legacy logic
+ functions->m_api_ms_win_core_memory_l1_1_6_handle.Close();
+ functions->m_kernel32_handle.Close();
+ return false;
+}
+
+MemArena::MemArena()
+{
+ // Check if VirtualAlloc2 and MapViewOfFile3 are available, which provide functionality to reserve
+ // a memory region no other allocation may occupy while still allowing us to allocate and map
+ // stuff within it. If they're not available we'll instead fall back to the 'legacy' logic and
+ // just hope that nothing allocates in our address range.
+ InitWindowsMemoryFunctions(&m_memory_functions);
}
MemArena::~MemArena()
@@ -146,9 +153,9 @@ u8* MemArena::ReserveMemoryRegion(size_t memory_size)
}
u8* base;
- if (m_api_ms_win_core_memory_l1_1_6_handle.IsOpen())
+ if (m_memory_functions.m_api_ms_win_core_memory_l1_1_6_handle.IsOpen())
{
- base = static_cast<u8*>(static_cast<PVirtualAlloc2>(m_address_VirtualAlloc2)(
+ base = static_cast<u8*>(static_cast<PVirtualAlloc2>(m_memory_functions.m_address_VirtualAlloc2)(
nullptr, nullptr, memory_size, MEM_RESERVE | MEM_RESERVE_PLACEHOLDER, PAGE_NOACCESS,
nullptr, 0));
if (base)
@@ -177,7 +184,7 @@ u8* MemArena::ReserveMemoryRegion(size_t memory_size)
void MemArena::ReleaseMemoryRegion()
{
- if (m_api_ms_win_core_memory_l1_1_6_handle.IsOpen() && m_reserved_region)
+ if (m_memory_functions.m_api_ms_win_core_memory_l1_1_6_handle.IsOpen() && m_reserved_region)
{
// user should have unmapped everything by this point, check if that's true and yell if not
// (it indicates a bug in the emulated memory mapping logic)
@@ -314,7 +321,7 @@ WindowsMemoryRegion* MemArena::EnsureSplitRegionForMapping(void* start_address,
void* MemArena::MapInMemoryRegion(s64 offset, size_t size, void* base)
{
- if (m_api_ms_win_core_memory_l1_1_6_handle.IsOpen())
+ if (m_memory_functions.m_api_ms_win_core_memory_l1_1_6_handle.IsOpen())
{
WindowsMemoryRegion* const region = EnsureSplitRegionForMapping(base, size);
if (!region)
@@ -323,7 +330,7 @@ void* MemArena::MapInMemoryRegion(s64 offset, size_t size, void* base)
return nullptr;
}
- void* rv = static_cast<PMapViewOfFile3>(m_address_MapViewOfFile3)(
+ void* rv = static_cast<PMapViewOfFile3>(m_memory_functions.m_address_MapViewOfFile3)(
m_memory_handle, nullptr, base, offset, size, MEM_REPLACE_PLACEHOLDER, PAGE_READWRITE,
nullptr, 0);
if (rv)
@@ -416,10 +423,10 @@ bool MemArena::JoinRegionsAfterUnmap(void* start_address, size_t size)
void MemArena::UnmapFromMemoryRegion(void* view, size_t size)
{
- if (m_api_ms_win_core_memory_l1_1_6_handle.IsOpen())
+ if (m_memory_functions.m_api_ms_win_core_memory_l1_1_6_handle.IsOpen())
{
- if (static_cast<PUnmapViewOfFileEx>(m_address_UnmapViewOfFileEx)(view,
- MEM_PRESERVE_PLACEHOLDER))
+ if (static_cast<PUnmapViewOfFileEx>(m_memory_functions.m_address_UnmapViewOfFileEx)(
+ view, MEM_PRESERVE_PLACEHOLDER))
{
if (!JoinRegionsAfterUnmap(view, size))
PanicAlertFmt("Joining memory region failed.");