Commit 3ece1663 authored by Anton Blanchard's avatar Anton Blanchard Committed by Michael Ellerman

powerpc: Remove assembly versions of strcpy, strcat, strlen and strcmp

A number of our assembly implementations of string functions do not
align their hot loops. I was going to align them manually, but I
realised that they are are almost instruction for instruction
identical to what gcc produces, with the advantage that gcc does
align them.

In light of that, let's just remove the assembly versions.
Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent d96f234f
...@@ -3,12 +3,8 @@ ...@@ -3,12 +3,8 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
#define __HAVE_ARCH_STRCPY
#define __HAVE_ARCH_STRNCPY #define __HAVE_ARCH_STRNCPY
#define __HAVE_ARCH_STRLEN
#define __HAVE_ARCH_STRCMP
#define __HAVE_ARCH_STRNCMP #define __HAVE_ARCH_STRNCMP
#define __HAVE_ARCH_STRCAT
#define __HAVE_ARCH_MEMSET #define __HAVE_ARCH_MEMSET
#define __HAVE_ARCH_MEMCPY #define __HAVE_ARCH_MEMCPY
#define __HAVE_ARCH_MEMMOVE #define __HAVE_ARCH_MEMMOVE
......
...@@ -9,11 +9,7 @@ EXPORT_SYMBOL(memmove); ...@@ -9,11 +9,7 @@ EXPORT_SYMBOL(memmove);
EXPORT_SYMBOL(memcmp); EXPORT_SYMBOL(memcmp);
EXPORT_SYMBOL(memchr); EXPORT_SYMBOL(memchr);
EXPORT_SYMBOL(strcpy);
EXPORT_SYMBOL(strncpy); EXPORT_SYMBOL(strncpy);
EXPORT_SYMBOL(strcat);
EXPORT_SYMBOL(strlen);
EXPORT_SYMBOL(strcmp);
EXPORT_SYMBOL(strncmp); EXPORT_SYMBOL(strncmp);
#ifndef CONFIG_GENERIC_CSUM #ifndef CONFIG_GENERIC_CSUM
......
...@@ -16,15 +16,6 @@ ...@@ -16,15 +16,6 @@
PPC_LONG_ALIGN PPC_LONG_ALIGN
.text .text
_GLOBAL(strcpy)
addi r5,r3,-1
addi r4,r4,-1
1: lbzu r0,1(r4)
cmpwi 0,r0,0
stbu r0,1(r5)
bne 1b
blr
/* This clears out any unused part of the destination buffer, /* This clears out any unused part of the destination buffer,
just as the libc version does. -- paulus */ just as the libc version does. -- paulus */
_GLOBAL(strncpy) _GLOBAL(strncpy)
...@@ -45,30 +36,6 @@ _GLOBAL(strncpy) ...@@ -45,30 +36,6 @@ _GLOBAL(strncpy)
bdnz 2b bdnz 2b
blr blr
_GLOBAL(strcat)
addi r5,r3,-1
addi r4,r4,-1
1: lbzu r0,1(r5)
cmpwi 0,r0,0
bne 1b
addi r5,r5,-1
1: lbzu r0,1(r4)
cmpwi 0,r0,0
stbu r0,1(r5)
bne 1b
blr
_GLOBAL(strcmp)
addi r5,r3,-1
addi r4,r4,-1
1: lbzu r3,1(r5)
cmpwi 1,r3,0
lbzu r0,1(r4)
subf. r3,r0,r3
beqlr 1
beq 1b
blr
_GLOBAL(strncmp) _GLOBAL(strncmp)
PPC_LCMPI 0,r5,0 PPC_LCMPI 0,r5,0
beq- 2f beq- 2f
...@@ -85,14 +52,6 @@ _GLOBAL(strncmp) ...@@ -85,14 +52,6 @@ _GLOBAL(strncmp)
2: li r3,0 2: li r3,0
blr blr
_GLOBAL(strlen)
addi r4,r3,-1
1: lbzu r0,1(r4)
cmpwi 0,r0,0
bne 1b
subf r3,r3,r4
blr
#ifdef CONFIG_PPC32 #ifdef CONFIG_PPC32
_GLOBAL(memcmp) _GLOBAL(memcmp)
PPC_LCMPI 0,r5,0 PPC_LCMPI 0,r5,0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment