SuperNovaa41/novaos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

holy crap im an idiot, i was getting constatnt gpf because i forgot to pop the stack

Browse Source
This commit is contained in:
Nathan Singer
2025-06-01 20:57:12 -04:00
parent ecc91fdc7d
commit 4c938a0855
7 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/arch/gdt/gdt.s
View File

@ -8,12 +8,8 @@ setGdt:
mov eax, [esp + 8]
mov [gdtr + 2], eax
lgdt [gdtr]
ret
global reloadSegments
reloadSegments:
jmp 0x08:.reload_CS ; 0x08 is a stand in for the code segment
.reload_CS:
jmp 0x08:reload_CS ; 0x08 is a stand in for the code segment
reload_CS:
mov ax, 0x10 ; stand in for the data segment
mov ds, ax
mov es, ax

6
kernel/arch/gdt/gdt_entry.c
View File

@ -63,11 +63,11 @@ void gdt_init(void)
gdt[0] = create_descriptor(0, 0, 0); // null
gdt[1] = create_descriptor(0, 0x000FFFFF, (GDT_CODE_PL0)); // kernel code
gdt[2] = create_descriptor(0, 0x000FFFFF, (GDT_DATA_PL0)); // kernel data
gdt[3] = create_descriptor(0, 0x000FFFFF, (GDT_CODE_PL3)); // user code
gdt[4] = create_descriptor(0, 0x000FFFFF, (GDT_DATA_PL3)); // user data
//gdt[3] = create_descriptor(0, 0x000FFFFF, (GDT_CODE_PL3)); // user code
//gdt[4] = create_descriptor(0, 0x000FFFFF, (GDT_DATA_PL3)); // user data
setGdt((sizeof(uint64_t) * GDT_SIZE) - 1, &(gdt[0])); // limit, base
reloadSegments();
//reloadSegments();
#ifdef __TESTING__
kinfo("Initialized the GDT");
dump_gdt();