deduplicate mips64/n32 syscall clobbered register lists

[musl] / arch / mips64 / syscall_arch.h

diff --git a/arch/mips64/syscall_arch.h b/arch/mips64/syscall_arch.h
index 5eabdf4..a653c31 100644 (file)
--- a/arch/mips64/syscall_arch.h
+++ b/arch/mips64/syscall_arch.h
@@ -1,9 +1,6 @@
 #define __SYSCALL_LL_E(x) (x)
 #define __SYSCALL_LL_O(x) (x)
 
-__attribute__((visibility("hidden")))
-long (__syscall)(long, ...);
-
 #define SYSCALL_RLIM_INFINITY (-1UL/2)
 
 #include <sys/stat.h>
@@ -49,6 +46,10 @@ static void __stat_fix(struct kernel_stat *kst, struct stat *st)
        st->st_blocks = kst->st_blocks;
 }
 
+#define SYSCALL_CLOBBERLIST \
+       "$1", "$3", "$10", "$11", "$12", "$13", \
+       "$14", "$15", "$24", "$25", "hi", "lo", "memory"
+
 static inline long __syscall0(long n)
 {
        register long r7 __asm__("$7");
@@ -56,8 +57,7 @@ static inline long __syscall0(long n)
        __asm__ __volatile__ (
                "daddu $2,$0,%2 ; syscall"
                : "=&r"(r2), "=r"(r7) : "ir"(n), "0"(r2), "1"(r7)
-               : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13",
-                 "$14", "$15", "$24", "$25", "hi", "lo", "memory");
+               : SYSCALL_CLOBBERLIST);
        return r7 ? -r2 : r2;
 }
 
@@ -70,8 +70,7 @@ static inline long __syscall1(long n, long a)
                "daddu $2,$0,%2 ; syscall"
                : "=&r"(r2), "=r"(r7) : "ir"(n), "0"(r2), "1"(r7),
                  "r"(r4)
-               : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13",
-                 "$14", "$15", "$24", "$25", "hi", "lo", "memory");
+               : SYSCALL_CLOBBERLIST);
        return r7 ? -r2 : r2;
 }
 
@@ -79,22 +78,19 @@ static inline long __syscall2(long n, long a, long b)
 {
        struct kernel_stat kst;
        long ret;
-       register long r4 __asm__("$4");
-       register long r5 __asm__("$5");
+       register long r4 __asm__("$4") = a;
+       register long r5 __asm__("$5") = b;
        register long r7 __asm__("$7");
        register long r2 __asm__("$2");
 
-       r5 = b;
        if (n == SYS_stat || n == SYS_fstat || n == SYS_lstat)
                r5 = (long) &kst;
 
-       r4 = a;
        __asm__ __volatile__ (
                "daddu $2,$0,%2 ; syscall"
                : "=&r"(r2), "=r"(r7) : "ir"(n), "0"(r2), "1"(r7),
                  "r"(r4), "r"(r5)
-               : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13",
-                 "$14", "$15", "$24", "$25", "hi", "lo", "memory");
+               : SYSCALL_CLOBBERLIST);
 
        if (r7) return -r2;
        ret = r2;
@@ -109,24 +105,20 @@ static inline long __syscall3(long n, long a, long b, long c)
 {
        struct kernel_stat kst;
        long ret;
-       register long r4 __asm__("$4");
-       register long r5 __asm__("$5");
-       register long r6 __asm__("$6");
+       register long r4 __asm__("$4") = a;
+       register long r5 __asm__("$5") = b;
+       register long r6 __asm__("$6") = c;
        register long r7 __asm__("$7");
        register long r2 __asm__("$2");
 
-       r5 = b;
        if (n == SYS_stat || n == SYS_fstat || n == SYS_lstat)
                r5 = (long) &kst;
 
-       r4 = a;
-       r6 = c;
        __asm__ __volatile__ (
                "daddu $2,$0,%2 ; syscall"
                : "=&r"(r2), "=r"(r7) : "ir"(n), "0"(r2), "1"(r7),
                  "r"(r4), "r"(r5), "r"(r6)
-               : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13",
-                 "$14", "$15", "$24", "$25", "hi", "lo", "memory");
+               : SYSCALL_CLOBBERLIST);
 
        if (r7) return -r2;
        ret = r2;
@@ -141,16 +133,12 @@ static inline long __syscall4(long n, long a, long b, long c, long d)
 {
        struct kernel_stat kst;
        long ret;
-       register long r4 __asm__("$4");
-       register long r5 __asm__("$5");
-       register long r6 __asm__("$6");
-       register long r7 __asm__("$7");
+       register long r4 __asm__("$4") = a;
+       register long r5 __asm__("$5") = b;
+       register long r6 __asm__("$6") = c;
+       register long r7 __asm__("$7") = d;
        register long r2 __asm__("$2");
 
-       r4 = a;
-       r5 = b;
-       r6 = c;
-       r7 = d;
        if (n == SYS_stat || n == SYS_fstat || n == SYS_lstat)
                r5 = (long) &kst;
        if (n == SYS_newfstatat)
@@ -160,8 +148,7 @@ static inline long __syscall4(long n, long a, long b, long c, long d)
                "daddu $2,$0,%2 ; syscall"
                : "=&r"(r2), "=r"(r7) : "ir"(n), "0"(r2), "1"(r7),
                  "r"(r4), "r"(r5), "r"(r6)
-               : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13",
-                 "$14", "$15", "$24", "$25", "hi", "lo", "memory");
+               : SYSCALL_CLOBBERLIST);
 
        if (r7) return -r2;
        ret = r2;
@@ -176,48 +163,69 @@ static inline long __syscall4(long n, long a, long b, long c, long d)
 
 static inline long __syscall5(long n, long a, long b, long c, long d, long e)
 {
-       long r2;
-       long old_b = b;
-       long old_c = c;
        struct kernel_stat kst;
+       long ret;
+       register long r4 __asm__("$4") = a;
+       register long r5 __asm__("$5") = b;
+       register long r6 __asm__("$6") = c;
+       register long r7 __asm__("$7") = d;
+       register long r8 __asm__("$8") = e;
+       register long r2 __asm__("$2");
 
        if (n == SYS_stat || n == SYS_fstat || n == SYS_lstat)
-               b = (long) &kst;
+               r5 = (long) &kst;
        if (n == SYS_newfstatat)
-               c = (long) &kst;
+               r6 = (long) &kst;
+
+       __asm__ __volatile__ (
+               "daddu $2,$0,%2 ; syscall"
+               : "=&r"(r2), "=r"(r7) : "ir"(n), "0"(r2), "1"(r7),
+                 "r"(r4), "r"(r5), "r"(r6), "r"(r8)
+               : SYSCALL_CLOBBERLIST);
 
-       r2 = (__syscall)(n, a, b, c, d, e);
-       if (r2 > -4096UL) return r2;
+       if (r7) return -r2;
+       ret = r2;
 
        if (n == SYS_stat || n == SYS_fstat || n == SYS_lstat)
-               __stat_fix(&kst, (struct stat *)old_b);
+               __stat_fix(&kst, (struct stat *)b);
        if (n == SYS_newfstatat)
-               __stat_fix(&kst, (struct stat *)old_c);
+               __stat_fix(&kst, (struct stat *)c);
 
-       return r2;
+       return ret;
 }
 
 static inline long __syscall6(long n, long a, long b, long c, long d, long e, long f)
 {
-       long r2;
-       long old_b = b;
-       long old_c = c;
        struct kernel_stat kst;
+       long ret;
+       register long r4 __asm__("$4") = a;
+       register long r5 __asm__("$5") = b;
+       register long r6 __asm__("$6") = c;
+       register long r7 __asm__("$7") = d;
+       register long r8 __asm__("$8") = e;
+       register long r9 __asm__("$9") = f;
+       register long r2 __asm__("$2");
 
        if (n == SYS_stat || n == SYS_fstat || n == SYS_lstat)
-               b = (long) &kst;
+               r5 = (long) &kst;
        if (n == SYS_newfstatat)
-               c = (long) &kst;
+               r6 = (long) &kst;
 
-       r2 = (__syscall)(n, a, b, c, d, e, f);
-       if (r2 > -4096UL) return r2;
+       __asm__ __volatile__ (
+               "daddu $2,$0,%2 ; syscall"
+               : "=&r"(r2), "=r"(r7) : "ir"(n), "0"(r2), "1"(r7),
+                 "r"(r4), "r"(r5), "r"(r6), "r"(r8), "r"(r9)
+               : SYSCALL_CLOBBERLIST);
+
+       if (r7) return -r2;
+       ret = r2;
 
        if (n == SYS_stat || n == SYS_fstat || n == SYS_lstat)
-               __stat_fix(&kst, (struct stat *)old_b);
+               __stat_fix(&kst, (struct stat *)b);
        if (n == SYS_newfstatat)
-               __stat_fix(&kst, (struct stat *)old_c);
+               __stat_fix(&kst, (struct stat *)c);
 
-       return r2;
+       return ret;
 }
 
 #define VDSO_USEFUL