refactor: use a more decent physical memory map

[lunaix-os.git] / lunaix-os / arch / i386 / exceptions / i386_isrm.c

diff --git a/lunaix-os/arch/i386/exceptions/i386_isrm.c b/lunaix-os/arch/i386/exceptions/i386_isrm.c
index a45ce7e2dfcc4d7f8a03389f445df3628225499e..1d5950ef37e1a4c12d023cf41c6722b29656a5b0 100644 (file)
--- a/lunaix-os/arch/i386/exceptions/i386_isrm.c
+++ b/lunaix-os/arch/i386/exceptions/i386_isrm.c
@@ -1,9 +1,8 @@
-#include <hal/acpi/acpi.h>
-#include <hal/ioapic.h>
-
 #include <lunaix/isrm.h>
 #include <lunaix/spike.h>
 
+#include <hal/intc.h>
+
 /*
     total: 256 ivs
     0~31: reserved for sys use (x32)
@@ -11,8 +10,8 @@
     48~  : free to allocate for external hardware use. (x208)
 */
 
-static char iv_bmp[(IV_MAX - IV_BASE) / 8];
-static isr_cb handlers[IV_MAX];
+static char iv_bmp[(IV_EX_END - IV_BASE_END) / 8];
+static isr_cb handlers[TOTAL_IV];
 
 extern void
 intr_routine_fallback(const isr_param* param);
@@ -20,7 +19,7 @@ intr_routine_fallback(const isr_param* param);
 void
 isrm_init()
 {
-    for (size_t i = 0; i < 256; i++) {
+    for (size_t i = 0; i < TOTAL_IV; i++) {
         handlers[i] = intr_routine_fallback;
     }
 }
@@ -28,23 +27,31 @@ isrm_init()
 static inline int
 __ivalloc_within(size_t a, size_t b, isr_cb handler)
 {
-    a = (a - IV_BASE) / 8;
-    b = (b - IV_BASE) / 8;
+    a = (a - IV_BASE_END);
+    b = (b - IV_BASE_END);
+    u8_t j = a % 8;
+    u8_t k = 0;
 
-    for (size_t i = a; i < b; i++) {
-        u8_t chunk = iv_bmp[i], j = 0;
+    for (size_t i = a / 8; i < b / 8; i++, k += 8) {
+        u8_t chunk = iv_bmp[i];
 
         if (chunk == 0xff)
             continue;
 
-        while ((chunk & 0x1)) {
+        chunk >>= j;
+        while ((chunk & 0x1) && k <= b) {
             chunk >>= 1;
             j++;
+            k++;
+        }
+
+        if (k > b) {
+            break;
         }
 
         iv_bmp[i] |= 1 << j;
 
-        int iv = IV_BASE + i * 8 + j;
+        int iv = IV_BASE_END + i * 8 + j;
         handlers[iv] = handler ? handler : intr_routine_fallback;
 
         return iv;
@@ -56,13 +63,13 @@ __ivalloc_within(size_t a, size_t b, isr_cb handler)
 int
 isrm_ivosalloc(isr_cb handler)
 {
-    return __ivalloc_within(IV_BASE, IV_EX, handler);
+    return __ivalloc_within(IV_BASE_END, IV_EX_BEGIN, handler);
 }
 
 int
 isrm_ivexalloc(isr_cb handler)
 {
-    return __ivalloc_within(IV_EX, IV_MAX, handler);
+    return __ivalloc_within(IV_EX_BEGIN, IV_EX_END, handler);
 }
 
 void
@@ -70,8 +77,8 @@ isrm_ivfree(int iv)
 {
     assert(iv < 256);
 
-    if (iv >= IV_BASE) {
-        iv_bmp[(iv - IV_BASE) / 8] &= ~(1 << ((iv - IV_BASE) % 8));
+    if (iv >= IV_BASE_END) {
+        iv_bmp[(iv - IV_BASE_END) / 8] &= ~(1 << ((iv - IV_BASE_END) % 8));
     }
 
     handlers[iv] = intr_routine_fallback;
@@ -86,9 +93,8 @@ isrm_bindirq(int irq, isr_cb irq_handler)
         return 0; // never reach
     }
 
-    // PC_AT_IRQ_RTC -> RTC_TIMER_IV, fixed, edge trigged, polarity=high,
-    // physical, APIC ID 0
-    ioapic_redirect(acpi_gistranslate(irq), iv, 0, IOAPIC_DELMOD_FIXED);
+    // fixed, edge trigged, polarity=high
+    intc_irq_attach(irq, iv, 0, IRQ_DEFAULT);
 
     return iv;
 }
@@ -98,8 +104,8 @@ isrm_bindiv(int iv, isr_cb handler)
 {
     assert(iv < 256);
 
-    if (iv >= IV_BASE) {
-        iv_bmp[(iv - IV_BASE) / 8] |= 1 << ((iv - IV_BASE) % 8);
+    if (iv >= IV_BASE_END) {
+        iv_bmp[(iv - IV_BASE_END) / 8] |= 1 << ((iv - IV_BASE_END) % 8);
     }
 
     handlers[iv] = handler;