aboutsummaryrefslogtreecommitdiff
path: root/src/kernel
diff options
context:
space:
mode:
authorNic Gaffney <gaffney_nic@protonmail.com>2023-12-21 03:32:06 -0600
committerNic Gaffney <gaffney_nic@protonmail.com>2023-12-21 03:32:06 -0600
commit138424b31d9c2af158e8ae619248b035b5a280d9 (patch)
tree0da4f6661d68737b5957029242bea43fad77d7a8 /src/kernel
parent9dbc5231dd738d97eea13f8ecf9005e5b78ea0d3 (diff)
downloadgftos-138424b31d9c2af158e8ae619248b035b5a280d9.tar.gz
set up bochs for debugging and started working on interrupts.
Diffstat (limited to 'src/kernel')
-rw-r--r--src/kernel/gdt.c (renamed from src/kernel/gdt/gdt.c)14
-rw-r--r--src/kernel/gdt/compile_flags.txt1
-rw-r--r--src/kernel/idt.c28
-rw-r--r--src/kernel/keyboard/pic.c1
4 files changed, 34 insertions, 10 deletions
diff --git a/src/kernel/gdt/gdt.c b/src/kernel/gdt.c
index 4886dc3..406b40c 100644
--- a/src/kernel/gdt/gdt.c
+++ b/src/kernel/gdt.c
@@ -1,19 +1,15 @@
#include "gdt.h"
#include <stdint.h>
-GDT_t *table = 0x0;
+GDT_t table = 0x0;
extern GDTR_t gdtr;
void get_gdtr() {
uint32_t base = 0x0000;
- *table = (GDT_t){
- // NULL
- make_descriptor(0, 0, 0),
- // Code segment, read
- make_descriptor(base, 0x8FFFF, make_code(0, 0, 1)),
- // Data segment, read write
- make_descriptor(base, 0x8FFFF, make_data(0, 0, 1)),
- };
+ table[0] = make_descriptor(0, 0, 0);
+ table[1] = make_descriptor(base, 0x3FFFF, make_code(0, 0, 1));
+ table[2] = make_descriptor(base, 0x3FFFF, make_data(0, 0, 1));
+
gdtr.size = sizeof(Segment_Descriptor_t) * 3 - 1;
gdtr.offset = base;
}
diff --git a/src/kernel/gdt/compile_flags.txt b/src/kernel/gdt/compile_flags.txt
deleted file mode 100644
index 2af49c7..0000000
--- a/src/kernel/gdt/compile_flags.txt
+++ /dev/null
@@ -1 +0,0 @@
--I../../include/
diff --git a/src/kernel/idt.c b/src/kernel/idt.c
new file mode 100644
index 0000000..f3fea4f
--- /dev/null
+++ b/src/kernel/idt.c
@@ -0,0 +1,28 @@
+#include "idt.h"
+#include "gdt.h"
+#include <stdint.h>
+
+IDT_t idt = (IDT_t)0x7fffe;
+extern GDTR_t idtr;
+
+void get_idtr() {
+ int base = 0x7fffe;
+ uint8_t code_seg = (0b1000 << 3) | 0b000;
+
+ // idtr.size = sizeof(Gate_Descriptor_t) * n - 1;
+ idtr.size = 0;
+ idtr.offset = base;
+}
+
+Gate_Descriptor_t make_gate(uint32_t offset, uint8_t segment_selector,
+ uint8_t type) {
+ Gate_Descriptor_t ret = (Gate_Descriptor_t){
+ .offset_low = offset,
+ .reserved = 0,
+ .attrs = (0b1000 << 4) | type,
+ .offset_high = offset >> 16,
+ .segment_selector = segment_selector,
+ };
+
+ return ret;
+}
diff --git a/src/kernel/keyboard/pic.c b/src/kernel/keyboard/pic.c
new file mode 100644
index 0000000..0c81629
--- /dev/null
+++ b/src/kernel/keyboard/pic.c
@@ -0,0 +1 @@
+#include "asm.h"