From d4ba87d90ae767fcb3b0641e3bcc80bf513f9026 Mon Sep 17 00:00:00 2001 From: Weiyi Wang Date: Sat, 17 Nov 2018 14:34:26 -0500 Subject: [PATCH] Memory: remove GetMMIOHandler with current process --- src/core/memory.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/core/memory.cpp b/src/core/memory.cpp index ed64ee381..f59630940 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp @@ -110,12 +110,6 @@ static MMIORegionPointer GetMMIOHandler(const PageTable& page_table, VAddr vaddr return nullptr; // Should never happen } -static MMIORegionPointer GetMMIOHandler(VAddr vaddr) { - const PageTable& page_table = - Core::System::GetInstance().Kernel().GetCurrentProcess()->vm_manager.page_table; - return GetMMIOHandler(page_table, vaddr); -} - template T ReadMMIO(MMIORegionPointer mmio_handler, VAddr addr); @@ -148,7 +142,7 @@ T Read(const VAddr vaddr) { return value; } case PageType::Special: - return ReadMMIO(GetMMIOHandler(vaddr), vaddr); + return ReadMMIO(GetMMIOHandler(*current_page_table, vaddr), vaddr); default: UNREACHABLE(); } @@ -184,7 +178,7 @@ void Write(const VAddr vaddr, const T data) { break; } case PageType::Special: - WriteMMIO(GetMMIOHandler(vaddr), vaddr, data); + WriteMMIO(GetMMIOHandler(*current_page_table, vaddr), vaddr, data); break; default: UNREACHABLE();