Adjust file structure and fix compilation issues

3 files changed, 11 insertions, 13 deletions

diff --git a/arch/x86_64/src/kernel/cpu/gdtr.cpp b/arch/x86_64/src/kernel/cpu/gdtr.cpp
index 2fe3a99..74a4e1c 100644
--- a/arch/x86_64/src/kernel/cpu/gdtr.cpp
+++ b/arch/x86_64/src/kernel/cpu/gdtr.cpp
@@ -1,19 +1,18 @@
 #include "arch/kernel/cpu/gdtr.hpp"
 
-#include "arch/context_switching/descriptor_table/global_descriptor_table_pointer.hpp"
+#include "arch/context_switching/segment_descriptor_table/global_descriptor_table_pointer.hpp"
 
 namespace teachos::arch::kernel::cpu
 {
-  auto store_global_descriptor_table() -> context_switching::descriptor_table::global_descriptor_table_pointer
+  auto store_global_descriptor_table() -> context_switching::segment_descriptor_table::global_descriptor_table_pointer
   {
-    context_switching::descriptor_table::global_descriptor_table_pointer current_value{};
+    context_switching::segment_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
+  auto load_global_descriptor_table(
+      context_switching::segment_descriptor_table::global_descriptor_table_pointer const & gdt_pointer) -> void
   {
     asm volatile("lgdt %[input]" : /* no output from call */ : [input] "m"(gdt_pointer));
   }
diff --git a/arch/x86_64/src/kernel/cpu/idtr.cpp b/arch/x86_64/src/kernel/cpu/idtr.cpp
index bbf34cb..7aa20c1 100644
--- a/arch/x86_64/src/kernel/cpu/idtr.cpp
+++ b/arch/x86_64/src/kernel/cpu/idtr.cpp
@@ -1,18 +1,17 @@
 #include "arch/kernel/cpu/idtr.hpp"
 
-#include "arch/context_switching/descriptor_table/interrupt_descriptor_table_pointer.hpp"
-
 namespace teachos::arch::kernel::cpu
 {
-  auto store_global_descriptor_table() -> context_switching::descriptor_table::global_descriptor_table_pointer
+  auto store_interrupt_descriptor_table()
+      -> context_switching::interrupt_descriptor_table::interrupt_descriptor_table_pointer
   {
-    context_switching::descriptor_table::interrupt_descriptor_table_pointer current_value{};
+    context_switching::interrupt_descriptor_table::interrupt_descriptor_table_pointer current_value{};
     asm("sidt %[output]" : [output] "=m"(current_value));
     return current_value;
   }
 
   auto load_interrupt_descriptor_table(
-      context_switching::descriptor_table::interrupt_descriptor_table_pointer const & idt_pointer) -> void
+      context_switching::interrupt_descriptor_table::interrupt_descriptor_table_pointer const & idt_pointer) -> void
   {
     asm volatile("lidt %[input]" : /* no output from call */ : [input] "m"(idt_pointer));
   }
diff --git a/arch/x86_64/src/kernel/main.cpp b/arch/x86_64/src/kernel/main.cpp
index 9433558..7782d30 100644
--- a/arch/x86_64/src/kernel/main.cpp
+++ b/arch/x86_64/src/kernel/main.cpp
@@ -1,7 +1,7 @@
 #include "arch/kernel/main.hpp"
 
 #include "arch/boot/pointers.hpp"
-#include "arch/context_switching/descriptor_table/initialization.hpp"
+#include "arch/context_switching/main.hpp"
 #include "arch/kernel/cpu/if.hpp"
 #include "arch/kernel/cpu/jmp.hpp"
 #include "arch/memory/heap/bump_allocator.hpp"
@@ -63,7 +63,7 @@ namespace teachos::arch::kernel
 
     heap_test();
 
-    decltype(auto) descriptor_tables = context_switching::descriptor_table::initialize_descriptor_tables();
+    decltype(auto) descriptor_tables = context_switching::initialize_descriptor_tables();
     (void)descriptor_tables;
   }
 }  // namespace teachos::arch::kernel