Moved interrupt stuff to a separate file

oystedal · Apr 14, 2017 · 57116df · 57116df
1 parent aaa29b0
commit 57116df
Show file tree

Hide file tree

Showing 4 changed files with 81 additions and 69 deletions.
diff --git a/loader/interrupt.S → loader/interrupt_entry.S b/loader/interrupt.S → loader/interrupt_entry.S
diff --git a/loader/interrupts.c b/loader/interrupts.c
@@ -0,0 +1,60 @@
+#include "interrupts.h"
+
+struct idt_gate {
+    uint16_t offset_low;
+    uint16_t segment;
+    uint16_t flags;
+    uint16_t offset_high;
+};
+
+struct idtr_reg {
+    uint8_t push_it_to_the[sizeof(uintptr_t)-sizeof(uint16_t)];
+    uint16_t limit;
+    uint32_t base;
+};
+
+struct idt_gate idt[32];
+
+void
+init_idt(void)
+{
+    MAP_INTERRUPT(0, interrupt0);
+    MAP_INTERRUPT(1, interrupt1);
+    MAP_INTERRUPT(2, interrupt2);
+    MAP_INTERRUPT(3, interrupt3);
+    MAP_INTERRUPT(4, interrupt4);
+    MAP_INTERRUPT(5, interrupt5);
+    MAP_INTERRUPT(6, interrupt6);
+    MAP_INTERRUPT(7, interrupt7);
+    MAP_INTERRUPT(8, interrupt8);
+    MAP_INTERRUPT(9, interrupt9);
+    MAP_INTERRUPT(10, interrupt10);
+    MAP_INTERRUPT(11, interrupt11);
+    MAP_INTERRUPT(12, interrupt12);
+    MAP_INTERRUPT(13, interrupt13);
+    MAP_INTERRUPT(14, interrupt14);
+    MAP_INTERRUPT(15, interrupt15);
+    MAP_INTERRUPT(16, interrupt16);
+    MAP_INTERRUPT(17, interrupt17);
+    MAP_INTERRUPT(18, interrupt18);
+    MAP_INTERRUPT(19, interrupt19);
+    MAP_INTERRUPT(20, interrupt20);
+    MAP_INTERRUPT(21, interrupt21);
+    MAP_INTERRUPT(22, interrupt22);
+    MAP_INTERRUPT(23, interrupt23);
+    MAP_INTERRUPT(24, interrupt24);
+    MAP_INTERRUPT(25, interrupt25);
+    MAP_INTERRUPT(26, interrupt26);
+    MAP_INTERRUPT(27, interrupt27);
+    MAP_INTERRUPT(28, interrupt28);
+    MAP_INTERRUPT(29, interrupt29);
+    MAP_INTERRUPT(30, interrupt30);
+    MAP_INTERRUPT(31, interrupt31);
+
+    struct idtr_reg reg;
+    reg.limit = sizeof(struct idt_gate) * 32;
+    reg.base = (uint32_t)idt;
+
+    __asm__ volatile ("lidt %0" :: "m"(reg.limit));
+}
+
diff --git a/loader/interrupts.h b/loader/interrupts.h
@@ -1,3 +1,22 @@
+#ifndef INTERRUPTS_INCLUDE_H
+#define INTERRUPTS_INCLUDE_H
+
+#include "stdint-gcc.h"
+
+void init_idt(void);
+
+#define MAP_INTERRUPT(vector, address) \
+    do { \
+        idt[vector].offset_high = (uint16_t)(((uint32_t)address >> 16) & 0xFFFF); \
+        idt[vector].offset_low = (uint16_t)((uint32_t)address & 0xFFFF); \
+        idt[vector].segment = 0x8; \
+        idt[vector].flags = (1 << 15) | /* segment present */ \
+                                   /* Descriptor Privilege level = 0 */ \
+                       (1 << 11) | /* Descpiptor size = 32 bit */ \
+                       (1 << 10) | /* always 1 */ \
+                       (1 << 9); /* always 1 */ \
+    } while (0);
+
 void interrupt0(void);
 void interrupt1(void);
 void interrupt2(void);
@@ -30,3 +49,5 @@ void interrupt28(void);
 void interrupt29(void);
 void interrupt30(void);
 void interrupt31(void);
+
+#endif /* ifndef INTERRUPTS_INCLUDE_H */
diff --git a/loader/loader.c b/loader/loader.c
@@ -3,23 +3,9 @@
 #include "../util.h"
 #include "interrupts.h"
 
-struct idt_gate {
-    uint16_t offset_low;
-    uint16_t segment;
-    uint16_t flags;
-    uint16_t offset_high;
 };
 
-struct idtr_reg {
-    uint8_t push_it_to_the[sizeof(uintptr_t)-sizeof(uint16_t)];
-    uint16_t limit;
-    uint32_t base;
-};
-
-struct idt_gate idt[32];
-
 void halt(void);
-void init_idt(void);
 
 void loader_main(uint32_t magic, uint32_t addr)
 {
@@ -57,61 +43,6 @@ void loader_main(uint32_t magic, uint32_t addr)
     halt();
 }
 
-#define MAP_INTERRUPT(vector, address) \
-    do { \
-        idt[vector].offset_high = (uint16_t)(((uint32_t)address >> 16) & 0xFFFF); \
-        idt[vector].offset_low = (uint16_t)((uint32_t)address & 0xFFFF); \
-        idt[vector].segment = 0x8; \
-        idt[vector].flags = (1 << 15) | /* segment present */ \
-                                   /* Descriptor Privilege level = 0 */ \
-                       (1 << 11) | /* Descpiptor size = 32 bit */ \
-                       (1 << 10) | /* always 1 */ \
-                       (1 << 9); /* always 1 */ \
-    } while (0);
-
-void
-init_idt(void)
-{
-    MAP_INTERRUPT(0, interrupt0);
-    MAP_INTERRUPT(1, interrupt1);
-    MAP_INTERRUPT(2, interrupt2);
-    MAP_INTERRUPT(3, interrupt3);
-    MAP_INTERRUPT(4, interrupt4);
-    MAP_INTERRUPT(5, interrupt5);
-    MAP_INTERRUPT(6, interrupt6);
-    MAP_INTERRUPT(7, interrupt7);
-    MAP_INTERRUPT(8, interrupt8);
-    MAP_INTERRUPT(9, interrupt9);
-    MAP_INTERRUPT(10, interrupt10);
-    MAP_INTERRUPT(11, interrupt11);
-    MAP_INTERRUPT(12, interrupt12);
-    MAP_INTERRUPT(13, interrupt13);
-    MAP_INTERRUPT(14, interrupt14);
-    MAP_INTERRUPT(15, interrupt15);
-    MAP_INTERRUPT(16, interrupt16);
-    MAP_INTERRUPT(17, interrupt17);
-    MAP_INTERRUPT(18, interrupt18);
-    MAP_INTERRUPT(19, interrupt19);
-    MAP_INTERRUPT(20, interrupt20);
-    MAP_INTERRUPT(21, interrupt21);
-    MAP_INTERRUPT(22, interrupt22);
-    MAP_INTERRUPT(23, interrupt23);
-    MAP_INTERRUPT(24, interrupt24);
-    MAP_INTERRUPT(25, interrupt25);
-    MAP_INTERRUPT(26, interrupt26);
-    MAP_INTERRUPT(27, interrupt27);
-    MAP_INTERRUPT(28, interrupt28);
-    MAP_INTERRUPT(29, interrupt29);
-    MAP_INTERRUPT(30, interrupt30);
-    MAP_INTERRUPT(31, interrupt31);
-
-    struct idtr_reg reg;
-    reg.limit = sizeof(struct idt_gate) * 32;
-    reg.base = (uint32_t)idt;
-
-    __asm__ volatile ("lidt %0" :: "m"(reg.limit));
-}
-
 void halt(void)
 {
     kprintf("Halting.\n");