chore: reformat source code

37 files changed, 216 insertions, 105 deletions

diff --git a/arch/x86_64/pre/include/arch/context_switching/interrupt_descriptor_table/segment_selector.hpp b/arch/x86_64/pre/include/arch/context_switching/interrupt_descriptor_table/segment_selector.hpp
index 2a7704e..ea8c145 100644
--- a/arch/x86_64/pre/include/arch/context_switching/interrupt_descriptor_table/segment_selector.hpp
+++ b/arch/x86_64/pre/include/arch/context_switching/interrupt_descriptor_table/segment_selector.hpp
@@ -96,9 +96,9 @@ namespace teachos::arch::context_switching::interrupt_descriptor_table
 
   private:
     uint8_t _flags : 3 = {};  ///< Underlying bits used to read the flags from.
-    uint16_t _index : 13 =
-        {};  ///< Index into the local or global descriptor table. Processor multiplies the index value by 16 (number of
-             ///< bytes in segment descriptor) and adds the result to the base address.
+    uint16_t _index
+        : 13 = {};  ///< Index into the local or global descriptor table. Processor multiplies the index value by 16
+                    ///< (number of bytes in segment descriptor) and adds the result to the base address.
   };
 }  // namespace teachos::arch::context_switching::interrupt_descriptor_table
 
diff --git a/arch/x86_64/pre/include/arch/context_switching/syscall/main.hpp b/arch/x86_64/pre/include/arch/context_switching/syscall/main.hpp
index 59adc13..f507c61 100644
--- a/arch/x86_64/pre/include/arch/context_switching/syscall/main.hpp
+++ b/arch/x86_64/pre/include/arch/context_switching/syscall/main.hpp
@@ -41,7 +41,10 @@ namespace teachos::arch::context_switching::syscall
    * @param e Error code that was returned by the syscall.
    * @return Return true if there was no error and false otherwise.
    */
-  constexpr bool operator!(error e) { return e == error::OK; }
+  constexpr bool operator!(error e)
+  {
+    return e == error::OK;
+  }
 
   /**
    * @brief Maximum amount of arguments that can be passed to a syscall. Default value is 0 and arguments are only ever
diff --git a/arch/x86_64/pre/include/arch/memory/allocator/tiny_frame_allocator.hpp b/arch/x86_64/pre/include/arch/memory/allocator/tiny_frame_allocator.hpp
index 1ceb74d..1e4746d 100644
--- a/arch/x86_64/pre/include/arch/memory/allocator/tiny_frame_allocator.hpp
+++ b/arch/x86_64/pre/include/arch/memory/allocator/tiny_frame_allocator.hpp
@@ -10,7 +10,7 @@ namespace teachos::arch::memory::allocator
 {
   namespace
   {
-    uint8_t constexpr TINY_ALLOCATOR_FRAMES_COUNT = 3U;
+    constexpr uint8_t TINY_ALLOCATOR_FRAMES_COUNT = 3U;
   }
 
   /**
diff --git a/arch/x86_64/pre/include/arch/memory/heap/global_heap_allocator.hpp b/arch/x86_64/pre/include/arch/memory/heap/global_heap_allocator.hpp
index c98c130..480b1d0 100644
--- a/arch/x86_64/pre/include/arch/memory/heap/global_heap_allocator.hpp
+++ b/arch/x86_64/pre/include/arch/memory/heap/global_heap_allocator.hpp
@@ -37,7 +37,7 @@ namespace teachos::arch::memory::heap
      *
      * @param new_type Type of the heap allocation implementation we want to instantiate
      */
-    static auto register_heap_allocator(heap_allocator_type new_type) -> void;
+    auto static register_heap_allocator(heap_allocator_type new_type) -> void;
 
     /**
      * @brief Allocates the given amount of memory and returns the pointer to the start of the allocatable memory area.
@@ -46,7 +46,7 @@ namespace teachos::arch::memory::heap
      * @param size Amount of bytes that should be allocated
      * @return void* Pointer to the start of the allocatable memory area
      */
-    static auto kmalloc(std::size_t size) -> void *;
+    auto static kmalloc(std::size_t size) -> void *;
 
     /**
      * @brief Deallocated all memory associated with the memory area starting from the given pointer address.
@@ -54,7 +54,7 @@ namespace teachos::arch::memory::heap
      *
      * @param pointer Previously allocated memory area, that should now be freed
      */
-    static auto kfree(void * pointer) noexcept -> void;
+    auto static kfree(void * pointer) noexcept -> void;
 
     /**
      * @brief Allocates the given amount of memory and returns the pointer to the start of the allocatable memory area.
@@ -64,7 +64,7 @@ namespace teachos::arch::memory::heap
      * @return void* Pointer to the start of the allocatable memory area
      */
     [[gnu::section(".user_text")]]
-    static auto malloc(std::size_t size) -> void *;
+    auto static malloc(std::size_t size) -> void *;
 
     /**
      * @brief Deallocated all memory associated with the memory area starting from the given pointer address.
@@ -73,11 +73,11 @@ namespace teachos::arch::memory::heap
      * @param pointer Previously allocated memory area, that should now be freed
      */
     [[gnu::section(".user_text")]]
-    static auto free(void * pointer) noexcept -> void;
+    auto static free(void * pointer) noexcept -> void;
 
   private:
-    static heap_allocator * kernel_allocator_instance;  ///< Instance used to allocate and deallocate kernel heap memory
-    [[gnu::section(".user_data")]] static user_heap_allocator *
+    heap_allocator static * kernel_allocator_instance;  ///< Instance used to allocate and deallocate kernel heap memory
+    [[gnu::section(".user_data")]] user_heap_allocator static *
         user_allocator_instance;  ///< Instance used to allocate and deallocate user heap memory
 
     /**
@@ -85,15 +85,14 @@ namespace teachos::arch::memory::heap
      *
      * @return Reference to the registered kernel heap allocation
      */
-    static auto kernel() -> heap_allocator &;
+    auto static kernel() -> heap_allocator &;
 
     /**
      * @brief Either returns the previously registered heap allocated or halts further execution
      *
      * @return Reference to the registered user heap allocation
      */
-    [[gnu::section(".user_text")]]
-    static auto user() -> user_heap_allocator &;
+    [[gnu::section(".user_text")]] auto static user() -> user_heap_allocator &;
   };
 }  // namespace teachos::arch::memory::heap
 
diff --git a/arch/x86_64/pre/include/arch/memory/heap/heap_allocator.hpp b/arch/x86_64/pre/include/arch/memory/heap/heap_allocator.hpp
index 420a1d3..6c25532 100644
--- a/arch/x86_64/pre/include/arch/memory/heap/heap_allocator.hpp
+++ b/arch/x86_64/pre/include/arch/memory/heap/heap_allocator.hpp
@@ -5,10 +5,10 @@
 
 namespace teachos::arch::memory::heap
 {
-  std::size_t constexpr KERNEL_HEAP_START = 0x100000000;
-  std::size_t constexpr KERNEL_HEAP_SIZE = 100 * 1024;
-  std::size_t constexpr USER_HEAP_START = 0x100019000;  // Starts directly after kernel heap
-  std::size_t constexpr USER_HEAP_SIZE = 100 * 1024;
+  constexpr std::size_t KERNEL_HEAP_START = 0x1'0000'0000;
+  constexpr std::size_t KERNEL_HEAP_SIZE = 100 * 1024;
+  constexpr std::size_t USER_HEAP_START = 0x1'0001'9000;  // Starts directly after kernel heap
+  constexpr std::size_t USER_HEAP_SIZE = 100 * 1024;
 
   /**
    * @brief Heap allocator interface containing methods required to allocate and deallocate heap memory areas
diff --git a/arch/x86_64/pre/include/arch/memory/heap/linked_list_allocator.hpp b/arch/x86_64/pre/include/arch/memory/heap/linked_list_allocator.hpp
index bbbad19..540ff5c 100644
--- a/arch/x86_64/pre/include/arch/memory/heap/linked_list_allocator.hpp
+++ b/arch/x86_64/pre/include/arch/memory/heap/linked_list_allocator.hpp
@@ -3,7 +3,6 @@
 
 #include "arch/memory/heap/heap_allocator.hpp"
 #include "arch/memory/heap/memory_block.hpp"
-
 #include <kstd/mutex.hpp>
 
 namespace teachos::arch::memory::heap
@@ -44,7 +43,10 @@ namespace teachos::arch::memory::heap
      *
      * @return Smallest allocatable block of heap memory.
      */
-    auto constexpr min_allocatable_size() -> std::size_t { return sizeof(memory_block); }
+    constexpr auto min_allocatable_size() -> std::size_t
+    {
+      return sizeof(memory_block);
+    }
 
     /**
      * @brief Removes a free memory block from the free list and returns its address so the caller can allocate into it.
diff --git a/arch/x86_64/pre/include/arch/memory/heap/user_heap_allocator.hpp b/arch/x86_64/pre/include/arch/memory/heap/user_heap_allocator.hpp
index 3b47f15..15d8574 100644
--- a/arch/x86_64/pre/include/arch/memory/heap/user_heap_allocator.hpp
+++ b/arch/x86_64/pre/include/arch/memory/heap/user_heap_allocator.hpp
@@ -5,6 +5,7 @@
 
 // #include <kstd/mutex.hpp>
 #include <kstd/mutex.hpp>
+
 #include <optional>
 
 namespace teachos::arch::memory::heap
@@ -47,7 +48,10 @@ namespace teachos::arch::memory::heap
      *
      * @return Smallest allocatable block of heap memory.
      */
-    [[gnu::section(".user_text")]] auto constexpr min_allocatable_size() -> std::size_t { return sizeof(memory_block); }
+    [[gnu::section(".user_text")]] constexpr auto min_allocatable_size() -> std::size_t
+    {
+      return sizeof(memory_block);
+    }
 
     /**
      * @brief Checks if the given memory block is big enough and if it is allocates into the current block.
diff --git a/arch/x86_64/pre/include/arch/memory/multiboot/reader.hpp b/arch/x86_64/pre/include/arch/memory/multiboot/reader.hpp
index c5464cb..ba80918 100644
--- a/arch/x86_64/pre/include/arch/memory/multiboot/reader.hpp
+++ b/arch/x86_64/pre/include/arch/memory/multiboot/reader.hpp
@@ -5,9 +5,9 @@
 // #include "arch/memory/multiboot/memory_map.hpp"
 
 #include "arch/memory/multiboot/elf_symbols_section.hpp"
+#include <multiboot2/information.hpp>
 
 #include <cstdint>
-#include <multiboot2/information.hpp>
 #include <span>
 
 namespace teachos::arch::memory::multiboot
diff --git a/arch/x86_64/pre/include/arch/memory/paging/active_page_table.hpp b/arch/x86_64/pre/include/arch/memory/paging/active_page_table.hpp
index f68d8b6..abefd61 100644
--- a/arch/x86_64/pre/include/arch/memory/paging/active_page_table.hpp
+++ b/arch/x86_64/pre/include/arch/memory/paging/active_page_table.hpp
@@ -25,7 +25,7 @@ namespace teachos::arch::memory::paging
      *
      * @return Active single unique instance of the level 4 page table.
      */
-    static auto create_or_get() -> active_page_table &;
+    auto static create_or_get() -> active_page_table &;
 
     /**
      * @brief Index operator overload to access specific mutable entry directy of the level 4 page table.
@@ -186,7 +186,7 @@ namespace teachos::arch::memory::paging
      * @param handle Page Table handle we want to access the entry that should be cleared on.
      */
     template<allocator::FrameAllocator T>
-    static auto unmap_page_table_entry(T & allocator, virtual_page page, page_table_handle & handle) -> void
+    auto static unmap_page_table_entry(T & allocator, virtual_page page, page_table_handle & handle) -> void
     {
       auto level_index = page.get_level_index(handle.get_level());
       auto & entry = handle[level_index];
diff --git a/arch/x86_64/pre/include/arch/memory/paging/kernel_mapper.hpp b/arch/x86_64/pre/include/arch/memory/paging/kernel_mapper.hpp
index 3afb54b..581f142 100644
--- a/arch/x86_64/pre/include/arch/memory/paging/kernel_mapper.hpp
+++ b/arch/x86_64/pre/include/arch/memory/paging/kernel_mapper.hpp
@@ -47,7 +47,7 @@ namespace teachos::arch::memory::paging
       auto cr4 = kernel::cpu::read_control_register(kernel::cpu::control_register::CR4);
       kernel::cpu::write_control_register(kernel::cpu::control_register::CR4, cr4 | 0x80);
 
-      temporary_page temporary_page{virtual_page{0xCAFEBABE}, allocator};
+      temporary_page temporary_page{virtual_page{0xCAFE'BABE}, allocator};
       decltype(auto) active_table = active_page_table::create_or_get();
       auto const frame = allocator.allocate_frame();
       exception_handling::assert(frame.has_value(),
@@ -124,14 +124,14 @@ namespace teachos::arch::memory::paging
     auto map_elf_kernel_sections(active_page_table & active_table) -> void
     {
       exception_handling::assert(!mem_info.sections.empty(), "[Kernel Mapper] Kernel elf sections empty");
-      std::array<uint64_t, 6U> constexpr USER_SECTION_BASES = {
-          0x102000,  // .boot_bss (Contains statically allocated variables)
-          0x209000,  // .stl_text (Contains code for custom std implementations and standard library code)
-          0x217000,  // .user_text (Contains the actual user code executed)
-          0x21E000,  // .user_data (Contains static user variables)
-
-          0x20A000  // .text (Necessary, because symbols for all template standard library features are placed here if
-                    // they were first used in the Kernel Code Section)
+      constexpr std::array<uint64_t, 6U> USER_SECTION_BASES = {
+        0x102000,  // .boot_bss (Contains statically allocated variables)
+        0x209000,  // .stl_text (Contains code for custom std implementations and standard library code)
+        0x217000,  // .user_text (Contains the actual user code executed)
+        0x21E000,  // .user_data (Contains static user variables)
+
+        0x20A000  // .text (Necessary, because symbols for all template standard library features are placed here if
+                  // they were first used in the Kernel Code Section)
       };
 
       for (auto const & section : mem_info.sections)
diff --git a/arch/x86_64/pre/include/arch/memory/paging/page_table.hpp b/arch/x86_64/pre/include/arch/memory/paging/page_table.hpp
index b972337..247086c 100644
--- a/arch/x86_64/pre/include/arch/memory/paging/page_table.hpp
+++ b/arch/x86_64/pre/include/arch/memory/paging/page_table.hpp
@@ -7,7 +7,7 @@
 
 namespace teachos::arch::memory::paging
 {
-  std::size_t constexpr PAGE_TABLE_ENTRY_COUNT = 512U;  ///< Default entry count of a page table in x86_84 is 512.
+  constexpr std::size_t PAGE_TABLE_ENTRY_COUNT = 512U;  ///< Default entry count of a page table in x86_84 is 512.
 
   /**
    * @brief Forward delcaration of the page_table, because it should only be accessible over the handle.
diff --git a/arch/x86_64/pre/include/arch/memory/paging/virtual_page.hpp b/arch/x86_64/pre/include/arch/memory/paging/virtual_page.hpp
index a6c8c39..1a20eae 100644
--- a/arch/x86_64/pre/include/arch/memory/paging/virtual_page.hpp
+++ b/arch/x86_64/pre/include/arch/memory/paging/virtual_page.hpp
@@ -73,12 +73,12 @@ namespace teachos::arch::memory::paging
     /**
      * @brief Defaulted equals operator.
      */
-    auto operator==(const virtual_page & other) const -> bool = default;
+    auto operator==(virtual_page const & other) const -> bool = default;
 
     /**
      * @brief Defaulted three-way comparsion operator.
      */
-    auto operator<=>(const virtual_page & other) const -> std::partial_ordering = default;
+    auto operator<=>(virtual_page const & other) const -> std::partial_ordering = default;
 
     std::size_t page_number =
         {};  ///< Index number of the current virtual page, used to distinguish it from other pages.
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_S