| /trunk/uspace/app/trace/trace.c |
|---|
| 35,7 → 35,6 |
| #include <stdio.h> |
| #include <stdlib.h> |
| #include <unistd.h> |
| #include <syscall.h> |
| #include <ipc/ipc.h> |
| #include <fibril.h> |
| #include <errno.h> |
| 44,6 → 43,8 |
| #include <task.h> |
| #include <loader/loader.h> |
| #include <libc.h> |
| // Temporary: service and method names |
| #include "proto.h" |
| #include <ipc/services.h> |
| /trunk/uspace/lib/libc/include/syscall.h |
|---|
| 32,15 → 32,28 |
| /** |
| * @file |
| * @brief Syscall function declaration for architectures that don't |
| * inline syscalls. |
| * inline syscalls or architectures that handle syscalls |
| * according to the number of arguments. |
| */ |
| #ifndef LIBC_SYSCALL_H_ |
| #define LIBC_SYSCALL_H_ |
| #ifndef LIBARCH_SYSCALL_GENERIC |
| #error "You can't include this file directly." |
| #endif |
| #include <sys/types.h> |
| #include <kernel/syscall/syscall.h> |
| #define __syscall0 __syscall |
| #define __syscall1 __syscall |
| #define __syscall2 __syscall |
| #define __syscall3 __syscall |
| #define __syscall4 __syscall |
| #define __syscall5 __syscall |
| #define __syscall6 __syscall |
| extern sysarg_t __syscall(const sysarg_t p1, const sysarg_t p2, |
| const sysarg_t p3, const sysarg_t p4, const sysarg_t p5, const sysarg_t p6, |
| const syscall_t id); |
| /trunk/uspace/lib/libc/include/libc.h |
|---|
| 39,14 → 39,14 |
| #include <kernel/syscall/syscall.h> |
| #include <libarch/syscall.h> |
| #define __SYSCALL0(id) __syscall(0, 0, 0, 0, 0, 0, id) |
| #define __SYSCALL1(id, p1) __syscall(p1, 0, 0, 0, 0, 0, id) |
| #define __SYSCALL2(id, p1, p2) __syscall(p1, p2, 0, 0, 0, 0, id) |
| #define __SYSCALL3(id, p1, p2, p3) __syscall(p1, p2, p3, 0, 0, 0, id) |
| #define __SYSCALL4(id, p1, p2, p3, p4) __syscall(p1, p2, p3, p4, 0, 0, id) |
| #define __SYSCALL5(id, p1, p2, p3, p4, p5) __syscall(p1, p2, p3, p4, p5, 0, id) |
| #define __SYSCALL0(id) __syscall0(0, 0, 0, 0, 0, 0, id) |
| #define __SYSCALL1(id, p1) __syscall1(p1, 0, 0, 0, 0, 0, id) |
| #define __SYSCALL2(id, p1, p2) __syscall2(p1, p2, 0, 0, 0, 0, id) |
| #define __SYSCALL3(id, p1, p2, p3) __syscall3(p1, p2, p3, 0, 0, 0, id) |
| #define __SYSCALL4(id, p1, p2, p3, p4) __syscall4(p1, p2, p3, p4, 0, 0, id) |
| #define __SYSCALL5(id, p1, p2, p3, p4, p5) __syscall5(p1, p2, p3, p4, p5, 0, id) |
| #define __SYSCALL6(id, p1, p2, p3, p4, p5, p6) \ |
| __syscall(p1, p2, p3, p4, p5, p6,id) |
| __syscall6(p1, p2, p3, p4, p5, p6, id) |
| extern void __main(void *pcb_ptr); |
| extern void __exit(void); |
| /trunk/uspace/lib/libc/generic/udebug.c |
|---|
| 34,7 → 34,6 |
| #include <udebug.h> |
| #include <sys/types.h> |
| #include <syscall.h> |
| #include <ipc/ipc.h> |
| #include <async.h> |
| /trunk/uspace/lib/libc/arch/sparc64/include/syscall.h |
|---|
| 38,6 → 38,14 |
| #include <sys/types.h> |
| #include <kernel/syscall/syscall.h> |
| #define __syscall0 __syscall |
| #define __syscall1 __syscall |
| #define __syscall2 __syscall |
| #define __syscall3 __syscall |
| #define __syscall4 __syscall |
| #define __syscall5 __syscall |
| #define __syscall6 __syscall |
| static inline sysarg_t |
| __syscall(const sysarg_t p1, const sysarg_t p2, const sysarg_t p3, |
| const sysarg_t p4, const sysarg_t p5, const sysarg_t p6, const syscall_t id) |
| /trunk/uspace/lib/libc/arch/ia64/include/syscall.h |
|---|
| 36,6 → 36,8 |
| #ifndef LIBC_ia64_SYSCALL_H_ |
| #define LIBC_ia64_SYSCALL_H_ |
| #define LIBARCH_SYSCALL_GENERIC |
| #include <syscall.h> |
| #endif |
| /trunk/uspace/lib/libc/arch/arm32/include/syscall.h |
|---|
| 30,12 → 30,14 |
| * @{ |
| */ |
| /** @file |
| * @brief Empty. |
| * @brief |
| */ |
| #ifndef LIBC_arm32_SYSCALL_H_ |
| #define LIBC_arm32_SYSCALL_H_ |
| #define LIBARCH_SYSCALL_GENERIC |
| #include <syscall.h> |
| #endif |
| /trunk/uspace/lib/libc/arch/ppc32/include/syscall.h |
|---|
| 36,6 → 36,8 |
| #ifndef LIBC_ppc32_SYSCALL_H_ |
| #define LIBC_ppc32_SYSCALL_H_ |
| #define LIBARCH_SYSCALL_GENERIC |
| #include <syscall.h> |
| #endif |
| /trunk/uspace/lib/libc/arch/amd64/include/syscall.h |
|---|
| 36,6 → 36,8 |
| #ifndef LIBC_amd64_SYSCALL_H_ |
| #define LIBC_amd64_SYSCALL_H_ |
| #define LIBARCH_SYSCALL_GENERIC |
| #include <syscall.h> |
| #endif |
| /trunk/uspace/lib/libc/arch/ppc64/include/syscall.h |
|---|
| 36,6 → 36,8 |
| #ifndef LIBC_ppc64_SYSCALL_H_ |
| #define LIBC_ppc64_SYSCALL_H_ |
| #define LIBARCH_SYSCALL_GENERIC |
| #include <syscall.h> |
| #endif |
| /trunk/uspace/lib/libc/arch/mips32/include/syscall.h |
|---|
| 36,6 → 36,8 |
| #ifndef LIBC_mips32_SYSCALL_H_ |
| #define LIBC_mips32_SYSCALL_H_ |
| #define LIBARCH_SYSCALL_GENERIC |
| #include <syscall.h> |
| #endif |
| /trunk/uspace/lib/libc/arch/ia32/include/syscall.h |
|---|
| 36,8 → 36,25 |
| #ifndef LIBC_ia32_SYSCALL_H_ |
| #define LIBC_ia32_SYSCALL_H_ |
| #include <syscall.h> |
| #include <sys/types.h> |
| #include <kernel/syscall/syscall.h> |
| #define __syscall0 __syscall_sysenter |
| #define __syscall1 __syscall_sysenter |
| #define __syscall2 __syscall_sysenter |
| #define __syscall3 __syscall_sysenter |
| #define __syscall4 __syscall_sysenter |
| #define __syscall5 __syscall_int |
| #define __syscall6 __syscall_int |
| extern sysarg_t |
| __syscall_sysenter(const sysarg_t, const sysarg_t, const sysarg_t, const sysarg_t, |
| const sysarg_t, const sysarg_t, const syscall_t); |
| extern sysarg_t |
| __syscall_int(const sysarg_t, const sysarg_t, const sysarg_t, const sysarg_t, |
| const sysarg_t, const sysarg_t, const syscall_t); |
| #endif |
| /** @} |
| /trunk/uspace/lib/libc/arch/ia32/src/syscall.S |
|---|
| 28,14 → 28,14 |
| .text |
| /** Syscall wrapper. |
| /** Syscall wrapper - INT $0x30 version. |
| * |
| * Mind the order of arguments. First two arguments and the syscall number go to |
| * scratch registers. An optimized version of this wrapper for fewer arguments |
| * could benefit from this and not save unused registers on the stack. |
| */ |
| .global __syscall |
| __syscall: |
| .global __syscall_int |
| __syscall_int: |
| pushl %ebx |
| pushl %esi |
| pushl %edi |
| 53,3 → 53,38 |
| popl %esi |
| popl %ebx |
| ret |
| /** Syscall wrapper - SYSENTER version. |
| * |
| * This is an optimized version of syscall for four or less arguments. Note |
| * that EBP and EDI are used to remember user stack address and the return |
| * address. The kernel part doesn't save DS, ES and FS so the handler restores |
| * these to the selector immediately following CS (it must be the flat data |
| * segment, otherwise the SYSENTER wouldn't work in the first place). |
| */ |
| .global __syscall_sysenter |
| __syscall_sysenter: |
| pushl %ebx |
| pushl %esi |
| pushl %edi |
| pushl %ebp |
| mov %esp, %ebp |
| lea ra, %edi |
| movl 20(%esp), %edx # First argument. |
| movl 24(%esp), %ecx # Second argument. |
| movl 28(%esp), %ebx # Third argument. |
| movl 32(%esp), %esi # Fourth argument. |
| movl 44(%esp), %eax # Syscall number. |
| sysenter |
| ra: |
| movw %cs, %cx |
| addw $8, %cx |
| movw %cx, %ds |
| movw %cx, %es |
| movw %cx, %fs |
| popl %ebp |
| popl %edi |
| popl %esi |
| popl %ebx |
| ret |