From e88cd338f1582f77940fb5583e7fb0967c4f2f25 Mon Sep 17 00:00:00 2001
From: Timon Kruiper <timonkruiper@gmail.com>
Date: Mon, 9 May 2022 23:20:57 +0200
Subject: [PATCH] Kernel: Move Prekernel{CPU, Exceptions}.cpp out of Prekernel
 directory

This lets us delete the Prekernel.h file, and gets us closer to deleting
the Prekernel from the aarch64 Kernel.
---
 Kernel/Arch/aarch64/CPU.h                          |  7 +++++++
 .../PrekernelExceptions.cpp => Exceptions.cpp}     |  2 +-
 .../{Prekernel/PrekernelMMU.cpp => MMU.cpp}        |  2 +-
 Kernel/Arch/aarch64/Prekernel/Prekernel.h          | 14 --------------
 Kernel/Arch/aarch64/Processor.cpp                  |  1 -
 Kernel/Arch/aarch64/init.cpp                       |  1 -
 Kernel/CMakeLists.txt                              |  4 ++--
 7 files changed, 11 insertions(+), 20 deletions(-)
 rename Kernel/Arch/aarch64/{Prekernel/PrekernelExceptions.cpp => Exceptions.cpp} (98%)
 rename Kernel/Arch/aarch64/{Prekernel/PrekernelMMU.cpp => MMU.cpp} (99%)
 delete mode 100644 Kernel/Arch/aarch64/Prekernel/Prekernel.h

diff --git a/Kernel/Arch/aarch64/CPU.h b/Kernel/Arch/aarch64/CPU.h
index 7a59983909..a71c4dd73b 100644
--- a/Kernel/Arch/aarch64/CPU.h
+++ b/Kernel/Arch/aarch64/CPU.h
@@ -7,3 +7,10 @@
 #pragma once
 
 #define PAGE_MASK (~(FlatPtr)0xfffu)
+
+namespace Prekernel {
+
+void drop_to_exception_level_1();
+void init_prekernel_page_tables();
+
+}
diff --git a/Kernel/Arch/aarch64/Prekernel/PrekernelExceptions.cpp b/Kernel/Arch/aarch64/Exceptions.cpp
similarity index 98%
rename from Kernel/Arch/aarch64/Prekernel/PrekernelExceptions.cpp
rename to Kernel/Arch/aarch64/Exceptions.cpp
index 61c394fda0..8d47d59333 100644
--- a/Kernel/Arch/aarch64/Prekernel/PrekernelExceptions.cpp
+++ b/Kernel/Arch/aarch64/Exceptions.cpp
@@ -5,7 +5,7 @@
  */
 
 #include <Kernel/Arch/aarch64/ASM_wrapper.h>
-#include <Kernel/Arch/aarch64/Prekernel/Prekernel.h>
+#include <Kernel/Arch/aarch64/CPU.h>
 #include <Kernel/Arch/aarch64/Registers.h>
 #include <Kernel/Panic.h>
 
diff --git a/Kernel/Arch/aarch64/Prekernel/PrekernelMMU.cpp b/Kernel/Arch/aarch64/MMU.cpp
similarity index 99%
rename from Kernel/Arch/aarch64/Prekernel/PrekernelMMU.cpp
rename to Kernel/Arch/aarch64/MMU.cpp
index ad09b8ea57..26388d6cc1 100644
--- a/Kernel/Arch/aarch64/Prekernel/PrekernelMMU.cpp
+++ b/Kernel/Arch/aarch64/MMU.cpp
@@ -6,7 +6,7 @@
 
 #include <AK/Types.h>
 
-#include <Kernel/Arch/aarch64/Prekernel/Prekernel.h>
+#include <Kernel/Arch/aarch64/CPU.h>
 
 #include <Kernel/Arch/aarch64/ASM_wrapper.h>
 #include <Kernel/Arch/aarch64/RPi/MMIO.h>
diff --git a/Kernel/Arch/aarch64/Prekernel/Prekernel.h b/Kernel/Arch/aarch64/Prekernel/Prekernel.h
deleted file mode 100644
index 8763be3ccd..0000000000
--- a/Kernel/Arch/aarch64/Prekernel/Prekernel.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright (c) 2021, James Mintram <me@jamesrm.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
- */
-
-#pragma once
-
-namespace Prekernel {
-
-void drop_to_exception_level_1();
-void init_prekernel_page_tables();
-
-}
diff --git a/Kernel/Arch/aarch64/Processor.cpp b/Kernel/Arch/aarch64/Processor.cpp
index 36a3df87d7..495de96aaa 100644
--- a/Kernel/Arch/aarch64/Processor.cpp
+++ b/Kernel/Arch/aarch64/Processor.cpp
@@ -8,7 +8,6 @@
 
 #include <Kernel/Arch/Processor.h>
 #include <Kernel/Arch/aarch64/ASM_wrapper.h>
-#include <Kernel/Arch/aarch64/Prekernel/Prekernel.h>
 
 extern "C" uintptr_t vector_table_el1;
 
diff --git a/Kernel/Arch/aarch64/init.cpp b/Kernel/Arch/aarch64/init.cpp
index 3d01268af3..b20a9f98d9 100644
--- a/Kernel/Arch/aarch64/init.cpp
+++ b/Kernel/Arch/aarch64/init.cpp
@@ -12,7 +12,6 @@
 
 #include <Kernel/Arch/Processor.h>
 #include <Kernel/Arch/aarch64/BootPPMParser.h>
-#include <Kernel/Arch/aarch64/Prekernel/Prekernel.h>
 #include <Kernel/Arch/aarch64/RPi/Framebuffer.h>
 #include <Kernel/Arch/aarch64/RPi/Mailbox.h>
 #include <Kernel/Arch/aarch64/RPi/Timer.h>
diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt
index f7429cc5d1..7d87d87141 100644
--- a/Kernel/CMakeLists.txt
+++ b/Kernel/CMakeLists.txt
@@ -399,8 +399,6 @@ if (NOT "${SERENITY_ARCH}" STREQUAL "aarch64")
 else()
     set(PREKERNEL_SOURCES
         Arch/aarch64/Prekernel/boot.S
-        Arch/aarch64/Prekernel/PrekernelExceptions.cpp
-        Arch/aarch64/Prekernel/PrekernelMMU.cpp
 
         Prekernel/UBSanitizer.cpp
     )
@@ -420,9 +418,11 @@ else()
         Arch/aarch64/BootPPMParser.cpp
         Arch/aarch64/CrashHandler.cpp
         Arch/aarch64/Dummy.cpp
+        Arch/aarch64/Exceptions.cpp
         Arch/aarch64/init.cpp
         Arch/aarch64/kprintf.cpp
         Arch/aarch64/MainIdRegister.cpp
+        Arch/aarch64/MMU.cpp
         Arch/aarch64/PageDirectory.cpp
         Arch/aarch64/Panic.cpp
         Arch/aarch64/Processor.cpp