From 15f3911599a8d005edee46247470afe2a7a0b4aa Mon Sep 17 00:00:00 2001 From: Aleksa Vuckovic Date: Mon, 27 Feb 2023 01:59:33 +0100 Subject: almost done multitasking --- kernel/src/cpu/idt.c | 75 ++++++++++++++++++++++++++------------------------- kernel/src/cpu/irq.c | 4 +-- kernel/src/cpu/regs.c | 33 +++++++++++++++++++++++ kernel/src/cpu/tss.c | 8 +++++- 4 files changed, 80 insertions(+), 40 deletions(-) create mode 100644 kernel/src/cpu/regs.c (limited to 'kernel/src/cpu') diff --git a/kernel/src/cpu/idt.c b/kernel/src/cpu/idt.c index 5ac6386..b60b8b9 100644 --- a/kernel/src/cpu/idt.c +++ b/kernel/src/cpu/idt.c @@ -20,60 +20,61 @@ void load_idt(idtp *pointer) __asm__ __volatile__("lidt (%0);" : : "r"(pointer) :); } -void add_to_idt(uint16_t num, uint64_t offset, uint16_t selector, uint8_t type) +void add_to_idt(uint16_t num, uint64_t offset, uint16_t selector, uint8_t type, + uint8_t ist) { idt_table[num].offset_1 = offset & 0xFFFF; idt_table[num].offset_2 = (offset >> 16) & 0xFFFF; idt_table[num].offset_3 = (uint32_t)(offset >> 32); idt_table[num].selector = selector; idt_table[num].type_attributes = type; - idt_table[num].ist = 0; + idt_table[num].ist = ist; idt_table[num].zero = 0; } void init_idt_table(void) { /* exceptions */ - add_to_idt(0, (uint64_t)isr0, GDT_CODE_SEG, TRAP_GATE); - add_to_idt(1, (uint64_t)isr1, GDT_CODE_SEG, TRAP_GATE); - add_to_idt(2, (uint64_t)isr2, GDT_CODE_SEG, TRAP_GATE); - add_to_idt(3, (uint64_t)isr3, GDT_CODE_SEG, TRAP_GATE); - add_to_idt(4, (uint64_t)isr4, GDT_CODE_SEG, TRAP_GATE); - add_to_idt(5, (uint64_t)isr5, GDT_CODE_SEG, TRAP_GATE); - add_to_idt(6, (uint64_t)isr6, GDT_CODE_SEG, TRAP_GATE); - add_to_idt(7, (uint64_t)isr7, GDT_CODE_SEG, TRAP_GATE); - add_to_idt(8, (uint64_t)isr8, GDT_CODE_SEG, TRAP_GATE); - add_to_idt(9, (uint64_t)isr9, GDT_CODE_SEG, TRAP_GATE); - add_to_idt(10, (uint64_t)isr10, GDT_CODE_SEG, TRAP_GATE); - add_to_idt(11, (uint64_t)isr11, GDT_CODE_SEG, TRAP_GATE); - add_to_idt(12, (uint64_t)isr12, GDT_CODE_SEG, TRAP_GATE); - add_to_idt(13, (uint64_t)isr13, GDT_CODE_SEG, TRAP_GATE); - add_to_idt(14, (uint64_t)isr14, GDT_CODE_SEG, TRAP_GATE); - add_to_idt(15, (uint64_t)isr15, GDT_CODE_SEG, TRAP_GATE); - add_to_idt(16, (uint64_t)isr16, GDT_CODE_SEG, TRAP_GATE); - add_to_idt(17, (uint64_t)isr17, GDT_CODE_SEG, TRAP_GATE); - add_to_idt(18, (uint64_t)isr18, GDT_CODE_SEG, TRAP_GATE); - add_to_idt(19, (uint64_t)isr19, GDT_CODE_SEG, TRAP_GATE); - add_to_idt(20, (uint64_t)isr20, GDT_CODE_SEG, TRAP_GATE); - add_to_idt(21, (uint64_t)isr21, GDT_CODE_SEG, TRAP_GATE); - add_to_idt(22, (uint64_t)isr22, GDT_CODE_SEG, TRAP_GATE); - add_to_idt(23, (uint64_t)isr23, GDT_CODE_SEG, TRAP_GATE); - add_to_idt(24, (uint64_t)isr24, GDT_CODE_SEG, TRAP_GATE); - add_to_idt(25, (uint64_t)isr25, GDT_CODE_SEG, TRAP_GATE); - add_to_idt(26, (uint64_t)isr26, GDT_CODE_SEG, TRAP_GATE); - add_to_idt(27, (uint64_t)isr27, GDT_CODE_SEG, TRAP_GATE); - add_to_idt(28, (uint64_t)isr28, GDT_CODE_SEG, TRAP_GATE); - add_to_idt(29, (uint64_t)isr29, GDT_CODE_SEG, TRAP_GATE); - add_to_idt(30, (uint64_t)isr30, GDT_CODE_SEG, TRAP_GATE); - add_to_idt(31, (uint64_t)isr31, GDT_CODE_SEG, TRAP_GATE); + add_to_idt(0, (uint64_t)isr0, GDT_CODE_SEG, TRAP_GATE, 0); + add_to_idt(1, (uint64_t)isr1, GDT_CODE_SEG, TRAP_GATE, 0); + add_to_idt(2, (uint64_t)isr2, GDT_CODE_SEG, TRAP_GATE, 0); + add_to_idt(3, (uint64_t)isr3, GDT_CODE_SEG, TRAP_GATE, 0); + add_to_idt(4, (uint64_t)isr4, GDT_CODE_SEG, TRAP_GATE, 0); + add_to_idt(5, (uint64_t)isr5, GDT_CODE_SEG, TRAP_GATE, 0); + add_to_idt(6, (uint64_t)isr6, GDT_CODE_SEG, TRAP_GATE, 0); + add_to_idt(7, (uint64_t)isr7, GDT_CODE_SEG, TRAP_GATE, 0); + add_to_idt(8, (uint64_t)isr8, GDT_CODE_SEG, TRAP_GATE, 0); + add_to_idt(9, (uint64_t)isr9, GDT_CODE_SEG, TRAP_GATE, 0); + add_to_idt(10, (uint64_t)isr10, GDT_CODE_SEG, TRAP_GATE, 0); + add_to_idt(11, (uint64_t)isr11, GDT_CODE_SEG, TRAP_GATE, 0); + add_to_idt(12, (uint64_t)isr12, GDT_CODE_SEG, TRAP_GATE, 0); + add_to_idt(13, (uint64_t)isr13, GDT_CODE_SEG, TRAP_GATE, 0); + add_to_idt(14, (uint64_t)isr14, GDT_CODE_SEG, TRAP_GATE, 0); + add_to_idt(15, (uint64_t)isr15, GDT_CODE_SEG, TRAP_GATE, 0); + add_to_idt(16, (uint64_t)isr16, GDT_CODE_SEG, TRAP_GATE, 0); + add_to_idt(17, (uint64_t)isr17, GDT_CODE_SEG, TRAP_GATE, 0); + add_to_idt(18, (uint64_t)isr18, GDT_CODE_SEG, TRAP_GATE, 0); + add_to_idt(19, (uint64_t)isr19, GDT_CODE_SEG, TRAP_GATE, 0); + add_to_idt(20, (uint64_t)isr20, GDT_CODE_SEG, TRAP_GATE, 0); + add_to_idt(21, (uint64_t)isr21, GDT_CODE_SEG, TRAP_GATE, 0); + add_to_idt(22, (uint64_t)isr22, GDT_CODE_SEG, TRAP_GATE, 0); + add_to_idt(23, (uint64_t)isr23, GDT_CODE_SEG, TRAP_GATE, 0); + add_to_idt(24, (uint64_t)isr24, GDT_CODE_SEG, TRAP_GATE, 0); + add_to_idt(25, (uint64_t)isr25, GDT_CODE_SEG, TRAP_GATE, 0); + add_to_idt(26, (uint64_t)isr26, GDT_CODE_SEG, TRAP_GATE, 0); + add_to_idt(27, (uint64_t)isr27, GDT_CODE_SEG, TRAP_GATE, 0); + add_to_idt(28, (uint64_t)isr28, GDT_CODE_SEG, TRAP_GATE, 0); + add_to_idt(29, (uint64_t)isr29, GDT_CODE_SEG, TRAP_GATE, 0); + add_to_idt(30, (uint64_t)isr30, GDT_CODE_SEG, TRAP_GATE, 0); + add_to_idt(31, (uint64_t)isr31, GDT_CODE_SEG, TRAP_GATE, 0); /* interrupts */ - add_to_idt(32, (uint64_t)irq0, GDT_CODE_SEG, INTERRUPT_GATE); - add_to_idt(33, (uint64_t)irq1, GDT_CODE_SEG, INTERRUPT_GATE); + add_to_idt(32, (uint64_t)irq0, GDT_CODE_SEG, INTERRUPT_GATE, 1); + add_to_idt(33, (uint64_t)irq1, GDT_CODE_SEG, INTERRUPT_GATE, 0); size_t i; for (i = 34; i < 256; i++) { add_to_idt((uint16_t)i, (uint64_t)irq2, GDT_CODE_SEG, - INTERRUPT_GATE); + INTERRUPT_GATE, 0); } } diff --git a/kernel/src/cpu/irq.c b/kernel/src/cpu/irq.c index 7480eef..becb7cb 100644 --- a/kernel/src/cpu/irq.c +++ b/kernel/src/cpu/irq.c @@ -77,12 +77,12 @@ void interrupt(uint64_t number, uint64_t rsp) { switch (number) { case 0x20: - timer_handler(rsp); eoi(number); + timer_handler(rsp); break; case 0x21: - keyboard_handler(); eoi(number); + keyboard_handler(); break; default: printf("spurious interrupt\n"); diff --git a/kernel/src/cpu/regs.c b/kernel/src/cpu/regs.c new file mode 100644 index 0000000..710448e --- /dev/null +++ b/kernel/src/cpu/regs.c @@ -0,0 +1,33 @@ +#include +#include + +void print_regs_from_rsp(uint64_t rsp) +{ + regs_t *regs = (regs_t *)rsp; + + printf("info regs:\n"); + printf("rax: 0x%x; ", regs->rax); + printf("rbx: 0x%x; ", regs->rbx); + printf("rcx: 0x%x; ", regs->rcx); + printf("rdx: 0x%x; ", regs->rdx); + printf("rdi: 0x%x; ", regs->rdi); + printf("rsi: 0x%x; ", regs->rsi); + printf("rsp: 0x%x; ", regs->rsp); + printf("rbp: 0x%x; ", regs->rbp); + printf("r8: 0x%x; ", regs->r8); + printf("r9: 0x%x; ", regs->r9); + printf("r10: 0x%x; ", regs->r10); + printf("r11: 0x%x; ", regs->r11); + printf("r12: 0x%x; ", regs->r12); + printf("r13: 0x%x; ", regs->r13); + printf("r14: 0x%x; ", regs->r14); + printf("r15: 0x%x; ", regs->r15); + printf("rip: 0x%x; ", regs->rip); + printf("cs: 0x%x; ", regs->cs); + printf("ds: 0x%x; ", regs->seg >> 48); + printf("ss: 0x%x; ", regs->ss); + printf("es: 0x%x; ", (regs->seg >> 32) & 0xFFFF); + printf("fs: 0x%x; ", (regs->seg >> 16) & 0xFFFF); + printf("gs: 0x%x; ", regs->seg & 0xFFFF); + printf("rflags: 0x%x; ", regs->rflags); +} diff --git a/kernel/src/cpu/tss.c b/kernel/src/cpu/tss.c index cdfe2cc..f80f8db 100644 --- a/kernel/src/cpu/tss.c +++ b/kernel/src/cpu/tss.c @@ -14,10 +14,16 @@ void init_tss() { memset(&tss, 0, sizeof(tss_type)); tss.iopb = sizeof(tss_type); - uint32_t stack_size = 4096 * 4; + uint32_t stack_size = 1024 * 16; uint64_t stack = (uint64_t)kalloc(stack_size) + stack_size - 8; tss.rsp0_low = (uint32_t)stack; tss.rsp0_high = (uint32_t)(stack >> 32); + uint32_t ist_stack_size = 1024 * 32; + uint64_t ist_stack = + (uint64_t)kalloc(ist_stack_size) + ist_stack_size - 8; + tss.ist1_low = (uint32_t)ist_stack; + tss.ist1_high = (uint32_t)(ist_stack >> 32); + load_tss(); } -- cgit v1.2.3