Commit 18cdae68 authored by David S. Miller's avatar David S. Miller
Browse files

sparc: Commonize memcmp assembler. 



Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ae984d72

arch/sparc/kernel/sparc_ksyms_32.c

+0 −2
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ extern void (*bzero_1page)(void *); 
extern void *__bzero(void *, size_t);

extern void *__memscan_zero(void *, size_t);

extern void *__memscan_generic(void *, int, size_t);

extern int __memcmp(const void *, const void *, __kernel_size_t);

extern int __strncmp(const char *, const char *, __kernel_size_t);



extern int __ashrdi3(int, int);
@@ -211,7 +210,6 @@ EXPORT_SYMBOL(bzero_1page); 
EXPORT_SYMBOL(__bzero);

EXPORT_SYMBOL(__memscan_zero);

EXPORT_SYMBOL(__memscan_generic);

EXPORT_SYMBOL(__memcmp);

EXPORT_SYMBOL(__strncmp);

EXPORT_SYMBOL(__memmove);

arch/sparc/kernel/sparc_ksyms_64.c

+0 −2
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ extern pid_t kernel_thread(int (*fn)(void *), void * arg, unsigned long flags); 
extern void *__bzero(void *, size_t);

extern void *__memscan_zero(void *, size_t);

extern void *__memscan_generic(void *, int, size_t);

extern int __memcmp(const void *, const void *, __kernel_size_t);

extern __kernel_size_t strlen(const char *);

extern void sys_sigsuspend(void);

extern int compat_sys_ioctl(unsigned int fd, unsigned int cmd, u32 arg);
@@ -223,7 +222,6 @@ EXPORT_SYMBOL(copy_user_page); 
EXPORT_SYMBOL(__bzero);

EXPORT_SYMBOL(__memscan_zero);

EXPORT_SYMBOL(__memscan_generic);

EXPORT_SYMBOL(__memcmp);

EXPORT_SYMBOL(__memset);



EXPORT_SYMBOL(csum_partial);

arch/sparc/lib/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ lib-$(CONFIG_SPARC32) += memcpy.o memset.o 
lib-y                 += strlen.o

lib-y                 += checksum_$(BITS).o

lib-$(CONFIG_SPARC32) += blockops.o

lib-y                 += memscan_$(BITS).o memcmp_$(BITS).o strncmp_$(BITS).o

lib-y                 += memscan_$(BITS).o memcmp.o strncmp_$(BITS).o

lib-y                 += strncpy_from_user_$(BITS).o strlen_user_$(BITS).o

lib-$(CONFIG_SPARC32) += divdi3.o udivdi3.o

lib-$(CONFIG_SPARC32) += copy_user.o locks.o

arch/sparc/lib/memcmp.S

0 → 100644
+27 −0
Original line number Diff line number Diff line 
/* Sparc optimized memcmp code.

 *

 * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz)

 * Copyright (C) 2000, 2008 David S. Miller (davem@davemloft.net)

 */



#include <linux/linkage.h>

#include <asm/asm.h>



	.text

ENTRY(memcmp)

	cmp	%o2, 0

1:	BRANCH32(be, pn, 2f)

	 nop

	ldub	[%o0], %g7

	ldub	[%o1], %g3

	sub	%o2, 1, %o2

	add	%o0, 1, %o0

	add	%o1, 1, %o1

	subcc	%g7, %g3, %g3

	BRANCH32(be, pt, 1b)

	 cmp	%o2, 0

	retl

	 mov	%g3, %o0

2:	retl

	 mov	0, %o0

ENDPROC(memcmp)

arch/sparc/lib/memcmp_32.S

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
	.text

	.align 4

	.global __memcmp, memcmp

__memcmp:

memcmp:

	cmp	%o2, 0

	ble	L3

	 mov	0, %g3

L5:

	ldub	[%o0], %g2

	ldub	[%o1], %g3

	sub	%g2, %g3, %g2

	mov	%g2, %g3

	sll	%g2, 24, %g2



	cmp	%g2, 0

	bne	L3

	 add	%o0, 1, %o0



	add	%o2, -1, %o2



	cmp	%o2, 0

	bg	L5

	 add	%o1, 1, %o1

L3:

	sll	%g3, 24, %o0

	sra	%o0, 24, %o0



	retl

	 nop