Changeset 357b5f5 in mainline for kernel/generic/src/syscall/syscall.c

Timestamp:

2011-01-23T20:09:13Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fdb9982c

Parents:

cead2aa (diff), 7e36c8d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/generic/src/syscall/syscall.c (modified) (9 diffs)

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>
@@ -56 +57 @@
 
 /** Dispatch system call */
-unative_t syscall_handler(unative_t a1, unative_t a2, unative_t a3,
-    unative_t a4, unative_t a5, unative_t a6, unative_t id)
+sysarg_t syscall_handler(sysarg_t a1, sysarg_t a2, sysarg_t a3,
+    sysarg_t a4, sysarg_t a5, sysarg_t a6, sysarg_t id)
 {
         /* Do userpace accounting */
@@ -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)
@@ -74 +81 @@
 #endif
         
-        unative_t rc;
+        sysarg_t rc;
         if (id < SYSCALL_END) {
                 rc = syscall_table[id](a1, a2, a3, a4, a5, a6);
@@ -98 +105 @@
                 udebug_stoppable_end();
         }
+
+        /* Clear userspace state pointer */
+        THREAD->udebug.uspace_state = NULL;
 #endif
         
@@ -120 +130 @@
         (syshandler_t) sys_task_get_id,
         (syshandler_t) sys_task_set_name,
+        (syshandler_t) sys_task_kill,
         (syshandler_t) sys_program_spawn_loader,
         
@@ -147 +158 @@
         (syshandler_t) sys_ipc_register_irq,
         (syshandler_t) sys_ipc_unregister_irq,
+        (syshandler_t) sys_ipc_connect_kbox,
         
         /* Event notification syscalls. */
@@ -159 +171 @@
         (syshandler_t) sys_physmem_map,
         (syshandler_t) sys_iospace_enable,
-        (syshandler_t) sys_interrupt_enable,
         
         /* Sysinfo syscalls */
@@ -169 +180 @@
         /* Debug calls */
         (syshandler_t) sys_debug_enable_console,
-        (syshandler_t) sys_debug_disable_console,
-        
-        (syshandler_t) sys_ipc_connect_kbox
+        (syshandler_t) sys_debug_disable_console
 };