Fixed the last issue with gdt.c other than ljmp when you run cmake -B build

2025-10-14 05:35:06 -07:00 · 2023-10-05 14:40:15 -07:00
parent ef2537720d
commit 436ba162eb
2 changed files with 6 additions and 5 deletions
--- a/src/kernel/arch/x86/gdt.c
+++ b/src/kernel/arch/x86/gdt.c
@@ -68,15 +68,15 @@ void gdt_init()
    // Load GDT
    struct gdt_ptr gdtp;
    gdtp.limit = gp.limit;
-    gdtp.base  = (uint32_t)gdt;
+    gdtp.base  = (uintptr_t)gdt;
    __asm__ volatile("lgdt %0" : : "m"(gdtp));
    __asm__ volatile("mov $0x10, %ax\n\t"
                     "mov %ax, %ds\n\t"
                     "mov %ax, %es\n\t"
                     "mov %ax, %fs\n\t"
                     "mov %ax, %gs\n\t"
-                     "ljmp $0x08, $next\n\t"
-                     "next:");
+                     "ljmp $0x08, $next_label\n\t"
+                     "next_label:");
 }

 // Exception handlers