Changeset 240 for trunk/hal/x86_64/core/hal_irqmask.c

Timestamp:

Jul 20, 2017, 9:55:05 AM (7 years ago)

Author:

max@…

Message:

Make the secondary CPUs jump into kernel_init().

File:

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

trunk/hal/x86_64/core/hal_irqmask.c

@@ -22 +22 @@
 #include <hal_types.h>
 #include <hal_internal.h>
-
-#define INTRS_ENABLED   0xFFEFAAAA
-#define INTRS_DISABLED  0xD0CCCCC0
-
-static uint32_t intrs_state __in_kdata = INTRS_DISABLED;
+#include <hal_segmentation.h>
 
 inline void hal_disable_irq(uint32_t *old)
 {
-        *old = intrs_state;
-        intrs_state = INTRS_DISABLED;
+        tls_t *tls = curcpu();
+
+        *old = tls->tls_intr;
+        tls->tls_intr = INTRS_DISABLED;
+
         cli();
 }
@@ -37 +36 @@
 inline void hal_enable_irq(uint32_t *old)
 {
-        *old = intrs_state;
-        intrs_state = INTRS_ENABLED;
+        tls_t *tls = curcpu();
+
+        *old = tls->tls_intr;
+        tls->tls_intr = INTRS_ENABLED;
+
         sti();
 }
@@ -44 +46 @@
 inline void hal_restore_irq(uint32_t old)
 {
-        intrs_state = old;
+        tls_t *tls = curcpu();
 
-        if (intrs_state == INTRS_ENABLED)
+        tls->tls_intr = old;
+
+        if (old == INTRS_ENABLED)
                 sti();
-        else if(intrs_state == INTRS_DISABLED)
+        else if(old == INTRS_DISABLED)
                 cli();
         else