Changes in / [9ad289d:3acd1bb] in mainline

Files:

• kernel/arch/amd64/include/istate.h (modified) (1 diff)
• kernel/arch/ia32/include/istate.h (modified) (1 diff)
• kernel/generic/src/main/kinit.c (modified) (1 diff)
• kernel/generic/src/proc/task.c (modified) (1 diff)
• tools/ew.py (deleted)

kernel/arch/amd64/include/istate.h

@@ -66 +66 @@
 } istate_t;
 
-#define RPL_USER        3
-
 /** Return true if exception happened while in userspace */
 NO_TRACE static inline int istate_from_uspace(istate_t *istate)
 {
-        return (istate->cs & RPL_USER) == RPL_USER;
+        return !(istate->rip & UINT64_C(0x8000000000000000));
 }
 

kernel/arch/ia32/include/istate.h

@@ -68 +68 @@
 } istate_t;
 
-#define RPL_USER        3
-
 /** Return true if exception happened while in userspace */
 NO_TRACE static inline int istate_from_uspace(istate_t *istate)
 {
-        return (istate->cs & RPL_USER) == RPL_USER;
+        return !(istate->eip & UINT32_C(0x80000000));
 }
 

kernel/generic/src/main/kinit.c

@@ -250 +250 @@
                                     CAP_IO_MANAGER | CAP_IRQ_REG);
                                 
-                                if (!ipc_phone_0) {
+                                if (!ipc_phone_0)
                                         ipc_phone_0 = &programs[i].task->answerbox;
-                                        /*
-                                         * Hold the first task so that the
-                                         * ipc_phone_0 remains a valid pointer
-                                         * even if the first task exits for
-                                         * whatever reason.
-                                         */
-                                        task_hold(programs[i].task);
-                                }
                         }
                         

kernel/generic/src/proc/task.c

@@ -125 +125 @@
 {
         size_t tasks_left;
-
-        if (ipc_phone_0) {
-                task_t *task_0 = ipc_phone_0->task;
-                ipc_phone_0 = NULL;
-                /*
-                 * The first task is held by kinit(), we need to release it or
-                 * it will never finish cleanup.
-                 */
-                task_release(task_0);
-        }
         
         /* Repeat until there are any tasks except TASK */