From 685e40bb09f5f24a2af54ea09c97328808f76990 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Sat, 19 Mar 2011 21:36:10 -0400 Subject: syscall overhaul part two - unify public and internal syscall interface with this patch, the syscallN() functions are no longer needed; a variadic syscall() macro allows syscalls with anywhere from 0 to 6 arguments to be made with a single macro name. also, manually casting each non-integer argument with (long) is no longer necessary; the casts are hidden in the macros. some source files which depended on being able to define the old macro SYSCALL_RETURNS_ERRNO have been modified to directly use __syscall() instead of syscall(). references to SYSCALL_SIGSET_SIZE and SYSCALL_LL have also been changed. x86_64 has not been tested, and may need a follow-up commit to fix any minor bugs/oversights. --- arch/i386/bits/fcntl.h | 7 +- arch/i386/bits/syscall.h | 131 +++++++++++++++++++++++++++++++++++ arch/i386/syscall.h | 167 --------------------------------------------- arch/x86_64/bits/fcntl.h | 7 +- arch/x86_64/bits/syscall.h | 64 +++++++++++++++++ arch/x86_64/syscall.h | 113 ------------------------------ 6 files changed, 205 insertions(+), 284 deletions(-) delete mode 100644 arch/i386/syscall.h delete mode 100644 arch/x86_64/syscall.h (limited to 'arch') diff --git a/arch/i386/bits/fcntl.h b/arch/i386/bits/fcntl.h index 802c3d14..61382eef 100644 --- a/arch/i386/bits/fcntl.h +++ b/arch/i386/bits/fcntl.h @@ -14,12 +14,15 @@ #define O_NOFOLLOW 0400000 #define O_CLOEXEC 02000000 -#ifdef _GNU_SOURCE -#define O_NDELAY O_NONBLOCK +/* Extensions, but in the reserved namespace, so OK */ #define O_ASYNC 020000 #define O_DIRECT 040000 +#define O_LARGEFILE 0100000 #define O_NOATIME 01000000 +#define O_NDELAY O_NONBLOCK #define F_DUPFD_CLOEXEC 1030 + +#ifdef _GNU_SOURCE #define FAPPENT O_APPEND #define FFSYNC O_FSYNC #define FASYNC O_ASYNC diff --git a/arch/i386/bits/syscall.h b/arch/i386/bits/syscall.h index b38f09e9..f8429b27 100644 --- a/arch/i386/bits/syscall.h +++ b/arch/i386/bits/syscall.h @@ -1,3 +1,130 @@ +#define __SYSCALL_LL(x) \ +((union { long long ll; long l[2]; }){ .ll = x }).l[0], \ +((union { long long ll; long l[2]; }){ .ll = x }).l[1] + +static inline long __syscall0(long n) +{ + unsigned long ret; + __asm__ __volatile__ ("int $128" : "=a"(ret) : "a"(n) : "memory"); + return __syscall_ret(ret); +} + +#ifndef __PIC__ + +static inline long __syscall1(long n, long a1) +{ + unsigned long ret; + __asm__ __volatile__ ("int $128" : "=a"(ret) : "a"(n), "b"(a1) : "memory"); + return ret; +} + +static inline long __syscall2(long n, long a1, long a2) +{ + unsigned long ret; + __asm__ __volatile__ ("int $128" : "=a"(ret) : "a"(n), "b"(a1), "c"(a2) : "memory"); + return ret; +} + +static inline long __syscall3(long n, long a1, long a2, long a3) +{ + unsigned long ret; + __asm__ __volatile__ ("int $128" : "=a"(ret) : "a"(n), "b"(a1), "c"(a2), "d"(a3) : "memory"); + return ret; +} + +static inline long __syscall4(long n, long a1, long a2, long a3, long a4) +{ + unsigned long ret; + __asm__ __volatile__ ("int $128" : "=a"(ret) : "a"(n), "b"(a1), "c"(a2), "d"(a3), "S"(a4) : "memory"); + return ret; +} + +static inline long __syscall5(long n, long a1, long a2, long a3, long a4, long a5) +{ + unsigned long ret; + __asm__ __volatile__ ("int $128" : "=a"(ret) : "a"(n), "b"(a1), "c"(a2), "d"(a3), "S"(a4), "D"(a5) : "memory"); + return ret; +} + +static inline long __syscall6(long n, long a1, long a2, long a3, long a4, long a5, long a6) +{ + unsigned long ret; + __asm__ __volatile__ ("pushl %7 ; pushl %%ebp ; mov 4(%%esp),%%ebp ; int $128 ; popl %%ebp ; popl %%ecx" + : "=a"(ret) : "a"(n), "b"(a1), "c"(a2), "d"(a3), "S"(a4), "D"(a5), "g"(a6) : "memory"); + return ret; +} + +#else + +static inline long __syscall1(long n, long a1) +{ + unsigned long ret; + __asm__ __volatile__ ("xchg %2,%%ebx ; int $128 ; xchg %2,%%ebx" + : "=a"(ret) : "a"(n), "r"(a1) : "memory"); + return ret; +} + +static inline long __syscall2(long n, long a1, long a2) +{ + unsigned long ret; + __asm__ __volatile__ ("xchg %2,%%ebx ; int $128 ; xchg %2,%%ebx" + : "=a"(ret) : "a"(n), "r"(a1), "c"(a2) : "memory"); + return ret; +} + +static inline long __syscall3(long n, long a1, long a2, long a3) +{ + unsigned long ret; + __asm__ __volatile__ ("xchg %2,%%ebx ; int $128 ; xchg %2,%%ebx" + : "=a"(ret) : "a"(n), "r"(a1), "c"(a2), "d"(a3) : "memory"); + return ret; +} + +static inline long __syscall4(long n, long a1, long a2, long a3, long a4) +{ + unsigned long ret; + __asm__ __volatile__ ("xchg %2,%%ebx ; int $128 ; xchg %2,%%ebx" + : "=a"(ret) : "a"(n), "r"(a1), "c"(a2), "d"(a3), "S"(a4) : "memory"); + return ret; +} + +static inline long __syscall5(long n, long a1, long a2, long a3, long a4, long a5) +{ + unsigned long ret; + __asm__ __volatile__ ("pushl %2 ; pushl %%ebx ; mov 4(%%esp),%%ebx ; int $128 ; popl %%ebx ; popl %%ecx" + : "=a"(ret) : "a"(n), "g"(a1), "c"(a2), "d"(a3), "S"(a4), "D"(a5) : "memory"); + return ret; +} + +static inline long __syscall6(long n, long a1, long a2, long a3, long a4, long a5, long a6) +{ + return (__syscall)(n, a1, a2, a3, a4, a5, a6); +} + +#endif + + +#define __SC_socket 1 +#define __SC_bind 2 +#define __SC_connect 3 +#define __SC_listen 4 +#define __SC_accept 5 +#define __SC_getsockname 6 +#define __SC_getpeername 7 +#define __SC_socketpair 8 +#define __SC_send 9 +#define __SC_recv 10 +#define __SC_sendto 11 +#define __SC_recvfrom 12 +#define __SC_shutdown 13 +#define __SC_setsockopt 14 +#define __SC_getsockopt 15 +#define __SC_sendmsg 16 +#define __SC_recvmsg 17 + +#define __socketcall(nm, a, b, c, d, e, f) syscall(SYS_socketcall, __SC_##nm, \ + ((long [6]){ (long)a, (long)b, (long)c, (long)d, (long)e, (long)f })) + #define __NR_restart_syscall 0 #define __NR_exit 1 #define __NR_fork 2 @@ -376,6 +503,7 @@ /* fixup legacy 32-bit-vs-lfs64 junk */ +#undef __NR_fcntl #undef __NR_getdents #undef __NR_ftruncate #undef __NR_truncate @@ -384,6 +512,7 @@ #undef __NR_lstat #undef __NR_statfs #undef __NR_fstatfs +#define __NR_fcntl __NR_fcntl64 #define __NR_getdents __NR_getdents64 #define __NR_ftruncate __NR_ftruncate64 #define __NR_truncate __NR_truncate64 @@ -783,6 +912,7 @@ /* fixup legacy 32-bit-vs-lfs64 junk */ +#undef SYS_fcntl #undef SYS_getdents #undef SYS_ftruncate #undef SYS_truncate @@ -791,6 +921,7 @@ #undef SYS_lstat #undef SYS_statfs #undef SYS_fstatfs +#define SYS_fcntl SYS_fcntl64 #define SYS_getdents SYS_getdents64 #define SYS_ftruncate SYS_ftruncate64 #define SYS_truncate SYS_truncate64 diff --git a/arch/i386/syscall.h b/arch/i386/syscall.h deleted file mode 100644 index cd3c5165..00000000 --- a/arch/i386/syscall.h +++ /dev/null @@ -1,167 +0,0 @@ -#ifndef _SYSCALL_H -#define _SYSCALL_H - -#include - -#define SYSCALL_LL(x) \ -((union { long long ll; long l[2]; }){ .ll = x }).l[0], \ -((union { long long ll; long l[2]; }){ .ll = x }).l[1] - -#define SYSCALL_SIGSET_SIZE 8 - -#if defined(SYSCALL_NORETURN) -static inline long __syscall_ret(unsigned long r) -{ - for(;;); - return 0; -} -#elif defined(SYSCALL_RETURN_ERRNO) -static inline long __syscall_ret(unsigned long r) -{ - return -r; -} -#else -extern long __syscall_ret(unsigned long); -#endif - -static inline long syscall0(long n) -{ - unsigned long ret; - __asm__ __volatile__ ("int $128" : "=a"(ret) : "a"(n) : "memory"); - return __syscall_ret(ret); -} - -#ifndef __PIC__ - -static inline long syscall1(long n, long a1) -{ - unsigned long ret; - __asm__ __volatile__ ("int $128" : "=a"(ret) : "a"(n), "b"(a1) : "memory"); - return __syscall_ret(ret); -} - -static inline long syscall2(long n, long a1, long a2) -{ - unsigned long ret; - __asm__ __volatile__ ("int $128" : "=a"(ret) : "a"(n), "b"(a1), "c"(a2) : "memory"); - return __syscall_ret(ret); -} - -static inline long syscall3(long n, long a1, long a2, long a3) -{ - unsigned long ret; - __asm__ __volatile__ ("int $128" : "=a"(ret) : "a"(n), "b"(a1), "c"(a2), "d"(a3) : "memory"); - return __syscall_ret(ret); -} - -static inline long syscall4(long n, long a1, long a2, long a3, long a4) -{ - unsigned long ret; - __asm__ __volatile__ ("int $128" : "=a"(ret) : "a"(n), "b"(a1), "c"(a2), "d"(a3), "S"(a4) : "memory"); - return __syscall_ret(ret); -} - -static inline long syscall5(long n, long a1, long a2, long a3, long a4, long a5) -{ - unsigned long ret; - __asm__ __volatile__ ("int $128" : "=a"(ret) : "a"(n), "b"(a1), "c"(a2), "d"(a3), "S"(a4), "D"(a5) : "memory"); - return __syscall_ret(ret); -} - -static inline long syscall6(long n, long a1, long a2, long a3, long a4, long a5, long a6) -{ - unsigned long ret; - __asm__ __volatile__ ("pushl %%ebp ; mov %%eax,%%ebp ; movl %1,%%eax ; int $128 ; popl %%ebp" - : "=a"(ret) : "i"(n), "b"(a1), "c"(a2), "d"(a3), "S"(a4), "D"(a5), "a"(a6) : "memory"); - return __syscall_ret(ret); -} - -#else - -static inline long syscall1(long n, long a1) -{ - unsigned long ret; - __asm__ __volatile__ ("xchg %2,%%ebx ; int $128 ; xchg %2,%%ebx" - : "=a"(ret) : "a"(n), "r"(a1) : "memory"); - return __syscall_ret(ret); -} - -static inline long syscall2(long n, long a1, long a2) -{ - unsigned long ret; - __asm__ __volatile__ ("xchg %2,%%ebx ; int $128 ; xchg %2,%%ebx" - : "=a"(ret) : "a"(n), "r"(a1), "c"(a2) : "memory"); - return __syscall_ret(ret); -} - -static inline long syscall3(long n, long a1, long a2, long a3) -{ - unsigned long ret; - __asm__ __volatile__ ("xchg %2,%%ebx ; int $128 ; xchg %2,%%ebx" - : "=a"(ret) : "a"(n), "r"(a1), "c"(a2), "d"(a3) : "memory"); - return __syscall_ret(ret); -} - -static inline long syscall4(long n, long a1, long a2, long a3, long a4) -{ - unsigned long ret; - __asm__ __volatile__ ("xchg %2,%%ebx ; int $128 ; xchg %2,%%ebx" - : "=a"(ret) : "a"(n), "r"(a1), "c"(a2), "d"(a3), "S"(a4) : "memory"); - return __syscall_ret(ret); -} - -static inline long syscall5(long n, long a1, long a2, long a3, long a4, long a5) -{ - unsigned long ret; - __asm__ __volatile__ ("pushl %%ebx ; mov %%eax,%%ebx ; movl %1,%%eax ; int $128 ; popl %%ebx" - : "=a"(ret) : "i"(n), "a"(a1), "c"(a2), "d"(a3), "S"(a4), "D"(a5) : "memory"); - return __syscall_ret(ret); -} - -#define syscall6(n,a1,a2,a3,a4,a5,a6) __syscall((n),(a1),(a2),(a3),(a4),(a5),(a6)) - -#endif - -#define __SC_socket 1 -#define __SC_bind 2 -#define __SC_connect 3 -#define __SC_listen 4 -#define __SC_accept 5 -#define __SC_getsockname 6 -#define __SC_getpeername 7 -#define __SC_socketpair 8 -#define __SC_send 9 -#define __SC_recv 10 -#define __SC_sendto 11 -#define __SC_recvfrom 12 -#define __SC_shutdown 13 -#define __SC_setsockopt 14 -#define __SC_getsockopt 15 -#define __SC_sendmsg 16 -#define __SC_recvmsg 17 - - -#define socketcall(nm, a, b, c, d, e, f) syscall2(__NR_socketcall, __SC_##nm, \ - (long)(long [6]){ (long)a, (long)b, (long)c, (long)d, (long)e, (long)f }) - - -#undef O_LARGEFILE -#define O_LARGEFILE 0100000 - -/* the following are needed for iso c functions to use */ -#define __syscall_open(filename, flags, mode) syscall3(__NR_open, (long)(filename), (flags)|O_LARGEFILE, (mode)) -#define __syscall_read(fd, buf, len) syscall3(__NR_read, (fd), (long)(buf), (len)) -#define __syscall_write(fd, buf, len) syscall3(__NR_write, (fd), (long)(buf), (len)) -#define __syscall_close(fd) syscall1(__NR_close, (fd)) -#define __syscall_fcntl(fd, cmd, arg) syscall3(__NR_fcntl64, (fd), (cmd), (long)(arg)) -#define __syscall_dup2(old, new) syscall2(__NR_dup2, (old), (new)) -#define __syscall_unlink(path) syscall1(__NR_unlink, (long)(path)) -#define __syscall_getpid() syscall0(__NR_getpid) -#define __syscall_kill(pid,sig) syscall2(__NR_kill, (pid), (sig)) -#define __syscall_sigaction(sig,new,old) syscall4(__NR_rt_sigaction, (sig), (long)(new), (long)(old), SYSCALL_SIGSET_SIZE) -#define __syscall_ioctl(fd,ioc,arg) syscall3(__NR_ioctl, (fd), (ioc), (long)(arg)) -#define __syscall_exit(code) syscall1(__NR_exit, code) - -long __syscall(long, ...); - -#endif diff --git a/arch/x86_64/bits/fcntl.h b/arch/x86_64/bits/fcntl.h index 802c3d14..2487a308 100644 --- a/arch/x86_64/bits/fcntl.h +++ b/arch/x86_64/bits/fcntl.h @@ -14,12 +14,15 @@ #define O_NOFOLLOW 0400000 #define O_CLOEXEC 02000000 -#ifdef _GNU_SOURCE -#define O_NDELAY O_NONBLOCK +/* Extensions, but in the reserved namespace, so OK */ #define O_ASYNC 020000 #define O_DIRECT 040000 +#define O_LARGEFILE 0 #define O_NOATIME 01000000 +#define O_NDELAY O_NONBLOCK #define F_DUPFD_CLOEXEC 1030 + +#ifdef _GNU_SOURCE #define FAPPENT O_APPEND #define FFSYNC O_FSYNC #define FASYNC O_ASYNC diff --git a/arch/x86_64/bits/syscall.h b/arch/x86_64/bits/syscall.h index ca75019d..c6f12230 100644 --- a/arch/x86_64/bits/syscall.h +++ b/arch/x86_64/bits/syscall.h @@ -1,3 +1,67 @@ +#define __SYSCALL_LL(x) (x) + +static inline long __syscall0(long __n) +{ + unsigned long __ret; + __asm__ __volatile__ ("syscall" : "=a"(__ret) : "a"(__n) : "rcx", "r11", "memory"); + return __ret; +} + +static inline long __syscall1(long __n, long __a1) +{ + unsigned long __ret; + __asm__ __volatile__ ("syscall" : "=a"(__ret) : "a"(__n), "D"(__a1) : "rcx", "r11", "memory"); + return __ret; +} + +static inline long __syscall2(long __n, long __a1, long __a2) +{ + unsigned long __ret; + __asm__ __volatile__ ("syscall" : "=a"(__ret) : "a"(__n), "D"(__a1), "S"(__a2) + : "rcx", "r11", "memory"); + return __ret; +} + +static inline long __syscall3(long __n, long __a1, long __a2, long __a3) +{ + unsigned long __ret; + __asm__ __volatile__ ("syscall" : "=a"(__ret) : "a"(__n), "D"(__a1), "S"(__a2), + "d"(__a3) : "rcx", "r11", "memory"); + return __ret; +} + +static inline long __syscall4(long __n, long __a1, long __a2, long __a3, long __a4) +{ + unsigned long __ret; + register long __r10 __asm__("r10") = __a4; + __asm__ __volatile__ ("syscall" : "=a"(__ret) : "a"(__n), "D"(__a1), "S"(__a2), + "d"(__a3), "r"(__r10): "rcx", "r11", "memory"); + return __ret; +} + +static inline long __syscall5(long __n, long __a1, long __a2, long __a3, long __a4, long __a5) +{ + unsigned long __ret; + register long __r10 __asm__("r10") = __a4; + register long__ r8 __asm__("r8") = __a5; + __asm__ __volatile__ ("syscall" : "=a"(__ret) : "a"(__n), "D"(__a1), "S"(__a2), + "d"(__a3), "r"(__r10), "r"(__r8) : "rcx", "r11", "memory"); + return __ret; +} + +static inline long __syscall6(long __n, long __a1, long __a2, long __a3, long __a4, long __a5, long __a6) +{ + unsigned long __ret; + register long __r10 __asm__("r10") = __a4; + register long __r8 __asm__("r8") = __a5; + register long __r9 __asm__("r9") = __a6; + __asm__ __volatile__ ("syscall" : "=a"(__ret) : "a"(__n), "D"(__a1), "S"(__a2), + "d"(__a3), "r"(__r10), "r"(__r8), "r"(__r9) : "rcx", "r11", "memory"); + return __ret; +} + +#define __socketcall(nm, a, b, c, d, e, f) syscall(__NR_##nm, a, b, c, d, e, f) + #define __NR_read 0 #define __NR_write 1 #define __NR_open 2 diff --git a/arch/x86_64/syscall.h b/arch/x86_64/syscall.h deleted file mode 100644 index 9f22e6ba..00000000 --- a/arch/x86_64/syscall.h +++ /dev/null @@ -1,113 +0,0 @@ -#ifndef _SYSCALL_H -#define _SYSCALL_H - -#include - -#define SYSCALL_LL(x) x, 0 -#define SYSCALL_SIGSET_SIZE 8 - -#if defined(SYSCALL_NORETURN) -static inline long __syscall_ret(unsigned long r) -{ - for(;;); - return 0; -} -#elif defined(SYSCALL_RETURN_ERRNO) -static inline long __syscall_ret(unsigned long r) -{ - return -r; -} -#else -extern long __syscall_ret(unsigned long); -#endif - -// 64: di, si, dx, r10, r8, r9 -// 32: ebx, ecx, edx, esi, edi, ebp - -#define SYSCALL "syscall" - -static inline long syscall0(long n) -{ - unsigned long ret; - __asm__ __volatile__ (SYSCALL : "=a"(ret) : "a"(n) : "rcx", "r11", "memory"); - return __syscall_ret(ret); -} - -static inline long syscall1(long n, long a1) -{ - unsigned long ret; - __asm__ __volatile__ (SYSCALL : "=a"(ret) : "a"(n), "D"(a1) : "rcx", "r11", "memory"); - return __syscall_ret(ret); -} - -static inline long syscall2(long n, long a1, long a2) -{ - unsigned long ret; - __asm__ __volatile__ (SYSCALL : "=a"(ret) : "a"(n), "D"(a1), "S"(a2) - : "rcx", "r11", "memory"); - return __syscall_ret(ret); -} - -static inline long syscall3(long n, long a1, long a2, long a3) -{ - unsigned long ret; - __asm__ __volatile__ (SYSCALL : "=a"(ret) : "a"(n), "D"(a1), "S"(a2), - "d"(a3) : "rcx", "r11", "memory"); - return __syscall_ret(ret); -} - -static inline long syscall4(long n, long a1, long a2, long a3, long a4) -{ - unsigned long ret; - register long r10 __asm__("r10") = a4; - __asm__ __volatile__ (SYSCALL : "=a"(ret) : "a"(n), "D"(a1), "S"(a2), - "d"(a3), "r"(r10): "rcx", "r11", "memory"); - return __syscall_ret(ret); -} - -static inline long syscall5(long n, long a1, long a2, long a3, long a4, - long a5) -{ - unsigned long ret; - register long r10 __asm__("r10") = a4; - register long r8 __asm__("r8") = a5; - __asm__ __volatile__ (SYSCALL : "=a"(ret) : "a"(n), "D"(a1), "S"(a2), - "d"(a3), "r"(r10), "r"(r8) : "rcx", "r11", "memory"); - return __syscall_ret(ret); -} - -static inline long syscall6(long n, long a1, long a2, long a3, long a4, - long a5, long a6) -{ - unsigned long ret; - register long r10 __asm__("r10") = a4; - register long r8 __asm__("r8") = a5; - register long r9 __asm__("r9") = a6; - __asm__ __volatile__ (SYSCALL : "=a"(ret) : "a"(n), "D"(a1), "S"(a2), - "d"(a3), "r"(r10), "r"(r8), "r"(r9) : "rcx", "r11", "memory"); - return __syscall_ret(ret); -} - -#undef O_LARGEFILE -#define O_LARGEFILE 0100000 - -#define socketcall(nm, a, b, c, d, e, f) syscall6(__NR_##nm, \ - (long)a, (long)b, (long)c, (long)d, (long)e, (long)f) - -/* the following are needed for iso c functions to use */ -#define __syscall_open(filename, flags, mode) syscall3(__NR_open, (long)(filename), (flags)|O_LARGEFILE, (mode)) -#define __syscall_read(fd, buf, len) syscall3(__NR_read, (fd), (long)(buf), (len)) -#define __syscall_write(fd, buf, len) syscall3(__NR_write, (fd), (long)(buf), (len)) -#define __syscall_close(fd) syscall1(__NR_close, (fd)) -#define __syscall_fcntl(fd, cmd, arg) syscall3(__NR_fcntl, (fd), (cmd), (long)(arg)) -#define __syscall_dup2(old, new) syscall2(__NR_dup2, (old), (new)) -#define __syscall_unlink(path) syscall1(__NR_unlink, (long)(path)) -#define __syscall_getpid() syscall0(__NR_getpid) -#define __syscall_kill(pid,sig) syscall2(__NR_kill, (pid), (sig)) -#define __syscall_sigaction(sig,new,old) syscall4(__NR_rt_sigaction, (sig), (long)(new), (long)(old), SYSCALL_SIGSET_SIZE) -#define __syscall_ioctl(fd,ioc,arg) syscall3(__NR_ioctl, (fd), (ioc), (long)(arg)) -#define __syscall_exit(code) syscall1(__NR_exit, code) - -long __syscall(long, ...); - -#endif -- cgit v1.2.1