| 32,9 → 32,9 |
|---|
| |
| /** |
| * @file |
| * @brief Syscall table and syscall wrappers. |
| * @brief Syscall table and syscall wrappers. |
| */ |
| |
| |
| #include <syscall/syscall.h> |
| #include <proc/thread.h> |
| #include <proc/task.h> |
| 41,61 → 41,19 |
|---|
| #include <proc/program.h> |
| #include <mm/as.h> |
| #include <print.h> |
| #include <putchar.h> |
| #include <errno.h> |
| #include <arch.h> |
| #include <debug.h> |
| #include <ddi/device.h> |
| #include <ipc/sysipc.h> |
| #include <synch/futex.h> |
| #include <synch/smc.h> |
| #include <ddi/ddi.h> |
| #include <ipc/event.h> |
| #include <security/cap.h> |
| #include <syscall/copy.h> |
| #include <sysinfo/sysinfo.h> |
| #include <console/console.h> |
| #include <udebug/udebug.h> |
| |
| /** Print using kernel facility |
| * |
| * Print to kernel log. |
| * |
| */ |
| static unative_t sys_klog(int fd, const void * buf, size_t count) |
| { |
| size_t i; |
| char *data; |
| int rc; |
| |
| if (count > PAGE_SIZE) |
| return ELIMIT; |
| |
| if (count > 0) { |
| data = (char *) malloc(count, 0); |
| if (!data) |
| return ENOMEM; |
| |
| rc = copy_from_uspace(data, buf, count); |
| if (rc) { |
| free(data); |
| return rc; |
| } |
| |
| for (i = 0; i < count; i++) |
| putchar(data[i]); |
| free(data); |
| } else |
| klog_update(); |
| |
| return count; |
| } |
| |
| /** Tell kernel to get keyboard/console access again */ |
| static unative_t sys_debug_enable_console(void) |
| { |
| arch_grab_console(); |
| return 0; |
| } |
| |
| /** 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) |
| 103,13 → 61,20 |
|---|
| unative_t rc; |
| |
| #ifdef CONFIG_UDEBUG |
| udebug_syscall_event(a1, a2, a3, a4, a5, a6, id, 0, false); |
| #endif |
| bool debug; |
| |
| if (id < SYSCALL_END) { |
| #ifdef CONFIG_UDEBUG |
| udebug_stoppable_begin(); |
| /* |
| * Early check for undebugged tasks. We do not lock anything as this |
| * test need not be precise in either way. |
| */ |
| debug = THREAD->udebug.active; |
| |
| if (debug) { |
| udebug_syscall_event(a1, a2, a3, a4, a5, a6, id, 0, false); |
| } |
| #endif |
| |
| if (id < SYSCALL_END) { |
| rc = syscall_table[id](a1, a2, a3, a4, a5, a6); |
| } else { |
| printf("Task %" PRIu64": Unknown syscall %#" PRIxn, TASK->taskid, id); |
| 116,13 → 81,22 |
|---|
| task_kill(TASK->taskid); |
| thread_exit(); |
| } |
| |
| |
| if (THREAD->interrupted) |
| thread_exit(); |
| |
| |
| #ifdef CONFIG_UDEBUG |
| udebug_syscall_event(a1, a2, a3, a4, a5, a6, id, rc, true); |
| udebug_stoppable_end(); |
| if (debug) { |
| udebug_syscall_event(a1, a2, a3, a4, a5, a6, id, rc, true); |
| |
| /* |
| * Stopping point needed for tasks that only invoke |
| * non-blocking system calls. Not needed if the task |
| * is not being debugged (it cannot block here). |
| */ |
| udebug_stoppable_begin(); |
| udebug_stoppable_end(); |
| } |
| #endif |
| |
| return rc; |
| 138,6 → 112,7 |
|---|
| (syshandler_t) sys_thread_get_id, |
| |
| (syshandler_t) sys_task_get_id, |
| (syshandler_t) sys_task_set_name, |
| (syshandler_t) sys_program_spawn_loader, |
| |
| /* Synchronization related syscalls. */ |
| 159,10 → 134,14 |
|---|
| (syshandler_t) sys_ipc_answer_fast, |
| (syshandler_t) sys_ipc_answer_slow, |
| (syshandler_t) sys_ipc_forward_fast, |
| (syshandler_t) sys_ipc_forward_slow, |
| (syshandler_t) sys_ipc_wait_for_call, |
| (syshandler_t) sys_ipc_hangup, |
| (syshandler_t) sys_ipc_register_irq, |
| (syshandler_t) sys_ipc_unregister_irq, |
| |
| /* Event notification syscalls. */ |
| (syshandler_t) sys_event_subscribe, |
| |
| /* Capabilities related syscalls. */ |
| (syshandler_t) sys_cap_grant, |
| 169,6 → 148,7 |
|---|
| (syshandler_t) sys_cap_revoke, |
| |
| /* DDI related syscalls. */ |
| (syshandler_t) sys_device_assign_devno, |
| (syshandler_t) sys_physmem_map, |
| (syshandler_t) sys_iospace_enable, |
| (syshandler_t) sys_preempt_control, |
| 179,7 → 159,8 |
|---|
| |
| /* Debug calls */ |
| (syshandler_t) sys_debug_enable_console, |
| |
| (syshandler_t) sys_debug_disable_console, |
| |
| (syshandler_t) sys_ipc_connect_kbox |
| }; |
| |