Kernel: Move ProcessPagingScope to its own files

4 files changed, 89 insertions, 23 deletions

diff --git a/Kernel/VM/MemoryManager.cpp b/Kernel/VM/MemoryManager.cpp
index 960458ac94..585310f81c 100644
--- a/Kernel/VM/MemoryManager.cpp
+++ b/Kernel/VM/MemoryManager.cpp
@@ -699,18 +699,4 @@ void MemoryManager::dump_kernel_regions()
     }
 }
 
-ProcessPagingScope::ProcessPagingScope(Process& process)
-{
-    ASSERT(Thread::current);
-    m_previous_cr3 = read_cr3();
-    MM.enter_process_paging_scope(process);
-}
-
-ProcessPagingScope::~ProcessPagingScope()
-{
-    InterruptDisabler disabler;
-    Thread::current->tss().cr3 = m_previous_cr3;
-    write_cr3(m_previous_cr3);
-}
-
 }
diff --git a/Kernel/VM/MemoryManager.h b/Kernel/VM/MemoryManager.h
index ab5023e080..1c58d3aae0 100644
--- a/Kernel/VM/MemoryManager.h
+++ b/Kernel/VM/MemoryManager.h
@@ -190,15 +190,6 @@ private:
     bool m_quickmap_in_use { false };
 };
 
-class ProcessPagingScope {
-public:
-    explicit ProcessPagingScope(Process&);
-    ~ProcessPagingScope();
-
-private:
-    u32 m_previous_cr3 { 0 };
-};
-
 template<typename Callback>
 void VMObject::for_each_region(Callback callback)
 {
diff --git a/Kernel/VM/ProcessPagingScope.cpp b/Kernel/VM/ProcessPagingScope.cpp
new file mode 100644
index 0000000000..9fbaf7da06
--- /dev/null
+++ b/Kernel/VM/ProcessPagingScope.cpp
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <Kernel/VM/MemoryManager.h>
+#include <Kernel/VM/ProcessPagingScope.h>
+
+namespace Kernel {
+
+ProcessPagingScope::ProcessPagingScope(Process& process)
+{
+    ASSERT(Thread::current);
+    m_previous_cr3 = read_cr3();
+    MM.enter_process_paging_scope(process);
+}
+
+ProcessPagingScope::~ProcessPagingScope()
+{
+    InterruptDisabler disabler;
+    Thread::current->tss().cr3 = m_previous_cr3;
+    write_cr3(m_previous_cr3);
+}
+
+}
diff --git a/Kernel/VM/ProcessPagingScope.h b/Kernel/VM/ProcessPagingScope.h
new file mode 100644
index 0000000000..4942b37a89
--- /dev/null
+++ b/Kernel/VM/ProcessPagingScope.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include <AK/Types.h>
+#include <Kernel/Forward.h>
+
+namespace Kernel {
+
+class ProcessPagingScope {
+public:
+    explicit ProcessPagingScope(Process&);
+    ~ProcessPagingScope();
+
+private:
+    u32 m_previous_cr3 { 0 };
+};
+
+}