From 956bb743a3ba6939aaff2372fc45628cda6a9840 Mon Sep 17 00:00:00 2001 From: Aleksa Vuckovic Date: Mon, 5 Sep 2022 23:54:12 +0200 Subject: userspace finally working --- kernel/src/cpu/gdt.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'kernel/src/cpu/gdt.c') diff --git a/kernel/src/cpu/gdt.c b/kernel/src/cpu/gdt.c index b4f1ec0..7ce51f1 100644 --- a/kernel/src/cpu/gdt.c +++ b/kernel/src/cpu/gdt.c @@ -23,10 +23,13 @@ void add_gdt_tss(uint32_t num, uint64_t offset, uint32_t limit, uint8_t access, void reload_gdt() { __asm__ volatile ( + // reload segment registers "mov $0x10, %ax;" "mov %ax, %ds;" "mov %ax, %es;" "mov %ax, %ss;" + "mov %ax, %fs;" + "mov %ax, %gs;" ); } @@ -42,12 +45,11 @@ void init_gdt() gdt_pointer.size = sizeof(gdt) - 1; add_gdt_entry(0, 0, 0, 0, 0); - add_gdt_entry(1, 0, 0xfffff, 0x9a, 0xa); - add_gdt_entry(2, 0, 0xfffff, 0x92, 0xc); - add_gdt_entry(3, 0, 0xfffff, 0xfa, 0xa); - add_gdt_entry(4, 0, 0xfffff, 0xf2, 0xc); + add_gdt_entry(1, 0, 0xfffff, 0x9a, 0xa); // code ring0 + add_gdt_entry(2, 0, 0xfffff, 0x92, 0xc); // data ring0 + add_gdt_entry(3, 0, 0xfffff, 0xf2, 0xc); // data ring3 + add_gdt_entry(4, 0, 0xfffff, 0xfa, 0xa); // code ring3 add_gdt_tss(5, (uint64_t)&tss, sizeof(tss_type), 0x89, 0); load_gdt(&gdt_pointer); - init_tss(); } -- cgit v1.2.3