* Changed paramater names to match their register, i.e. __a -> __r10.

* Do not clobber things that are specified as outputs.

ldso/ldso/cris/dl-syscalls.h

@@ -29,72 +29,72 @@
 #define _syscall0(type,name) \
 type name(void) \
 { \
-  register long __a __asm__ ("r10"); \
+  register long __r10 __asm__ ("r10"); \
   __asm__ __volatile__ ("movu.w %1,$r9\n\tbreak 13" \
-                        : "=r" (__a) \
+                        : "=r" (__r10) \
                         : "g" (__NR_##name) \
-                        : "r10", "r9"); \
-  if(__a >= 0) \
-  	return (type) __a; \
+                        : "r9"); \
+  if(__r10 >= 0) \
+  	return (type) __r10; \
   return (type) -1; \
 }
 
 #define _syscall1(type,name,type1,arg1) \
 type name(type1 arg1) \
 { \
-  register long __a __asm__ ("r10") = (long) arg1; \
+  register long __r10 __asm__ ("r10") = (long) arg1; \
   __asm__ __volatile__ ("movu.w %1,$r9\n\tbreak 13" \
-                        : "=r" (__a) \
-                        : "g" (__NR_##name), "0" (__a) \
-                        : "r10", "r9"); \
-  if(__a >= 0) \
-  	return (type) __a; \
+                        : "=r" (__r10) \
+                        : "g" (__NR_##name), "0" (__r10) \
+                        : "r9"); \
+  if(__r10 >= 0) \
+  	return (type) __r10; \
   return (type) -1; \
 }
 
 #define _syscall2(type,name,type1,arg1,type2,arg2) \
 type name(type1 arg1,type2 arg2) \
 { \
-  register long __a __asm__ ("r10") = (long) arg1; \
-  register long __b __asm__ ("r11") = (long) arg2; \
+  register long __r10 __asm__ ("r10") = (long) arg1; \
+  register long __r11 __asm__ ("r11") = (long) arg2; \
   __asm__ __volatile__ ("movu.w %1,$r9\n\tbreak 13" \
-                        : "=r" (__a) \
-                        : "g" (__NR_##name), "0" (__a), "r" (__b) \
-                        : "r10", "r9"); \
-  if(__a >= 0) \
-  	return (type) __a; \
+                        : "=r" (__r10) \
+                        : "g" (__NR_##name), "0" (__r10), "r" (__r11) \
+                        : "r9"); \
+  if(__r10 >= 0) \
+  	return (type) __r10; \
   return (type) -1; \
 }
 
 #define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
 type name(type1 arg1,type2 arg2,type3 arg3) \
 { \
-  register long __a __asm__ ("r10") = (long) arg1; \
-  register long __b __asm__ ("r11") = (long) arg2; \
-  register long __c __asm__ ("r12") = (long) arg3; \
+  register long __r10 __asm__ ("r10") = (long) arg1; \
+  register long __r11 __asm__ ("r11") = (long) arg2; \
+  register long __r12 __asm__ ("r12") = (long) arg3; \
   __asm__ __volatile__ ("movu.w %1,$r9\n\tbreak 13" \
-                        : "=r" (__a) \
-                        : "g" (__NR_##name), "0" (__a), "r" (__b), "r" (__c) \
-                        : "r10", "r9"); \
-  if(__a >= 0) \
-  	return (type) __a; \
+                        : "=r" (__r10) \
+                        : "g" (__NR_##name), "0" (__r10), "r" (__r11), "r" (__r12) \
+                        : "r9"); \
+  if(__r10 >= 0) \
+  	return (type) __r10; \
   return (type) -1; \
 }
 
 #define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
 type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \
 { \
-  register long __a __asm__ ("r10") = (long) arg1; \
-  register long __b __asm__ ("r11") = (long) arg2; \
-  register long __c __asm__ ("r12") = (long) arg3; \
-  register long __d __asm__ ("r13") = (long) arg4; \
+  register long __r10 __asm__ ("r10") = (long) arg1; \
+  register long __r11 __asm__ ("r11") = (long) arg2; \
+  register long __r12 __asm__ ("r12") = (long) arg3; \
+  register long __r13 __asm__ ("r13") = (long) arg4; \
   __asm__ __volatile__ ("movu.w %1,$r9\n\tbreak 13" \
-                        : "=r" (__a) \
-                        : "g" (__NR_##name), "0" (__a), "r" (__b), \
-                          "r" (__c), "r" (__d) \
-                        : "r10", "r9"); \
-  if(__a >= 0) \
-  	return (type) __a; \
+                        : "=r" (__r10) \
+                        : "g" (__NR_##name), "0" (__r10), "r" (__r11), \
+                          "r" (__r12), "r" (__r13) \
+                        : "r9"); \
+  if(__r10 >= 0) \
+  	return (type) __r10; \
   return (type) -1; \
 } 
 
@@ -102,18 +102,18 @@ type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \
           type5,arg5) \
 type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \
 { \
-  register long __a __asm__ ("r10") = (long) arg1; \
-  register long __b __asm__ ("r11") = (long) arg2; \
-  register long __c __asm__ ("r12") = (long) arg3; \
-  register long __d __asm__ ("r13") = (long) arg4; \
+  register long __r10 __asm__ ("r10") = (long) arg1; \
+  register long __r11 __asm__ ("r11") = (long) arg2; \
+  register long __r12 __asm__ ("r12") = (long) arg3; \
+  register long __r13 __asm__ ("r13") = (long) arg4; \
   __asm__ __volatile__ ("move %6,$mof\n\t" \
                         "movu.w %1,$r9\n\tbreak 13" \
-                        : "=r" (__a) \
-                        : "g" (__NR_##name), "0" (__a), "r" (__b), \
-                          "r" (__c), "r" (__d), "g" (arg5) \
-                        : "r10", "r9"); \
-  if(__a >= 0) \
-  	return (type) __a; \
+                        : "=r" (__r10) \
+                        : "g" (__NR_##name), "0" (__r10), "r" (__r11), \
+                          "r" (__r12), "r" (__r13), "g" (arg5) \
+                        : "r9"); \
+  if(__r10 >= 0) \
+  	return (type) __r10; \
   return (type) -1; \
 }
 
@@ -121,17 +121,17 @@ type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \
           type5,arg5,type6,arg6) \
 type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5,type6 arg6) \
 { \
-  register long __a __asm__ ("r10") = (long) arg1; \
-  register long __b __asm__ ("r11") = (long) arg2; \
-  register long __c __asm__ ("r12") = (long) arg3; \
-  register long __d __asm__ ("r13") = (long) arg4; \
+  register long __r10 __asm__ ("r10") = (long) arg1; \
+  register long __r11 __asm__ ("r11") = (long) arg2; \
+  register long __r12 __asm__ ("r12") = (long) arg3; \
+  register long __r13 __asm__ ("r13") = (long) arg4; \
   __asm__ __volatile__ ("move %6,$mof\n\tmove %7,$srp\n\t" \
                         "movu.w %1,$r9\n\tbreak 13" \
-                        : "=r" (__a) \
-                        : "g" (__NR_##name), "0" (__a), "r" (__b), \
-                          "r" (__c), "r" (__d), "g" (arg5), "g" (arg6)\
-                        : "r10", "r9", "srp"); \
-  if(__a >= 0) \
-  	return (type) __a; \
+                        : "=r" (__r10) \
+                        : "g" (__NR_##name), "0" (__r10), "r" (__r11), \
+                          "r" (__r12), "r" (__r13), "g" (arg5), "g" (arg6)\
+                        : "r9", "srp"); \
+  if(__r10 >= 0) \
+  	return (type) __r10; \
   return (type) -1; \
 }

ldso/ldso/cris/ld_syscalls.h

@@ -29,72 +29,72 @@
 #define _syscall0(type,name) \
 type name(void) \
 { \
-  register long __a __asm__ ("r10"); \
+  register long __r10 __asm__ ("r10"); \
   __asm__ __volatile__ ("movu.w %1,$r9\n\tbreak 13" \
-                        : "=r" (__a) \
+                        : "=r" (__r10) \
                         : "g" (__NR_##name) \
-                        : "r10", "r9"); \
-  if(__a >= 0) \
-  	return (type) __a; \
+                        : "r9"); \
+  if(__r10 >= 0) \
+  	return (type) __r10; \
   return (type) -1; \
 }
 
 #define _syscall1(type,name,type1,arg1) \
 type name(type1 arg1) \
 { \
-  register long __a __asm__ ("r10") = (long) arg1; \
+  register long __r10 __asm__ ("r10") = (long) arg1; \
   __asm__ __volatile__ ("movu.w %1,$r9\n\tbreak 13" \
-                        : "=r" (__a) \
-                        : "g" (__NR_##name), "0" (__a) \
-                        : "r10", "r9"); \
-  if(__a >= 0) \
-  	return (type) __a; \
+                        : "=r" (__r10) \
+                        : "g" (__NR_##name), "0" (__r10) \
+                        : "r9"); \
+  if(__r10 >= 0) \
+  	return (type) __r10; \
   return (type) -1; \
 }
 
 #define _syscall2(type,name,type1,arg1,type2,arg2) \
 type name(type1 arg1,type2 arg2) \
 { \
-  register long __a __asm__ ("r10") = (long) arg1; \
-  register long __b __asm__ ("r11") = (long) arg2; \
+  register long __r10 __asm__ ("r10") = (long) arg1; \
+  register long __r11 __asm__ ("r11") = (long) arg2; \
   __asm__ __volatile__ ("movu.w %1,$r9\n\tbreak 13" \
-                        : "=r" (__a) \
-                        : "g" (__NR_##name), "0" (__a), "r" (__b) \
-                        : "r10", "r9"); \
-  if(__a >= 0) \
-  	return (type) __a; \
+                        : "=r" (__r10) \
+                        : "g" (__NR_##name), "0" (__r10), "r" (__r11) \
+                        : "r9"); \
+  if(__r10 >= 0) \
+  	return (type) __r10; \
   return (type) -1; \
 }
 
 #define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
 type name(type1 arg1,type2 arg2,type3 arg3) \
 { \
-  register long __a __asm__ ("r10") = (long) arg1; \
-  register long __b __asm__ ("r11") = (long) arg2; \
-  register long __c __asm__ ("r12") = (long) arg3; \
+  register long __r10 __asm__ ("r10") = (long) arg1; \
+  register long __r11 __asm__ ("r11") = (long) arg2; \
+  register long __r12 __asm__ ("r12") = (long) arg3; \
   __asm__ __volatile__ ("movu.w %1,$r9\n\tbreak 13" \
-                        : "=r" (__a) \
-                        : "g" (__NR_##name), "0" (__a), "r" (__b), "r" (__c) \
-                        : "r10", "r9"); \
-  if(__a >= 0) \
-  	return (type) __a; \
+                        : "=r" (__r10) \
+                        : "g" (__NR_##name), "0" (__r10), "r" (__r11), "r" (__r12) \
+                        : "r9"); \
+  if(__r10 >= 0) \
+  	return (type) __r10; \
   return (type) -1; \
 }
 
 #define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
 type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \
 { \
-  register long __a __asm__ ("r10") = (long) arg1; \
-  register long __b __asm__ ("r11") = (long) arg2; \
-  register long __c __asm__ ("r12") = (long) arg3; \
-  register long __d __asm__ ("r13") = (long) arg4; \
+  register long __r10 __asm__ ("r10") = (long) arg1; \
+  register long __r11 __asm__ ("r11") = (long) arg2; \
+  register long __r12 __asm__ ("r12") = (long) arg3; \
+  register long __r13 __asm__ ("r13") = (long) arg4; \
   __asm__ __volatile__ ("movu.w %1,$r9\n\tbreak 13" \
-                        : "=r" (__a) \
-                        : "g" (__NR_##name), "0" (__a), "r" (__b), \
-                          "r" (__c), "r" (__d) \
-                        : "r10", "r9"); \
-  if(__a >= 0) \
-  	return (type) __a; \
+                        : "=r" (__r10) \
+                        : "g" (__NR_##name), "0" (__r10), "r" (__r11), \
+                          "r" (__r12), "r" (__r13) \
+                        : "r9"); \
+  if(__r10 >= 0) \
+  	return (type) __r10; \
   return (type) -1; \
 } 
 
@@ -102,18 +102,18 @@ type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \
           type5,arg5) \
 type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \
 { \
-  register long __a __asm__ ("r10") = (long) arg1; \
-  register long __b __asm__ ("r11") = (long) arg2; \
-  register long __c __asm__ ("r12") = (long) arg3; \
-  register long __d __asm__ ("r13") = (long) arg4; \
+  register long __r10 __asm__ ("r10") = (long) arg1; \
+  register long __r11 __asm__ ("r11") = (long) arg2; \
+  register long __r12 __asm__ ("r12") = (long) arg3; \
+  register long __r13 __asm__ ("r13") = (long) arg4; \
   __asm__ __volatile__ ("move %6,$mof\n\t" \
                         "movu.w %1,$r9\n\tbreak 13" \
-                        : "=r" (__a) \
-                        : "g" (__NR_##name), "0" (__a), "r" (__b), \
-                          "r" (__c), "r" (__d), "g" (arg5) \
-                        : "r10", "r9"); \
-  if(__a >= 0) \
-  	return (type) __a; \
+                        : "=r" (__r10) \
+                        : "g" (__NR_##name), "0" (__r10), "r" (__r11), \
+                          "r" (__r12), "r" (__r13), "g" (arg5) \
+                        : "r9"); \
+  if(__r10 >= 0) \
+  	return (type) __r10; \
   return (type) -1; \
 }
 
@@ -121,17 +121,17 @@ type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \
           type5,arg5,type6,arg6) \
 type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5,type6 arg6) \
 { \
-  register long __a __asm__ ("r10") = (long) arg1; \
-  register long __b __asm__ ("r11") = (long) arg2; \
-  register long __c __asm__ ("r12") = (long) arg3; \
-  register long __d __asm__ ("r13") = (long) arg4; \
+  register long __r10 __asm__ ("r10") = (long) arg1; \
+  register long __r11 __asm__ ("r11") = (long) arg2; \
+  register long __r12 __asm__ ("r12") = (long) arg3; \
+  register long __r13 __asm__ ("r13") = (long) arg4; \
   __asm__ __volatile__ ("move %6,$mof\n\tmove %7,$srp\n\t" \
                         "movu.w %1,$r9\n\tbreak 13" \
-                        : "=r" (__a) \
-                        : "g" (__NR_##name), "0" (__a), "r" (__b), \
-                          "r" (__c), "r" (__d), "g" (arg5), "g" (arg6)\
-                        : "r10", "r9", "srp"); \
-  if(__a >= 0) \
-  	return (type) __a; \
+                        : "=r" (__r10) \
+                        : "g" (__NR_##name), "0" (__r10), "r" (__r11), \
+                          "r" (__r12), "r" (__r13), "g" (arg5), "g" (arg6)\
+                        : "r9", "srp"); \
+  if(__r10 >= 0) \
+  	return (type) __r10; \
   return (type) -1; \
 }