From efc6faf61901c93d9580308883da83687cf809a0 Mon Sep 17 00:00:00 2001
From: Alex <enderice2@users.noreply.github.com>
Date: Mon, 17 Oct 2022 00:18:25 +0300
Subject: [PATCH] Fixed interrupt handler manager

---
 Core/Interrupts/IntManager.cpp | 37 +++++++++++++++++++---------------
 Fennix Kernel.code-workspace   |  3 ++-
 include/hashmap.hpp            |  6 +++---
 3 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/Core/Interrupts/IntManager.cpp b/Core/Interrupts/IntManager.cpp
index f9dea1f..7984b3f 100644
--- a/Core/Interrupts/IntManager.cpp
+++ b/Core/Interrupts/IntManager.cpp
@@ -1,6 +1,7 @@
 #include <interrupts.hpp>
 
 #include <syscalls.hpp>
+#include <hashmap.hpp>
 
 #if defined(__amd64__)
 #include "../Architecture/amd64/cpu/gdt.hpp"
@@ -20,6 +21,8 @@ extern "C" __attribute__((no_stack_protector)) void ExceptionHandler(void *Data)
 
 namespace Interrupts
 {
+    HashMap<int, uint64_t> *RegisteredEvents;
+
 #if defined(__amd64__)
     /* APIC::APIC */ void *apic = nullptr;
 #elif defined(__i386__)
@@ -29,6 +32,10 @@ namespace Interrupts
 
     void Initialize(int Core)
     {
+        static int once = 0;
+        if (!once++)
+            RegisteredEvents = new HashMap<int, uint64_t>;
+
 #if defined(__amd64__)
         GlobalDescriptorTable::Init(0);
         InterruptDescriptorTable::Init(0);
@@ -64,14 +71,16 @@ namespace Interrupts
 #endif
     }
 
-    Vector<Handler *> RegisteredEvents;
-
     extern "C" void MainInterruptHandler(void *Data)
     {
 #if defined(__amd64__)
         CPU::x64::TrapFrame *Frame = (CPU::x64::TrapFrame *)Data;
-        if (RegisteredEvents[Frame->InterruptNumber])
-            RegisteredEvents[Frame->InterruptNumber]->OnInterruptReceived(Frame);
+
+        Handler *handler = (Handler *)RegisteredEvents->Get(Frame->InterruptNumber);
+        if (handler != (Handler *)0xdeadbeef)
+            handler->OnInterruptReceived(Frame);
+        else
+            error("Unhandled IRQ%d on CPU %d", Frame->InterruptNumber - 32, ((APIC::APIC *)Interrupts::apic)->Read(APIC::APIC::APIC_ID) >> 24);
 
         if (apic)
         {
@@ -90,34 +99,30 @@ namespace Interrupts
 
     Handler::Handler(int InterruptNumber)
     {
-        debug("Handler::Handler(%d)", InterruptNumber);
+        debug("Registering interrupt handler for IRQ%d", InterruptNumber - 32);
         this->InterruptNumber = InterruptNumber;
-        RegisteredEvents.push_back(this);
+        RegisteredEvents->AddNode(InterruptNumber, (uint64_t)this);
     }
 
     Handler::~Handler()
     {
-        for (uint64_t i = 0; i < RegisteredEvents.size(); i++)
-            if (RegisteredEvents[i] == this)
-            {
-                debug("Handler::~Handler(%d)", InterruptNumber);
-                RegisteredEvents.remove(i);
-                return;
-            }
+        debug("Unregistering interrupt handler for IRQ%d", InterruptNumber - 32);
+        if (RegisteredEvents->DeleteNode(InterruptNumber) == 0xdeadbeef)
+            warn("Node %d not found", InterruptNumber);
     }
 
 #if defined(__amd64__)
     void Handler::OnInterruptReceived(CPU::x64::TrapFrame *Frame)
     {
-        warn("Unhandled interrupt received %#lx", Frame->InterruptNumber);
+        trace("Unhandled interrupt IRQ%d", Frame->InterruptNumber - 32);
 #elif defined(__i386__)
     void Handler::OnInterruptReceived(void *Frame);
     {
-        warn("Unhandled interrupt received");
+        trace("Unhandled interrupt received");
 #elif defined(__aarch64__)
     void Handler::OnInterruptReceived(void *Frame);
     {
-        warn("Unhandled interrupt received");
+        trace("Unhandled interrupt received");
 #endif
     }
 }
diff --git a/Fennix Kernel.code-workspace b/Fennix Kernel.code-workspace
index dd03003..e493ef2 100644
--- a/Fennix Kernel.code-workspace	
+++ b/Fennix Kernel.code-workspace	
@@ -10,7 +10,8 @@
 			"limine.h": "c",
 			"types.h": "c",
 			"binfo.h": "c",
-			"liballoc_1_1.h": "c"
+			"liballoc_1_1.h": "c",
+			"cstring": "cpp"
 		}
 	}
 }
\ No newline at end of file
diff --git a/include/hashmap.hpp b/include/hashmap.hpp
index 4cbec76..5873a17 100644
--- a/include/hashmap.hpp
+++ b/include/hashmap.hpp
@@ -67,7 +67,7 @@ public:
             Index++;
             Index %= HashMapCapacity;
         }
-        return nullptr;
+        return 0xdeadbeef;
     }
 
     V Get(int Key)
@@ -78,14 +78,14 @@ public:
         while (Nodes[Index] != nullptr)
         {
             if (Iterate++ > HashMapCapacity)
-                return 0;
+                return 0xdeadbeef;
 
             if (Nodes[Index]->Key == Key)
                 return Nodes[Index]->Value;
             Index++;
             Index %= HashMapCapacity;
         }
-        return 0;
+        return 0xdeadbeef;
     }
 
     int Size() { return HashMapSize; }