From c962cfdc281ac48a075ef9b3f6aed0dd512eca67 Mon Sep 17 00:00:00 2001 From: Jesse Buhagiar Date: Mon, 17 Oct 2022 23:53:57 +1100 Subject: [PATCH] Kernel: Reintroduce `ScopedAddressSpaceSwitcher` to aarch64 build --- Kernel/CMakeLists.txt | 1 + Kernel/Memory/ScopedAddressSpaceSwitcher.cpp | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt index 5b0448fd1a..1468086fae 100644 --- a/Kernel/CMakeLists.txt +++ b/Kernel/CMakeLists.txt @@ -532,6 +532,7 @@ else() Memory/RegionTree.cpp Memory/RingBuffer.cpp Memory/ScatterGatherList.cpp + Memory/ScopedAddressSpaceSwitcher.cpp Memory/SharedInodeVMObject.cpp Memory/VirtualRange.cpp Memory/VMObject.cpp diff --git a/Kernel/Memory/ScopedAddressSpaceSwitcher.cpp b/Kernel/Memory/ScopedAddressSpaceSwitcher.cpp index 266e7ff1cc..1b12b1715f 100644 --- a/Kernel/Memory/ScopedAddressSpaceSwitcher.cpp +++ b/Kernel/Memory/ScopedAddressSpaceSwitcher.cpp @@ -13,15 +13,23 @@ namespace Kernel { ScopedAddressSpaceSwitcher::ScopedAddressSpaceSwitcher(Process& process) { VERIFY(Thread::current() != nullptr); +#if ARCH(I386) || ARCH(X86_64) m_previous_cr3 = read_cr3(); +#elif ARCH(AARC64) + TODO_AARCH64(); +#endif Memory::MemoryManager::enter_process_address_space(process); } ScopedAddressSpaceSwitcher::~ScopedAddressSpaceSwitcher() { InterruptDisabler disabler; +#if ARCH(I386) || ARCH(X86_64) Thread::current()->regs().cr3 = m_previous_cr3; write_cr3(m_previous_cr3); +#elif ARCH(AARC64) + TODO_AARCH64(); +#endif } }