aboutsummaryrefslogtreecommitdiff
path: root/arch/x86_64/pre/src
diff options
context:
space:
mode:
authorFelix Morgner <felix.morgner@ost.ch>2025-10-29 15:01:43 +0100
committerFelix Morgner <felix.morgner@ost.ch>2025-10-29 15:01:43 +0100
commitb157e2c472d8bd67ac1656404a6a6ee821260f4b (patch)
tree9c4ebaee21c9ad3521f86c543dc1f29906305baa /arch/x86_64/pre/src
parentc2b0bdfe3b725166f16c742cdaca7969052df382 (diff)
downloadteachos-b157e2c472d8bd67ac1656404a6a6ee821260f4b.tar.xz
teachos-b157e2c472d8bd67ac1656404a6a6ee821260f4b.zip
chore: reformat source code
Diffstat (limited to 'arch/x86_64/pre/src')
-rw-r--r--arch/x86_64/pre/src/context_switching/interrupt_descriptor_table/idt_flags.cpp5
-rw-r--r--arch/x86_64/pre/src/context_switching/interrupt_descriptor_table/interrupt_descriptor_table.cpp2
-rw-r--r--arch/x86_64/pre/src/context_switching/interrupt_descriptor_table/segment_selector.cpp15
-rw-r--r--arch/x86_64/pre/src/context_switching/main.cpp13
-rw-r--r--arch/x86_64/pre/src/context_switching/segment_descriptor_table/access_byte.cpp5
-rw-r--r--arch/x86_64/pre/src/context_switching/segment_descriptor_table/gdt_flags.cpp10
-rw-r--r--arch/x86_64/pre/src/context_switching/segment_descriptor_table/global_descriptor_table.cpp10
-rw-r--r--arch/x86_64/pre/src/context_switching/segment_descriptor_table/segment_descriptor_base.cpp5
-rw-r--r--arch/x86_64/pre/src/context_switching/segment_descriptor_table/segment_descriptor_extension.cpp10
-rw-r--r--arch/x86_64/pre/src/context_switching/syscall/syscall_enable.cpp10
-rw-r--r--arch/x86_64/pre/src/context_switching/syscall/syscall_handler.cpp11
-rw-r--r--arch/x86_64/pre/src/exception_handling/abort.cpp5
-rw-r--r--arch/x86_64/pre/src/exception_handling/panic.cpp5
-rw-r--r--arch/x86_64/pre/src/kernel/cpu/if.cpp10
-rw-r--r--arch/x86_64/pre/src/kernel/cpu/msr.cpp2
-rw-r--r--arch/x86_64/pre/src/memory/allocator/area_frame_allocator.cpp5
-rw-r--r--arch/x86_64/pre/src/memory/heap/global_heap_allocator.cpp33
-rw-r--r--arch/x86_64/pre/src/memory/heap/memory_block.cpp5
-rw-r--r--arch/x86_64/pre/src/memory/heap/user_heap_allocator.cpp4
-rw-r--r--arch/x86_64/pre/src/memory/main.cpp4
-rw-r--r--arch/x86_64/pre/src/memory/multiboot/elf_symbols_section.cpp5
-rw-r--r--arch/x86_64/pre/src/memory/paging/active_page_table.cpp11
-rw-r--r--arch/x86_64/pre/src/memory/paging/page_entry.cpp27
-rw-r--r--arch/x86_64/pre/src/memory/paging/page_table.cpp20
-rw-r--r--arch/x86_64/pre/src/memory/paging/virtual_page.cpp7
25 files changed, 171 insertions, 68 deletions
diff --git a/arch/x86_64/pre/src/context_switching/interrupt_descriptor_table/idt_flags.cpp b/arch/x86_64/pre/src/context_switching/interrupt_descriptor_table/idt_flags.cpp
index d36a4c1..f3b9d5e 100644
--- a/arch/x86_64/pre/src/context_switching/interrupt_descriptor_table/idt_flags.cpp
+++ b/arch/x86_64/pre/src/context_switching/interrupt_descriptor_table/idt_flags.cpp
@@ -13,5 +13,8 @@ namespace teachos::arch::context_switching::interrupt_descriptor_table
return (std::bitset<8U>{_flags} & other) == other;
}
- auto idt_flags::operator|=(std::bitset<8U> other) -> void { _flags |= other.to_ulong(); }
+ auto idt_flags::operator|=(std::bitset<8U> other) -> void
+ {
+ _flags |= other.to_ulong();
+ }
} // namespace teachos::arch::context_switching::interrupt_descriptor_table
diff --git a/arch/x86_64/pre/src/context_switching/interrupt_descriptor_table/interrupt_descriptor_table.cpp b/arch/x86_64/pre/src/context_switching/interrupt_descriptor_table/interrupt_descriptor_table.cpp
index 7aa0859..8640385 100644
--- a/arch/x86_64/pre/src/context_switching/interrupt_descriptor_table/interrupt_descriptor_table.cpp
+++ b/arch/x86_64/pre/src/context_switching/interrupt_descriptor_table/interrupt_descriptor_table.cpp
@@ -33,7 +33,7 @@ namespace teachos::arch::context_switching::interrupt_descriptor_table
auto get_or_create_interrupt_descriptor_table() -> interrupt_descriptor_table &
{
// Interrupt Descriptor Table needs to be kept alive
- static interrupt_descriptor_table idt = create_interrupt_descriptor_table();
+ interrupt_descriptor_table static idt = create_interrupt_descriptor_table();
return idt;
}
diff --git a/arch/x86_64/pre/src/context_switching/interrupt_descriptor_table/segment_selector.cpp b/arch/x86_64/pre/src/context_switching/interrupt_descriptor_table/segment_selector.cpp
index 27f0a3b..25ba859 100644
--- a/arch/x86_64/pre/src/context_switching/interrupt_descriptor_table/segment_selector.cpp
+++ b/arch/x86_64/pre/src/context_switching/interrupt_descriptor_table/segment_selector.cpp
@@ -7,9 +7,18 @@ namespace teachos::arch::context_switching::interrupt_descriptor_table
return (std::bitset<3U>{_flags} & other) == other;
}
- auto segment_selector::get_index() const -> uint16_t { return _index; }
+ auto segment_selector::get_index() const -> uint16_t
+ {
+ return _index;
+ }
- auto segment_selector::operator|=(std::bitset<3U> other) -> void { _flags |= other.to_ulong(); }
+ auto segment_selector::operator|=(std::bitset<3U> other) -> void
+ {
+ _flags |= other.to_ulong();
+ }
- segment_selector::operator uint16_t() const { return *reinterpret_cast<uint16_t const *>(this); }
+ segment_selector::operator uint16_t() const
+ {
+ return *reinterpret_cast<uint16_t const *>(this);
+ }
} // namespace teachos::arch::context_switching::interrupt_descriptor_table
diff --git a/arch/x86_64/pre/src/context_switching/main.cpp b/arch/x86_64/pre/src/context_switching/main.cpp
index 9539428..3eb6dae 100644
--- a/arch/x86_64/pre/src/context_switching/main.cpp
+++ b/arch/x86_64/pre/src/context_switching/main.cpp
@@ -13,20 +13,23 @@ namespace teachos::arch::context_switching
namespace
{
constexpr interrupt_descriptor_table::segment_selector KERNEL_CODE_SEGMENT_SELECTOR{
- 1U, interrupt_descriptor_table::segment_selector::REQUEST_LEVEL_KERNEL};
+ 1U, interrupt_descriptor_table::segment_selector::REQUEST_LEVEL_KERNEL};
constexpr kernel::cpu::far_pointer KERNEL_CODE_POINTER{&kernel::cpu::reload_data_segment_registers,
KERNEL_CODE_SEGMENT_SELECTOR};
constexpr context_switching::interrupt_descriptor_table::segment_selector USER_CODE_SEGMENT_SELECTOR{
- 3U, context_switching::interrupt_descriptor_table::segment_selector::REQUEST_LEVEL_USER};
+ 3U, context_switching::interrupt_descriptor_table::segment_selector::REQUEST_LEVEL_USER};
constexpr context_switching::interrupt_descriptor_table::segment_selector USER_DATA_SEGMENT_SELECTOR{
- 4U, context_switching::interrupt_descriptor_table::segment_selector::REQUEST_LEVEL_USER};
+ 4U, context_switching::interrupt_descriptor_table::segment_selector::REQUEST_LEVEL_USER};
- auto reload_gdtr() -> void { kernel::cpu::call(KERNEL_CODE_POINTER); }
+ auto reload_gdtr() -> void
+ {
+ kernel::cpu::call(KERNEL_CODE_POINTER);
+ }
} // namespace
auto initialize_descriptor_tables() -> descriptor_tables
{
- static bool initalized = false;
+ bool static initalized = false;
if (!initalized)
{
diff --git a/arch/x86_64/pre/src/context_switching/segment_descriptor_table/access_byte.cpp b/arch/x86_64/pre/src/context_switching/segment_descriptor_table/access_byte.cpp
index e31e021..fcc72cf 100644
--- a/arch/x86_64/pre/src/context_switching/segment_descriptor_table/access_byte.cpp
+++ b/arch/x86_64/pre/src/context_switching/segment_descriptor_table/access_byte.cpp
@@ -13,5 +13,8 @@ namespace teachos::arch::context_switching::segment_descriptor_table
return (std::bitset<8U>{_flags} & other) == other;
}
- auto access_byte::operator|=(std::bitset<8U> other) -> void { _flags |= other.to_ulong(); }
+ auto access_byte::operator|=(std::bitset<8U> other) -> void
+ {
+ _flags |= other.to_ulong();
+ }
} // namespace teachos::arch::context_switching::segment_descriptor_table
diff --git a/arch/x86_64/pre/src/context_switching/segment_descriptor_table/gdt_flags.cpp b/arch/x86_64/pre/src/context_switching/segment_descriptor_table/gdt_flags.cpp
index e444a24..ad1366a 100644
--- a/arch/x86_64/pre/src/context_switching/segment_descriptor_table/gdt_flags.cpp
+++ b/arch/x86_64/pre/src/context_switching/segment_descriptor_table/gdt_flags.cpp
@@ -14,7 +14,13 @@ namespace teachos::arch::context_switching::segment_descriptor_table
return (std::bitset<4U>{_flags} & other) == other;
}
- auto gdt_flags::get_limit() const -> std::bitset<4U> { return std::bitset<4U>{_limit_2}; }
+ auto gdt_flags::get_limit() const -> std::bitset<4U>
+ {
+ return std::bitset<4U>{_limit_2};
+ }
- auto gdt_flags::operator|=(std::bitset<4U> other) -> void { _flags |= other.to_ulong(); }
+ auto gdt_flags::operator|=(std::bitset<4U> other) -> void
+ {
+ _flags |= other.to_ulong();
+ }
} // namespace teachos::arch::context_switching::segment_descriptor_table
diff --git a/arch/x86_64/pre/src/context_switching/segment_descriptor_table/global_descriptor_table.cpp b/arch/x86_64/pre/src/context_switching/segment_descriptor_table/global_descriptor_table.cpp
index bbcee31..1c4729f 100644
--- a/arch/x86_64/pre/src/context_switching/segment_descriptor_table/global_descriptor_table.cpp
+++ b/arch/x86_64/pre/src/context_switching/segment_descriptor_table/global_descriptor_table.cpp
@@ -12,8 +12,8 @@ namespace teachos::arch::context_switching::segment_descriptor_table
auto create_segment_descriptor(segment_descriptor_type segment_descriptor_type, access_byte access_level)
-> segment_descriptor_base
{
- uint64_t constexpr BASE = 0x0;
- std::bitset<20U> constexpr LIMIT{0xFFFFF};
+ constexpr uint64_t BASE = 0x0;
+ constexpr std::bitset<20U> LIMIT{0xFFFFF};
gdt_flags flags{gdt_flags::GRANULARITY, LIMIT};
access_level |= access_byte::PRESENT | access_byte::CODE_OR_DATA_SEGMENT;
@@ -33,7 +33,7 @@ namespace teachos::arch::context_switching::segment_descriptor_table
auto create_tss_descriptor(task_state_segment * tss) -> segment_descriptor_extension
{
- uint64_t constexpr TSS_LIMIT = sizeof(task_state_segment) - 1;
+ constexpr uint64_t TSS_LIMIT = sizeof(task_state_segment) - 1;
access_byte const tss_access_byte{access_byte::PRESENT | access_byte::DESCRIPTOR_LEVEL_KERNEL |
access_byte::TASK_STATE_SEGMENT_AVAILABLE};
gdt_flags const tss_gdt_flags{0U, TSS_LIMIT};
@@ -55,7 +55,7 @@ namespace teachos::arch::context_switching::segment_descriptor_table
create_segment_descriptor(segment_descriptor_type::DATA_SEGMENT, access_byte::DESCRIPTOR_LEVEL_USER);
// Task State Segment needs to be kept alive
- static auto tss = new task_state_segment();
+ auto static tss = new task_state_segment();
segment_descriptor_extension const tss_descriptor = create_tss_descriptor(tss);
global_descriptor_table global_descriptor_table{null_segment,
@@ -72,7 +72,7 @@ namespace teachos::arch::context_switching::segment_descriptor_table
auto get_or_create_gdt() -> global_descriptor_table &
{
// Global Descriptor Table needs to be kept alive
- static global_descriptor_table gdt = create_gdt();
+ global_descriptor_table static gdt = create_gdt();
return gdt;
}
diff --git a/arch/x86_64/pre/src/context_switching/segment_descriptor_table/segment_descriptor_base.cpp b/arch/x86_64/pre/src/context_switching/segment_descriptor_table/segment_descriptor_base.cpp
index 04804d9..c3a03fc 100644
--- a/arch/x86_64/pre/src/context_switching/segment_descriptor_table/segment_descriptor_base.cpp
+++ b/arch/x86_64/pre/src/context_switching/segment_descriptor_table/segment_descriptor_base.cpp
@@ -33,6 +33,9 @@ namespace teachos::arch::context_switching::segment_descriptor_table
: segment_descriptor_type::DATA_SEGMENT;
}
- segment_descriptor_base::operator uint64_t() const { return *reinterpret_cast<uint64_t const *>(this); }
+ segment_descriptor_base::operator uint64_t() const
+ {
+ return *reinterpret_cast<uint64_t const *>(this);
+ }
} // namespace teachos::arch::context_switching::segment_descriptor_table
diff --git a/arch/x86_64/pre/src/context_switching/segment_descriptor_table/segment_descriptor_extension.cpp b/arch/x86_64/pre/src/context_switching/segment_descriptor_table/segment_descriptor_extension.cpp
index a28ec9b..5ea0d8a 100644
--- a/arch/x86_64/pre/src/context_switching/segment_descriptor_table/segment_descriptor_extension.cpp
+++ b/arch/x86_64/pre/src/context_switching/segment_descriptor_table/segment_descriptor_extension.cpp
@@ -17,8 +17,14 @@ namespace teachos::arch::context_switching::segment_descriptor_table
// Nothing to do
}
- auto segment_descriptor_extension::get_first_gdt_entry() const -> segment_descriptor_base { return _base; }
+ auto segment_descriptor_extension::get_first_gdt_entry() const -> segment_descriptor_base
+ {
+ return _base;
+ }
- auto segment_descriptor_extension::get_second_gdt_entry() const -> uint64_t { return _base_3; }
+ auto segment_descriptor_extension::get_second_gdt_entry() const -> uint64_t
+ {
+ return _base_3;
+ }
} // namespace teachos::arch::context_switching::segment_descriptor_table
diff --git a/arch/x86_64/pre/src/context_switching/syscall/syscall_enable.cpp b/arch/x86_64/pre/src/context_switching/syscall/syscall_enable.cpp
index 3c43336..dbb3ed9 100644
--- a/arch/x86_64/pre/src/context_switching/syscall/syscall_enable.cpp
+++ b/arch/x86_64/pre/src/context_switching/syscall/syscall_enable.cpp
@@ -8,12 +8,12 @@ namespace teachos::arch::context_switching::syscall
{
namespace
{
- interrupt_descriptor_table::segment_selector constexpr KERNEL_CODE_SEGMENT_SELECTOR{
- 1U, interrupt_descriptor_table::segment_selector::REQUEST_LEVEL_KERNEL};
+ constexpr interrupt_descriptor_table::segment_selector KERNEL_CODE_SEGMENT_SELECTOR{
+ 1U, interrupt_descriptor_table::segment_selector::REQUEST_LEVEL_KERNEL};
- auto constexpr IA32_STAR_ADDRESS = 0xC0000081;
- auto constexpr IA32_LSTAR_ADDRESS = 0xC0000082;
- auto constexpr IA32_FMASK_ADDRESS = 0xC0000084;
+ constexpr auto IA32_STAR_ADDRESS = 0xC000'0081;
+ constexpr auto IA32_LSTAR_ADDRESS = 0xC000'0082;
+ constexpr auto IA32_FMASK_ADDRESS = 0xC000'0084;
} // namespace
diff --git a/arch/x86_64/pre/src/context_switching/syscall/syscall_handler.cpp b/arch/x86_64/pre/src/context_switching/syscall/syscall_handler.cpp
index 84dbe5f..c120f77 100644
--- a/arch/x86_64/pre/src/context_switching/syscall/syscall_handler.cpp
+++ b/arch/x86_64/pre/src/context_switching/syscall/syscall_handler.cpp
@@ -14,7 +14,7 @@ namespace teachos::arch::context_switching::syscall
{
auto write_to_vga_buffer(uint64_t buffer) -> response
{
- video::vga::text::write(reinterpret_cast<const char *>(buffer),
+ video::vga::text::write(reinterpret_cast<char const *>(buffer),
video::vga::text::common_attributes::green_on_black);
video::vga::text::newline();
return {error::OK};
@@ -22,11 +22,14 @@ namespace teachos::arch::context_switching::syscall
auto expand_user_heap() -> response
{
- static auto current_heap_end = memory::heap::USER_HEAP_START;
+ auto static current_heap_end = memory::heap::USER_HEAP_START;
uint64_t const heap_start = current_heap_end;
memory::remap_heap(heap_start, memory::heap::USER_HEAP_SIZE, memory::paging::entry::USER_ACCESSIBLE);
current_heap_end += memory::heap::USER_HEAP_SIZE;
- return {error::OK, {heap_start, memory::heap::USER_HEAP_SIZE}};
+ return {
+ error::OK,
+ {heap_start, memory::heap::USER_HEAP_SIZE}
+ };
}
} // namespace
@@ -62,7 +65,7 @@ namespace teachos::arch::context_switching::syscall
result = expand_user_heap();
break;
case type::ASSERT:
- teachos::arch::exception_handling::assert(arg_0, reinterpret_cast<const char *>(arg_1));
+ teachos::arch::exception_handling::assert(arg_0, reinterpret_cast<char const *>(arg_1));
break;
default:
teachos::arch::exception_handling::panic("[Syscall Handler] Invalid syscall number");
diff --git a/arch/x86_64/pre/src/exception_handling/abort.cpp b/arch/x86_64/pre/src/exception_handling/abort.cpp
index e12e4cb..5dc6869 100644
--- a/arch/x86_64/pre/src/exception_handling/abort.cpp
+++ b/arch/x86_64/pre/src/exception_handling/abort.cpp
@@ -11,5 +11,8 @@ namespace teachos::arch::exception_handling
* a matching implementation. Since the default implemenatation calls a number of functions the kernel does not
* currently implement, @p ::abort gets overridden to simply panic.
*/
- extern "C" auto abort() -> void { panic("Terminate was called, possibly due to an unhandled exception"); }
+ extern "C" auto abort() -> void
+ {
+ panic("Terminate was called, possibly due to an unhandled exception");
+ }
} // namespace teachos::arch::exception_handling
diff --git a/arch/x86_64/pre/src/exception_handling/panic.cpp b/arch/x86_64/pre/src/exception_handling/panic.cpp
index 8e3802a..9511a9a 100644
--- a/arch/x86_64/pre/src/exception_handling/panic.cpp
+++ b/arch/x86_64/pre/src/exception_handling/panic.cpp
@@ -7,7 +7,10 @@ namespace teachos::arch::exception_handling
{
extern "C" char const message_prefix_panic[];
- auto panic(char const * reason) -> void { panic(message_prefix_panic, reason); }
+ auto panic(char const * reason) -> void
+ {
+ panic(message_prefix_panic, reason);
+ }
auto panic(char const * prefix, char const * reason) -> void
{
diff --git a/arch/x86_64/pre/src/kernel/cpu/if.cpp b/arch/x86_64/pre/src/kernel/cpu/if.cpp
index 60a90a3..5d056fc 100644
--- a/arch/x86_64/pre/src/kernel/cpu/if.cpp
+++ b/arch/x86_64/pre/src/kernel/cpu/if.cpp
@@ -1,7 +1,13 @@
namespace teachos::arch::kernel::cpu
{
- auto set_interrupt_flag() -> void { asm volatile("sti"); }
+ auto set_interrupt_flag() -> void
+ {
+ asm volatile("sti");
+ }
- auto clear_interrupt_flag() -> void { asm volatile("cli"); }
+ auto clear_interrupt_flag() -> void
+ {
+ asm volatile("cli");
+ }
} // namespace teachos::arch::kernel::cpu
diff --git a/arch/x86_64/pre/src/kernel/cpu/msr.cpp b/arch/x86_64/pre/src/kernel/cpu/msr.cpp
index 9c474a1..9d6a318 100644
--- a/arch/x86_64/pre/src/kernel/cpu/msr.cpp
+++ b/arch/x86_64/pre/src/kernel/cpu/msr.cpp
@@ -4,7 +4,7 @@ namespace teachos::arch::kernel::cpu
{
namespace
{
- auto constexpr IA32_EFER_ADDRESS = 0xC0000080;
+ constexpr auto IA32_EFER_ADDRESS = 0xC000'0080;
}
auto read_msr(uint32_t msr) -> uint64_t
diff --git a/arch/x86_64/pre/src/memory/allocator/area_frame_allocator.cpp b/arch/x86_64/pre/src/memory/allocator/area_frame_allocator.cpp
index a5a1b49..3105023 100644
--- a/arch/x86_64/pre/src/memory/allocator/area_frame_allocator.cpp
+++ b/arch/x86_64/pre/src/memory/allocator/area_frame_allocator.cpp
@@ -81,5 +81,8 @@ namespace teachos::arch::memory::allocator
return allocate_frame();
}
- auto area_frame_allocator::deallocate_frame(physical_frame const & physical_frame) -> void { (void)physical_frame; }
+ auto area_frame_allocator::deallocate_frame(physical_frame const & physical_frame) -> void
+ {
+ (void)physical_frame;
+ }
} // namespace teachos::arch::memory::allocator
diff --git a/arch/x86_64/pre/src/memory/heap/global_heap_allocator.cpp b/arch/x86_64/pre/src/memory/heap/global_heap_allocator.cpp
index 35cd623..709cda1 100644
--- a/arch/x86_64/pre/src/memory/heap/global_heap_allocator.cpp
+++ b/arch/x86_64/pre/src/memory/heap/global_heap_allocator.cpp
@@ -27,13 +27,25 @@ namespace teachos::arch::memory::heap
heap_allocator * global_heap_allocator::kernel_allocator_instance = nullptr;
user_heap_allocator * global_heap_allocator::user_allocator_instance = nullptr;
- auto global_heap_allocator::kmalloc(std::size_t size) -> void * { return kernel().allocate(size); }
+ auto global_heap_allocator::kmalloc(std::size_t size) -> void *
+ {
+ return kernel().allocate(size);
+ }
- auto global_heap_allocator::kfree(void * pointer) noexcept -> void { kernel().deallocate(pointer); }
+ auto global_heap_allocator::kfree(void * pointer) noexcept -> void
+ {
+ kernel().deallocate(pointer);
+ }
- auto global_heap_allocator::malloc(std::size_t size) -> void * { return user().allocate(size); }
+ auto global_heap_allocator::malloc(std::size_t size) -> void *
+ {
+ return user().allocate(size);
+ }
- auto global_heap_allocator::free(void * pointer) noexcept -> void { user().deallocate(pointer); }
+ auto global_heap_allocator::free(void * pointer) noexcept -> void
+ {
+ user().deallocate(pointer);
+ }
auto global_heap_allocator::register_heap_allocator(heap_allocator_type new_type) -> void
{
@@ -45,20 +57,21 @@ namespace teachos::arch::memory::heap
case heap_allocator_type::NONE:
// Nothing to do
break;
- case heap_allocator_type::BUMP: {
- static bump_allocator kernel_allocator{KERNEL_HEAP_START, KERNEL_HEAP_START + KERNEL_HEAP_SIZE};
+ case heap_allocator_type::BUMP:
+ {
+ bump_allocator static kernel_allocator{KERNEL_HEAP_START, KERNEL_HEAP_START + KERNEL_HEAP_SIZE};
kernel_allocator_instance = &kernel_allocator;
break;
}
- case heap_allocator_type::LINKED_LIST: {
- static linked_list_allocator kernel_allocator{KERNEL_HEAP_START, KERNEL_HEAP_START + KERNEL_HEAP_SIZE};
+ case heap_allocator_type::LINKED_LIST:
+ {
+ linked_list_allocator static kernel_allocator{KERNEL_HEAP_START, KERNEL_HEAP_START + KERNEL_HEAP_SIZE};
kernel_allocator_instance = &kernel_allocator;
break;
}
}
- [[gnu::section(".user_data")]]
- static user_heap_allocator user_allocator{};
+ [[gnu::section(".user_data")]] user_heap_allocator static user_allocator{};
user_allocator_instance = &user_allocator;
}
diff --git a/arch/x86_64/pre/src/memory/heap/memory_block.cpp b/arch/x86_64/pre/src/memory/heap/memory_block.cpp
index bc97bd6..4c07454 100644
--- a/arch/x86_64/pre/src/memory/heap/memory_block.cpp
+++ b/arch/x86_64/pre/src/memory/heap/memory_block.cpp
@@ -11,5 +11,8 @@ namespace teachos::arch::memory::heap
this->next = next;
}
- memory_block::~memory_block() { memset(static_cast<void *>(this), 0U, sizeof(memory_block)); }
+ memory_block::~memory_block()
+ {
+ memset(static_cast<void *>(this), 0U, sizeof(memory_block));
+ }
} // namespace teachos::arch::memory::heap
diff --git a/arch/x86_64/pre/src/memory/heap/user_heap_allocator.cpp b/arch/x86_64/pre/src/memory/heap/user_heap_allocator.cpp
index 427a68a..96de005 100644
--- a/arch/x86_64/pre/src/memory/heap/user_heap_allocator.cpp
+++ b/arch/x86_64/pre/src/memory/heap/user_heap_allocator.cpp
@@ -39,7 +39,7 @@ namespace teachos::arch::memory::heap
}
}
- char constexpr OUT_OF_MEMORY_ERROR_MESSAGE[] = "[Linked List Allocator] Out of memory";
+ constexpr char OUT_OF_MEMORY_ERROR_MESSAGE[] = "[Linked List Allocator] Out of memory";
context_switching::syscall::syscall(context_switching::syscall::type::ASSERT,
{false, reinterpret_cast<uint64_t>(&OUT_OF_MEMORY_ERROR_MESSAGE)});
return nullptr;
@@ -178,7 +178,7 @@ namespace teachos::arch::memory::heap
// Check if the block we want to deallocate is contained in the previous block, because if it is it can only mean
// that the block has already been deallocated and we therefore attempted a double free.
- char constexpr DOUBLE_FREE_ERROR_MESSAGE[] = "[Linked List Allocator] Attempted double free detected";
+ constexpr char DOUBLE_FREE_ERROR_MESSAGE[] = "[Linked List Allocator] Attempted double free detected";
context_switching::syscall::syscall(
context_switching::syscall::type::ASSERT,
{previous_block == nullptr ||
diff --git a/arch/x86_64/pre/src/memory/main.cpp b/arch/x86_64/pre/src/memory/main.cpp
index 2746a71..b5980db 100644
--- a/arch/x86_64/pre/src/memory/main.cpp
+++ b/arch/x86_64/pre/src/memory/main.cpp
@@ -15,7 +15,7 @@ namespace teachos::arch::memory
{
namespace
{
- static std::optional<allocator::area_frame_allocator> frame_allocator;
+ std::optional<allocator::area_frame_allocator> static frame_allocator;
auto create_frame_allocator(multiboot::memory_information const & memory_information)
-> allocator::area_frame_allocator &
@@ -54,7 +54,7 @@ namespace teachos::arch::memory
auto initialize_memory_management() -> void
{
- static bool has_been_called = false;
+ bool static has_been_called = false;
arch::exception_handling::assert(!has_been_called,
"[Initialization] Memory management has already been initialized");
has_been_called = true;
diff --git a/arch/x86_64/pre/src/memory/multiboot/elf_symbols_section.cpp b/arch/x86_64/pre/src/memory/multiboot/elf_symbols_section.cpp
index f5d126b..3105120 100644
--- a/arch/x86_64/pre/src/memory/multiboot/elf_symbols_section.cpp
+++ b/arch/x86_64/pre/src/memory/multiboot/elf_symbols_section.cpp
@@ -2,7 +2,10 @@
namespace teachos::arch::memory::multiboot
{
- auto elf_section_flags::contains_flags(std::bitset<64U> other) const -> bool { return (flags & other) == other; }
+ auto elf_section_flags::contains_flags(std::bitset<64U> other) const -> bool
+ {
+ return (flags & other) == other;
+ }
auto elf_section_header::is_null() const -> bool
{
diff --git a/arch/x86_64/pre/src/memory/paging/active_page_table.cpp b/arch/x86_64/pre/src/memory/paging/active_page_table.cpp
index 0113869..930588d 100644
--- a/arch/x86_64/pre/src/memory/paging/active_page_table.cpp
+++ b/arch/x86_64/pre/src/memory/paging/active_page_table.cpp
@@ -4,18 +4,21 @@ namespace teachos::arch::memory::paging
{
namespace
{
- paging::virtual_address constexpr PAGE_TABLE_LEVEL_4_ADDRESS = 0xffffffff'fffff000;
+ constexpr paging::virtual_address PAGE_TABLE_LEVEL_4_ADDRESS = 0xffff'ffff'ffff'f000;
}
auto active_page_table::create_or_get() -> active_page_table &
{
- static page_table_handle active_handle{reinterpret_cast<page_table *>(PAGE_TABLE_LEVEL_4_ADDRESS),
+ page_table_handle static active_handle{reinterpret_cast<page_table *>(PAGE_TABLE_LEVEL_4_ADDRESS),
page_table_handle::LEVEL4};
- static active_page_table active_page{active_handle};
+ active_page_table static active_page{active_handle};
return active_page;
}
- auto active_page_table::operator[](std::size_t index) -> entry & { return active_handle[index]; }
+ auto active_page_table::operator[](std::size_t index) -> entry &
+ {
+ return active_handle[index];
+ }
auto active_page_table::translate_address(virtual_address address) -> std::optional<allocator::physical_address>
{
diff --git a/arch/x86_64/pre/src/memory/paging/page_entry.cpp b/arch/x86_64/pre/src/memory/paging/page_entry.cpp
index 57045ca..ec45068 100644
--- a/arch/x86_64/pre/src/memory/paging/page_entry.cpp
+++ b/arch/x86_64/pre/src/memory/paging/page_entry.cpp
@@ -6,7 +6,7 @@ namespace teachos::arch::memory::paging
{
namespace
{
- std::size_t constexpr PHYSICAL_ADDRESS_MASK = 0x000fffff'fffff000;
+ constexpr std::size_t PHYSICAL_ADDRESS_MASK = 0x000f'ffff'ffff'f000;
} // namespace
entry::entry(uint64_t flags)
@@ -33,11 +33,20 @@ namespace teachos::arch::memory::paging
}
}
- auto entry::is_unused() const -> bool { return flags == 0U; }
+ auto entry::is_unused() const -> bool
+ {
+ return flags == 0U;
+ }
- auto entry::set_unused() -> void { flags = 0U; }
+ auto entry::set_unused() -> void
+ {
+ flags = 0U;
+ }
- auto entry::set_user_accessible() -> void { flags |= entry::USER_ACCESSIBLE; }
+ auto entry::set_user_accessible() -> void
+ {
+ flags |= entry::USER_ACCESSIBLE;
+ }
auto entry::calculate_pointed_to_frame() const -> std::optional<allocator::physical_frame>
{
@@ -49,7 +58,10 @@ namespace teachos::arch::memory::paging
return std::nullopt;
}
- auto entry::contains_flags(std::bitset<64U> other) const -> bool { return (flags & other) == other; }
+ auto entry::contains_flags(std::bitset<64U> other) const -> bool
+ {
+ return (flags & other) == other;
+ }
auto entry::set_entry(allocator::physical_frame frame, std::bitset<64U> additional_flags) -> void
{
@@ -59,5 +71,8 @@ namespace teachos::arch::memory::paging
flags =