forked from PoliEcho-holding-org/kern
The great 64-bit rewrite
* We did loose tasking and only have a paging skeleton, but hey it took like 4 months so i'm happy that there's something :p
This commit is contained in:
+42
-31
@@ -1,10 +1,11 @@
|
||||
#include <syscall.h>
|
||||
#include <kernel.h>
|
||||
#include <serial.h>
|
||||
#include <string.h>
|
||||
#include <system.h>
|
||||
#include <idt.h>
|
||||
#include <isr.h>
|
||||
|
||||
isr_handler_ptr irq_handlers[16];
|
||||
isr_handler_ptr irq_handlers[ISR_COUNT];
|
||||
|
||||
const char* exceptions[] = {
|
||||
"Division By Zero",
|
||||
@@ -26,9 +27,9 @@ const char* exceptions[] = {
|
||||
"Coprocessor Fault",
|
||||
"Alignment Check",
|
||||
"Machine Check",
|
||||
"Reserved",
|
||||
"Reserved",
|
||||
"Reserved",
|
||||
"SIMD Floating-Point",
|
||||
"Virtualization",
|
||||
"Control Protection",
|
||||
"Reserved",
|
||||
"Reserved",
|
||||
"Reserved",
|
||||
@@ -41,41 +42,50 @@ const char* exceptions[] = {
|
||||
"Reserved"
|
||||
};
|
||||
|
||||
// I have no clue how this works or what it does, but it doesn't work without it
|
||||
void isr_remap_pic(void) {
|
||||
void pic_disable(void) {
|
||||
outb(0x21, 0xFF); iowait();
|
||||
outb(0xA1, 0xFF); iowait();
|
||||
}
|
||||
|
||||
void pic_remap(void) {
|
||||
outb(0x20, 0x11); iowait();
|
||||
outb(0xa0, 0x11); iowait();
|
||||
outb(0xA0, 0x11); iowait();
|
||||
outb(0x21, 0x20); iowait();
|
||||
outb(0xa1, 0x28); iowait();
|
||||
outb(0xA1, 0x28); iowait();
|
||||
outb(0x21, 0x04); iowait();
|
||||
outb(0xa1, 0x02); iowait();
|
||||
outb(0xA1, 0x02); iowait();
|
||||
outb(0x21, 0x01); iowait();
|
||||
outb(0xa1, 0x01); iowait();
|
||||
outb(0xA1, 0x01); iowait();
|
||||
outb(0x21, 0x00); iowait();
|
||||
outb(0xa1, 0x00); iowait();
|
||||
outb(0xA1, 0x00); iowait();
|
||||
// pic_disable(); For APIC
|
||||
}
|
||||
|
||||
int isr_init(void) {
|
||||
idt_init();
|
||||
isr_remap_pic();
|
||||
memset(irq_handlers, 0, sizeof(irq_handlers));
|
||||
|
||||
if (idt_init() != 0) {
|
||||
debugf("[isr] Could not load IDT.");
|
||||
return 1;
|
||||
}
|
||||
|
||||
for (int i = 0; i < 48; i++) {
|
||||
// First 32 IRSs are exceptions (traps) and the next 16 are hardware interrupts
|
||||
idt_set_gate(i, isr_redirect_table[i], (i < 32) ? IDT_FLAG_TRAP : IDT_FLAG_INT);
|
||||
idt_set_gate(i, isr_redirect_table[i], IDT_FLAG_INT);
|
||||
}
|
||||
idt_set_gate(0x03, isr_redirect_table[3], IDT_FLAG_USER); // Allow breakpoints
|
||||
idt_set_gate(0x80, isr128, IDT_FLAG_USER); // Syscall
|
||||
//
|
||||
pic_remap();
|
||||
// TODO: apic_init();
|
||||
|
||||
// System call (should be callable from userspace)
|
||||
idt_set_gate(0x80, (void*)(uint32_t)isr128, IDT_FLAG_USER);
|
||||
|
||||
// Let interrupts interrupt
|
||||
sti();
|
||||
|
||||
debugf("[isr] ISR initialized.\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
void isr_register(uint8_t i, isr_handler_ptr handler) {
|
||||
if (i > 16) return; // Security
|
||||
if (i >= ISR_COUNT) return; // secutiry B)
|
||||
irq_handlers[i] = handler;
|
||||
}
|
||||
|
||||
@@ -85,19 +95,20 @@ void isr_send_eoi(uint8_t irq) {
|
||||
}
|
||||
|
||||
// TODO: Write fault handlers and make this more robust
|
||||
void isr_handle_interrupt(struct isr_int_frame iframe) {
|
||||
if (iframe.interrupt < 32) {
|
||||
// ISRs 0-31 - Exceptions
|
||||
if (iframe.error) debugf("[kernel] Error code: 0x%08x\n", iframe.error);
|
||||
panic(exceptions[iframe.interrupt]);
|
||||
} else if (iframe.interrupt >= 32 && iframe.interrupt < 48) {
|
||||
void isr_handle_interrupt(size_t rsp) {
|
||||
struct isr_int_frame* iframe = (void*)rsp;
|
||||
|
||||
if (iframe->interrupt < 32) {
|
||||
if (iframe->error) debugf("[kernel] Error code: 0x%08x\n", iframe->error);
|
||||
panic(exceptions[iframe->interrupt]);
|
||||
} else if (iframe->interrupt >= 32 && iframe->interrupt < 48) {
|
||||
// ISRs 32-47 - Hardware interrupts
|
||||
uint8_t irq = iframe.interrupt - 32;
|
||||
uint8_t irq = iframe->interrupt - 32;
|
||||
isr_send_eoi(irq);
|
||||
if (irq_handlers[irq]) irq_handlers[irq](&iframe);
|
||||
} else if (iframe.interrupt == 128) {
|
||||
if (irq_handlers[irq]) irq_handlers[irq](iframe);
|
||||
} else if (iframe->interrupt == 128) {
|
||||
// ISR 128 - System call
|
||||
syscall_handler(&iframe);
|
||||
debugf("SYSCALL!\n");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user