i need a break

This commit is contained in:
2025-05-30 18:58:45 -04:00
parent f8c38d22b0
commit 013b5a557e
8 changed files with 73 additions and 26 deletions

View File

@ -23,6 +23,6 @@ loader:
call kmain
cli
;cli
loop: hlt
jmp loop

View File

@ -26,6 +26,14 @@ uint64_t create_descriptor(uint32_t base, uint32_t limit, uint16_t flag)
return descriptor;
}
void dump_gdt(void)
{
for (int i = 0; i < GDT_SIZE; i++) {
printf("GDT_ENTRY %d: %4 | %2\n", i, gdt[i], gdt[i]);
}
}
void gdt_init(void)
{
#ifdef __TESTING__
@ -45,9 +53,4 @@ void gdt_init(void)
#endif
}
void dump_gdt(void)
{
for (int i = 0; i < GDT_SIZE; i++) {
printf("GDT_ENTRY %d: %1 | %2\n", i, gdt[i], gdt[i]);
}
}

View File

@ -2,8 +2,10 @@
#ifdef __TESTING__
#include <kernel/_kernel.h>
#include <stdio.h>
#endif
#include <kernel/x86/idt.h>
#include <kernel/x86/pic.h>
__attribute__((aligned(0x10)))
static idt_entry_t idt[256];
@ -12,8 +14,12 @@ static idtr_t idtr;
static bool vectors[IDT_MAX_DESCRIPTORS];
void exception_handler()
void exception_handler(unsigned int i)
{
#ifdef __TESTING__
kerror("EXCEPTION");
printf("Exeption: %u\n", i);
#endif
__asm__ volatile ("cli; hlt"); // hangs the computer
}
@ -28,7 +34,6 @@ void idt_set_descriptor(uint8_t vector, void *isr, uint8_t flags)
descriptor->reserved = 0;
}
extern void* isr_stub_table[];
void idt_init(void)
{
@ -38,16 +43,19 @@ void idt_init(void)
idtr.base = (uintptr_t)&idt[0];
idtr.limit = (uint16_t) sizeof(idt_entry_t) * IDT_MAX_DESCRIPTORS - 1;
for (uint8_t vector = 0; vector < 32; vector++) {
for (uint8_t vector = 0; vector < IDT_MAX_DESCRIPTORS; vector++) {
idt_set_descriptor(vector, isr_stub_table[vector], 0x8E);
vectors[vector] = true;
}
// The "m" indicates actual data, not a pointer
__asm__ volatile("lidt %0" : : "m"(idtr)); // load the new IDT
PIC_remap(0x20, 0x28);
IRQ_set_mask(0xfd); // unmask IRQ1
__asm__ volatile("sti"); // set the interrupt flag
#ifdef __TESTING__
kinfo("Initialized the IDT");
#endif
}

View File

@ -2,13 +2,19 @@ extern exception_handler
%macro isr_err_stub 1
isr_stub_%+%1:
pushad
push dword %1
call exception_handler
popad
iret
%endmacro
%macro isr_no_err_stub 1
isr_stub_%+%1:
pushad
push dword %1
call exception_handler
popad
iret
%endmacro
@ -44,11 +50,28 @@ isr_no_err_stub 28
isr_no_err_stub 29
isr_err_stub 30
isr_no_err_stub 31
isr_no_err_stub 32
isr_no_err_stub 33
isr_no_err_stub 34
isr_no_err_stub 35
isr_no_err_stub 36
isr_no_err_stub 37
isr_no_err_stub 38
isr_no_err_stub 39
isr_no_err_stub 40
isr_no_err_stub 41
isr_no_err_stub 42
isr_no_err_stub 43
isr_no_err_stub 44
isr_no_err_stub 45
isr_no_err_stub 46
isr_no_err_stub 47
global isr_stub_table
isr_stub_table:
%assign i 0
%rep 32
%rep 48
dd isr_stub_%+i
%assign i i+1
%endrep