revert mips64/n32 syscall asm clean-up due to regressions

[musl] / arch / mipsn32 / syscall_arch.h

diff --git a/arch/mipsn32/syscall_arch.h b/arch/mipsn32/syscall_arch.h
index c1a4b7d..cbb4a05 100644 (file)
--- a/arch/mipsn32/syscall_arch.h
+++ b/arch/mipsn32/syscall_arch.h
@@ -16,11 +16,11 @@
 static inline long __syscall0(long n)
 {
        register long r7 __asm__("$7");
-       register long r2 __asm__("$2") = n;
+       register long r2 __asm__("$2");
        __asm__ __volatile__ (
-               "syscall"
-               : "+&r"(r2), "=r"(r7)
-               :
+               "daddu $2,$0,%2 ; syscall"
+               : "=&r"(r2), "=r"(r7)
+               : "ir"(n), "0"(r2)
                : SYSCALL_CLOBBERLIST);
        return r7 ? -r2 : r2;
 }
@@ -29,11 +29,11 @@ static inline long __syscall1(long n, long a)
 {
        register long r4 __asm__("$4") = a;
        register long r7 __asm__("$7");
-       register long r2 __asm__("$2") = n;
+       register long r2 __asm__("$2");
        __asm__ __volatile__ (
-               "syscall"
-               : "+&r"(r2), "=r"(r7)
-               : "r"(r4)
+               "daddu $2,$0,%2 ; syscall"
+               : "=&r"(r2), "=r"(r7)
+               : "ir"(n), "0"(r2), "r"(r4)
                : SYSCALL_CLOBBERLIST);
        return r7 ? -r2 : r2;
 }
@@ -43,11 +43,12 @@ static inline long __syscall2(long n, long a, long b)
        register long r4 __asm__("$4") = a;
        register long r5 __asm__("$5") = b;
        register long r7 __asm__("$7");
-       register long r2 __asm__("$2") = n;
+       register long r2 __asm__("$2");
+
        __asm__ __volatile__ (
-               "syscall"
-               : "+&r"(r2), "=r"(r7)
-               : "r"(r4), "r"(r5)
+               "daddu $2,$0,%2 ; syscall"
+               : "=&r"(r2), "=r"(r7)
+               : "ir"(n), "0"(r2), "r"(r4), "r"(r5)
                : SYSCALL_CLOBBERLIST);
        return r7 ? -r2 : r2;
 }
@@ -58,11 +59,12 @@ static inline long __syscall3(long n, long a, long b, long c)
        register long r5 __asm__("$5") = b;
        register long r6 __asm__("$6") = c;
        register long r7 __asm__("$7");
-       register long r2 __asm__("$2") = n;
+       register long r2 __asm__("$2");
+
        __asm__ __volatile__ (
-               "syscall"
-               : "+&r"(r2), "=r"(r7)
-               : "r"(r4), "r"(r5), "r"(r6)
+               "daddu $2,$0,%2 ; syscall"
+               : "=&r"(r2), "=r"(r7)
+               : "ir"(n), "0"(r2), "r"(r4), "r"(r5), "r"(r6)
                : SYSCALL_CLOBBERLIST);
        return r7 ? -r2 : r2;
 }
@@ -73,11 +75,12 @@ static inline long __syscall4(long n, long a, long b, long c, long d)
        register long r5 __asm__("$5") = b;
        register long r6 __asm__("$6") = c;
        register long r7 __asm__("$7") = d;
-       register long r2 __asm__("$2") = n;
+       register long r2 __asm__("$2");
+
        __asm__ __volatile__ (
-               "syscall"
-               : "+&r"(r2), "+r"(r7)
-               : "r"(r4), "r"(r5), "r"(r6)
+               "daddu $2,$0,%2 ; syscall"
+               : "=&r"(r2), "+r"(r7)
+               : "ir"(n), "0"(r2), "r"(r4), "r"(r5), "r"(r6)
                : SYSCALL_CLOBBERLIST);
        return r7 ? -r2 : r2;
 }
@@ -89,11 +92,12 @@ static inline long __syscall5(long n, long a, long b, long c, long d, long e)
        register long r6 __asm__("$6") = c;
        register long r7 __asm__("$7") = d;
        register long r8 __asm__("$8") = e;
-       register long r2 __asm__("$2") = n;
+       register long r2 __asm__("$2");
+
        __asm__ __volatile__ (
-               "syscall"
-               : "+&r"(r2), "+r"(r7)
-               : "r"(r4), "r"(r5), "r"(r6), "r"(r8)
+               "daddu $2,$0,%2 ; syscall"
+               : "=&r"(r2), "+r"(r7)
+               : "ir"(n), "0"(r2), "r"(r4), "r"(r5), "r"(r6), "r"(r8)
                : SYSCALL_CLOBBERLIST);
        return r7 ? -r2 : r2;
 }
@@ -106,11 +110,12 @@ static inline long __syscall6(long n, long a, long b, long c, long d, long e, lo
        register long r7 __asm__("$7") = d;
        register long r8 __asm__("$8") = e;
        register long r9 __asm__("$9") = f;
-       register long r2 __asm__("$2") = n;
+       register long r2 __asm__("$2");
+
        __asm__ __volatile__ (
-               "syscall"
-               : "+&r"(r2), "+r"(r7)
-               : "r"(r4), "r"(r5), "r"(r6), "r"(r8), "r"(r9)
+               "daddu $2,$0,%2 ; syscall"
+               : "=&r"(r2), "+r"(r7)
+               : "ir"(n), "0"(r2), "r"(r4), "r"(r5), "r"(r6), "r"(r8), "r"(r9)
                : SYSCALL_CLOBBERLIST);
        return r7 ? -r2 : r2;
 }