diff options
Diffstat (limited to 'arch/x86_64/include')
7 files changed, 13 insertions, 12 deletions
diff --git a/arch/x86_64/include/arch/cpu/global_descriptor_table.hpp b/arch/x86_64/include/arch/cpu/global_descriptor_table.hpp index 402c87d..bc7d328 100644 --- a/arch/x86_64/include/arch/cpu/global_descriptor_table.hpp +++ b/arch/x86_64/include/arch/cpu/global_descriptor_table.hpp @@ -1,10 +1,10 @@ #ifndef TEACHOS_X86_64_GLOBAL_DESCRIPTOR_TABLE_HPP #define TEACHOS_X86_64_GLOBAL_DESCRIPTOR_TABLE_HPP -#include "kapi/memory.hpp" - #include "arch/cpu/segment_descriptor.hpp" +#include "kapi/memory.hpp" + #include <algorithm> #include <array> #include <bit> diff --git a/arch/x86_64/include/arch/cpu/interrupts.hpp b/arch/x86_64/include/arch/cpu/interrupts.hpp index b9adb6e..24b72e9 100644 --- a/arch/x86_64/include/arch/cpu/interrupts.hpp +++ b/arch/x86_64/include/arch/cpu/interrupts.hpp @@ -1,10 +1,10 @@ #ifndef TEACHOS_X86_64_CPU_INTERRUPTS_HPP #define TEACHOS_X86_64_CPU_INTERRUPTS_HPP -#include "kapi/memory.hpp" - #include "arch/cpu/segment_selector.hpp" +#include "kapi/memory.hpp" + #include <array> #include <cstdint> #include <type_traits> diff --git a/arch/x86_64/include/arch/cpu/registers.hpp b/arch/x86_64/include/arch/cpu/registers.hpp index d7def10..62206bf 100644 --- a/arch/x86_64/include/arch/cpu/registers.hpp +++ b/arch/x86_64/include/arch/cpu/registers.hpp @@ -1,11 +1,11 @@ #ifndef TEACHOS_X86_64_CPU_REGISTERS_HPP #define TEACHOS_X86_64_CPU_REGISTERS_HPP -#include "kapi/memory.hpp" - #include "arch/cpu/control_register.hpp" // IWYU pragma: export #include "arch/cpu/model_specific_register.hpp" // IWYU pragma: export +#include "kapi/memory.hpp" + namespace arch::cpu { diff --git a/arch/x86_64/include/arch/debug/qemu_output.hpp b/arch/x86_64/include/arch/debug/qemu_output.hpp index e72eb39..f43e147 100644 --- a/arch/x86_64/include/arch/debug/qemu_output.hpp +++ b/arch/x86_64/include/arch/debug/qemu_output.hpp @@ -1,10 +1,10 @@ #ifndef TEACHOS_X86_64_DEBUG_QEMU_OUTPUT_HPP #define TEACHOS_X86_64_DEBUG_QEMU_OUTPUT_HPP -#include "kapi/cio.hpp" - #include "arch/device_io/port_io.hpp" +#include "kapi/cio.hpp" + #include <string_view> namespace arch::debug diff --git a/arch/x86_64/include/arch/memory/higher_half_mapper.hpp b/arch/x86_64/include/arch/memory/higher_half_mapper.hpp index c8df40c..24bea17 100644 --- a/arch/x86_64/include/arch/memory/higher_half_mapper.hpp +++ b/arch/x86_64/include/arch/memory/higher_half_mapper.hpp @@ -1,10 +1,10 @@ #ifndef TEACHOS_X86_64_HIGHER_HALF_MAPPER_HPP #define TEACHOS_X86_64_HIGHER_HALF_MAPPER_HPP -#include "kapi/memory.hpp" - #include "arch/memory/page_table.hpp" +#include "kapi/memory.hpp" + #include <cstddef> namespace arch::memory diff --git a/arch/x86_64/include/arch/memory/kernel_mapper.hpp b/arch/x86_64/include/arch/memory/kernel_mapper.hpp index 4329f1b..ae593a5 100644 --- a/arch/x86_64/include/arch/memory/kernel_mapper.hpp +++ b/arch/x86_64/include/arch/memory/kernel_mapper.hpp @@ -5,6 +5,7 @@ #include <elf/format.hpp> #include <elf/section_header.hpp> + #include <multiboot2/information.hpp> #include <cstdint> diff --git a/arch/x86_64/include/arch/vga/text/device.hpp b/arch/x86_64/include/arch/vga/text/device.hpp index 11b3281..d0eb45d 100644 --- a/arch/x86_64/include/arch/vga/text/device.hpp +++ b/arch/x86_64/include/arch/vga/text/device.hpp @@ -3,10 +3,10 @@ // IWYU pragma: private, include "arch/vga/text.hpp" -#include "kapi/cio.hpp" - #include "arch/vga/text/buffer.hpp" +#include "kapi/cio.hpp" + #include <string_view> namespace arch::vga::text |