X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=arch%2Fmips%2Fsyscall_arch.h;h=7c7f9a1a655cdf13b9b8fbb03402975fc1a47de3;hp=f3df2dcddf01ae9adee41c503c53487337ed53c2;hb=121e3a38a1d0b324696fc1671029e4b815ea7fa4;hpb=328810d32524e4928fec50b57e37e1bf330b2e40

diff --git a/arch/mips/syscall_arch.h b/arch/mips/syscall_arch.h
index f3df2dcd..7c7f9a1a 100644
--- a/arch/mips/syscall_arch.h
+++ b/arch/mips/syscall_arch.h
@@ -9,53 +9,51 @@
 
 #define __asm_syscall(...) do { \
 	register long r2 __asm__("$2"); \
-	register long r7 __asm__("$7"); \
 	__asm__ __volatile__ ( \
-	"move $2,%2 ; syscall" \
-	: "=&r"(r2), "=r"(r7) : __VA_ARGS__ \
+	"addu $2,$0,%2 ; syscall" \
+	: "=&r"(r2), "=r"(r7) : "ir"(n), __VA_ARGS__, "0"(r2), "1"(r7) \
 	: "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", \
-	  "$14", "$15", "$24", "hi", "lo", "memory"); \
+	  "$14", "$15", "$24", "$25", "hi", "lo", "memory"); \
 	return r7 ? -r2 : r2; \
 	} while (0)
 
 static inline long __syscall0(long n)
 {
-	register long r25 __asm__("$25") = n;
-	__asm_syscall("r"(r25));
+	register long r7 __asm__("$7");
+	__asm_syscall("i"(0));
 }
 
 static inline long __syscall1(long n, long a)
 {
-	register long r25 __asm__("$25") = n;
 	register long r4 __asm__("$4") = a;
-	__asm_syscall("r"(r25), "r"(r4));
+	register long r7 __asm__("$7");
+	__asm_syscall("r"(r4));
 }
 
 static inline long __syscall2(long n, long a, long b)
 {
-	register long r25 __asm__("$25") = n;
 	register long r4 __asm__("$4") = a;
 	register long r5 __asm__("$5") = b;
-	__asm_syscall("r"(r25), "r"(r4), "r"(r5));
+	register long r7 __asm__("$7");
+	__asm_syscall("r"(r4), "r"(r5));
 }
 
 static inline long __syscall3(long n, long a, long b, long c)
 {
-	register long r25 __asm__("$25") = n;
 	register long r4 __asm__("$4") = a;
 	register long r5 __asm__("$5") = b;
 	register long r6 __asm__("$6") = c;
-	__asm_syscall("r"(r25), "r"(r4), "r"(r5), "r"(r6));
+	register long r7 __asm__("$7");
+	__asm_syscall("r"(r4), "r"(r5), "r"(r6));
 }
 
 static inline long __syscall4(long n, long a, long b, long c, long d)
 {
-	register long r25 __asm__("$25") = n;
 	register long r4 __asm__("$4") = a;
 	register long r5 __asm__("$5") = b;
 	register long r6 __asm__("$6") = c;
 	register long r7 __asm__("$7") = d;
-	__asm_syscall("r"(r25), "r"(r4), "r"(r5), "r"(r6), "r"(r7));
+	__asm_syscall("r"(r4), "r"(r5), "r"(r6));
 }
 
 #else