You can register interrupt handlers now

Nekofile

@@ -2,7 +2,7 @@
 ;
 
 ; Constants
-CCFLAGS = -std=gnu++11 -ffreestanding -mno-red-zone -fno-exceptions -nostdlib -Wall -Wextra -fno-pie -O2 -mgeneral-regs-only
+CCFLAGS = -std=gnu++11 -ffreestanding -mno-red-zone -fno-exceptions -nostdlib -Wall -Wextra -fno-pie -fno-rtti -O2 -mgeneral-regs-only
 
 ; Tools
 [asm, multi]:

kernel/arch/interrupts.cpp

@@ -11,6 +11,8 @@
 
 using namespace Kernel;
 
+nk::Vector<InterruptHandlerEntry> Interrupts::entries;
+
 static const char *exception_descriptors[] = {
 	"Division by Zero",
 	"Debug",
@@ -62,8 +64,6 @@ extern "C"
 
 	void irq1_handler(void)
 	{
-		unsigned char scan_code = IO::In8(0x60);
-		Device::Keyboard::HandleInterrupt(scan_code);
 		Interrupts::HandleInterrupt(1);
 		master_eoi();
 	}
@@ -204,9 +204,6 @@ extern "C"
 
 void Interrupts::SetupIdt()
 {
-	/* remapping the PIC */
-	Device::PIC::Remap();
-
 	/* build table */
 	SetIdtEntry(0, TYPE_TRAP_GATE, (unsigned long)exc0);
 	SetIdtEntry(1, TYPE_TRAP_GATE, (unsigned long)exc1);
@@ -272,7 +269,7 @@ void Interrupts::Disable()
 void Interrupts::SetIdtEntry(unsigned int interrupt, unsigned char type, unsigned long address)
 {
 	IDT[interrupt].offset_lowerbits = address & 0xffff;
-	IDT[interrupt].selector = 0x08; /* KERNEL_CODE_SEGMENT_OFFSET */
+	IDT[interrupt].selector = 0x08; /* kernel code segment */
 	IDT[interrupt].zero = 0;
 	IDT[interrupt].type_attr = type;
 	IDT[interrupt].offset_higherbits = (address & 0xffff0000) >> 16;
@@ -295,9 +292,15 @@ void Interrupts::HandleException(unsigned int vector, struct interrupt_frame *fr
 
 void Interrupts::HandleInterrupt(unsigned int interrupt)
 {
+	for (int i = 0; i < entries.Size(); i++) {
+		InterruptHandlerEntry &entry = entries.At(i);
+		if (entry.interrupt == interrupt)
+			entry.handler->HandleInterrupt(interrupt);
+	}
 }
 
-void Interrupts::AddHandler(unsigned int interrupt, InterruptHandler handler)
+void Interrupts::AddHandler(unsigned int interrupt, InterruptHandler *handler)
 {
-
+	InterruptHandlerEntry entry = {interrupt, handler};
+	entries.Add(entry);
 }

kernel/device/devicemanager.cpp

@@ -0,0 +1,14 @@
+#include <device/devicemanager.h>
+
+using namespace Device;
+
+Keyboard* DeviceManager::keyboard;        
+PIC* DeviceManager::pic;
+
+void DeviceManager::Initialize() {
+    keyboard = new Keyboard();
+    keyboard->Initialize();
+
+    pic = new PIC();
+    pic->Remap();
+}

kernel/device/keyboard.cpp

@@ -1,11 +1,11 @@
 #include <kernel/tty.h>
 #include <kernel/interrupts.h>
+#include <kernel/io.h>
 #include <device/keyboard.h>
 
+using namespace Kernel;
 using namespace Device;
 
-char Keyboard::scancode_map[128];
-
 void Keyboard::Initialize()
 {
     for (int i = 0; i < 128; i++)
@@ -63,10 +63,13 @@ void Keyboard::Initialize()
     NewScancode(53, '-');
     NewScancode(57, ' ');
 
+    Interrupts::AddHandler(1, this);
 }
 
-void Keyboard::HandleInterrupt(unsigned int scancode)
+void Keyboard::HandleInterrupt(unsigned int interrupt)
 {
+    unsigned int scancode = IO::In8(0x60);
+
     if (scancode > 128)
         return;
 

kernel/heap.cpp

@@ -1,4 +1,4 @@
-#include <device/cpu.h>
+#include <device/devicemanager.h>
 #include <string.h>
 extern "C"
 {

kernel/include/device/cpu.h

@@ -1,3 +1,6 @@
+#ifndef _CPU_H
+#define _CPU_H
+
 namespace Device
 {
 
@@ -8,3 +11,5 @@ namespace Device
     };
 
 } // namespace Device
+
+#endif

kernel/include/device/devicemanager.h

@@ -0,0 +1,23 @@
+#ifndef _DEVICEMANAGER_H
+#define _DEVICEMANAGER_H
+
+#include "cpu.h"
+#include "keyboard.h"
+#include "pic.h"
+
+namespace Device
+{
+
+    class DeviceManager
+    {
+    public:
+        static Keyboard *keyboard;
+
+        static PIC *pic;
+
+        static void Initialize();
+    };
+
+} // namespace Device
+
+#endif

kernel/include/device/keyboard.h

@@ -1,18 +1,24 @@
+#ifndef _KEYBOARD_H
+#define _KEYBOARD_H
+
+#include <kernel/interrupts.h>
+
 namespace Device
 {
-    class Keyboard
+    class Keyboard : public Kernel::InterruptHandler
     {
     private:
-        static char scancode_map[128];
+        char scancode_map[128];
 
     public:
-        static void Initialize();
+        void Initialize();
 
-        static void HandleInterrupt(unsigned int scancode);
+        void HandleInterrupt(unsigned int interrupt) override;
 
     private:
-        static void NewScancode(unsigned int code, char c);
-
-        static char MapChar(unsigned int scancode);
+        void NewScancode(unsigned int code, char c);
+        char MapChar(unsigned int scancode);
     };
-} // namespace Device
+} // namespace Device
+
+#endif

kernel/include/device/pic.h

@@ -1,10 +1,15 @@
+#ifndef _PIC_H
+#define _PIC_H
+
 namespace Device
 {
 
     class PIC
     {
     public:
-        static void Remap();
+        void Remap();
     };
 
 } // namespace Device
+
+#endif

kernel/include/kernel/heap.h

@@ -1,3 +1,6 @@
+#ifndef _HEAP_H
+#define _HEAP_H
+
 #include <stddef.h>
 #include <stdint.h>
 
@@ -14,4 +17,6 @@ extern "C"
 
 #ifdef __cplusplus
 }
+#endif
+
 #endif

kernel/include/kernel/interrupts.h

@@ -1,3 +1,7 @@
+#ifndef _INTERRUPTS_H
+#define _INTERRUPTS_H
+
+#include <nk/vector.h>
 
 struct IDT_entry
 {
@@ -21,11 +25,21 @@ namespace Kernel
 {
     class InterruptHandler
     {
-        virtual void Handle(unsigned int interrupt);
+    public:
+        virtual void HandleInterrupt(unsigned int interrupt) = 0;
+    };
+
+    struct InterruptHandlerEntry
+    {
+        unsigned int interrupt;
+        InterruptHandler *handler;
     };
 
     class Interrupts
     {
+    private:
+        static nk::Vector<InterruptHandlerEntry> entries;
+
     public:
         static void SetupIdt();
 
@@ -39,7 +53,9 @@ namespace Kernel
 
         static void HandleInterrupt(unsigned int interrupt);
 
-        static void AddHandler(unsigned int interrupt, InterruptHandler handler);
+        static void AddHandler(unsigned int interrupt, InterruptHandler *handler);
     };
 
-}; // namespace Kernel
+}; // namespace Kernel
+
+#endif

kernel/kernel.cpp

@@ -1,11 +1,11 @@
 #include <kernel/tty.h>
 #include <kernel/heap.h>
 #include <kernel/interrupts.h>
-#include <device/keyboard.h>
-#include <device/cpu.h>
+#include <device/devicemanager.h>
 #include <stdio.h>
 
 using namespace Kernel;
+using namespace Device;
 
 /* nekosys Kernel entry point */
 extern "C" void nkmain() {
@@ -15,16 +15,18 @@ extern "C" void nkmain() {
 	printf("nekosys 0.01 <by Twometer>\n");
 	TTY::SetColor(0x0f);
 
+	printf("Initializing heap...\n"); 
+	heap_init();
+
+	printf("Initializing devices...\n");
+	DeviceManager::Initialize();
+
 	// Set up environment
 	printf("Setting up interrupts...\n");
 	Interrupts::Disable();
 	Interrupts::SetupIdt();
 	Interrupts::Enable();
 
-	printf("Registering devices...\n");
-	Device::Keyboard::Initialize();
-	heap_init();
-
 	// Dummy terminal
 	printf("Initialized.\n\n");
 	printf("$ ");

libc/cpplib.cpp

@@ -0,0 +1,27 @@
+#include <stddef.h>
+#include <stdlib.h>
+
+extern "C" void __cxa_pure_virtual()
+{
+    // Do nothing or print an error message.
+}
+
+void *operator new(size_t size)
+{
+    return malloc(size);
+}
+
+void *operator new[](size_t size)
+{
+    return malloc(size);
+}
+
+void operator delete(void *p)
+{
+    free(p);
+}
+
+void operator delete[](void *p)
+{
+    free(p);
+}