Merge pull request #3666 from bunnei/new-vmm

Implement a new virtual memory manager

1 files changed, 10 insertions, 7 deletions

diff --git a/src/core/memory/cheat_engine.cpp b/src/core/memory/cheat_engine.cpp
index 4472500d2..b139e8465 100644
--- a/src/core/memory/cheat_engine.cpp
+++ b/src/core/memory/cheat_engine.cpp
@@ -10,13 +10,15 @@
 #include "core/core_timing.h"
 #include "core/core_timing_util.h"
 #include "core/hardware_properties.h"
+#include "core/hle/kernel/memory/page_table.h"
 #include "core/hle/kernel/process.h"
 #include "core/hle/service/hid/controllers/npad.h"
 #include "core/hle/service/hid/hid.h"
 #include "core/hle/service/sm/sm.h"
+#include "core/memory.h"
 #include "core/memory/cheat_engine.h"
 
-namespace Memory {
+namespace Core::Memory {
 
 constexpr s64 CHEAT_ENGINE_TICKS = static_cast<s64>(Core::Hardware::BASE_CLOCK_RATE / 12);
 constexpr u32 KEYPAD_BITMASK = 0x3FFFFFF;
@@ -194,11 +196,12 @@ void CheatEngine::Initialize() {
     metadata.process_id = system.CurrentProcess()->GetProcessID();
     metadata.title_id = system.CurrentProcess()->GetTitleID();
 
-    const auto& vm_manager = system.CurrentProcess()->VMManager();
-    metadata.heap_extents = {vm_manager.GetHeapRegionBaseAddress(), vm_manager.GetHeapRegionSize()};
-    metadata.address_space_extents = {vm_manager.GetAddressSpaceBaseAddress(),
-                                      vm_manager.GetAddressSpaceSize()};
-    metadata.alias_extents = {vm_manager.GetMapRegionBaseAddress(), vm_manager.GetMapRegionSize()};
+    const auto& page_table = system.CurrentProcess()->PageTable();
+    metadata.heap_extents = {page_table.GetHeapRegionStart(), page_table.GetHeapRegionSize()};
+    metadata.address_space_extents = {page_table.GetAddressSpaceStart(),
+                                      page_table.GetAddressSpaceSize()};
+    metadata.alias_extents = {page_table.GetAliasCodeRegionStart(),
+                              page_table.GetAliasCodeRegionSize()};
 
     is_pending_reload.exchange(true);
 }
@@ -230,4 +233,4 @@ void CheatEngine::FrameCallback(u64 userdata, s64 cycles_late) {
     core_timing.ScheduleEvent(CHEAT_ENGINE_TICKS - cycles_late, event);
 }
 
-} // namespace Memory
+} // namespace Core::Memory