patch-2.4.0-test8 linux/arch/arm/lib/memchr.S

• Lines: 36
• Date: Sun Sep 3 11:19:11 2000
• Orig file: v2.4.0-test7/linux/arch/arm/lib/memchr.S
• Orig date: Fri Jan 21 18:19:16 2000

diff -u --recursive --new-file v2.4.0-test7/linux/arch/arm/lib/memchr.S linux/arch/arm/lib/memchr.S
@@ -1,24 +1,21 @@
 /*
  * linux/arch/arm/lib/memchr.S
  *
- * Copyright (C) 1995-1999 Russell King
+ * Copyright (C) 1995-2000 Russell King
  *
  * ASM optimised string functions
- *
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include "constants.h"
 
-		.text
+	.text
+	.align	5
 ENTRY(memchr)
-		str	lr, [sp, #-4]!
-1:		ldrb	r3, [r0], #1
-		teq	r3, r1
-		beq	2f
-		subs	r2, r2, #1
-		bpl	1b
-2:		movne	r0, #0
-		subeq	r0, r0, #1
-		LOADREGS(fd, sp!, {pc})
-
+1:	ldrb	r3, [r0], #1
+	teq	r3, r1
+	beq	2f
+	subs	r2, r2, #1
+	bpl	1b
+2:	movne	r0, #0
+	subeq	r0, r0, #1
+	RETINSTR(mov,pc,lr)