diff options
Diffstat (limited to 'src/kernel.cc')
-rw-r--r-- | src/kernel.cc | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/src/kernel.cc b/src/kernel.cc index 33282db..98c3a1a 100644 --- a/src/kernel.cc +++ b/src/kernel.cc @@ -13,23 +13,14 @@ #include "cga.h" #include "gdt.h" #include "idt.h" +#include "keyboard.h" #include "scheduler.h" #include "serial.h" - -#include "keyboard.h" +#include "vmm.h" #include "hardware.h" -typedef void (*constructor)(); - extern "C" { - -constructor begin_ctors; -constructor end_ctors; -void kernel_constructors() { - for (constructor* i = &begin_ctors; i != &end_ctors; ++i) (*i)(); -} - void dump_multiboot(uint32_t mb_magic, uint32_t mb_addr); void dump_gdt(); @@ -45,12 +36,13 @@ void kernel_main([[maybe_unused]] uint32_t mb_magic, [[maybe_unused]] uint32_t m printk("Hello, kernel World!\n"); - dump_multiboot(mb_magic, mb_addr + 0xc0000000); + dump_address(); + // dump_multiboot(mb_magic, mb_addr + 0xc0000000); // dump_gdt(); GDT gdt; IDT idt{gdt.descriptor(GDT::kcode)}; - Scheduler s{gdt.descriptor(GDT::kcode)}; + // Scheduler s{gdt.descriptor(GDT::kcode)}; Keyboard kb; idt.enable(); |