From 812cc8b6322fa72982a3084bb3de4bdb564331fe Mon Sep 17 00:00:00 2001
From: "Admiral H. Curtiss" <pikachu025@gmail.com>
Date: Mon, 21 Jun 2021 01:17:07 +0200
Subject: MemArena: Split into three separate files for each OS.

---
 Source/Core/Common/MemArenaWin.cpp | 61 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 Source/Core/Common/MemArenaWin.cpp

(limited to 'Source/Core/Common/MemArenaWin.cpp')

diff --git a/Source/Core/Common/MemArenaWin.cpp b/Source/Core/Common/MemArenaWin.cpp
new file mode 100644
index 0000000000..e65e642028
--- /dev/null
+++ b/Source/Core/Common/MemArenaWin.cpp
@@ -0,0 +1,61 @@
+// Copyright 2008 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "Common/MemArena.h"
+
+#include <cstddef>
+#include <cstdlib>
+#include <set>
+#include <string>
+
+#include <windows.h>
+
+#include "Common/CommonFuncs.h"
+#include "Common/CommonTypes.h"
+#include "Common/Logging/Log.h"
+#include "Common/MsgHandler.h"
+#include "Common/StringUtil.h"
+
+namespace Common
+{
+void MemArena::GrabSHMSegment(size_t size)
+{
+  const std::string name = "dolphin-emu." + std::to_string(GetCurrentProcessId());
+  hMemoryMapping = CreateFileMapping(INVALID_HANDLE_VALUE, nullptr, PAGE_READWRITE, 0,
+                                     static_cast<DWORD>(size), UTF8ToTStr(name).c_str());
+}
+
+void MemArena::ReleaseSHMSegment()
+{
+  CloseHandle(hMemoryMapping);
+  hMemoryMapping = 0;
+}
+
+void* MemArena::CreateView(s64 offset, size_t size, void* base)
+{
+  return MapViewOfFileEx(hMemoryMapping, FILE_MAP_ALL_ACCESS, 0, (DWORD)((u64)offset), size, base);
+}
+
+void MemArena::ReleaseView(void* view, size_t size)
+{
+  UnmapViewOfFile(view);
+}
+
+u8* MemArena::FindMemoryBase()
+{
+#if _ARCH_32
+  const size_t memory_size = 0x31000000;
+#else
+  const size_t memory_size = 0x400000000;
+#endif
+
+  u8* base = static_cast<u8*>(VirtualAlloc(nullptr, memory_size, MEM_RESERVE, PAGE_READWRITE));
+  if (!base)
+  {
+    PanicAlertFmt("Failed to map enough memory space: {}", GetLastErrorString());
+    return nullptr;
+  }
+  VirtualFree(base, 0, MEM_RELEASE);
+  return base;
+}
+}  // namespace Common
-- 
cgit v1.2.3


From 155412856072c07521536d5a07117c400c0ce131 Mon Sep 17 00:00:00 2001
From: "Admiral H. Curtiss" <pikachu025@gmail.com>
Date: Mon, 21 Jun 2021 02:13:00 +0200
Subject: MemArena: Prepare interface for proper memory reservation.

---
 Source/Core/Common/MemArenaWin.cpp | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

(limited to 'Source/Core/Common/MemArenaWin.cpp')

diff --git a/Source/Core/Common/MemArenaWin.cpp b/Source/Core/Common/MemArenaWin.cpp
index e65e642028..3229e417ab 100644
--- a/Source/Core/Common/MemArenaWin.cpp
+++ b/Source/Core/Common/MemArenaWin.cpp
@@ -18,6 +18,9 @@
 
 namespace Common
 {
+MemArena::MemArena() = default;
+MemArena::~MemArena() = default;
+
 void MemArena::GrabSHMSegment(size_t size)
 {
   const std::string name = "dolphin-emu." + std::to_string(GetCurrentProcessId());
@@ -31,24 +34,18 @@ void MemArena::ReleaseSHMSegment()
   hMemoryMapping = 0;
 }
 
-void* MemArena::CreateView(s64 offset, size_t size, void* base)
+void* MemArena::CreateView(s64 offset, size_t size)
 {
-  return MapViewOfFileEx(hMemoryMapping, FILE_MAP_ALL_ACCESS, 0, (DWORD)((u64)offset), size, base);
+  return MapInMemoryRegion(offset, size, nullptr);
 }
 
 void MemArena::ReleaseView(void* view, size_t size)
 {
-  UnmapViewOfFile(view);
+  UnmapFromMemoryRegion(view, size);
 }
 
-u8* MemArena::FindMemoryBase()
+u8* MemArena::ReserveMemoryRegion(size_t memory_size)
 {
-#if _ARCH_32
-  const size_t memory_size = 0x31000000;
-#else
-  const size_t memory_size = 0x400000000;
-#endif
-
   u8* base = static_cast<u8*>(VirtualAlloc(nullptr, memory_size, MEM_RESERVE, PAGE_READWRITE));
   if (!base)
   {
@@ -58,4 +55,18 @@ u8* MemArena::FindMemoryBase()
   VirtualFree(base, 0, MEM_RELEASE);
   return base;
 }
+
+void MemArena::ReleaseMemoryRegion()
+{
+}
+
+void* MemArena::MapInMemoryRegion(s64 offset, size_t size, void* base)
+{
+  return MapViewOfFileEx(hMemoryMapping, FILE_MAP_ALL_ACCESS, 0, (DWORD)((u64)offset), size, base);
+}
+
+void MemArena::UnmapFromMemoryRegion(void* view, size_t size)
+{
+  UnmapViewOfFile(view);
+}
 }  // namespace Common
-- 
cgit v1.2.3