5 files changed, 15 insertions, 22 deletions
diff --git a/arch/x86_64/src/boot/boot.s b/arch/x86_64/src/boot/boot.s
index 4fb23e5..35a6121 100644
--- a/arch/x86_64/src/boot/boot.s
+++ b/arch/x86_64/src/boot/boot.s
@@ -366,7 +366,7 @@ segment_register_reload_pointer:
     ret
 
 _transition_to_long_mode:
-    call segment_register_reload_pointer
+    //call segment_register_reload_pointer
 
     xor %rax, %rax
     mov %rax, %ss
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 0555e4c..ddc098e 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
@@ -9,22 +9,12 @@ namespace teachos::arch::context_switching::interrupt_descriptor_table
   {
     auto create_interrupt_descriptor_table() -> interrupt_descriptor_table
     {
-      interrupt_descriptor_table idt{};
-
-      // Define basic exception handlers (at least for CPU exceptions 0x00-0x1F)
-      for (uint8_t vector = 0; vector < 32; ++vector)
-      {
-        uint64_t offset = reinterpret_cast<uint64_t>(default_exception_handler);  // Use a real handler function
-        segment_selector selector{0U, segment_selector::REQUEST_LEVEL_KERNEL};
-        ist_offset ist{0U};  // Default stack offset (can be updated for IST)
-        idt_flags flags{idt_flags::DESCRIPTOR_LEVEL_KERNEL | idt_flags::TRAP_GATE};
-
-        idt.push_back(gate_descriptor{selector, ist, flags, offset});
-      }
-
-      // Additional entries for hardware interrupts (IRQs) and syscalls can be added here
-
-      return idt;
+      uint64_t offset = 0U;
+      segment_selector selector{0U, segment_selector::REQUEST_LEVEL_KERNEL};
+      ist_offset ist{0U};
+      idt_flags flags{idt_flags::DESCRIPTOR_LEVEL_KERNEL};
+      gate_descriptor gate_descriptor{selector, ist, flags, offset};
+      return interrupt_descriptor_table{gate_descriptor};
     }
   }  // namespace
 
diff --git a/arch/x86_64/src/context_switching/main.cpp b/arch/x86_64/src/context_switching/main.cpp
index 95a25e0..c3c0cf0 100644
--- a/arch/x86_64/src/context_switching/main.cpp
+++ b/arch/x86_64/src/context_switching/main.cpp
@@ -13,7 +13,10 @@ namespace teachos::arch::context_switching
     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::jmp((uint64_t)&global_descriptor_table.at(1), boot::segment_register_reload_pointer);
+    interrupt_descriptor_table::segment_selector segment_selector{
+        1U, interrupt_descriptor_table::segment_selector::REQUEST_LEVEL_KERNEL};
+    kernel::cpu::far_pointer pointer{boot::segment_register_reload_pointer, segment_selector};
+    kernel::cpu::jmp(pointer);
 
     // 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
diff --git a/arch/x86_64/src/kernel/cpu/if.cpp b/arch/x86_64/src/kernel/cpu/if.cpp
index 2a25df5..60a90a3 100644
--- a/arch/x86_64/src/kernel/cpu/if.cpp
+++ b/arch/x86_64/src/kernel/cpu/if.cpp
@@ -2,4 +2,6 @@ namespace teachos::arch::kernel::cpu
 {
   auto set_interrupt_flag() -> void { asm volatile("sti"); }
 
+  auto clear_interrupt_flag() -> void { asm volatile("cli"); }
+
 }  // namespace teachos::arch::kernel::cpu
diff --git a/arch/x86_64/src/kernel/cpu/jmp.cpp b/arch/x86_64/src/kernel/cpu/jmp.cpp
index 009981b..205c4a9 100644
--- a/arch/x86_64/src/kernel/cpu/jmp.cpp
+++ b/arch/x86_64/src/kernel/cpu/jmp.cpp
@@ -7,10 +7,8 @@ namespace teachos::arch::kernel::cpu
     asm volatile("jmp *%[input]" : /* no output from call */ : [input] "r"(address));
   }
 
-  auto jmp(uint64_t segment, uint64_t offset) -> void
+  auto jmp(far_pointer pointer) -> void
   {
-    far_pointer far_pointer = {offset, static_cast<uint16_t>(segment)};
-    asm volatile("jmp *%0" : : "m"(far_pointer));
+    asm volatile("jmp *%[input]" : /* no output from call */ : [input] "m"(pointer));
   }
-
 }  // namespace teachos::arch::kernel::cpu