Changes in kernel/generic/src/interrupt/interrupt.c [e4d96e9:5cac9cd] in mainline

File:

• kernel/generic/src/interrupt/interrupt.c (modified) (4 diffs)

kernel/generic/src/interrupt/interrupt.c

@@ -50 +50 @@
 #include <panic.h>
 #include <print.h>
-#include <stdarg.h>
 #include <symtab.h>
 #include <proc/thread.h>
 #include <arch/cycle.h>
-#include <arch/stack.h>
 #include <str.h>
 #include <trace.h>
@@ -167 +165 @@
 }
 
-static NO_TRACE
-void fault_from_uspace_core(istate_t *istate, const char *fmt, va_list args)
-{
+/** Terminate thread and task if exception came from userspace.
+ *
+ */
+NO_TRACE void fault_if_from_uspace(istate_t *istate, const char *fmt, ...)
+{
+        if (!istate_from_uspace(istate))
+                return;
+        
         printf("Task %s (%" PRIu64 ") killed due to an exception at "
             "program counter %p.\n", TASK->name, TASK->taskid,
@@ -178 +181 @@
         
         printf("Kill message: ");
-        vprintf(fmt, args);
-        printf("\n");
-        
-        task_kill_self(true);
-}
-
-/** Terminate thread and task after the exception came from userspace.
- *
- */
-NO_TRACE void fault_from_uspace(istate_t *istate, const char *fmt, ...)
-{
-        va_list args;
-
-        va_start(args, fmt);
-        fault_from_uspace_core(istate, fmt, args);
-        va_end(args);
-}
-
-/** Terminate thread and task if exception came from userspace.
- *
- */
-NO_TRACE void fault_if_from_uspace(istate_t *istate, const char *fmt, ...)
-{
-        if (!istate_from_uspace(istate))
-                return;
         
         va_list args;
         va_start(args, fmt);
-        fault_from_uspace_core(istate, fmt, args);
+        vprintf(fmt, args);
         va_end(args);
+        printf("\n");
+        
+        task_kill_self(true);
 }
 
@@ -223 +204 @@
         /*
          * The istate structure should be right at the bottom of the kernel
-         * memory stack.
+         * stack.
          */
-        return (istate_t *) &thread->kstack[MEM_STACK_SIZE - sizeof(istate_t)];
+        return (istate_t *) ((uint8_t *)
+            thread->kstack + STACK_SIZE - sizeof(istate_t));
 }