From 79b837afa7b1c1280c5818c952c3300518abf5d4 Mon Sep 17 00:00:00 2001 From: bamsbamx Date: Thu, 27 Jun 2019 16:33:55 +0200 Subject: [PATCH] kernel: Rename memory page table set function --- src/core/hle/kernel/kernel.cpp | 4 ++-- src/core/hle/kernel/kernel.h | 2 +- src/tests/core/arm/arm_test_common.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 2c569355a9..f480f6362e 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -48,10 +48,10 @@ std::shared_ptr KernelSystem::GetCurrentProcess() const { void KernelSystem::SetCurrentProcess(std::shared_ptr process) { current_process = process; - SetCurrentMemPageTable(&process->vm_manager.page_table); + SetCurrentMemoryPageTable(&process->vm_manager.page_table); } -void KernelSystem::SetCurrentMemPageTable(Memory::PageTable* page_table) { +void KernelSystem::SetCurrentMemoryPageTable(Memory::PageTable* page_table) { memory.SetCurrentPageTable(page_table); if (current_cpu != nullptr) { current_cpu->PageTableChanged(); // notify the CPU the page table in memory has changed diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index a9632be42c..38045a4255 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h @@ -207,7 +207,7 @@ public: std::shared_ptr GetCurrentProcess() const; void SetCurrentProcess(std::shared_ptr process); - void SetCurrentMemPageTable(Memory::PageTable* page_table); + void SetCurrentMemoryPageTable(Memory::PageTable* page_table); void SetCPU(std::shared_ptr cpu); diff --git a/src/tests/core/arm/arm_test_common.cpp b/src/tests/core/arm/arm_test_common.cpp index 6cb90a48f8..dbbc21c8c6 100644 --- a/src/tests/core/arm/arm_test_common.cpp +++ b/src/tests/core/arm/arm_test_common.cpp @@ -28,7 +28,7 @@ TestEnvironment::TestEnvironment(bool mutable_memory_) memory->MapIoRegion(*page_table, 0x00000000, 0x80000000, test_memory); memory->MapIoRegion(*page_table, 0x80000000, 0x80000000, test_memory); - kernel->SetCurrentMemPageTable(page_table); + kernel->SetCurrentMemoryPageTable(page_table); } TestEnvironment::~TestEnvironment() {