| Index: fusl/arch/i386/syscall_arch.h
|
| diff --git a/fusl/arch/i386/syscall_arch.h b/fusl/arch/i386/syscall_arch.h
|
| index 4c9d874aa3ebc6fa2da64cfdfd0d57d624d8b858..1d5c3a238fc85032d9fbf9ac122c91f89b732b29 100644
|
| --- a/fusl/arch/i386/syscall_arch.h
|
| +++ b/fusl/arch/i386/syscall_arch.h
|
| @@ -1,55 +1,85 @@
|
| #define __SYSCALL_LL_E(x) \
|
| -((union { long long ll; long l[2]; }){ .ll = x }).l[0], \
|
| -((union { long long ll; long l[2]; }){ .ll = x }).l[1]
|
| + ((union { \
|
| + long long ll; \
|
| + long l[2]; \
|
| + }){.ll = x}) \
|
| + .l[0], \
|
| + ((union { \
|
| + long long ll; \
|
| + long l[2]; \
|
| + }){.ll = x}) \
|
| + .l[1]
|
| #define __SYSCALL_LL_O(x) __SYSCALL_LL_E((x))
|
|
|
| -static inline long __syscall0(long n)
|
| -{
|
| - unsigned long __ret;
|
| - __asm__ __volatile__ (".hidden __vsyscall ; call __vsyscall" : "=a"(__ret) : "a"(n) : "memory");
|
| - return __ret;
|
| +static inline long __syscall0(long n) {
|
| + unsigned long __ret;
|
| + __asm__ __volatile__(".hidden __vsyscall ; call __vsyscall"
|
| + : "=a"(__ret)
|
| + : "a"(n)
|
| + : "memory");
|
| + return __ret;
|
| }
|
|
|
| -static inline long __syscall1(long n, long a1)
|
| -{
|
| - unsigned long __ret;
|
| - __asm__ __volatile__ (".hidden __vsyscall ; call __vsyscall" : "=a"(__ret) : "a"(n), "d"(a1) : "memory");
|
| - return __ret;
|
| +static inline long __syscall1(long n, long a1) {
|
| + unsigned long __ret;
|
| + __asm__ __volatile__(".hidden __vsyscall ; call __vsyscall"
|
| + : "=a"(__ret)
|
| + : "a"(n), "d"(a1)
|
| + : "memory");
|
| + return __ret;
|
| }
|
|
|
| -static inline long __syscall2(long n, long a1, long a2)
|
| -{
|
| - unsigned long __ret;
|
| - __asm__ __volatile__ (".hidden __vsyscall ; call __vsyscall" : "=a"(__ret) : "a"(n), "d"(a1), "c"(a2) : "memory");
|
| - return __ret;
|
| +static inline long __syscall2(long n, long a1, long a2) {
|
| + unsigned long __ret;
|
| + __asm__ __volatile__(".hidden __vsyscall ; call __vsyscall"
|
| + : "=a"(__ret)
|
| + : "a"(n), "d"(a1), "c"(a2)
|
| + : "memory");
|
| + return __ret;
|
| }
|
|
|
| -static inline long __syscall3(long n, long a1, long a2, long a3)
|
| -{
|
| - unsigned long __ret;
|
| - __asm__ __volatile__ (".hidden __vsyscall ; call __vsyscall" : "=a"(__ret) : "a"(n), "d"(a1), "c"(a2), "D"(a3) : "memory");
|
| - return __ret;
|
| +static inline long __syscall3(long n, long a1, long a2, long a3) {
|
| + unsigned long __ret;
|
| + __asm__ __volatile__(".hidden __vsyscall ; call __vsyscall"
|
| + : "=a"(__ret)
|
| + : "a"(n), "d"(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__ (".hidden __vsyscall ; call __vsyscall" : "=a"(__ret) : "a"(n), "d"(a1), "c"(a2), "D"(a3), "S"(a4) : "memory");
|
| - return __ret;
|
| +static inline long __syscall4(long n, long a1, long a2, long a3, long a4) {
|
| + unsigned long __ret;
|
| + __asm__ __volatile__(".hidden __vsyscall ; call __vsyscall"
|
| + : "=a"(__ret)
|
| + : "a"(n), "d"(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__ ("push %6 ; .hidden __vsyscall ; call __vsyscall ; add $4,%%esp" : "=a"(__ret) : "a"(n), "d"(a1), "c"(a2), "D"(a3), "S"(a4), "g"(a5) : "memory");
|
| - return __ret;
|
| +static inline long __syscall5(long n,
|
| + long a1,
|
| + long a2,
|
| + long a3,
|
| + long a4,
|
| + long a5) {
|
| + unsigned long __ret;
|
| + __asm__ __volatile__(
|
| + "push %6 ; .hidden __vsyscall ; call __vsyscall ; add $4,%%esp"
|
| + : "=a"(__ret)
|
| + : "a"(n), "d"(a1), "c"(a2), "D"(a3), "S"(a4), "g"(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__ ("push %6 ; .hidden __vsyscall6 ; call __vsyscall6 ; add $4,%%esp" : "=a"(__ret) : "a"(n), "d"(a1), "c"(a2), "D"(a3), "S"(a4), "g"(0+(long[]){a5, a6}) : "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__(
|
| + "push %6 ; .hidden __vsyscall6 ; call __vsyscall6 ; add $4,%%esp"
|
| + : "=a"(__ret)
|
| + : "a"(n), "d"(a1), "c"(a2), "D"(a3), "S"(a4), "g"(0 + (long[]){a5, a6})
|
| + : "memory");
|
| + return __ret;
|
| }
|
|
|
| #define VDSO_USEFUL
|
|
|