Changeset 63594c0 in mainline

Timestamp:

2011-01-04T22:01:13Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

1ad52de

Parents:

c11ebb6a

Message:

Obtain userspace state in case of system call.

Files:

• kernel/generic/include/interrupt.h (modified) (1 diff)
• kernel/generic/src/interrupt/interrupt.c (modified) (1 diff)
• kernel/generic/src/syscall/syscall.c (modified) (3 diffs)
• uspace/app/taskdump/taskdump.c (modified) (1 diff)

kernel/generic/include/interrupt.h

@@ -60 +60 @@
 extern void fault_if_from_uspace(istate_t *, const char *, ...)
     PRINTF_ATTRIBUTE(2, 3);
+extern istate_t *istate_get(thread_t *);
 extern iroutine_t exc_register(unsigned int, const char *, bool, iroutine_t);
 extern void exc_dispatch(unsigned int, istate_t *);

kernel/generic/src/interrupt/interrupt.c

@@ -209 +209 @@
 }
 
+istate_t *istate_get(thread_t *thread)
+{
+        return (istate_t *) ((uint8_t *) thread->kstack + THREAD_STACK_SIZE -
+            sizeof(istate_t));
+}
+
 #ifdef CONFIG_KCONSOLE
 

kernel/generic/src/syscall/syscall.c

@@ -45 +45 @@
 #include <debug.h>
 #include <ddi/device.h>
+#include <interrupt.h>
 #include <ipc/sysipc.h>
 #include <synch/futex.h>
@@ -66 +67 @@
 #ifdef CONFIG_UDEBUG
         /*
+         * An istate_t-compatible record was created on the stack by the
+         * low-level syscall handler. This is the userspace space state
+         * structure.
+         */
+        THREAD->udebug.uspace_state = istate_get(THREAD);
+
+        /*
          * Early check for undebugged tasks. We do not lock anything as this
          * test need not be precise in either direction.
-         *
          */
         if (THREAD->udebug.active)
@@ -98 +105 @@
                 udebug_stoppable_end();
         }
+
+        /* Clear userspace state pointer */
+        THREAD->udebug.uspace_state = NULL;
 #endif
         

uspace/app/taskdump/taskdump.c

@@ -326 +326 @@
 
         sym_pc = fmt_sym_address(pc);
-        printf("Thread %p crashed at %s. FP = %p\n", (void *) thash,
+        printf("Thread %p: PC = %s. FP = %p\n", (void *) thash,
             sym_pc, (void *) fp);
         free(sym_pc);