Clean up global descriptor table initalization

4 files changed, 58 insertions, 58 deletions

diff --git a/arch/x86_64/src/context_switching/interrupt_descriptor_table/gate_descriptor.cpp b/arch/x86_64/src/context_switching/interrupt_descriptor_table/gate_descriptor.cpp
index d86c459..28f289c 100644
--- a/arch/x86_64/src/context_switching/interrupt_descriptor_table/gate_descriptor.cpp
+++ b/arch/x86_64/src/context_switching/interrupt_descriptor_table/gate_descriptor.cpp
@@ -8,7 +8,6 @@ namespace teachos::arch::context_switching::interrupt_descriptor_table
       , _ist(flags >> 32U)
       , _flags(flags >> 40U)
       , _offset_2(flags >> 48U)
-      , _offset_3(flags >> 64U)
   {
     // Nothing to do.
   }
@@ -19,7 +18,6 @@ namespace teachos::arch::context_switching::interrupt_descriptor_table
       , _ist(ist)
       , _flags(flags)
       , _offset_2(offset >> 16U)
-      , _offset_3(offset >> 48U)
   {
     // Nothing to do.
   }
diff --git a/arch/x86_64/src/context_switching/interrupt_descriptor_table/interrupt_descriptor_table.cpp b/arch/x86_64/src/context_switching/interrupt_descriptor_table/interrupt_descriptor_table.cpp
index 1c1de68..62b116b 100644
--- a/arch/x86_64/src/context_switching/interrupt_descriptor_table/interrupt_descriptor_table.cpp
+++ b/arch/x86_64/src/context_switching/interrupt_descriptor_table/interrupt_descriptor_table.cpp
@@ -6,26 +6,23 @@
 
 namespace teachos::arch::context_switching::interrupt_descriptor_table
 {
-  namespace
+  auto get_or_create_interrupt_descriptor_table() -> interrupt_descriptor_table &
   {
+    // @MTO: This address resolution is most certainly wrong -> numbers in dbg seem off (offset_3 = 0)
+    uint64_t offset = reinterpret_cast<uint64_t>(&interrupt_handling::generic_interrupt_handler);
+    segment_selector selector{0U, segment_selector::REQUEST_LEVEL_KERNEL};
+    ist_offset ist{0U};
+    idt_flags flags{idt_flags::DESCRIPTOR_LEVEL_KERNEL | idt_flags::PRESENT};
+    gate_descriptor descriptor{selector, ist, flags, offset};
 
-    auto create_interrupt_descriptor_table() -> interrupt_descriptor_table
-    {
-      // @MTO: This address resolution is most certainly wrong -> numbers in dbg seem off (offset_3 = 0)
-      uint64_t offset = reinterpret_cast<uint64_t>(&interrupt_handling::generic_interrupt_handler);
-      segment_selector selector{0U, segment_selector::REQUEST_LEVEL_KERNEL};
-      ist_offset ist{0U};
-      idt_flags flags{idt_flags::DESCRIPTOR_LEVEL_KERNEL | idt_flags::PRESENT};
-      gate_descriptor descriptor{selector, ist, flags, offset};
-
-      return interrupt_descriptor_table{descriptor};
-    }
-  }  // namespace
+    // Interrupt Descriptor Table needs to be kept alive
+    static interrupt_descriptor_table interrupt_descriptor_table{descriptor};
+    return interrupt_descriptor_table;
+  }
 
-  auto initialize_interrupt_descriptor_table() -> interrupt_descriptor_table &
+  auto update_interrupt_descriptor_table_register() -> void
   {
-    // Interrupt Descriptor Table needs to be kept alive
-    static auto idt = create_interrupt_descriptor_table();
+    static auto idt = get_or_create_interrupt_descriptor_table();
 
     interrupt_descriptor_table_pointer idt_pointer{static_cast<uint16_t>((idt.size() * sizeof(gate_descriptor)) - 1),
                                                    idt.data()};
@@ -35,7 +32,5 @@ namespace teachos::arch::context_switching::interrupt_descriptor_table
     arch::exception_handling::assert(
         idt_pointer == stored_gdt_pointer,
         "[Interrupt Descriptor Table] Loaded IDTR value is not the same as the stored value.");
-
-    return idt;
   }
 }  // namespace teachos::arch::context_switching::interrupt_descriptor_table
diff --git a/arch/x86_64/src/context_switching/main.cpp b/arch/x86_64/src/context_switching/main.cpp
index 008da2f..db04b52 100644
--- a/arch/x86_64/src/context_switching/main.cpp
+++ b/arch/x86_64/src/context_switching/main.cpp
@@ -11,22 +11,16 @@ namespace teachos::arch::context_switching
   auto initialize_descriptor_tables() -> descriptor_tables
   {
     kernel::cpu::clear_interrupt_flag();
-    decltype(auto) global_descriptor_table = segment_descriptor_table::initialize_global_descriptor_table();
-    decltype(auto) interrupt_descriptor_table = interrupt_descriptor_table::initialize_interrupt_descriptor_table();
 
-    kernel::cpu::far_pointer pointer{&boot::reload_segment_register,
-                                     1 * sizeof(segment_descriptor_table::segment_descriptor)};
-    asm volatile("rex64 lcall *%[far_function_pointer]" : : [far_function_pointer] "m"(pointer));
+    segment_descriptor_table::update_global_descriptor_table_register();
+    interrupt_descriptor_table::update_interrupt_descriptor_table_register();
 
-    // Load task state segment descriptor from the last element in the global descriptor table, done by calculating
-    // offset in bytes to the start of the segment descriptor (5 * 16) = 80
-    uint16_t const tss_selector =
-        (global_descriptor_table.size() - 1) * sizeof(segment_descriptor_table::segment_descriptor);
-    kernel::cpu::load_task_register(tss_selector);
+    interrupt_descriptor_table::segment_selector segment_selector{
+        2U, interrupt_descriptor_table::segment_selector::REQUEST_LEVEL_KERNEL};
+    kernel::cpu::far_pointer pointer{&boot::reload_segment_register, segment_selector};
+    kernel::cpu::jmp(pointer);
 
-    auto const stored_task_register = kernel::cpu::store_task_register();
-    arch::exception_handling::assert(tss_selector == stored_task_register,
-                                     "[Global Descriptor Table] Loaded TR value is not the same as the stored value.");
+    segment_descriptor_table::update_task_state_segment_register();
 
     // FIXME: We currently cannot enable interrupts, since for some reason, we will later run into what looks like a GP
     // and triple fault.
@@ -34,7 +28,8 @@ namespace teachos::arch::context_switching
     // idt). NEVER happened when stepping through quickly. Can you reproduce this?
     kernel::cpu::set_interrupt_flag();
 
-    descriptor_tables tables = {global_descriptor_table, interrupt_descriptor_table};
+    descriptor_tables tables = {segment_descriptor_table::get_or_create_global_descriptor_table(),
+                                interrupt_descriptor_table::get_or_create_interrupt_descriptor_table()};
     return tables;
   }
 }  // namespace teachos::arch::context_switching
diff --git a/arch/x86_64/src/context_switching/segment_descriptor_table/global_descriptor_table.cpp b/arch/x86_64/src/context_switching/segment_descriptor_table/global_descriptor_table.cpp
index d9ad91c..346db9e 100644
--- a/arch/x86_64/src/context_switching/segment_descriptor_table/global_descriptor_table.cpp
+++ b/arch/x86_64/src/context_switching/segment_descriptor_table/global_descriptor_table.cpp
@@ -24,7 +24,7 @@ namespace teachos::arch::context_switching::segment_descriptor_table
       }
       else if (segment_descriptor_type == segment_descriptor_type::DATA_SEGMENT)
       {
-        gdt_flags_bits |= 1 << 2;
+        gdt_flags_bits |= gdt_flags::UPPER_BOUND;
         access_level_bits |= access_byte::WRITABLE;
       }
 
@@ -46,33 +46,33 @@ namespace teachos::arch::context_switching::segment_descriptor_table
                                               TSS_LIMIT};
       return tss_descriptor;
     }
+  }  // namespace
 
-    auto create_global_descriptor_table() -> global_descriptor_table
-    {
-      segment_descriptor const null_segment{0};
-      segment_descriptor const kernel_code_segment =
-          create_segment_descriptor(segment_descriptor_type::CODE_SEGMENT, access_byte::DESCRIPTOR_LEVEL_KERNEL);
-      segment_descriptor const kernel_data_segment =
-          create_segment_descriptor(segment_descriptor_type::DATA_SEGMENT, access_byte::DESCRIPTOR_LEVEL_KERNEL);
-      segment_descriptor const user_code_segment =
-          create_segment_descriptor(segment_descriptor_type::CODE_SEGMENT, access_byte::DESCRIPTOR_LEVEL_USER);
-      segment_descriptor const user_data_segment =
-          create_segment_descriptor(segment_descriptor_type::DATA_SEGMENT, access_byte::DESCRIPTOR_LEVEL_USER);
+  auto get_or_create_global_descriptor_table() -> global_descriptor_table &
+  {
+    segment_descriptor const null_segment{0};
+    segment_descriptor const kernel_code_segment =
+        create_segment_descriptor(segment_descriptor_type::CODE_SEGMENT, access_byte::DESCRIPTOR_LEVEL_KERNEL);
+    segment_descriptor const kernel_data_segment =
+        create_segment_descriptor(segment_descriptor_type::DATA_SEGMENT, access_byte::DESCRIPTOR_LEVEL_KERNEL);
+    segment_descriptor const user_code_segment =
+        create_segment_descriptor(segment_descriptor_type::CODE_SEGMENT, access_byte::DESCRIPTOR_LEVEL_USER);
+    segment_descriptor const user_data_segment =
+        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();
-      segment_descriptor const tss_descriptor = create_task_state_segment_descriptor(tss);
+    // Task State Segment needs to be kept alive
+    static auto tss = new task_state_segment();
+    segment_descriptor const tss_descriptor = create_task_state_segment_descriptor(tss);
 
-      global_descriptor_table const global_descriptor_table{null_segment,      kernel_code_segment, kernel_data_segment,
-                                                            user_code_segment, user_data_segment,   tss_descriptor};
-      return global_descriptor_table;
-    }
-  }  // namespace
+    // Global Descriptor Table needs to be kept alive
+    static global_descriptor_table global_descriptor_table{null_segment,      kernel_code_segment, kernel_data_segment,
+                                                           user_code_segment, user_data_segment,   tss_descriptor};
+    return global_descriptor_table;
+  }
 
-  auto initialize_global_descriptor_table() -> global_descriptor_table &
+  auto update_global_descriptor_table_register() -> void
   {
-    // Global Descriptor Table needs to be kept alive
-    static auto gdt = create_global_descriptor_table();
+    decltype(auto) gdt = get_or_create_global_descriptor_table();
 
     // Calculate the size of the gdt in bytes - 1. This subtraction occurs because the maximum value of Size is 65535,
     // while the GDT can be up to 65536 bytes in length (8192 entries). Further, no GDT can have a size of 0 bytes.
@@ -84,8 +84,20 @@ namespace teachos::arch::context_switching::segment_descriptor_table
     arch::exception_handling::assert(
         gdt_pointer == stored_gdt_pointer,
         "[Global Descriptor Table] Loaded GDTR value is not the same as the stored value.");
+  }
+
+  auto update_task_state_segment_register() -> void
+  {
+    decltype(auto) gdt = get_or_create_global_descriptor_table();
+
+    // Load task state segment descriptor from the last element in the global descriptor table, done by calculating
+    // offset in bytes to the start of the segment descriptor (5 * 16) = 80
+    uint16_t const tss_selector = (gdt.size() - 1) * sizeof(segment_descriptor_table::segment_descriptor);
+    kernel::cpu::load_task_register(tss_selector);
 
-    return gdt;
+    auto const stored_task_register = kernel::cpu::store_task_register();
+    arch::exception_handling::assert(tss_selector == stored_task_register,
+                                     "[Global Descriptor Table] Loaded TR value is not the same as the stored value.");
   }
 
 }  // namespace teachos::arch::context_switching::segment_descriptor_table