diff options
| -rw-r--r-- | boot/entry.asm | 2 | ||||
| -rw-r--r-- | kernel/drivers/interrupts.c | 4 | ||||
| -rw-r--r-- | kernel/features/syscall.c | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/boot/entry.asm b/boot/entry.asm index f77c4e7..92a8406 100644 --- a/boot/entry.asm +++ b/boot/entry.asm @@ -545,7 +545,7 @@ tss_entry: dd 0 ; gs dd 0 ; ldt dw 0 ; trap - dw 0 ; iomap base + dw -1 ; iomap base tss_entry_end: times 1024 - ($ - $$) db 0 diff --git a/kernel/drivers/interrupts.c b/kernel/drivers/interrupts.c index a0cd106..fe2321a 100644 --- a/kernel/drivers/interrupts.c +++ b/kernel/drivers/interrupts.c @@ -232,6 +232,10 @@ static void isr_install(void) idt_set_gate(29, (u32)isr29, 0x08, 0x8E); idt_set_gate(30, (u32)isr30, 0x08, 0x8E); idt_set_gate(31, (u32)isr31, 0x08, 0x8E); + + // Set default routines + for (u32 i = 0; i < 256; i++) + isr_routines[i] = isr_panic; } /** diff --git a/kernel/features/syscall.c b/kernel/features/syscall.c index dc49d67..68bcbaa 100644 --- a/kernel/features/syscall.c +++ b/kernel/features/syscall.c @@ -90,6 +90,7 @@ static void syscall_handler(struct regs *r) switch (r->ecx) { case SYS_BOOT_REBOOT: print("Rebooting...\n"); + outb(0x64, 0xfe); __asm__ volatile("ud2"); break; case SYS_BOOT_SHUTDOWN: @@ -97,6 +98,7 @@ static void syscall_handler(struct regs *r) outw(0xB004, 0x2000); outw(0x604, 0x2000); outw(0x4004, 0x3400); + outb(0x64, 0xfe); __asm__ volatile("ud2"); break; default: |