Changeset 122 for trunk

Timestamp:

Jul 3, 2017, 2:20:52 PM (7 years ago)

Author:

max@…

Message:

we will fix nested interrupt contexts later

File:

• trunk/hal/x86_64/core/hal_irqmask.c (modified) (3 diffs)

trunk/hal/x86_64/core/hal_irqmask.c

@@ -23 +23 @@
 #include <hal_internal.h>
 
-static int interrupts_enabled __in_kdata = 0;
+#define INTRS_ENABLED   0xFFEFAAAA
+#define INTRS_DISABLED  0xD0CCCCC0
+
+static uint32_t intrs_state __in_kdata = INTRS_DISABLED;
 
 inline void hal_disable_irq(uint32_t *old)
 {
-        if (!interrupts_enabled) {
-                x86_panic("nested critical sections forbidden");
-        }
-        interrupts_enabled = 0;
+        *old = intrs_state;
+        intrs_state = INTRS_DISABLED;
         cli();
 }
@@ -36 +37 @@
 inline void hal_enable_irq(uint32_t *old)
 {
-        if (interrupts_enabled) {
-                x86_panic("nested critical sections forbidden");
-        }
-        interrupts_enabled = 1;
+        *old = intrs_state;
+        intrs_state = INTRS_ENABLED;
         sti();
 }
@@ -45 +44 @@
 inline void hal_restore_irq(uint32_t old)
 {
-        if (interrupts_enabled)
-                hal_disable_irq(&old);
+        intrs_state = old;
+
+        if (intrs_state == INTRS_ENABLED)
+                sti();
+        else if(intrs_state == INTRS_DISABLED)
+                cli();
         else
-                hal_enable_irq(&old);
+                x86_panic("hal_restore_irq: not reachable");
 }