3 files changed, 14 insertions, 13 deletions
diff --git a/arch/x86_64/src/kernel/cpu/lgdt.cpp b/arch/x86_64/src/kernel/cpu/lgdt.cpp
index cad3ffa..386914f 100644
--- a/arch/x86_64/src/kernel/cpu/lgdt.cpp
+++ b/arch/x86_64/src/kernel/cpu/lgdt.cpp
@@ -4,10 +4,17 @@
 
 namespace teachos::arch::kernel::cpu
 {
+  auto store_global_descriptor_table() -> context_switching::descriptor_table::global_descriptor_table_pointer
+  {
+    context_switching::descriptor_table::global_descriptor_table_pointer current_value{};
+    asm("sgdt %[output]" : [output] "=m"(current_value));
+    return current_value;
+  }
+
   auto
   load_global_descriptor_table(context_switching::descriptor_table::global_descriptor_table_pointer const & gdt_pointer)
       -> void
   {
-    asm volatile("lgdt %[input]" : /* no output from call */ : [input] "r"(gdt_pointer));
+    asm volatile("lgdt %[input]" : /* no output from call */ : [input] "m"(gdt_pointer));
   }
 }  // namespace teachos::arch::kernel::cpu
diff --git a/arch/x86_64/src/kernel/cpu/ss.cpp b/arch/x86_64/src/kernel/cpu/ss.cpp
index 9c8dd61..1f28e7f 100644
--- a/arch/x86_64/src/kernel/cpu/ss.cpp
+++ b/arch/x86_64/src/kernel/cpu/ss.cpp
@@ -19,15 +19,15 @@ namespace teachos::arch::kernel::cpu
 
   auto read_ss() -> uint16_t
   {
-    uint16_t ss;
-    asm volatile("mov %%ss, %0" : "=r"(ss));
-    return ss;
+    uint16_t segment_selector;
+    asm volatile("mov %%ss, %[output]" : [output] "=r"(segment_selector));
+    return segment_selector;
   }
 
   auto write_ss(segment_selector selector) -> void
   {
     uint16_t ss = selector.to_uint16();
-    asm volatile("mov %0, %%ss" ::"r"(ss));
+    asm volatile("mov %[input], %%ss" : /* no output from call */ : [input] "r"(ss));
   }
 
 }  // namespace teachos::arch::kernel::cpu
 \ No newline at end of file
diff --git a/arch/x86_64/src/kernel/main.cpp b/arch/x86_64/src/kernel/main.cpp
index 055b516..2c0b6c8 100644
--- a/arch/x86_64/src/kernel/main.cpp
+++ b/arch/x86_64/src/kernel/main.cpp
@@ -1,6 +1,7 @@
 #include "arch/kernel/main.hpp"
 
 #include "arch/context_switching/descriptor_table/global_descriptor_table.hpp"
+#include "arch/kernel/cpu/lgdt.hpp"
 #include "arch/memory/heap/bump_allocator.hpp"
 #include "arch/memory/heap/global_heap_allocator.hpp"
 #include "arch/memory/main.hpp"
@@ -61,14 +62,7 @@ namespace teachos::arch::kernel
     heap_test();
 
     auto global_descriptor_table = context_switching::descriptor_table::initialize_global_descriptor_table();
-
-    decltype(auto) x = global_descriptor_table.at(1);
-    if (global_descriptor_table.size() == 0)
-    {
-    }
-    if (x.get_segment_type() == context_switching::descriptor_table::segment_descriptor_type::CODE_SEGMENT)
-    {
-    }
+    (void)global_descriptor_table.at(1);
     video::vga::text::write("GDT FILLED", video::vga::text::common_attributes::green_on_black);
   }
 }  // namespace teachos::arch::kernel