Kernel: Move {Virtual,Physical}Address classes to the Memory directory

Author: https://github.com/supercomputer7
Commit: https://github.com/SerenityOS/serenity/commit/aaa1de7878
Pull-request: https://github.com/SerenityOS/serenity/pull/17604
Reviewed-by: https://github.com/gmta ✅
Reviewed-by: https://github.com/kleinesfilmroellchen ✅

AK/Userspace.h

@@ -10,7 +10,7 @@
 #include <AK/Types.h>
 
 #ifdef KERNEL
-#    include <Kernel/VirtualAddress.h>
+#    include <Kernel/Memory/VirtualAddress.h>
 #endif
 
 namespace AK {

Kernel/Arch/PageFault.h

@@ -10,7 +10,7 @@
 #include <AK/Types.h>
 #include <Kernel/Arch/RegisterState.h>
 #include <Kernel/ExecutionMode.h>
-#include <Kernel/VirtualAddress.h>
+#include <Kernel/Memory/VirtualAddress.h>
 
 namespace Kernel {
 

Kernel/Arch/aarch64/PageDirectory.h

@@ -15,8 +15,8 @@
 #include <AK/Types.h>
 #include <Kernel/Forward.h>
 #include <Kernel/Locking/Spinlock.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/PhysicalPage.h>
-#include <Kernel/PhysicalAddress.h>
 
 namespace Kernel::Memory {
 

Kernel/Arch/aarch64/Processor.h

@@ -16,7 +16,7 @@
 #include <Kernel/Arch/ProcessorSpecificDataID.h>
 #include <Kernel/Arch/aarch64/CPUID.h>
 #include <Kernel/Arch/aarch64/Registers.h>
-#include <Kernel/VirtualAddress.h>
+#include <Kernel/Memory/VirtualAddress.h>
 
 namespace Kernel {
 

Kernel/Arch/aarch64/RPi/MMIO.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include <AK/Types.h>
-#include <Kernel/PhysicalAddress.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel::RPi {

Kernel/Arch/x86_64/DescriptorTable.h

@@ -8,7 +8,7 @@
 #pragma once
 
 #include <AK/Types.h>
-#include <Kernel/VirtualAddress.h>
+#include <Kernel/Memory/VirtualAddress.h>
 
 #include <AK/Platform.h>
 VALIDATE_IS_X86()

Kernel/Arch/x86_64/PageDirectory.h

@@ -15,8 +15,8 @@
 #include <Kernel/Forward.h>
 #include <Kernel/Locking/LockRank.h>
 #include <Kernel/Locking/Spinlock.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/PhysicalPage.h>
-#include <Kernel/PhysicalAddress.h>
 
 namespace Kernel::Memory {
 

Kernel/Arch/x86_64/Time/HPET.h

@@ -9,8 +9,8 @@
 #include <AK/OwnPtr.h>
 #include <AK/Types.h>
 #include <AK/Vector.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/Region.h>
-#include <Kernel/PhysicalAddress.h>
 
 namespace Kernel {
 

Kernel/BootInfo.h

@@ -7,9 +7,9 @@
 #pragma once
 
 #include <AK/StringView.h>
+#include <Kernel/Memory/PhysicalAddress.h>
+#include <Kernel/Memory/VirtualAddress.h>
 #include <Kernel/Multiboot.h>
-#include <Kernel/PhysicalAddress.h>
-#include <Kernel/VirtualAddress.h>
 
 namespace Kernel::Memory {
 class PageTableEntry;

Kernel/Bus/PCI/Definitions.h

@@ -13,7 +13,7 @@
 #include <AK/Vector.h>
 #include <Kernel/Debug.h>
 #include <Kernel/Locking/Spinlock.h>
-#include <Kernel/PhysicalAddress.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel::PCI {
 

Kernel/Devices/Audio/Channel.h

@@ -8,8 +8,8 @@
 
 #include <Kernel/Devices/CharacterDevice.h>
 #include <Kernel/Interrupts/IRQHandler.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/PhysicalPage.h>
-#include <Kernel/PhysicalAddress.h>
 #include <Kernel/Tasks/WaitQueue.h>
 
 namespace Kernel {

Kernel/Devices/Audio/Controller.h

@@ -15,8 +15,8 @@
 #include <Kernel/Devices/Device.h>
 #include <Kernel/Library/LockWeakable.h>
 #include <Kernel/Locking/Mutex.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/PhysicalPage.h>
-#include <Kernel/PhysicalAddress.h>
 #include <Kernel/Security/Random.h>
 
 namespace Kernel {

Kernel/Devices/Generic/MemoryDevice.h

@@ -8,7 +8,7 @@
 
 #include <AK/Types.h>
 #include <Kernel/Devices/CharacterDevice.h>
-#include <Kernel/PhysicalAddress.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel {
 

Kernel/Devices/Storage/ATA/AHCI/InterruptHandler.h

@@ -13,8 +13,8 @@
 #include <Kernel/Interrupts/PCIIRQHandler.h>
 #include <Kernel/Library/LockRefPtr.h>
 #include <Kernel/Locking/Mutex.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/PhysicalPage.h>
-#include <Kernel/PhysicalAddress.h>
 #include <Kernel/Sections.h>
 #include <Kernel/Security/Random.h>
 #include <Kernel/Tasks/WaitQueue.h>

Kernel/Devices/Storage/ATA/AHCI/Port.h

@@ -19,9 +19,9 @@
 #include <Kernel/Locking/Mutex.h>
 #include <Kernel/Locking/Spinlock.h>
 #include <Kernel/Memory/AnonymousVMObject.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/PhysicalPage.h>
 #include <Kernel/Memory/ScatterGatherList.h>
-#include <Kernel/PhysicalAddress.h>
 #include <Kernel/Sections.h>
 #include <Kernel/Security/Random.h>
 #include <Kernel/Tasks/WaitQueue.h>

Kernel/Devices/Storage/ATA/GenericIDE/Channel.h

@@ -26,8 +26,8 @@
 #include <Kernel/Interrupts/IRQHandler.h>
 #include <Kernel/Library/LockRefPtr.h>
 #include <Kernel/Locking/Mutex.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/PhysicalPage.h>
-#include <Kernel/PhysicalAddress.h>
 #include <Kernel/Security/Random.h>
 #include <Kernel/Tasks/WaitQueue.h>
 

Kernel/Devices/Storage/StorageController.h

@@ -12,8 +12,8 @@
 #include <Kernel/Devices/Device.h>
 #include <Kernel/Library/LockRefPtr.h>
 #include <Kernel/Locking/Mutex.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/PhysicalPage.h>
-#include <Kernel/PhysicalAddress.h>
 #include <Kernel/Security/Random.h>
 #include <Kernel/Tasks/WaitQueue.h>
 

Kernel/FileSystem/File.h

@@ -13,9 +13,9 @@
 #include <Kernel/Forward.h>
 #include <Kernel/Library/LockWeakable.h>
 #include <Kernel/Library/NonnullLockRefPtr.h>
+#include <Kernel/Memory/VirtualAddress.h>
 #include <Kernel/UnixTypes.h>
 #include <Kernel/UserOrKernelBuffer.h>
-#include <Kernel/VirtualAddress.h>
 
 namespace Kernel {
 

Kernel/FileSystem/OpenFileDescription.h

@@ -15,7 +15,7 @@
 #include <Kernel/FileSystem/InodeMetadata.h>
 #include <Kernel/Forward.h>
 #include <Kernel/KBuffer.h>
-#include <Kernel/VirtualAddress.h>
+#include <Kernel/Memory/VirtualAddress.h>
 
 namespace Kernel {
 

Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/Component.h

@@ -11,7 +11,8 @@
 #include <AK/Vector.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Firmware/Directory.h>
 #include <Kernel/KBuffer.h>
-#include <Kernel/PhysicalAddress.h>
+#include <Kernel/Library/LockRefPtr.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel {
 

Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/Directory.h

@@ -10,7 +10,8 @@
 #include <AK/Types.h>
 #include <AK/Vector.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Firmware/Directory.h>
-#include <Kernel/PhysicalAddress.h>
+#include <Kernel/Library/LockRefPtr.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel {
 

Kernel/FileSystem/SysFS/Subsystems/Kernel/PowerStateSwitch.h

@@ -13,9 +13,9 @@
 #include <Kernel/FileSystem/SysFS/Subsystems/Kernel/Directory.h>
 #include <Kernel/KBuffer.h>
 #include <Kernel/Memory/MappedROM.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/Region.h>
-#include <Kernel/PhysicalAddress.h>
-#include <Kernel/VirtualAddress.h>
+#include <Kernel/Memory/VirtualAddress.h>
 
 namespace Kernel {
 

Kernel/Firmware/ACPI/Definitions.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include <AK/Types.h>
-#include <Kernel/PhysicalAddress.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel::ACPI {
 

Kernel/Firmware/ACPI/Parser.h

@@ -14,10 +14,10 @@
 #include <Kernel/Firmware/ACPI/Initialize.h>
 #include <Kernel/Interrupts/IRQHandler.h>
 #include <Kernel/Library/LockRefPtr.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/Region.h>
 #include <Kernel/Memory/TypedMapping.h>
-#include <Kernel/PhysicalAddress.h>
-#include <Kernel/VirtualAddress.h>
+#include <Kernel/Memory/VirtualAddress.h>
 
 namespace Kernel::ACPI {
 

Kernel/Firmware/BIOS.h

@@ -8,9 +8,9 @@
 #pragma once
 
 #include <Kernel/Memory/MappedROM.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/Region.h>
-#include <Kernel/PhysicalAddress.h>
-#include <Kernel/VirtualAddress.h>
+#include <Kernel/Memory/VirtualAddress.h>
 
 namespace Kernel {
 

Kernel/Firmware/MultiProcessor/Parser.h

@@ -8,9 +8,9 @@
 
 #include <AK/Types.h>
 #include <AK/Vector.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/Region.h>
-#include <Kernel/PhysicalAddress.h>
-#include <Kernel/VirtualAddress.h>
+#include <Kernel/Memory/VirtualAddress.h>
 
 namespace Kernel {
 namespace MultiProcessor {

Kernel/Graphics/Bochs/GraphicsAdapter.h

@@ -11,8 +11,8 @@
 #include <Kernel/Graphics/Bochs/Definitions.h>
 #include <Kernel/Graphics/Console/GenericFramebufferConsole.h>
 #include <Kernel/Graphics/GenericGraphicsAdapter.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/TypedMapping.h>
-#include <Kernel/PhysicalAddress.h>
 
 namespace Kernel {
 

Kernel/Graphics/Console/GenericFramebufferConsole.h

@@ -8,7 +8,7 @@
 
 #include <AK/Types.h>
 #include <Kernel/Graphics/Console/Console.h>
-#include <Kernel/PhysicalAddress.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel::Graphics {
 

Kernel/Graphics/GenericGraphicsAdapter.h

@@ -10,7 +10,7 @@
 #include <Kernel/Bus/PCI/Definitions.h>
 #include <Kernel/Devices/BlockDevice.h>
 #include <Kernel/Library/LockWeakable.h>
-#include <Kernel/PhysicalAddress.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel {
 class GenericGraphicsAdapter

Kernel/Graphics/Intel/Auxiliary/GMBusConnector.cpp

@@ -6,7 +6,7 @@
 
 #include <Kernel/Arch/Delay.h>
 #include <Kernel/Graphics/Intel/Auxiliary/GMBusConnector.h>
-#include <Kernel/PhysicalAddress.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel {
 

Kernel/Graphics/Intel/NativeGraphicsAdapter.cpp

@@ -9,7 +9,7 @@
 #include <Kernel/Graphics/Definitions.h>
 #include <Kernel/Graphics/GraphicsManagement.h>
 #include <Kernel/Graphics/Intel/NativeGraphicsAdapter.h>
-#include <Kernel/PhysicalAddress.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel {
 

Kernel/Graphics/Intel/NativeGraphicsAdapter.h

@@ -11,7 +11,7 @@
 #include <Kernel/Graphics/Definitions.h>
 #include <Kernel/Graphics/Intel/DisplayConnectorGroup.h>
 #include <Kernel/Graphics/Intel/NativeDisplayConnector.h>
-#include <Kernel/PhysicalAddress.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <LibEDID/EDID.h>
 
 namespace Kernel {

Kernel/Graphics/Intel/Plane/DisplayPlane.cpp

@@ -5,7 +5,7 @@
  */
 
 #include <Kernel/Graphics/Intel/Plane/DisplayPlane.h>
-#include <Kernel/PhysicalAddress.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel {
 

Kernel/Graphics/Intel/Plane/G33DisplayPlane.cpp

@@ -5,7 +5,7 @@
  */
 
 #include <Kernel/Graphics/Intel/Plane/G33DisplayPlane.h>
-#include <Kernel/PhysicalAddress.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel {
 

Kernel/Graphics/Intel/Transcoder/AnalogDisplayTranscoder.cpp

@@ -6,7 +6,7 @@
 
 #include <Kernel/Arch/Delay.h>
 #include <Kernel/Graphics/Intel/Transcoder/AnalogDisplayTranscoder.h>
-#include <Kernel/PhysicalAddress.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel {
 

Kernel/Graphics/Intel/Transcoder/DisplayTranscoder.cpp

@@ -6,7 +6,7 @@
 
 #include <Kernel/Arch/Delay.h>
 #include <Kernel/Graphics/Intel/Transcoder/DisplayTranscoder.h>
-#include <Kernel/PhysicalAddress.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel {
 

Kernel/Graphics/VMWare/GraphicsAdapter.h

@@ -12,8 +12,8 @@
 #include <Kernel/Graphics/VMWare/Definitions.h>
 #include <Kernel/IOWindow.h>
 #include <Kernel/Locking/Spinlock.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/TypedMapping.h>
-#include <Kernel/PhysicalAddress.h>
 
 namespace Kernel {
 

Kernel/IOWindow.h

@@ -13,8 +13,8 @@
 #    include <Kernel/Arch/x86_64/IO.h>
 #endif
 #include <Kernel/Bus/PCI/Definitions.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/TypedMapping.h>
-#include <Kernel/PhysicalAddress.h>
 
 namespace Kernel {
 

Kernel/Memory/AnonymousVMObject.h

@@ -9,8 +9,8 @@
 #include <Kernel/Memory/AllocationStrategy.h>
 #include <Kernel/Memory/MemoryManager.h>
 #include <Kernel/Memory/PageFaultResponse.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/VMObject.h>
-#include <Kernel/PhysicalAddress.h>
 
 namespace Kernel::Memory {
 

Kernel/Memory/MappedROM.h

@@ -7,8 +7,8 @@
 #pragma once
 
 #include <AK/OwnPtr.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/Region.h>
-#include <Kernel/PhysicalAddress.h>
 
 namespace Kernel::Memory {
 

Kernel/Memory/PhysicalPage.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include <AK/NonnullRefPtr.h>
-#include <Kernel/PhysicalAddress.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel::Memory {
 

Kernel/Memory/RegionTree.h

@@ -10,8 +10,8 @@
 #include <AK/IntrusiveRedBlackTree.h>
 #include <Kernel/Locking/Spinlock.h>
 #include <Kernel/Memory/Region.h>
+#include <Kernel/Memory/VirtualAddress.h>
 #include <Kernel/Memory/VirtualRange.h>
-#include <Kernel/VirtualAddress.h>
 
 namespace Kernel::Memory {
 

Kernel/Memory/RingBuffer.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <Kernel/PhysicalAddress.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/UserOrKernelBuffer.h>
 
 namespace Kernel::Memory {

Kernel/Memory/ScatterGatherList.h

@@ -11,7 +11,7 @@
 #include <Kernel/Devices/BlockDevice.h>
 #include <Kernel/Memory/AnonymousVMObject.h>
 #include <Kernel/Memory/MemoryManager.h>
-#include <Kernel/PhysicalAddress.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel::Memory {
 

Kernel/Memory/SharedFramebufferVMObject.h

@@ -11,7 +11,7 @@
 #include <Kernel/Memory/AnonymousVMObject.h>
 #include <Kernel/Memory/MemoryManager.h>
 #include <Kernel/Memory/PageFaultResponse.h>
-#include <Kernel/PhysicalAddress.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel::Memory {
 

Kernel/Memory/VirtualRange.h

@@ -8,7 +8,7 @@
 #pragma once
 
 #include <AK/Error.h>
-#include <Kernel/VirtualAddress.h>
+#include <Kernel/Memory/VirtualAddress.h>
 
 namespace Kernel::Memory {
 

Kernel/Prekernel/Prekernel.h

@@ -7,9 +7,9 @@
 #pragma once
 
 #ifdef __cplusplus
+#    include <Kernel/Memory/PhysicalAddress.h>
+#    include <Kernel/Memory/VirtualAddress.h>
 #    include <Kernel/Multiboot.h>
-#    include <Kernel/PhysicalAddress.h>
-#    include <Kernel/VirtualAddress.h>
 #endif
 
 #define MAX_KERNEL_SIZE 0x4000000

Kernel/Prekernel/init.cpp

@@ -7,10 +7,10 @@
  */
 
 #include <AK/Types.h>
+#include <Kernel/Memory/PhysicalAddress.h>
+#include <Kernel/Memory/VirtualAddress.h>
 #include <Kernel/Multiboot.h>
-#include <Kernel/PhysicalAddress.h>
 #include <Kernel/Prekernel/Prekernel.h>
-#include <Kernel/VirtualAddress.h>
 #include <LibC/elf.h>
 #include <LibELF/Relocation.h>
 

Userland/DevTools/UserspaceEmulator/Range.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include <AK/Types.h>
-#include <Kernel/VirtualAddress.h>
+#include <Kernel/Memory/VirtualAddress.h>
 
 namespace UserspaceEmulator {
 

Userland/Libraries/LibELF/DynamicObject.h

@@ -12,7 +12,7 @@
 #include <AK/Concepts.h>
 #include <AK/DeprecatedString.h>
 #include <AK/RefCounted.h>
-#include <Kernel/VirtualAddress.h>
+#include <Kernel/Memory/VirtualAddress.h>
 #include <LibC/elf.h>
 #include <LibC/link.h>
 

Userland/Libraries/LibELF/Image.h

@@ -9,7 +9,7 @@
 
 #include <AK/Concepts.h>
 #include <AK/Vector.h>
-#include <Kernel/VirtualAddress.h>
+#include <Kernel/Memory/VirtualAddress.h>
 #include <LibC/elf.h>
 
 #ifndef KERNEL

Userland/Libraries/LibELF/Relocation.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <Kernel/VirtualAddress.h>
+#include <Kernel/Memory/VirtualAddress.h>
 
 namespace ELF {