qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

powerpc: refactor strnlen and strlen IFUNC. 

Clean up the IFUNC implementations for powerpc in order to remove
unneeded macro definitions.

Tested on ppc64le with and without --disable-multi-arch flag.

	* sysdeps/powerpc/powerpc64/multiarch/strlen-power7.S: Define
	the strlen implementation name and remove unneeded macros definition.
	* sysdeps/powerpc/powerpc64/multiarch/strlen-power8.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strlen-ppc64.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/strnlen-power7.S: Define
	the strnlen implementation name and remove unneeded macros definition.
	* sysdeps/powerpc/powerpc64/power7/strlen.S: Set a default function
	name if not defined and pass as parameter to macros accordingly.
	* sysdeps/powerpc/powerpc64/power7/strnlen.S: Likewise.
	* sysdeps/powerpc/powerpc64/power8/strlen.S: Likewise.
	* sysdeps/powerpc/powerpc64/strlen.S: Likewise.
This commit is contained in:
Wainer dos Santos Moschetta 2017-04-11 14:18:35 -03:00 committed by Tulio Magno Quites Machado Filho
parent 3bc426e156
commit 001649fd18
9 changed files with 40 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,5 +1,17 @@
2017-04-11 Wainer dos Santos Moschetta <wainersm@linux.vnet.ibm.com> 2017-04-11 Wainer dos Santos Moschetta <wainersm@linux.vnet.ibm.com>
* sysdeps/powerpc/powerpc64/multiarch/strlen-power7.S: Define
the strlen implementation name and remove unneeded macros definition.
* sysdeps/powerpc/powerpc64/multiarch/strlen-power8.S: Likewise.
* sysdeps/powerpc/powerpc64/multiarch/strlen-ppc64.S: Likewise.
* sysdeps/powerpc/powerpc64/multiarch/strnlen-power7.S: Define
the strnlen implementation name and remove unneeded macros definition.
* sysdeps/powerpc/powerpc64/power7/strlen.S: Set a default function
name if not defined and pass as parameter to macros accordingly.
* sysdeps/powerpc/powerpc64/power7/strnlen.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/strlen.S: Likewise.
* sysdeps/powerpc/powerpc64/strlen.S: Likewise.
* sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l-power7.S: Define * sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l-power7.S: Define
the implementation-specific function name and remove unneeded the implementation-specific function name and remove unneeded
macros definition. macros definition.

15
sysdeps/powerpc/powerpc64/multiarch/strlen-power7.S
View File

@ -18,20 +18,7 @@
#include <sysdep.h> #include <sysdep.h>
#undef ENTRY #define STRLEN __strlen_power7
#define ENTRY(name) \
.section ".text"; \
ENTRY_2(__strlen_power7) \
.align ALIGNARG(2); \
BODY_LABEL(__strlen_power7): \
cfi_startproc; \
LOCALENTRY(__strlen_power7)
#undef END
#define END(name) \
cfi_endproc; \
TRACEBACK(__strlen_power7) \
END_2(__strlen_power7)
#undef libc_hidden_builtin_def #undef libc_hidden_builtin_def
#define libc_hidden_builtin_def(name) #define libc_hidden_builtin_def(name)

15
sysdeps/powerpc/powerpc64/multiarch/strlen-power8.S
View File

@ -18,20 +18,7 @@
#include <sysdep.h> #include <sysdep.h>
#undef EALIGN #define STRLEN __strlen_power8
#define EALIGN(name, alignt, words) \
.section ".text"; \
ENTRY_2(__strlen_power8) \
.align ALIGNARG(alignt); \
EALIGN_W_##words; \
BODY_LABEL(__strlen_power8): \
cfi_startproc; \
LOCALENTRY(__strlen_power8)
#undef END
#define END(name) \
cfi_endproc; \
TRACEBACK(__strlen_power8) \
END_2(__strlen_power8)
#undef libc_hidden_builtin_def #undef libc_hidden_builtin_def
#define libc_hidden_builtin_def(name) #define libc_hidden_builtin_def(name)

15
sysdeps/powerpc/powerpc64/multiarch/strlen-ppc64.S
View File

@ -19,20 +19,7 @@
#include <sysdep.h> #include <sysdep.h>
#if defined SHARED && IS_IN (libc) #if defined SHARED && IS_IN (libc)
# undef ENTRY # define STRLEN __strlen_ppc
# define ENTRY(name) \
.section ".text"; \
ENTRY_2(__strlen_ppc) \
.align ALIGNARG(2); \
BODY_LABEL(__strlen_ppc): \
cfi_startproc; \
LOCALENTRY(__strlen_ppc)
# undef END
# define END(name) \
cfi_endproc; \
TRACEBACK(__strlen_ppc) \
END_2(__strlen_ppc)
# undef libc_hidden_builtin_def # undef libc_hidden_builtin_def
# define libc_hidden_builtin_def(name) # define libc_hidden_builtin_def(name)

15
sysdeps/powerpc/powerpc64/multiarch/strnlen-power7.S
View File

@ -18,20 +18,7 @@
#include <sysdep.h> #include <sysdep.h>
#undef ENTRY #define STRNLEN __strnlen_power7
#define ENTRY(name) \
.section ".text"; \
ENTRY_2(__strnlen_power7) \
.align ALIGNARG(2); \
BODY_LABEL(__strnlen_power7): \
cfi_startproc; \
LOCALENTRY(__strnlen_power7)
#undef END
#define END(name) \
cfi_endproc; \
TRACEBACK(__strnlen_power7) \
END_2(__strnlen_power7)
#undef libc_hidden_builtin_def #undef libc_hidden_builtin_def
#define libc_hidden_builtin_def(name) #define libc_hidden_builtin_def(name)

8
sysdeps/powerpc/powerpc64/power7/strlen.S
View File

@ -20,8 +20,12 @@
#include <sysdep.h> #include <sysdep.h>
/* int [r3] strlen (char *s [r3]) */ /* int [r3] strlen (char *s [r3]) */
#ifndef STRLEN
# define STRLEN strlen
#endif
.machine power7 .machine power7
ENTRY (strlen) ENTRY (STRLEN)
CALL_MCOUNT 1 CALL_MCOUNT 1
dcbt 0,r3 dcbt 0,r3
clrrdi r4,r3,3 /* Align the address to doubleword boundary. */ clrrdi r4,r3,3 /* Align the address to doubleword boundary. */
@ -99,5 +103,5 @@ L(done):
srdi r0,r0,3 /* Convert leading/trailing zeros to bytes. */ srdi r0,r0,3 /* Convert leading/trailing zeros to bytes. */
add r3,r5,r0 /* Compute final length. */ add r3,r5,r0 /* Compute final length. */
blr blr
END (strlen) END (STRLEN)
libc_hidden_builtin_def (strlen) libc_hidden_builtin_def (strlen)

8
sysdeps/powerpc/powerpc64/power7/strnlen.S
View File

@ -19,9 +19,13 @@
#include <sysdep.h> #include <sysdep.h>
#ifndef STRNLEN
# define STRNLEN __strnlen
#endif
/* int [r3] strnlen (char *s [r3], int size [r4]) */ /* int [r3] strnlen (char *s [r3], int size [r4]) */
.machine power7 .machine power7
ENTRY (__strnlen) ENTRY (STRNLEN)
CALL_MCOUNT 2 CALL_MCOUNT 2
dcbt 0,r3 dcbt 0,r3
clrrdi r8,r3,3 clrrdi r8,r3,3
@ -172,7 +176,7 @@ L(loop_small):
mr r3,r4 mr r3,r4
blr blr
END (__strnlen) END (STRNLEN)
libc_hidden_def (__strnlen) libc_hidden_def (__strnlen)
weak_alias (__strnlen, strnlen) weak_alias (__strnlen, strnlen)
libc_hidden_def (strnlen) libc_hidden_def (strnlen)

8
sysdeps/powerpc/powerpc64/power8/strlen.S
View File

@ -29,10 +29,14 @@
/* int [r3] strlen (char *s [r3]) */ /* int [r3] strlen (char *s [r3]) */
#ifndef STRLEN
# define STRLEN strlen
#endif
/* TODO: change this to .machine power8 when the minimum required binutils /* TODO: change this to .machine power8 when the minimum required binutils
allows it. */ allows it. */
.machine power7 .machine power7
EALIGN (strlen, 4, 0) EALIGN (STRLEN, 4, 0)
CALL_MCOUNT 1 CALL_MCOUNT 1
dcbt 0,r3 dcbt 0,r3
clrrdi r4,r3,3 /* Align the address to doubleword boundary. */ clrrdi r4,r3,3 /* Align the address to doubleword boundary. */
@ -293,5 +297,5 @@ L(vmx_zero):
add r3,r5,r0 /* Compute final length. */ add r3,r5,r0 /* Compute final length. */
blr blr
END (strlen) END (STRLEN)
libc_hidden_builtin_def (strlen) libc_hidden_builtin_def (strlen)

8
sysdeps/powerpc/powerpc64/strlen.S
View File

@ -80,7 +80,11 @@
/* int [r3] strlen (char *s [r3]) */ /* int [r3] strlen (char *s [r3]) */
ENTRY (strlen) #ifndef STRLEN
# define STRLEN strlen
#endif
ENTRY (STRLEN)
CALL_MCOUNT 1 CALL_MCOUNT 1
#define rTMP4 r0 #define rTMP4 r0
@ -195,5 +199,5 @@ L(done1):
blr blr
#endif #endif
END (strlen) END (STRLEN)
libc_hidden_builtin_def (strlen) libc_hidden_builtin_def (strlen)