From 50a518be69ef871a674afd91caebdf31cbda4485 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Tue, 26 Nov 2019 18:28:44 -0500
Subject: core/memory: Migrate over GetPointerFromVMA() to the Memory class

Now that everything else is migrated over, this is essentially just code
relocation and conversion of a global accessor to the class member
variable.

All that remains is to migrate over the page table.
---
 src/core/memory.cpp | 72 ++++++++++++++++++++++++++---------------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

(limited to 'src')

diff --git a/src/core/memory.cpp b/src/core/memory.cpp
index 5c940a82e..a49e971aa 100644
--- a/src/core/memory.cpp
+++ b/src/core/memory.cpp
@@ -22,42 +22,6 @@
 namespace Memory {
 namespace {
 Common::PageTable* current_page_table = nullptr;
-
-/**
- * Gets a pointer to the exact memory at the virtual address (i.e. not page aligned)
- * using a VMA from the current process
- */
-u8* GetPointerFromVMA(const Kernel::Process& process, VAddr vaddr) {
-    const auto& vm_manager = process.VMManager();
-
-    const auto it = vm_manager.FindVMA(vaddr);
-    DEBUG_ASSERT(vm_manager.IsValidHandle(it));
-
-    u8* direct_pointer = nullptr;
-    const auto& vma = it->second;
-    switch (vma.type) {
-    case Kernel::VMAType::AllocatedMemoryBlock:
-        direct_pointer = vma.backing_block->data() + vma.offset;
-        break;
-    case Kernel::VMAType::BackingMemory:
-        direct_pointer = vma.backing_memory;
-        break;
-    case Kernel::VMAType::Free:
-        return nullptr;
-    default:
-        UNREACHABLE();
-    }
-
-    return direct_pointer + (vaddr - vma.base);
-}
-
-/**
- * Gets a pointer to the exact memory at the virtual address (i.e. not page aligned)
- * using a VMA from the current process.
- */
-u8* GetPointerFromVMA(VAddr vaddr) {
-    return ::Memory::GetPointerFromVMA(*Core::System::GetInstance().CurrentProcess(), vaddr);
-}
 } // Anonymous namespace
 
 // Implementation class used to keep the specifics of the memory subsystem hidden
@@ -135,6 +99,42 @@ struct Memory::Impl {
         return IsValidVirtualAddress(*system.CurrentProcess(), vaddr);
     }
 
+    /**
+     * Gets a pointer to the exact memory at the virtual address (i.e. not page aligned)
+     * using a VMA from the current process
+     */
+    u8* GetPointerFromVMA(const Kernel::Process& process, VAddr vaddr) {
+        const auto& vm_manager = process.VMManager();
+
+        const auto it = vm_manager.FindVMA(vaddr);
+        DEBUG_ASSERT(vm_manager.IsValidHandle(it));
+
+        u8* direct_pointer = nullptr;
+        const auto& vma = it->second;
+        switch (vma.type) {
+        case Kernel::VMAType::AllocatedMemoryBlock:
+            direct_pointer = vma.backing_block->data() + vma.offset;
+            break;
+        case Kernel::VMAType::BackingMemory:
+            direct_pointer = vma.backing_memory;
+            break;
+        case Kernel::VMAType::Free:
+            return nullptr;
+        default:
+            UNREACHABLE();
+        }
+
+        return direct_pointer + (vaddr - vma.base);
+    }
+
+    /**
+     * Gets a pointer to the exact memory at the virtual address (i.e. not page aligned)
+     * using a VMA from the current process.
+     */
+    u8* GetPointerFromVMA(VAddr vaddr) {
+        return GetPointerFromVMA(*system.CurrentProcess(), vaddr);
+    }
+
     u8* GetPointer(const VAddr vaddr) {
         u8* const page_pointer = current_page_table->pointers[vaddr >> PAGE_BITS];
         if (page_pointer != nullptr) {
-- 
cgit v1.2.3