patch-1.3.48 linux/include/asm-mips/string.h

• Lines: 184
• Date: Wed Dec 13 12:39:47 1995
• Orig file: v1.3.47/linux/include/asm-mips/string.h
• Orig date: Sat Jan 14 01:15:15 1995

diff -u --recursive --new-file v1.3.47/linux/include/asm-mips/string.h linux/include/asm-mips/string.h
@@ -8,12 +8,10 @@
  * Copyright (c) 1994, 1995  Waldorf Electronics
  * written by Ralf Baechle
  */
-
 #ifndef __ASM_MIPS_STRING_H
 #define __ASM_MIPS_STRING_H
 
-#include <asm/mipsregs.h>
-
+#define __HAVE_ARCH_STRCPY
 extern __inline__ char * strcpy(char * dest, const char *src)
 {
   char *xdest = dest;
@@ -22,10 +20,10 @@
 	".set\tnoreorder\n\t"
 	".set\tnoat\n"
 	"1:\tlbu\t$1,(%1)\n\t"
-	"addiu\t%1,%1,1\n\t"
+	"addiu\t%1,1\n\t"
 	"sb\t$1,(%0)\n\t"
 	"bnez\t$1,1b\n\t"
-	"addiu\t%0,%0,1\n\t"
+	"addiu\t%0,1\n\t"
 	".set\tat\n\t"
 	".set\treorder"
 	: "=r" (dest), "=r" (src)
@@ -35,6 +33,7 @@
   return xdest;
 }
 
+#define __HAVE_ARCH_STRNCPY
 extern __inline__ char * strncpy(char *dest, const char *src, size_t n)
 {
   char *xdest = dest;
@@ -62,6 +61,7 @@
   return dest;
 }
 
+#define __HAVE_ARCH_STRCMP
 extern __inline__ int strcmp(const char * cs, const char * ct)
 {
   int __res;
@@ -71,16 +71,18 @@
 	".set\tnoat\n\t"
 	"lbu\t%2,(%0)\n"
 	"1:\tlbu\t$1,(%1)\n\t"
-	"addiu\t%0,%0,1\n\t"
+	"addiu\t%0,1\n\t"
 	"bne\t$1,%2,2f\n\t"
-	"addiu\t%1,%1,1\n\t"
+	"addiu\t%1,1\n\t"
 	"bnez\t%2,1b\n\t"
 	"lbu\t%2,(%0)\n\t"
-	STR(FILL_LDS) "\n\t"
+#ifndef __R4000__
+	"nop\n\t"
+#endif
 	"move\t%2,$1\n"
-	"2:\tsub\t%2,%2,$1\n"
+	"2:\tsubu\t%2,$1\n"
 	"3:\t.set\tat\n\t"
-	".set\treorder\n\t"
+	".set\treorder"
 	: "=d" (cs), "=d" (ct), "=d" (__res)
 	: "0" (cs), "1" (ct)
 	: "$1");
@@ -88,6 +90,7 @@
   return __res;
 }
 
+#define __HAVE_ARCH_STRNCMP
 extern __inline__ int strncmp(const char * cs, const char * ct, size_t count)
 {
   char __res;
@@ -98,13 +101,13 @@
        	"1:\tlbu\t%3,(%0)\n\t"
 	"beqz\t%2,2f\n\t"
         "lbu\t$1,(%1)\n\t"
-       	"addiu\t%2,%2,-1\n\t"
+       	"subu\t%2,1\n\t"
         "bne\t$1,%3,3f\n\t"
-        "addiu\t%0,%0,1\n\t"
+        "addiu\t%0,1\n\t"
         "bnez\t%3,1b\n\t"
-        "addiu\t%1,%1,1\n"
+        "addiu\t%1,1\n"
 	"2:\tmove\t%3,$1\n"
-	"3:\tsub\t%3,%3,$1\n\t"
+	"3:\tsubu\t%3,$1\n\t"
 	".set\tat\n\t"
 	".set\treorder"
         : "=d" (cs), "=d" (ct), "=d" (count), "=d" (__res)
@@ -114,6 +117,7 @@
   return __res;
 }
 
+#define __HAVE_ARCH_MEMSET
 extern __inline__ void * memset(void * s, int c, size_t count)
 {
   void *xs = s;
@@ -133,6 +137,7 @@
   return xs;
 }
 
+#define __HAVE_ARCH_MEMCPY
 extern __inline__ void * memcpy(void * to, const void * from, size_t n)
 {
   void *xto = to;
@@ -143,11 +148,11 @@
 	".set\tnoreorder\n\t"
 	".set\tnoat\n"
 	"1:\tlbu\t$1,(%1)\n\t"
-	"addiu\t%1,%1,1\n\t"
+	"addiu\t%1,1\n\t"
 	"sb\t$1,(%0)\n\t"
-	"subu\t%2,%2,1\n\t"
+	"subu\t%2,1\n\t"
 	"bnez\t%2,1b\n\t"
-	"addiu\t%0,%0,1\n\t"
+	"addiu\t%0,1\n\t"
 	".set\tat\n\t"
 	".set\treorder"
         : "=r" (to), "=r" (from), "=r" (n)
@@ -156,6 +161,7 @@
   return xto;
 }
 
+#define __HAVE_ARCH_MEMMOVE
 extern __inline__ void * memmove(void * dest,const void * src, size_t n)
 {
   void *xdest = dest;
@@ -168,11 +174,11 @@
 	".set\tnoreorder\n\t"
 	".set\tnoat\n"
 	"1:\tlbu\t$1,(%1)\n\t"
-	"addiu\t%1,%1,1\n\t"
+	"addiu\t%1,1\n\t"
 	"sb\t$1,(%0)\n\t"
-	"subu\t%2,%2,1\n\t"
+	"subu\t%2,1\n\t"
 	"bnez\t%2,1b\n\t"
-	"addiu\t%0,%0,1\n\t"
+	"addiu\t%0,1\n\t"
 	".set\tat\n\t"
 	".set\treorder"
         : "=r" (dest), "=r" (src), "=r" (n)
@@ -183,11 +189,11 @@
 	".set\tnoreorder\n\t"
 	".set\tnoat\n"
 	"1:\tlbu\t$1,-1(%1)\n\t"
-	"subu\t%1,%1,1\n\t"
+	"subu\t%1,1\n\t"
 	"sb\t$1,-1(%0)\n\t"
-	"subu\t%2,%2,1\n\t"
+	"subu\t%2,1\n\t"
 	"bnez\t%2,1b\n\t"
-	"subu\t%0,%0,1\n\t"
+	"subu\t%0,1\n\t"
 	".set\tat\n\t"
 	".set\treorder"
         : "=r" (dest), "=r" (src), "=r" (n)
@@ -196,17 +202,18 @@
   return xdest;
 }
 
+#define __HAVE_ARCH_MEMSCAN
 extern __inline__ void * memscan(void * addr, int c, size_t size)
 {
 	if (!size)
 		return addr;
 	__asm__(".set\tnoreorder\n\t"
 		".set\tnoat\n"
-		"1:\tbeq\t$0,%1,2f\n\t"
+		"1:\tbeqz\t%1,2f\n\t"
 		"lbu\t$1,(%0)\n\t"
-		"subu\t%1,%1,1\n\t"
+		"subu\t%1,1\n\t"
 		"bnez\t%1,1b\n\t"
-		"addiu\t%0,%0,1\n\t"
+		"addiu\t%0,1\n\t"
 		".set\tat\n\t"
 		".set\treorder\n"
 		"2:"