[Linux-mips-commits]CVS: linux/include/asm-mips uaccess.h,1.3,1.4

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/include/asm-mips
In directory usw-pr-cvs1:/tmp/cvs-serv27928

Modified Files:
	uaccess.h 
Log Message:
Attempt at fixing register corruption.

Index: uaccess.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/uaccess.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- uaccess.h	2001/07/20 17:50:22	1.3
+++ uaccess.h	2001/09/26 16:53:12	1.4
@@ -56,7 +56,7 @@
 #define access_ok(type,addr,size) \
 __access_ok(((unsigned long)(addr)),(size),__access_mask)
 
-extern inline int verify_area(int type, const void * addr, unsigned long size)
+static inline int verify_area(int type, const void * addr, unsigned long size)
 {
 	return access_ok(type,addr,size) ? 0 : -EFAULT;
 }
@@ -270,102 +270,84 @@
 extern size_t __copy_user(void *__to, const void *__from, size_t __n);
 
 #define __copy_to_user(to,from,n) ({ \
-	void *__cu_to; \
-	const void *__cu_from; \
-	long __cu_len; \
+	register void *__cu_to __asm__ ("$4"); \
+	register const void *__cu_from __asm__ ("$5"); \
+	register long __cu_len __asm__ ("$6"); \
 	\
 	__cu_to = (to); \
 	__cu_from = (from); \
 	__cu_len = (n); \
 	__asm__ __volatile__( \
-		"move\t$4, %1\n\t" \
-		"move\t$5, %2\n\t" \
-		"move\t$6, %3\n\t" \
 		__MODULE_JAL(__copy_user) \
-		"move\t%0, $6" \
-		: "=r" (__cu_len) \
-		: "r" (__cu_to), "r" (__cu_from), "r" (__cu_len) \
-		: "$4", "$5", "$6", "$8", "$9", "$10", "$11", "$12", "$15", \
-		  "$24", "$31","memory"); \
+	: "+r" (__cu_to), "+r" (__cu_from), "+r" (__cu_len) \
+	: \
+	: "$8", "$9", "$10", "$11", "$12", "$15", "$24", "$31","memory"); \
 	__cu_len; \
 })
 
 #define __copy_from_user(to,from,n) ({ \
-	void *__cu_to; \
-	const void *__cu_from; \
-	long __cu_len; \
+	register void *__cu_to __asm__ ("$4"); \
+	register const void *__cu_from __asm__ ("$5"); \
+	register long __cu_len __asm__ ("$6"); \
 	\
 	__cu_to = (to); \
 	__cu_from = (from); \
 	__cu_len = (n); \
 	__asm__ __volatile__( \
-		"move\t$4, %1\n\t" \
-		"move\t$5, %2\n\t" \
-		"move\t$6, %3\n\t" \
 		".set\tnoreorder\n\t" \
 		__MODULE_JAL(__copy_user) \
 		".set\tnoat\n\t" \
-		"addu\t$1, %2, %3\n\t" \
+		"addu\t$1, %1, %2\n\t" \
 		".set\tat\n\t" \
 		".set\treorder\n\t" \
-		"move\t%0, $6" \
-		: "=r" (__cu_len) \
-		: "r" (__cu_to), "r" (__cu_from), "r" (__cu_len) \
-		: "$4", "$5", "$6", "$8", "$9", "$10", "$11", "$12", "$15", \
-		  "$24", "$31","memory"); \
+	: "+r" (__cu_to), "+r" (__cu_from), "+r" (__cu_len) \
+	: \
+	: "$8", "$9", "$10", "$11", "$12", "$15", "$24", "$31","memory"); \
 	__cu_len; \
 })
 
 #define copy_to_user(to,from,n) ({ \
-	void *__cu_to; \
-	const void *__cu_from; \
-	long __cu_len; \
+	register void *__cu_to __asm__ ("$4"); \
+	register const void *__cu_from __asm__ ("$5"); \
+	register long __cu_len __asm__ ("$6"); \
 	\
 	__cu_to = (to); \
 	__cu_from = (from); \
 	__cu_len = (n); \
 	if (access_ok(VERIFY_WRITE, __cu_to, __cu_len)) \
 		__asm__ __volatile__( \
-			"move\t$4, %1\n\t" \
-			"move\t$5, %2\n\t" \
-			"move\t$6, %3\n\t" \
 			__MODULE_JAL(__copy_user) \
-			"move\t%0, $6" \
-			: "=r" (__cu_len) \
-			: "r" (__cu_to), "r" (__cu_from), "r" (__cu_len) \
-			: "$4", "$5", "$6", "$8", "$9", "$10", "$11", "$12", \
-			  "$15", "$24", "$31","memory"); \
+		: "+r" (__cu_to), "+r" (__cu_from), "+r" (__cu_len) \
+		: \
+		: "$8", "$9", "$10", "$11", "$12", "$15", "$24", "$31", \
+		  "memory"); \
 	__cu_len; \
 })
 
 #define copy_from_user(to,from,n) ({ \
-	void *__cu_to; \
-	const void *__cu_from; \
-	long __cu_len; \
+	register void *__cu_to __asm__ ("$4"); \
+	register const void *__cu_from __asm__ ("$5"); \
+	register long __cu_len __asm__ ("$6"); \
 	\
 	__cu_to = (to); \
 	__cu_from = (from); \
 	__cu_len = (n); \
 	if (access_ok(VERIFY_READ, __cu_from, __cu_len)) \
 		__asm__ __volatile__( \
-			"move\t$4, %1\n\t" \
-			"move\t$5, %2\n\t" \
-			"move\t$6, %3\n\t" \
 			".set\tnoreorder\n\t" \
 			__MODULE_JAL(__copy_user) \
 			".set\tnoat\n\t" \
-			"addu\t$1, %2, %3\n\t" \
+			"addu\t$1, %1, %2\n\t" \
 			".set\tat\n\t" \
 			".set\treorder\n\t" \
-			"move\t%0, $6" \
-			: "=r" (__cu_len) \
-			: "r" (__cu_to), "r" (__cu_from), "r" (__cu_len) \
-			: "$4", "$5", "$6", "$8", "$9", "$10", "$11", "$12", \
-			  "$15", "$24", "$31","memory"); \
+		: "+r" (__cu_to), "+r" (__cu_from), "+r" (__cu_len) \
+		: \
+		: "$8", "$9", "$10", "$11", "$12", "$15", "$24", "$31", \
+		  "memory"); \
 	__cu_len; \
 })
 
-extern inline __kernel_size_t
+static inline __kernel_size_t
 __clear_user(void *addr, __kernel_size_t size)
 {
 	__kernel_size_t res;
@@ -394,7 +376,7 @@
  * Returns: -EFAULT if exception before terminator, N if the entire
  * buffer filled, else strlen.
  */
-extern inline long
+static inline long
 __strncpy_from_user(char *__to, const char *__from, long __len)
 {
 	long res;
@@ -412,7 +394,7 @@
 	return res;
 }
 
-extern inline long
+static inline long
 strncpy_from_user(char *__to, const char *__from, long __len)
 {
 	long res;
@@ -431,7 +413,7 @@
 }
 
 /* Returns: 0 if bad, string length+1 (memory size) of string if ok */
-extern inline long __strlen_user(const char *s)
+static inline long __strlen_user(const char *s)
 {
 	long res;
 
@@ -446,7 +428,7 @@
 	return res;
 }
 
-extern inline long strlen_user(const char *s)
+static inline long strlen_user(const char *s)
 {
 	long res;
 
@@ -462,7 +444,7 @@
 }
 
 /* Returns: 0 if bad, string length+1 (memory size) of string if ok */
-extern inline long __strnlen_user(const char *s, long n)
+static inline long __strnlen_user(const char *s, long n)
 {
 	long res;
 
@@ -478,7 +460,7 @@
 	return res;
 }
 
-extern inline long strnlen_user(const char *s, long n)
+static inline long strnlen_user(const char *s, long n)
 {
 	long res;