5-malloc.md (#25)

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

diff --git a/lunaix-os/arch/i386/exceptions/interrupts.c b/lunaix-os/arch/i386/exceptions/interrupts.c
index a323008b977886e0609802122776d931a7e7d52d..5951236e3c8175b7e1d820029b55fc71432d45c9 100644 (file)
--- a/lunaix-os/arch/i386/exceptions/interrupts.c
+++ b/lunaix-os/arch/i386/exceptions/interrupts.c
@@ -14,14 +14,28 @@
 
 LOG_MODULE("INTR")
 
+static inline void
+update_thread_context(isr_param* param)
+{
+    if (!current_thread) {
+        return;
+    }
+
+    isr_param* ppctx = current_thread->intr_ctx;
+    param->execp->saved_prev_ctx = ppctx;
+    current_thread->intr_ctx = param;
+
+    if (ppctx) {
+        param->depth = ppctx->depth + 1;
+    }
+}
+
 void
 intr_handler(isr_param* param)
 {
-    param->execp->saved_prev_ctx = __current->intr_ctx;
-    __current->intr_ctx = param;
-
-    volatile struct exec_param* execp = __current->intr_ctx->execp;
+    update_thread_context(param);
 
+    volatile struct exec_param* execp = param->execp;
     if (execp->vector <= 255) {
         isr_cb subscriber = isrm_get(execp->vector);
         subscriber(param);