diff options
Diffstat (limited to 'kernel/src/cpu')
| -rw-r--r-- | kernel/src/cpu/idt.c | 66 | ||||
| -rw-r--r-- | kernel/src/cpu/regs.c | 1 | ||||
| -rw-r--r-- | kernel/src/cpu/tss.c | 16 |
3 files changed, 45 insertions, 38 deletions
diff --git a/kernel/src/cpu/idt.c b/kernel/src/cpu/idt.c index b60b8b9..9278145 100644 --- a/kernel/src/cpu/idt.c +++ b/kernel/src/cpu/idt.c @@ -35,42 +35,42 @@ void add_to_idt(uint16_t num, uint64_t offset, uint16_t selector, uint8_t type, void init_idt_table(void) { /* exceptions */ - 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); + add_to_idt(0, (uint64_t)isr0, GDT_CODE_SEG, TRAP_GATE, 2); + add_to_idt(1, (uint64_t)isr1, GDT_CODE_SEG, TRAP_GATE, 2); + add_to_idt(2, (uint64_t)isr2, GDT_CODE_SEG, TRAP_GATE, 2); + add_to_idt(3, (uint64_t)isr3, GDT_CODE_SEG, TRAP_GATE, 2); + add_to_idt(4, (uint64_t)isr4, GDT_CODE_SEG, TRAP_GATE, 2); + add_to_idt(5, (uint64_t)isr5, GDT_CODE_SEG, TRAP_GATE, 2); + add_to_idt(6, (uint64_t)isr6, GDT_CODE_SEG, TRAP_GATE, 2); + add_to_idt(7, (uint64_t)isr7, GDT_CODE_SEG, TRAP_GATE, 2); + add_to_idt(8, (uint64_t)isr8, GDT_CODE_SEG, TRAP_GATE, 2); + add_to_idt(9, (uint64_t)isr9, GDT_CODE_SEG, TRAP_GATE, 2); + add_to_idt(10, (uint64_t)isr10, GDT_CODE_SEG, TRAP_GATE, 2); + add_to_idt(11, (uint64_t)isr11, GDT_CODE_SEG, TRAP_GATE, 2); + add_to_idt(12, (uint64_t)isr12, GDT_CODE_SEG, TRAP_GATE, 2); + add_to_idt(13, (uint64_t)isr13, GDT_CODE_SEG, TRAP_GATE, 2); + add_to_idt(14, (uint64_t)isr14, GDT_CODE_SEG, TRAP_GATE, 2); + add_to_idt(15, (uint64_t)isr15, GDT_CODE_SEG, TRAP_GATE, 2); + add_to_idt(16, (uint64_t)isr16, GDT_CODE_SEG, TRAP_GATE, 2); + add_to_idt(17, (uint64_t)isr17, GDT_CODE_SEG, TRAP_GATE, 2); + add_to_idt(18, (uint64_t)isr18, GDT_CODE_SEG, TRAP_GATE, 2); + add_to_idt(19, (uint64_t)isr19, GDT_CODE_SEG, TRAP_GATE, 2); + add_to_idt(20, (uint64_t)isr20, GDT_CODE_SEG, TRAP_GATE, 2); + add_to_idt(21, (uint64_t)isr21, GDT_CODE_SEG, TRAP_GATE, 2); + add_to_idt(22, (uint64_t)isr22, GDT_CODE_SEG, TRAP_GATE, 2); + add_to_idt(23, (uint64_t)isr23, GDT_CODE_SEG, TRAP_GATE, 2); + add_to_idt(24, (uint64_t)isr24, GDT_CODE_SEG, TRAP_GATE, 2); + add_to_idt(25, (uint64_t)isr25, GDT_CODE_SEG, TRAP_GATE, 2); + add_to_idt(26, (uint64_t)isr26, GDT_CODE_SEG, TRAP_GATE, 2); + add_to_idt(27, (uint64_t)isr27, GDT_CODE_SEG, TRAP_GATE, 2); + add_to_idt(28, (uint64_t)isr28, GDT_CODE_SEG, TRAP_GATE, 2); + add_to_idt(29, (uint64_t)isr29, GDT_CODE_SEG, TRAP_GATE, 2); + add_to_idt(30, (uint64_t)isr30, GDT_CODE_SEG, TRAP_GATE, 2); + add_to_idt(31, (uint64_t)isr31, GDT_CODE_SEG, TRAP_GATE, 2); /* interrupts */ 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); + add_to_idt(33, (uint64_t)irq1, GDT_CODE_SEG, INTERRUPT_GATE, 2); size_t i; for (i = 34; i < 256; i++) { add_to_idt((uint16_t)i, (uint64_t)irq2, GDT_CODE_SEG, diff --git a/kernel/src/cpu/regs.c b/kernel/src/cpu/regs.c index 710448e..a747154 100644 --- a/kernel/src/cpu/regs.c +++ b/kernel/src/cpu/regs.c @@ -30,4 +30,5 @@ void print_regs_from_rsp(uint64_t rsp) printf("fs: 0x%x; ", (regs->seg >> 16) & 0xFFFF); printf("gs: 0x%x; ", regs->seg & 0xFFFF); printf("rflags: 0x%x; ", regs->rflags); + printf("\n"); } diff --git a/kernel/src/cpu/tss.c b/kernel/src/cpu/tss.c index f80f8db..45c24dc 100644 --- a/kernel/src/cpu/tss.c +++ b/kernel/src/cpu/tss.c @@ -19,11 +19,17 @@ void init_tss() 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); + uint32_t ist1_stack_size = 1024 * 32; + uint64_t ist1_stack = + (uint64_t)kalloc(ist1_stack_size) + ist1_stack_size - 8; + tss.ist1_low = (uint32_t)ist1_stack; + tss.ist1_high = (uint32_t)(ist1_stack >> 32); + + uint32_t ist2_stack_size = 1024 * 32; + uint64_t ist2_stack = + (uint64_t)kalloc(ist2_stack_size) + ist2_stack_size - 8; + tss.ist2_low = (uint32_t)ist2_stack; + tss.ist2_high = (uint32_t)(ist2_stack >> 32); load_tss(); } |