fix regression in i386 inline syscall asm producing invalid code

[musl] / arch / i386 / syscall_arch.h

diff --git a/arch/i386/syscall_arch.h b/arch/i386/syscall_arch.h
index dc9ad14..29e141f 100644 (file)
--- a/arch/i386/syscall_arch.h
+++ b/arch/i386/syscall_arch.h
@@ -3,134 +3,68 @@
 ((union { long long ll; long l[2]; }){ .ll = x }).l[1]
 #define __SYSCALL_LL_O(x) __SYSCALL_LL_E((x))
 
-#define __SYSCALL_SSLEN 8
-
-static inline long __syscall0(long n)
-{
-       unsigned long __ret;
-       __asm__ __volatile__ ("int $128" : "=a"(__ret) : "a"(n) : "memory");
-       return __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;
-}
+#if SYSCALL_NO_TLS
+#define SYSCALL_INSNS "int $128"
+#else
+#define SYSCALL_INSNS "call *%%gs:16"
+#endif
 
-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;
-}
+#define SYSCALL_INSNS_12 "xchg %%ebx,%%edx ; " SYSCALL_INSNS " ; xchg %%ebx,%%edx"
+#define SYSCALL_INSNS_34 "xchg %%ebx,%%edi ; " SYSCALL_INSNS " ; xchg %%ebx,%%edi"
 
-static inline long __syscall6(long n, long a1, long a2, long a3, long a4, long a5, long a6)
+static inline long __syscall0(long n)
 {
        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");
+       __asm__ __volatile__ (SYSCALL_INSNS : "=a"(__ret) : "a"(n) : "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), "d"(a1) : "memory");
+       __asm__ __volatile__ (SYSCALL_INSNS_12 : "=a"(__ret) : "a"(n), "d"(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), "d"(a1), "c"(a2) : "memory");
+       __asm__ __volatile__ (SYSCALL_INSNS_12 : "=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__ ("xchg %2,%%ebx ; int $128 ; xchg %2,%%ebx"
-               : "=a"(__ret) : "a"(n), "S"(a1), "c"(a2), "d"(a3) : "memory");
+       __asm__ __volatile__ (SYSCALL_INSNS_34 : "=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__ ("xchg %2,%%ebx ; int $128 ; xchg %2,%%ebx"
-               : "=a"(__ret) : "a"(n), "D"(a1), "c"(a2), "d"(a3), "S"(a4) : "memory");
+       __asm__ __volatile__ (SYSCALL_INSNS_34 : "=a"(__ret) : "a"(n), "D"(a1), "c"(a2), "d"(a3), "S"(a4) : "memory");
        return __ret;
 }
 
-#if 0
 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"
+       __asm__ __volatile__ ("pushl %2 ; push %%ebx ; mov 4(%%esp),%%ebx ; " SYSCALL_INSNS " ; pop %%ebx ; add $4,%%esp"
                : "=a"(__ret) : "a"(n), "g"(a1), "c"(a2), "d"(a3), "S"(a4), "D"(a5) : "memory");
        return __ret;
 }
-#else
-static inline long __syscall5(long n, long a1, long a2, long a3, long a4, long a5)
-{
-       return (__syscall)(n, a1, a2, a3, a4, a5);
-}
-#endif
 
 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);
+       unsigned long __ret, a1a6[2] = { a1, a6 };
+       __asm__ __volatile__ ("pushl %1 ; push %%ebx ; push %%ebp ; mov 8(%%esp),%%ebx ; mov 4(%%ebx),%%ebp ; mov (%%ebx),%%ebx ; " SYSCALL_INSNS " ; pop %%ebp ; pop %%ebx ; add $4,%%esp"
+               : "=a"(__ret) : "g"(&a1a6), "a"(n), "c"(a2), "d"(a3), "S"(a4), "D"(a5) : "memory");
+       return __ret;
 }
 
-#endif
-
+#define VDSO_USEFUL
+#define VDSO_CGT_SYM "__vdso_clock_gettime"
+#define VDSO_CGT_VER "LINUX_2.6"
 
-#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 __SC_accept4     18
-#define __SC_recvmmsg    19
-#define __SC_sendmmsg    20
+#define SYSCALL_USE_SOCKETCALL