Added empty interrupts desriptive table

Author: scopeInfinity

Makefile

@@ -106,11 +106,12 @@ $(bt_stage2): $(SRC_BOOTLOADER)/stage2.asm $(SRC_BOOTLOADER)/stage2.c $(SRC_BOOT
 	ld --oformat binary -m elf_i386 -Ttext 0x8000 --strip-all -o $@ $(BUILD_BOOTLOADER)/stage2_asm.o $(BUILD_BOOTLOADER)/stage2_c.o  $(BUILD_LIB_UTILS)/libutils_16 $(BUILD_DRIVERS)/display/libtm_bios
 	truncate --size=%512 $@
 
-$(kernel_core): $(SRC_KERNEL)/core.asm $(SRC_KERNEL)/core.c $(SRC_KERNEL)/essentials.c $(SRC_LIB_UTILS)/io.h $(SRC_DRIVERS)/keyboard/keyboard.h $(BUILD_LIB_UTILS)/libutils $(BUILD_DRIVERS)/keyboard/libkeyboard $(BUILD_DRIVERS)/display/libtm_vga # And other io.h dependecies -_-
+$(kernel_core): $(SRC_KERNEL)/core.asm $(SRC_KERNEL)/core.c $(SRC_KERNEL)/essentials.c $(SRC_KERNEL)/interrupts.c $(SRC_KERNEL)/interrupts.asm $(SRC_LIB_UTILS)/io.h $(SRC_DRIVERS)/keyboard/keyboard.h $(BUILD_LIB_UTILS)/libutils $(BUILD_DRIVERS)/keyboard/libkeyboard $(BUILD_DRIVERS)/display/libtm_vga # And other io.h dependecies -_-
 	mkdir -p $$(dirname $(kernel_core))
 	nasm -o $(BUILD_KERNEL)/core_asm.o -f elf32 $(SRC_KERNEL)/core.asm
-	gcc -m32 -fno-pie -c -Isrc -o $(BUILD_KERNEL)/core_c.o $(SRC_KERNEL)/core.c
-	ld --oformat binary -m elf_i386 --trace -Ttext 0x0000 --strip-all -o $(kernel_core) $(BUILD_KERNEL)/core_asm.o $(BUILD_KERNEL)/core_c.o $(BUILD_LIB_UTILS)/libutils $(BUILD_DRIVERS)/keyboard/libkeyboard $(BUILD_DRIVERS)/display/libtm_vga
+	nasm -o $(BUILD_KERNEL)/interrupts_asm.o -f elf32 $(SRC_KERNEL)/interrupts.asm
+	gcc -m32 -fno-pie -c -Isrc -D KERNEL_MEMORY_LOCATION=$(KERNEL_MEMORY_LOCATION) -o $(BUILD_KERNEL)/core_c.o $(SRC_KERNEL)/core.c
+	ld --oformat binary -m elf_i386 --trace -Ttext 0x0000 --strip-all -o $(kernel_core) $(BUILD_KERNEL)/core_asm.o $(BUILD_KERNEL)/core_c.o $(BUILD_KERNEL)/interrupts_asm.o $(BUILD_LIB_UTILS)/libutils $(BUILD_DRIVERS)/keyboard/libkeyboard $(BUILD_DRIVERS)/display/libtm_vga
 	truncate --size=%512 $(kernel_core)
 
 # Libraries

src/bootloader/stage2.asm

@@ -9,7 +9,6 @@ global enter_protected_mode
 global label_exit
 
 [SECTION .text]
-        CLI
         MOV ax, 0x0000
         MOV es, ax                  ; es := 0
         set_blinking 0
@@ -24,8 +23,6 @@ global label_exit
         push ebp
         mov ebp, esp
 
-        cli
-
         ; Load GDT Table
             ; Workaround for Issue #3
             mov eax, [esp+8]   ; gdtr_address

src/bootloader/stage2.c

@@ -11,11 +11,11 @@ char message_protected_mode[] = "Enabling Protected Mode...";
 
 #define GDT_TABLE_SIZE 3
 
+#pragma pack(push, 1)
 struct GDTReference {
     unsigned short size;
     unsigned int base_address;
 };
-
 struct GDTEntry {
     unsigned short limit0;
     unsigned short base0;
@@ -24,6 +24,7 @@ struct GDTEntry {
     unsigned char flags_limit1;
     unsigned char base2;
 };
+#pragma pack(pop)
 
 // Issue#2: gdt_table must immediately after gdtr.
 struct GDTReference gdtr;

src/drivers/keyboard/keyboard.asm

@@ -2,6 +2,8 @@
 
 global port_write
 global port_read
+global enable_interrupts
+global disable_interrupts
 
 [SECTION .text]
     port_write:
@@ -26,4 +28,12 @@ global port_read
 
         mov esp, ebp
         pop ebp
-        ret
+        ret
+
+    enable_interrupts:
+        STI
+        ret
+
+    disable_interrupts:
+        CLI
+        ret

src/drivers/keyboard/keyboard.cpp

@@ -129,9 +129,13 @@ unsigned char read_data_reply() {
     wait_for_status_flag_timeout(STATUS_OUTPUT_BUFFER, 1, WAIT_FOR_STATUS_TIMEOUT);
     return port_read(DRIVERS_KEYBOARD_PORT_DATA);
 }
+extern "C" void enable_interrupts();
+extern "C" void disable_interrupts();
+
 
 extern "C" void keyboard_init() {
-    sleep_mini(30000000);
+    sleep_mini(3000000);
+
     unsigned char out;
     // disable PS/2 first port
     ps2_controller_send_command(0XAD, 0);
@@ -186,6 +190,7 @@ extern "C" void keyboard_init() {
         // enable second port
         ps2_controller_send_command(0xA8, 0);
     }
+
     // enable interrupts
     // out = ps2_controller_send_command(0X20, 1);
     // out |= 0b11;

src/kernel/core.asm

@@ -4,6 +4,7 @@ extern entry_core
 global __low_va_args
 
 [SECTION .text]
+        CLI
         mov ax, 0x10
         mov es, ax
         mov ss, ax

src/kernel/core.c

@@ -1,9 +1,13 @@
 #include <drivers/display/text_mode.h>
 #include <drivers/keyboard/keyboard.h>
-#include <kernel/essentials.c>
 #include <lib/utils/io.h>
 #include <lib/utils/panic.h>
 
+#include "kernel/essentials.c"
+#include "kernel/interrupts.c"
+
+extern void kernel_enable_interrupts();
+
 int call_main(unsigned short cs,unsigned short ip, int argc, char *argv[]) {
     return ((int (*) (int, char *[]))(unsigned int)ip)(argc, argv);
 }
@@ -24,11 +28,13 @@ void exec(int sector_index, int sector_count){
 }
 
 void entry_core() {
-    set_color_bg(C_BLACK);
+    set_color_bg(C_BLUE);
     set_color_fg(C_WHITE);
+    print_rectangle(0, 0, TEXT_WINDOW_WIDTH-1, TEXT_WINDOW_WIDTH-1);
 
-    move_xy(6,22);
+    move_xy(2,2);
     print_line("Initializing Kernel...");
-    keyboard_init();
+    populate_and_load_idt_table();
+    kernel_enable_interrupts();
     PANIC(501, "Kernel is under development!!!");
 }

src/kernel/interrupts.asm

@@ -0,0 +1,31 @@
+[BITS 32]
+
+global interrupt_nohup
+global load_idt_table
+global kernel_enable_interrupts
+global kernel_disable_interrupts
+global idt_table
+
+[SECTION .text]
+
+    interrupt_nohup:
+        iret
+
+    load_idt_table:
+        push ebp
+        mov ebp, esp
+
+        mov eax, [ebp + 0x8]
+        lidt [eax]
+
+        mov esp, ebp
+        pop ebp
+        ret
+
+    kernel_enable_interrupts:
+        STI
+        ret
+
+    kernel_disable_interrupts:
+        CLI
+        ret

src/kernel/interrupts.c

@@ -1,26 +1,75 @@
-#define IDT_SIZE 1
+#define IDT_SIZE 16
 
+extern void interrupt_nohup();
+extern void load_idt_table(unsigned int idtr_address);
+
+#pragma pack(push, 1)
 struct IDTEntry {
-    unsigned short something0;
-    unsigned short something1;
-    unsigned short something2;
-    unsigned short something3;
-    unsigned short something4;
-    unsigned short something5;
-    unsigned short something6;
-    unsigned short something7;
+    unsigned short offset_0;
+    unsigned short selector;
+    unsigned char  unused;
+    unsigned char  type_attr;
+    unsigned short offset_1;
 };
 
 struct IDTReference {
     unsigned short size;
     unsigned int base_address;
 };
+#pragma pack(pop)
+
 struct IDTReference idtr;
 struct IDTEntry idt_table[IDT_SIZE];
 
-void populate_ict_entry(struct IDTEntry *entry) {
+void populate_idt_entry(int id,
+    unsigned short selector,
+    unsigned int address,
+    unsigned char present,  // 1-bit
+    unsigned char dpl, // 2-bit
+    unsigned char  storage_segment, // 1-bit
+    unsigned char gate_type // 4-bit
+    ) {
+    struct IDTEntry *entry = &idt_table[id];
+    entry->offset_0 = address&0xFFFF;
+    entry->offset_1 = (address>>16)&0xFFFF;
+    entry->selector = selector;
+    entry->unused = 0;
+    entry->type_attr = (present<<7) | (dpl<<5) | (storage_segment<<4) | gate_type;
+}
+
+void populate_idt_entry_32bit(int id,
+    unsigned int address,
+    unsigned char dpl, // 2-bit
+    int is_trap
+    ) {
+    populate_idt_entry(
+        id,
+        0x08,  // kernel code segment selector
+        address,
+        1,
+        dpl,
+        0,
+        is_trap?0b1111:0b1110
+        );
 }
 
-int populate_idt_table() {
-    return (int)&idtr;
+void populate_and_load_idt_table() {
+    for (int i = 0; i < IDT_SIZE; ++i) {
+        populate_idt_entry_32bit(i, (unsigned int)interrupt_nohup, 0, 1);
+    }
+    idtr.size = sizeof(struct IDTEntry)*IDT_SIZE;
+    idtr.base_address = ((int)idt_table + KERNEL_MEMORY_LOCATION);
+
+    move_xy(4,4);
+    print_line("IDT Reference: ");
+    int idtr_address = (int)&idtr;
+    print_hex_int(idtr_address);
+
+    move_xy(4,5);
+    print_line("IDT Table: ");
+    print_hex_int(idtr.base_address);
+    print_char(' ');
+    print_hex_int(idtr.size);
+
+    load_idt_table(idtr_address);
 }

src/lib/utils/io.c

@@ -31,13 +31,13 @@ void move_xy_diff(unsigned char dx, unsigned char dy) {
 
 void print_rectangle(unsigned char x1,unsigned char y1,
                      unsigned char x2, unsigned char y2) {
-    io_low_scroll_screen(0, get_color_fgbg(), x1, y1, x2, y2);    
+    io_low_scroll_screen(0, get_color_fgbg(), x1, y1, x2, y2);
 }
 
 void scroll(unsigned char count,
             unsigned char x1,unsigned char y1,
             unsigned char x2, unsigned char y2) {
-    io_low_scroll_screen(count, get_color_fgbg(), x1, y1, x2, y2);    
+    io_low_scroll_screen(count, get_color_fgbg(), x1, y1, x2, y2);
 }
 
 void print_char(char c) {
@@ -70,6 +70,15 @@ void print_hex_byte(unsigned char x) {
     print_hex_nibble(x&0xF);
 }
 
+void print_hex_short(unsigned short x) {
+    print_hex_byte(x>>8);
+    print_hex_byte(x&0xFF);
+}
+
+void print_hex_int(unsigned int x) {
+    print_hex_short(x>>16);
+    print_hex_short(x&0xFFFF);
+}
 
 void print_line(const char *str) {
     while((*str)!='\0') {