diff options
Diffstat (limited to 'src/idt.cc')
| -rw-r--r-- | src/idt.cc | 89 |
1 files changed, 51 insertions, 38 deletions
@@ -1,11 +1,10 @@ #include "idt.h" #include <stdlib.h> +#include "cpu/irq.h" #include "ports.h" static_assert(sizeof(IDT::Pointer) == 6); -// size of IDT::Entry in protected mode is 64 bits -// and in long mode is 128 bits -static_assert(sizeof(IDT::Entry) == 8); +static_assert(sizeof(IDT::Entry) == 8); // size of IDT::Entry in protected mode is 64 bits /* reinitialize the PIC controllers, giving them specified vector offsets rather than 8h and 70h, as configured by default */ @@ -22,60 +21,74 @@ static_assert(sizeof(IDT::Entry) == 8); #define ICW4_BUF_MASTER 0x0C /* Buffered mode/master */ #define ICW4_SFNM 0x10 /* Special fully nested (not) */ -template <uint8_t irq> -__attribute__((interrupt)) void t_irq(interrupt_frame*) { - static_assert(irq <= 15); - - com1_port_t com1; - com1.write("0123456789abcdef"[irq]); - com1.write('\n'); - com1.write('\r'); - +extern "C" uint32_t handle_interrupt(uint8_t irq, uint32_t esp) { + printk("interrupt ", uhex{irq}, '\n'); pic1_t pic1; pic1.write(0x20); - if constexpr (irq > 7) { + if (irq > 7) { pic2_t pic2; pic2.write(0x20); } + return esp; }; -IDT::IDT() { +IDT::IDT(const uint16_t selector) { + table[0x00] = Entry(&exception0x00, selector, Intr); + table[0x01] = Entry(&exception0x01, selector, Intr); + table[0x02] = Entry(&exception0x02, selector, Intr); + table[0x03] = Entry(&exception0x03, selector, Intr); + table[0x04] = Entry(&exception0x04, selector, Intr); + table[0x05] = Entry(&exception0x05, selector, Intr); + table[0x06] = Entry(&exception0x06, selector, Intr); + table[0x07] = Entry(&exception0x07, selector, Intr); + table[0x08] = Entry(&exception0x08, selector, Intr); + table[0x09] = Entry(&exception0x09, selector, Intr); + table[0x0a] = Entry(&exception0x0a, selector, Intr); + table[0x0b] = Entry(&exception0x0b, selector, Intr); + table[0x0c] = Entry(&exception0x0c, selector, Intr); + table[0x0d] = Entry(&exception0x0d, selector, Intr); + table[0x0e] = Entry(&exception0x0e, selector, Intr); + table[0x0f] = Entry(&exception0x0f, selector, Intr); + table[0x10] = Entry(&exception0x10, selector, Intr); + table[0x11] = Entry(&exception0x11, selector, Intr); + table[0x12] = Entry(&exception0x12, selector, Intr); + table[0x13] = Entry(&exception0x13, selector, Intr); + + table[0x20] = Entry(&interrupt0x00, selector, Intr); + table[0x21] = Entry(&interrupt0x01, selector, Intr); + table[0x22] = Entry(&interrupt0x02, selector, Intr); + table[0x23] = Entry(&interrupt0x03, selector, Intr); + table[0x24] = Entry(&interrupt0x04, selector, Intr); + table[0x25] = Entry(&interrupt0x05, selector, Intr); + table[0x26] = Entry(&interrupt0x06, selector, Intr); + table[0x27] = Entry(&interrupt0x07, selector, Intr); + + table[0x28] = Entry(&interrupt0x08, selector, Intr); + table[0x29] = Entry(&interrupt0x09, selector, Intr); + table[0x2a] = Entry(&interrupt0x0a, selector, Intr); + table[0x2b] = Entry(&interrupt0x0b, selector, Intr); + table[0x2c] = Entry(&interrupt0x0c, selector, Intr); + table[0x2d] = Entry(&interrupt0x0d, selector, Intr); + table[0x2e] = Entry(&interrupt0x0e, selector, Intr); + table[0x2f] = Entry(&interrupt0x0f, selector, Intr); + pic1_t pic1; pic2_t pic2; - // const auto mask1 = pic1.read(0x1); - // const auto mask2 = pic2.read(0x1); - pic1.write(ICW1_INIT | ICW1_ICW4); pic2.write(ICW1_INIT | ICW1_ICW4); pic1.write(0x20, 0x1); // offset 0x20 pic2.write(0x28, 0x1); // offset 0x28 - pic1.write(4, 0x1); // tell master pic there is a slave pic - pic2.write(2, 0x1); // tell slave pic its cascade identity + pic1.write(0x04, 0x1); // tell master pic there is a slave pic + pic2.write(0x02, 0x1); // tell slave pic its cascade identity + pic1.write(ICW4_8086, 0x1); pic2.write(ICW4_8086, 0x1); - // pic1.write(mask1); - // pic2.write(mask2); - pic1.write(0xfd, 0x1); // only enable irq1 + // pic masks + pic1.write(0xfc, 0x1); // only enable irq1 pic2.write(0xff, 0x1); - table[0x20] = Entry(reinterpret_cast<unsigned long>(t_irq<0x0>), 0x08, InterruptGate); - table[0x21] = Entry(reinterpret_cast<unsigned long>(t_irq<0x1>), 0x08, InterruptGate); - table[0x22] = Entry(reinterpret_cast<unsigned long>(t_irq<0x2>), 0x08, InterruptGate); - table[0x23] = Entry(reinterpret_cast<unsigned long>(t_irq<0x3>), 0x08, InterruptGate); - table[0x24] = Entry(reinterpret_cast<unsigned long>(t_irq<0x4>), 0x08, InterruptGate); - table[0x25] = Entry(reinterpret_cast<unsigned long>(t_irq<0x5>), 0x08, InterruptGate); - table[0x26] = Entry(reinterpret_cast<unsigned long>(t_irq<0x6>), 0x08, InterruptGate); - table[0x27] = Entry(reinterpret_cast<unsigned long>(t_irq<0x7>), 0x08, InterruptGate); - table[0x28] = Entry(reinterpret_cast<unsigned long>(t_irq<0x8>), 0x08, InterruptGate); - table[0x29] = Entry(reinterpret_cast<unsigned long>(t_irq<0x9>), 0x08, InterruptGate); - table[0x2a] = Entry(reinterpret_cast<unsigned long>(t_irq<0xa>), 0x08, InterruptGate); - table[0x2b] = Entry(reinterpret_cast<unsigned long>(t_irq<0xb>), 0x08, InterruptGate); - table[0x2c] = Entry(reinterpret_cast<unsigned long>(t_irq<0xc>), 0x08, InterruptGate); - table[0x2d] = Entry(reinterpret_cast<unsigned long>(t_irq<0xd>), 0x08, InterruptGate); - table[0x2e] = Entry(reinterpret_cast<unsigned long>(t_irq<0xe>), 0x08, InterruptGate); - Pointer ptr{.limit = sizeof(table), .base = reinterpret_cast<uint32_t>(table)}; asm volatile("lidt %0" : : "m"(ptr)); asm volatile("sti"); |