small gdt fix
This commit is contained in:
@ -5,19 +5,28 @@
|
||||
#include <kernel/serial.h>
|
||||
#include <kernel/x86/gdt.h>
|
||||
|
||||
uint64_t gdt[5];
|
||||
#define GDT_SIZE 5
|
||||
|
||||
uint64_t gdt[GDT_SIZE];
|
||||
|
||||
|
||||
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
|
||||
|
||||
setGdt((sizeof(uint64_t) * GDT_SIZE) - 1, &(gdt[0])); // limit, base
|
||||
reloadSegments();
|
||||
}
|
||||
|
||||
#undef GDT_SIZE
|
||||
|
||||
void kmain(void)
|
||||
{
|
||||
gdt[0] = create_descriptor(0, 0, 0); // null
|
||||
gdt[1] = create_descriptor(0, 0x000FFFFF, (GDT_CODE_PL0));
|
||||
gdt[2] = create_descriptor(0, 0x000FFFFF, (GDT_DATA_PL0));
|
||||
gdt[3] = create_descriptor(0, 0x000FFFFF, (GDT_CODE_PL3));
|
||||
gdt[4] = create_descriptor(0, 0x000FFFFF, (GDT_DATA_PL3));
|
||||
|
||||
setGdt((sizeof(uint64_t) * 5) - 1, &(gdt[0]));
|
||||
reloadSegments();
|
||||
|
||||
gdt_init();
|
||||
|
||||
terminal_initialize();
|
||||
serial_initialize();
|
||||
|
Reference in New Issue
Block a user