aboutsummaryrefslogtreecommitdiff
path: root/arch/x86_64/src
diff options
context:
space:
mode:
authorLukas Oesch <lukas.oesch@ost.ch>2026-06-10 10:40:46 +0200
committerLukas Oesch <lukas.oesch@ost.ch>2026-06-10 10:40:46 +0200
commit33abd5cf264cb9e34121082105b0bc17b3cf7a36 (patch)
tree36b15d53fea04f4f9d9af817100f7ad013bd9b5c /arch/x86_64/src
parentd01caf1c4aef3c89c68b9d1cc9fe56445f0860b5 (diff)
parent7e27130c342b7299a1d2188a7192a7f17b5ac2ad (diff)
downloadkernel-33abd5cf264cb9e34121082105b0bc17b3cf7a36.tar.xz
kernel-33abd5cf264cb9e34121082105b0bc17b3cf7a36.zip
Merge branch 'develop-BA-FS26' into 'develop'HEADdevelop
Merge of BA-FS26 branch into develop See merge request teachos/kernel!49
Diffstat (limited to 'arch/x86_64/src')
-rw-r--r--arch/x86_64/src/boot/boot32.S443
-rw-r--r--arch/x86_64/src/boot/entry64.s62
-rw-r--r--arch/x86_64/src/boot/initialize_runtime.cpp22
-rw-r--r--arch/x86_64/src/boot/multiboot.s26
-rw-r--r--arch/x86_64/src/debug/qemu_output.cpp25
-rw-r--r--arch/x86_64/src/memory/higher_half_mapper.cpp119
-rw-r--r--arch/x86_64/src/memory/kernel_mapper.cpp113
-rw-r--r--arch/x86_64/src/memory/mmu.cpp19
-rw-r--r--arch/x86_64/src/memory/page_table.cpp82
-rw-r--r--arch/x86_64/src/memory/region_allocator.cpp144
-rw-r--r--arch/x86_64/src/vga/text/buffer.cpp101
-rw-r--r--arch/x86_64/src/vga/text/device.cpp60
12 files changed, 0 insertions, 1216 deletions
diff --git a/arch/x86_64/src/boot/boot32.S b/arch/x86_64/src/boot/boot32.S
deleted file mode 100644
index 1c2fdaf..0000000
--- a/arch/x86_64/src/boot/boot32.S
+++ /dev/null
@@ -1,443 +0,0 @@
-#include "arch/boot/boot.hpp"
-
-/**
- * @brief Uninitialized data for the bootstrapping process.
- */
-.section .boot_bss, "aw", @nobits
-
-page_maps_start:
-page_map_level_4: .skip 512 * 8
-page_map_level_3_high: .skip 512 * 8
-page_map_level_3_low: .skip 512 * 8
-page_map_level_2: .skip 512 * 8
-page_maps_end = .
-page_maps_size = page_maps_end - page_maps_start
-
-/**
- * @brief Storage for the multiboot2 information pointer.
- */
-.global multiboot_information_pointer
-multiboot_information_pointer: .skip 8
-
-/**
- * @brief Storage for the bootstrap stack.
- */
-.section .boot_stack, "aw", @nobits
-.align 16
-
-early_stack_bottom: .skip 1 << 8
-early_stack_top:
-early_stack_size = early_stack_top - early_stack_bottom
-
-/**
- * @brief Constants for the bootstrapping process.
- */
-.section .boot_rodata, "a", @progbits
-
-.global global_descriptor_table_data
-
-/**
- * @brief A basic GDT for long mode.
- */
-global_descriptor_table:
-global_descriptor_table_null = . - global_descriptor_table
-.quad 0
-global_descriptor_table_code = . - global_descriptor_table
-.quad GDT_READ_WRITE | GDT_EXECUTABLE | GDT_DESCRIPTOR_TYPE | GDT_PRESENT | GDT_LONG_MODE | (1 << 55)
-global_descriptor_table_data = . - global_descriptor_table
-.quad GDT_READ_WRITE | GDT_DESCRIPTOR_TYPE | GDT_PRESENT | (1 << 54) | (1 << 55)
-global_descriptor_table_end:
-
-message_prefix_panic: .string "Panic: "
-message_not_loaded_by_multiboot2: .string "The operating system was not loaded by a Multiboot 2 loader."
-message_cpuid_instruction_no_supported: .string "The 'cpuid' instruction is not supported on this platform."
-message_long_mode_not_supported: .string "Long mode is not supported by this platform."
-message_return_from_kernel_main: .string "Execution returned from kernel main."
-
-/**
- * @brief Initialized data for the bootstrapping process.
- */
-.section .boot_data, "aw", @progbits
-
-/**
- * @brief A pointer to the current position within the VGA text buffer.
- */
-.global vga_buffer_pointer
-vga_buffer_pointer: .quad 0xb8000
-
-/**
- * @brief Code for the bootstrapping process.
- */
-.section .boot_text, "ax", @progbits
-.align 16
-.code32
-
-.macro pie_base
- push %esi
- call 0f
- 0:
- pop %esi
-.endm
-
-.macro function_start
- push %ebp
- mov %esp, %ebp
-.endm
-
-.macro function_end
- leave
- ret
-.endm
-
-.macro pie_function_start
- function_start
- pie_base
-.endm
-
-.macro pie_function_end
- pop %esi
- function_end
-.endm
-
-/**
- * @brief Prepare the environment and start the kernel.
- *
- * This function performs all necessary checks to ensure the system was loaded
- * by the expected loader and supports all features required to run the kernel.
- * If successful, it prepares the system by setting up memory virtualization
- * and then start the kernel proper.
- *
- * @param %eax The Multiboot 2 magic marker.
- * @param %ebx The Multiboot 2 information pointer.
- * @return void This function does not return.
- */
-.global _start
-_start:
- call 0f
-0:
- pop %esi
-
- lea (early_stack_top - 0b)(%esi), %ecx
-
- mov %ecx, %esp
- mov %esp, %ebp
-
- call _assert_loaded_by_multiboot2_loader
- call _save_multiboot_information_pointer
-
- call _assert_cpuid_instruction_is_supported
- call _assert_cpu_supports_long_mode
-
- push $HUGE_PAGES_TO_MAP
- call _prepare_page_maps
- add $4, %esp
-
- call _enable_paging
- call _enable_sse
- call _reload_gdt
-
- lea (_entry64 - 0b)(%esi), %eax
- pushl $global_descriptor_table_code
- pushl %eax
- lret
-
-/**
- * @brief Halt the system.
- *
- * This function will instruct the CPU to halt. It will try to keep the CPU
- * halted, even if interrupts occur.
- *
- * @return This function never returns.
- */
-_halt:
- function_start
-
-1:
- hlt
- jmp 1b
-
- function_end
-
-/**
- * @brief Print a message via the VGA text buffer.
- *
- * @param ebp+12 The message to print.
- * @param ebp+8 The color to print the message in.
- */
-_print:
- pie_function_start
-
- push %edi
- push %ebx
-
- mov 8(%ebp), %al
- mov 12(%ebp), %edx
- mov $0, %ecx
- lea (vga_buffer_pointer - 0b)(%esi), %edi
- mov (%edi), %edi
-
-1:
- mov (%edx, %ecx), %bl
- test %bl, %bl
- je 2f
- mov %bl, (%edi, %ecx, 2)
- mov %al, 1(%edi, %ecx, 2)
- inc %ecx
- jmp 1b
-
-2:
- shl $1, %ecx
- add %ecx, %edi
- lea (vga_buffer_pointer - 0b)(%esi), %ecx
- mov %edi, (%ecx)
-
- pop %ebx
- pop %edi
-
- pie_function_end
-
-/**
- * @brief Print a given panic message and then halt the machine as if by calling ::halt()
- *
- * @param ebp+4 A message to print.
- * @return This function does not return.
- */
-_panic:
- pie_function_start
-
- lea (message_prefix_panic - 0b)(%esi), %eax
-
- push %eax
- push $0x4f
- call _print
-
- mov 8(%ebp), %eax
- mov %eax, 4(%esp)
- call _print
- add $8, %esp
-
- call _halt
-
- pie_function_end
-
-/**
- * Assert that we were loaded by a Multiboot 2 compliant bootloader.
- *
- * This assertion will panic the system if the magic signature was not found.
- * If we were loaded my an appropriate bootloader, this function also saves
- * the provided MBI pointer to `multiboot_information_pointer`.
- */
-_assert_loaded_by_multiboot2_loader:
- pie_function_start
-
- cmp $MULTIBOOT2_MAGIC, %eax
- je 1f
- lea (message_not_loaded_by_multiboot2 - 0b)(%esi), %eax
- push %eax
- call _panic
-1:
- pie_function_end
-
-/**
- * @brief Store the multiboot 2 information pointer in the global memory.
- *
- * @return void
- */
-_save_multiboot_information_pointer:
- pie_function_start
-
- lea (multiboot_information_pointer - 0b)(%esi), %eax
- mov %ebx, (%eax)
-
- pie_function_end
-
-/**
- * @brief Assert that the CPU supports the CPUID instruction.
- *
- * The primary way to check for support of the instruction is to flip the ID
- * bin in EFLAGS and then check if this changed was accepted. If so, the CPU
- * supports the CPUID instruction, otherwise it most-likely doesn't.
- */
-_assert_cpuid_instruction_is_supported:
- pie_function_start
-
- pushfl
- pop %eax
- mov %eax, %ecx
-
- xor $(1 << 21), %eax /* Flip the ID bit */
- push %eax /* Move the new bitset on the stack for loading */
- popfl /* Load the flags with ID set back into EFLAGS */
- pushfl /* Copy the flags back onto the stack */
- pop %eax /* Load the flags for further checking */
-
- push %ecx
- popfl
-
- cmp %ecx, %eax
- jne 1f
- lea (message_cpuid_instruction_no_supported - 0b)(%esi), %eax
- push %eax
- call _panic
-
-1:
- pie_function_end
-
-/**
- * @brief Assert that the CPU supports going into long mode.
- */
-_assert_cpu_supports_long_mode:
- pie_function_start
-
- mov $0x80000000, %eax
- cpuid
- cmp $0x80000001, %eax
- jb 1f
-
- mov $0x80000001, %eax
- cpuid
- test $(1 << 29), %edx
- jnz 2f
-1:
- lea (message_long_mode_not_supported - 0b)(%esi), %eax
- push %eax
- call _panic
-2:
- pie_function_end
-
-/**
- * @brief Prepare a basic page map hierarchy
- *
- * @param ebp+8 The number of huge pages to map
- * @return void
- */
-_prepare_page_maps:
- pie_function_start
-
- push %edi
-
- call _clear_page_map_memory
-
- lea (page_map_level_4 - 0b)(%esi), %edi
- lea (page_map_level_3_low - 0b)(%esi), %eax
- or $0b11, %eax
- mov %eax, (%edi)
-
- lea (page_map_level_3_high - 0b)(%esi), %eax
- or $0b11, %eax
- mov %eax, (511 * 8)(%edi)
-
- lea (page_map_level_3_low - 0b)(%esi), %edi
- lea (page_map_level_2 - 0b)(%esi), %eax
- or $0b11, %eax
- mov %eax, (%edi)
-
- lea (page_map_level_3_high - 0b)(%esi), %edi
- lea (page_map_level_2 - 0b)(%esi), %eax
- or $0b11, %eax
- mov %eax, (510 * 8)(%edi)
-
- lea (page_map_level_2 - 0b)(%esi), %edi
- mov 8(%ebp), %ecx
-
-1:
- dec %ecx
- mov $(1 << 21), %eax
- mul %ecx
- or $0b10000011, %eax
- mov %eax, (%edi, %ecx, 8)
-
- test %ecx, %ecx
- jnz 1b
-
- pop %edi
-
- pie_function_end
-
-/**
- * @brief Clear all page map memory by filling it with 0s.
- *
- * @return void
- */
-_clear_page_map_memory:
- pie_function_start
-
- push %edi
-
- xor %eax, %eax
- mov $page_maps_size, %ecx
- shr $2, %ecx
- lea (page_maps_start - 0b)(%esi), %edi
- rep stosl
-
- pop %edi
-
- pie_function_end
-
-/**
- * @p Enable memory virtualization via paging.
- *
- * Note: This routine expects for there to be a valid set of page maps already
- * set up for use.
- *
- * @return void
- */
-_enable_paging:
- pie_function_start
-
- lea (page_map_level_4 - 0b)(%esi), %eax
- mov %eax, %cr3
-
- /* Enable Physical Address Extension */
- mov %cr4, %eax
- or $(1 << 5), %eax
- mov %eax, %cr4
-
- /* Enable long mode support */
- mov $0xC0000080, %ecx
- rdmsr
- or $(1 << 8), %eax
- wrmsr
-
- /* Enable paging */
- mov %cr0, %eax
- or $(1 << 31), %eax
- mov %eax, %cr0
-
- pie_function_end
-
-/**
- * @brief Enable use of SSE instructions.
- */
-_enable_sse:
- function_start
-
- mov %cr0, %eax
- and $0xfffffffb, %eax
- or $0x00000002, %eax
- mov %eax, %cr0
-
- mov %cr4, %eax
- or $(3 << 9), %eax
- mov %eax, %cr4
-
- function_end
-
-/**
- * @brief Prepare a new GTD and load make it active.
- *
- * @return void
- */
-_reload_gdt:
- pie_function_start
-
- sub $10, %esp
- lea (global_descriptor_table - 0b)(%esi), %eax
- movw $(global_descriptor_table_end - global_descriptor_table -1), (%esp)
- mov %eax, 2(%esp)
- movl $0, 6(%esp)
-
- lgdt (%esp)
- add $10, %esp
-
- pie_function_end
diff --git a/arch/x86_64/src/boot/entry64.s b/arch/x86_64/src/boot/entry64.s
deleted file mode 100644
index 29fb778..0000000
--- a/arch/x86_64/src/boot/entry64.s
+++ /dev/null
@@ -1,62 +0,0 @@
-.section .stack, "aw", @nobits
-
-.align 16
-.global stack_top
-stack_bottom: .skip 1 << 20
-stack_top:
-stack_size = stack_top - stack_bottom
-
-.section .bss, "aw", @nobits
-
-//! A structure containing information gathered during the bootstrap process.
-//! Expected layout (as described by teachos::boot::information):
-//!
-//! struct
-//! {
-//! multiboot2::information_view const * mbi;
-//! std::size_t vga_buffer_index;
-//! }
-.global bootstrap_information
-bootstrap_information: .skip 16
-
-.section .boot_text, "ax", @progbits
-.code64
-
-.global _entry64
-_entry64:
- mov $global_descriptor_table_data, %rax
- mov %rax, %ss
- mov %rax, %ds
- mov %rax, %es
- mov %rax, %fs
- mov %rax, %gs
-
- mov $stack_top, %rsp
- mov %rsp, %rbp
-
- mov multiboot_information_pointer, %rax
- or $TEACHOS_VMA, %rax
- mov vga_buffer_pointer, %rdx
- sub $0xb8000, %rdx
- mov %rax, (bootstrap_information)
- mov %rdx, (bootstrap_information + 8)
-
- call invoke_global_constructors
-
- xor %rax, %rax
- mov %rax, %rbp
- mov %rax, %rdx
- mov %rax, %rsi
-
- mov $stack_size, %rcx
- shr $3, %rcx
- lea (stack_bottom), %rdi
- rep stosq
-
- mov %rax, %rdi
-
- call main
-
-1:
- hlt
- jmp 1b
diff --git a/arch/x86_64/src/boot/initialize_runtime.cpp b/arch/x86_64/src/boot/initialize_runtime.cpp
deleted file mode 100644
index b08c13c..0000000
--- a/arch/x86_64/src/boot/initialize_runtime.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <algorithm>
-#include <functional>
-#include <span>
-
-namespace arch::boot
-{
-
- extern "C"
- {
- using global_initializer = auto (*)() -> void;
-
- extern global_initializer __init_array_start;
- extern global_initializer __init_array_end;
-
- auto invoke_global_constructors() -> void
- {
- auto initializers = std::span{&__init_array_start, &__init_array_end};
- std::ranges::for_each(initializers, [](auto invokable) { std::invoke(invokable); });
- }
- }
-
-} // namespace arch::boot \ No newline at end of file
diff --git a/arch/x86_64/src/boot/multiboot.s b/arch/x86_64/src/boot/multiboot.s
deleted file mode 100644
index 7ccca56..0000000
--- a/arch/x86_64/src/boot/multiboot.s
+++ /dev/null
@@ -1,26 +0,0 @@
-.section .boot_mbh, "a"
-.align 8
-
-multiboot_header_start:
-.Lmagic:
- .long 0xe85250d6
-.Larch:
- .long 0
-.Llength:
- .long multiboot_header_end - multiboot_header_start
-.Lchecksum:
- .long 0x100000000 - (0xe85250d6 + 0 + (multiboot_header_end - multiboot_header_start))
-.align 8
-.Lflags_start:
- .word 4
- .word 1
- .long .Lflags_end - .Lflags_start
- .long 3
-.Lflags_end:
-.align 8
-.Lend_start:
- .word 0
- .word 0
- .long .Lend_end - .Lend_start
-.Lend_end:
-multiboot_header_end:
diff --git a/arch/x86_64/src/debug/qemu_output.cpp b/arch/x86_64/src/debug/qemu_output.cpp
deleted file mode 100644
index 535017d..0000000
--- a/arch/x86_64/src/debug/qemu_output.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "arch/debug/qemu_output.hpp"
-
-#include "kapi/cio.hpp"
-
-#include <algorithm>
-#include <string_view>
-
-namespace arch::debug
-{
-
- qemu_output::qemu_output(output_device & lower)
- : m_lower{lower}
- , m_present{port::read() == port::address}
- {}
-
- auto qemu_output::write(kapi::cio::output_stream stream, std::string_view text) -> void
- {
- if (m_present)
- {
- std::ranges::for_each(text, port::write<port::value_type>);
- }
- m_lower.write(stream, text);
- }
-
-} // namespace arch::debug
diff --git a/arch/x86_64/src/memory/higher_half_mapper.cpp b/arch/x86_64/src/memory/higher_half_mapper.cpp
deleted file mode 100644
index abb54a3..0000000
--- a/arch/x86_64/src/memory/higher_half_mapper.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-#include "arch/memory/higher_half_mapper.hpp"
-
-#include "kapi/memory.hpp"
-#include "kapi/system.hpp"
-
-#include "arch/memory/page_table.hpp"
-#include "arch/memory/page_utilities.hpp"
-
-#include <algorithm>
-#include <array>
-#include <cstddef>
-#include <memory>
-#include <ranges>
-#include <utility>
-
-namespace arch::memory
-{
-
- higher_half_mapper::higher_half_mapper(page_table * root)
- : m_root{root}
- {}
-
- auto higher_half_mapper::map(kapi::memory::page page, kapi::memory::frame frame, flags flags) -> std::byte *
- {
- auto table = get_or_create_page_table(page);
- if (!table)
- {
- return nullptr;
- }
-
- auto const index = pml_index(1, page);
- auto & entry = (*table)[index];
-
- if (entry.present())
- {
- kapi::system::panic("[x86_64:MEM] Tried to map a page that is already mapped!");
- }
-
- entry.frame(frame, to_table_flags(flags) | page_table::entry::flags::present);
-
- return static_cast<std::byte *>(page.start_address());
- }
-
- auto higher_half_mapper::unmap(kapi::memory::page page) -> void
- {
- if (!try_unmap(page))
- {
- kapi::system::panic("[x86_64:MEM] Tried to unmap a page that is not mapped!");
- }
- }
-
- auto higher_half_mapper::try_unmap(kapi::memory::page page) noexcept -> bool
- {
- auto table_path = std::array<std::pair<page_table *, std::size_t>, 4>{};
- table_path[0] = std::pair{m_root, pml_index(4, page)};
-
- for (auto level = 4uz; level > 1uz; --level)
- {
- auto [table, index] = table_path[4 - level];
- auto & entry = (*table)[index];
-
- if (!entry.present())
- {
- return false;
- }
-
- auto next_table = to_higher_half_pointer<page_table>(entry.frame()->start_address());
- auto next_index = pml_index(4 - level - 1, page);
- table_path[4 - level - 1] = std::pair{next_table, next_index};
- }
-
- std::ranges::for_each(std::views::reverse(table_path), [previous_was_empty = true](auto & step) mutable {
- auto [table, index] = step;
- auto & entry = (*table)[index];
- auto frame = entry.frame();
-
- if (previous_was_empty)
- {
- entry.clear();
- previous_was_empty = table->empty();
- kapi::memory::get_frame_allocator().release(*frame);
- }
- });
-
- return true;
- }
-
- auto higher_half_mapper::get_or_create_page_table(kapi::memory::page page) noexcept -> page_table *
- {
- auto table = m_root;
-
- for (auto level = 4uz; level > 1uz; --level)
- {
- auto index = pml_index(level, page);
- auto & entry = (*table)[index];
-
- if (!entry.present())
- {
- auto table_frame = kapi::memory::allocate_frame();
- if (!table_frame)
- {
- return nullptr;
- }
-
- auto new_table = to_higher_half_pointer<page_table>(table_frame->start_address());
- std::construct_at(new_table);
-
- auto const flags = page_table::entry::flags::present | page_table::entry::flags::writable |
- page_table::entry::flags::user_accessible;
- entry.frame(*table_frame, flags);
- }
-
- table = to_higher_half_pointer<page_table>(entry.frame()->start_address());
- }
-
- return table;
- }
-
-} // namespace arch::memory \ No newline at end of file
diff --git a/arch/x86_64/src/memory/kernel_mapper.cpp b/arch/x86_64/src/memory/kernel_mapper.cpp
deleted file mode 100644
index 08c32c5..0000000
--- a/arch/x86_64/src/memory/kernel_mapper.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-#include "arch/memory/kernel_mapper.hpp"
-
-#include "kapi/memory.hpp"
-#include "kapi/system.hpp"
-
-#include "arch/boot/ld.hpp"
-
-#include <kstd/print>
-
-#include <elf/format.hpp>
-#include <elf/section_header.hpp>
-#include <multiboot2/information.hpp>
-
-#include <algorithm>
-#include <array>
-#include <bit>
-#include <cstdint>
-#include <ranges>
-#include <string_view>
-#include <utility>
-
-namespace arch::memory
-{
-
- namespace
- {
- using namespace std::string_view_literals;
-
- constexpr auto static ignored_section_prefixes = std::array{
- ".boot_"sv,
- };
-
- constexpr auto static user_accessible_prefixes = std::array{
- ".user"sv,
- ".stl"sv,
- };
-
- } // namespace
-
- kernel_mapper::kernel_mapper(multiboot2::information_view const * mbi)
- : m_mbi{std::move(mbi)}
- , m_kernel_load_base{std::bit_cast<std::uintptr_t>(&arch::boot::TEACHOS_VMA)}
- {}
-
- auto kernel_mapper::remap_kernel(kapi::memory::page_mapper & mapper) -> void
- {
- auto elf_information = m_mbi->maybe_elf_symbols<elf::format::elf64>();
- if (!elf_information)
- {
- kapi::system::panic("[x86_64:MEM] ELF section information is not available.");
- }
-
- auto sections = *elf_information;
- auto allocated_sections =
- std::views::all(sections) | std::views::filter(&elf::section_header<elf::format::elf64>::allocated) |
- std::views::filter([&](auto const & section) -> auto {
- auto name = sections.name(section);
- return !std::ranges::any_of(ignored_section_prefixes,
- [&](auto const & prefix) -> auto { return name.starts_with(prefix); });
- });
-
- if (allocated_sections.empty())
- {
- kapi::system::panic("[x86_64:MEM] No allocated ELF sections were found.");
- }
-
- std::ranges::for_each(allocated_sections,
- [&](auto const & section) -> auto { map_section(section, sections.name(section), mapper); });
- }
-
- auto kernel_mapper::map_section(section_header_type const & section, std::string_view name,
- kapi::memory::page_mapper & mapper) -> void
- {
- auto number_of_pages = (section.size + (PLATFORM_PAGE_SIZE - 1)) / PLATFORM_PAGE_SIZE;
- auto linear_start_address = kapi::memory::linear_address{section.virtual_load_address};
- auto physical_start_address = kapi::memory::physical_address{section.virtual_load_address & ~m_kernel_load_base};
-
- kstd::println("[x86_64:MEM] mapping {}"
- "\n {} bytes -> page count: {}"
- "\n {} @ {}",
- name, section.size, number_of_pages, linear_start_address, physical_start_address);
-
- auto first_page = kapi::memory::page::containing(linear_start_address);
- auto first_frame = kapi::memory::frame::containing(physical_start_address);
-
- auto page_flags = kapi::memory::page_mapper::flags::empty;
-
- if (section.writable())
- {
- page_flags |= kapi::memory::page_mapper::flags::writable;
- }
-
- if (section.executable())
- {
- page_flags |= kapi::memory::page_mapper::flags::executable;
- }
-
- auto is_prefix_of_name = [=](auto prefix) -> bool {
- return name.starts_with(prefix);
- };
-
- if (!std::ranges::any_of(user_accessible_prefixes, is_prefix_of_name))
- {
- page_flags |= kapi::memory::page_mapper::flags::supervisor_only;
- }
-
- for (auto i = 0uz; i < number_of_pages; ++i)
- {
- mapper.map(first_page + i, first_frame + i, page_flags);
- }
- }
-
-} // namespace arch::memory \ No newline at end of file
diff --git a/arch/x86_64/src/memory/mmu.cpp b/arch/x86_64/src/memory/mmu.cpp
deleted file mode 100644
index ea23278..0000000
--- a/arch/x86_64/src/memory/mmu.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "arch/memory/mmu.hpp"
-
-#include "kapi/memory.hpp"
-
-#include "arch/cpu/registers.hpp"
-
-namespace arch::memory
-{
- auto tlb_flush(kapi::memory::linear_address address) -> void
- {
- asm volatile("invlpg (%[input])" : /* no output from call */ : [input] "r"(address) : "memory");
- }
-
- auto tlb_flush_all() -> void
- {
- auto paging_root = cpu::cr3::read();
- cpu::cr3::write(paging_root);
- }
-} // namespace arch::memory
diff --git a/arch/x86_64/src/memory/page_table.cpp b/arch/x86_64/src/memory/page_table.cpp
deleted file mode 100644
index 26cdd29..0000000
--- a/arch/x86_64/src/memory/page_table.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-#include "arch/memory/page_table.hpp"
-
-#include "kapi/memory.hpp"
-
-#include <algorithm>
-#include <bit>
-#include <cstddef>
-#include <cstdint>
-#include <optional>
-#include <utility>
-
-namespace arch::memory
-{
-
- auto page_table::entry::clear() noexcept -> void
- {
- m_raw = 0;
- }
-
- auto page_table::entry::present() const noexcept -> bool
- {
- return (all_flags() & flags::present) != flags::empty;
- }
-
- auto page_table::entry::huge() const noexcept -> bool
- {
- return (all_flags() & flags::huge_page) != flags::empty;
- }
-
- auto page_table::entry::all_flags() const noexcept -> flags
- {
- return std::bit_cast<flags>(m_raw & ~frame_number_mask);
- }
-
- auto page_table::entry::all_flags(flags flags) noexcept -> void
- {
- m_raw = (m_raw & ~frame_number_mask) | std::to_underlying(flags);
- }
-
- auto page_table::entry::operator|=(flags rhs) noexcept -> page_table::entry &
- {
- auto raw_flags = std::to_underlying(rhs) & ~frame_number_mask;
- m_raw |= raw_flags;
- return *this;
- }
-
- auto page_table::entry::frame() const noexcept -> std::optional<kapi::memory::frame>
- {
- if (present())
- {
- return kapi::memory::frame::containing(kapi::memory::physical_address{m_raw & frame_number_mask});
- }
- return std::nullopt;
- }
-
- auto page_table::entry::frame(kapi::memory::frame frame, flags flags) noexcept -> void
- {
- m_raw = (frame.start_address().raw() | static_cast<std::uint64_t>(flags));
- };
-
- auto page_table::operator[](std::size_t index) -> entry &
- {
- return m_entries.at(index);
- }
-
- auto page_table::operator[](std::size_t index) const -> entry const &
- {
- return m_entries.at(index);
- }
-
- auto page_table::clear() noexcept -> void
- {
- std::ranges::for_each(m_entries, &page_table::entry::clear);
- }
-
- auto page_table::empty() const noexcept -> bool
- {
- return std::ranges::all_of(m_entries,
- [](auto const & entry) -> auto { return entry.all_flags() == entry::flags::empty; });
- }
-
-} // namespace arch::memory
diff --git a/arch/x86_64/src/memory/region_allocator.cpp b/arch/x86_64/src/memory/region_allocator.cpp
deleted file mode 100644
index facb1f2..0000000
--- a/arch/x86_64/src/memory/region_allocator.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-#include "arch/memory/region_allocator.hpp"
-
-#include "kapi/memory/address.hpp"
-#include "kapi/memory/frame.hpp"
-
-#include <multiboot2/information.hpp>
-
-#include <algorithm>
-#include <cstddef>
-#include <optional>
-#include <ranges>
-#include <utility>
-
-namespace arch::memory
-{
- namespace
- {
- constexpr auto last_frame(multiboot2::memory_map::region const & region)
- {
- return kapi::memory::frame::containing(kapi::memory::physical_address{region.base + region.size_in_B - 1});
- }
-
- constexpr auto falls_within(kapi::memory::frame const & candidate, kapi::memory::frame const & start,
- kapi::memory::frame const & end)
- {
- return candidate >= start && candidate <= end;
- }
- } // namespace
-
- region_allocator::region_allocator(memory_information const & mem_info)
- : m_next_frame{}
- , m_current_region{}
- , m_memory_map{mem_info.memory_map}
- , m_kernel_start{kapi::memory::frame::containing(mem_info.image_range.first)}
- , m_kernel_end{kapi::memory::frame::containing(mem_info.image_range.second)}
- , m_multiboot_start{kapi::memory::frame::containing(mem_info.mbi_range.first)}
- , m_multiboot_end{kapi::memory::frame::containing(mem_info.mbi_range.second)}
- // TODO BA-FS26: Protect MB2 boot modules
- {
- choose_next_region();
- }
-
- auto region_allocator::choose_next_region() -> void
- {
- m_current_region.reset();
-
- auto remaining_regions =
- m_memory_map | //
- std::views::filter(&multiboot2::memory_map::region::available) |
- std::views::filter([this](auto const & region) -> bool { return last_frame(region) >= m_next_frame; });
-
- auto lowest_region =
- std::ranges::min_element(remaining_regions, [](auto lhs, auto rhs) -> bool { return lhs.base < rhs.base; });
-
- if (lowest_region == remaining_regions.end())
- {
- return;
- }
-
- m_current_region = *lowest_region;
- if (auto start_of_region = kapi::memory::frame::containing(kapi::memory::physical_address{m_current_region->base});
- start_of_region > m_next_frame)
- {
- m_next_frame = start_of_region;
- }
- }
-
- auto region_allocator::find_next_frame() -> std::optional<kapi::memory::frame>
- {
- if (!m_current_region || m_next_frame > last_frame(*m_current_region))
- {
- choose_next_region();
- if (!m_current_region)
- {
- return std::nullopt;
- }
- }
-
- if (falls_within(m_next_frame, m_kernel_start, m_kernel_end))
- {
- m_next_frame = m_kernel_end + 1;
- }
-
- if (falls_within(m_next_frame, m_multiboot_start, m_multiboot_end))
- {
- m_next_frame = m_multiboot_end + 1;
- }
-
- if (falls_within(m_next_frame, m_kernel_start, m_kernel_end))
- {
- m_next_frame = m_kernel_end + 1;
- }
-
- if (m_next_frame > last_frame(*m_current_region))
- {
- choose_next_region();
- }
-
- return m_current_region.transform([this](auto) -> auto { return m_next_frame; });
- }
-
- auto region_allocator::allocate_many(std::size_t count) noexcept
- -> std::optional<std::pair<kapi::memory::frame, std::size_t>>
- {
- while (m_current_region)
- {
- auto result = find_next_frame();
-
- if (result)
- {
- auto region_end = last_frame(*m_current_region);
- if ((region_end.number() - result->number()) >= count)
- {
- m_next_frame = m_next_frame + count;
- return std::make_pair(*result, count);
- }
- else
- {
- m_next_frame = region_end + 1;
- choose_next_region();
- }
- }
- }
-
- return std::nullopt;
- }
-
- auto region_allocator::mark_used(kapi::memory::frame frame) -> void
- {
- if (frame < m_next_frame)
- {
- m_next_frame = frame;
- find_next_frame();
- }
- }
-
- auto region_allocator::release_many(std::pair<kapi::memory::frame, std::size_t>) -> void {}
-
- auto region_allocator::next_free_frame() noexcept -> std::optional<kapi::memory::frame>
- {
- return find_next_frame();
- }
-
-} // namespace arch::memory
diff --git a/arch/x86_64/src/vga/text/buffer.cpp b/arch/x86_64/src/vga/text/buffer.cpp
deleted file mode 100644
index 7112573..0000000
--- a/arch/x86_64/src/vga/text/buffer.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-#include "arch/vga/text/buffer.hpp"
-
-#include "arch/vga/text/attribute.hpp"
-
-#include <algorithm>
-#include <bit>
-#include <cstddef>
-#include <span>
-#include <string_view>
-#include <utility>
-
-namespace arch::vga::text
-{
- buffer::buffer(std::size_t width, std::size_t height, cell * start, std::size_t position)
- : m_width{width}
- , m_height{height}
- , m_buffer{start, m_width * m_height}
- , m_position{position}
- {}
-
- auto buffer::clear() -> void
- {
- m_position = 0;
- std::ranges::fill(m_buffer, std::pair{'\0', static_cast<std::byte>(0x00)});
- }
-
- auto buffer::write(std::string_view code_points, attribute attribute) -> void
- {
- std::ranges::for_each(code_points, [&](auto code_point) -> void { write(code_point, attribute); });
- }
-
- auto buffer::write(char code_point, attribute attribute) -> void
- {
- if (m_position + 1 > m_height * m_width)
- {
- scroll();
- }
-
- if (!handle_special_code_point(code_point, attribute))
- {
- do_write(code_point, attribute);
- }
- };
-
- auto buffer::newline() -> void
- {
- auto free_glyphs_in_line = m_width - column();
- m_position += free_glyphs_in_line;
- }
-
- auto buffer::scroll(std::size_t nof_lines) -> void
- {
- auto scroll_count = std::min(nof_lines, m_height);
-
- auto scroll_start = m_buffer.begin() + (scroll_count * m_width);
- std::ranges::move(scroll_start, m_buffer.end(), m_buffer.begin());
-
- auto clear_start = m_buffer.begin() + (m_height - scroll_count) * m_width;
- std::ranges::fill(clear_start, m_buffer.end(), cell{});
-
- m_position = (line() - scroll_count) * m_width;
- }
-
- auto buffer::column() const noexcept -> std::ptrdiff_t
- {
- return m_position % m_width;
- }
-
- auto buffer::line() const noexcept -> std::ptrdiff_t
- {
- return m_position / m_width;
- }
- auto buffer::handle_special_code_point(char code_point, attribute attribute) -> bool
- {
- switch (code_point)
- {
- case '\n':
- newline();
- return true;
- case '\r':
- m_position -= column();
- return true;
- case '\t':
- do_write(" ", attribute);
- return true;
- default:
- return false;
- }
- }
-
- auto buffer::do_write(std::string_view code_points, attribute attribute) -> void
- {
- std::ranges::for_each(code_points, [&](auto code_point) -> void { do_write(code_point, attribute); });
- }
-
- auto buffer::do_write(char code_point, attribute attribute) -> void
- {
- m_buffer[m_position++] = std::pair{code_point, std::bit_cast<std::byte>(attribute)};
- }
-
-} // namespace arch::vga::text
diff --git a/arch/x86_64/src/vga/text/device.cpp b/arch/x86_64/src/vga/text/device.cpp
deleted file mode 100644
index dcacd8c..0000000
--- a/arch/x86_64/src/vga/text/device.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-#include "kapi/cio.hpp"
-
-#include "arch/boot/boot.hpp"
-#include "arch/boot/ld.hpp"
-#include "arch/vga/crtc.hpp"
-#include "arch/vga/text.hpp"
-
-#include <bit>
-#include <cstddef>
-#include <cstdint>
-#include <string_view>
-
-namespace arch::vga::text
-{
- namespace
- {
- constexpr auto default_buffer_address = std::uintptr_t{0xb8000};
- constexpr auto default_buffer_width = 80z;
- constexpr auto default_buffer_height = 25z;
-
- constexpr auto bit_cursor_enabled = 5U;
- } // namespace
-
- device::device()
- : m_buffer{
- default_buffer_width, default_buffer_height,
- std::bit_cast<buffer::cell *>(default_buffer_address + std::bit_cast<std::uintptr_t>(&boot::TEACHOS_VMA)),
- kapi::boot::bootstrap_information.vga_buffer_index}
- {
- clear();
- }
-
- auto device::clear() -> void
- {
- m_buffer.clear();
- }
-
- auto device::cursor(bool enabled) -> void
- {
- auto cursor_disable_byte = std::byte{!enabled} << bit_cursor_enabled;
-
- crtc::address::write(crtc::registers::cursor_start);
- crtc::data::write(crtc::data::read() | cursor_disable_byte);
- }
-
- auto device::write(kapi::cio::output_stream stream, std::string_view text) -> void
- {
- auto attributes = [&] -> attribute {
- switch (stream)
- {
- case kapi::cio::output_stream::stderr:
- return red_on_black;
- default:
- return green_on_black;
- }
- }();
- m_buffer.write(text, attributes);
- }
-
-} // namespace arch::vga::text