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

powerpc: refactor memcmp and memmove 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/memcmp-power4.S: Define the
	implementation-specific function name and remove unneeded
	macros definition.
	* sysdeps/powerpc/powerpc64/multiarch/memcmp-power7.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/memmove-power7.S: Likewise.
	* sysdeps/powerpc/powerpc64/power4/memcmp.S: Set a default function
	name if not defined and pass as parameter to macros accordingly.
	* sysdeps/powerpc/powerpc64/power7/memcmp.S: Likewise.
	* sysdeps/powerpc/powerpc64/power7/memmove.S: Likewise.
This commit is contained in:
Wainer dos Santos Moschetta 2017-04-11 14:18:36 -03:00 committed by Tulio Magno Quites Machado Filho
parent 72fd128a08
commit b6a6622209
7 changed files with 29 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,5 +1,15 @@
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/memcmp-power4.S: Define the
implementation-specific function name and remove unneeded
macros definition.
* sysdeps/powerpc/powerpc64/multiarch/memcmp-power7.S: Likewise.
* sysdeps/powerpc/powerpc64/multiarch/memmove-power7.S: Likewise.
* sysdeps/powerpc/powerpc64/power4/memcmp.S: Set a default function
name if not defined and pass as parameter to macros accordingly.
* sysdeps/powerpc/powerpc64/power7/memcmp.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/memmove.S: Likewise.
* sysdeps/powerpc/powerpc64/multiarch/memcpy-a2.S: Define the * sysdeps/powerpc/powerpc64/multiarch/memcpy-a2.S: Define the
implementation-specific function name and remove unneeded implementation-specific function name and remove unneeded
macros definition. macros definition.

16
sysdeps/powerpc/powerpc64/multiarch/memcmp-power4.S
View File

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

16
sysdeps/powerpc/powerpc64/multiarch/memcmp-power7.S
View File

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

16
sysdeps/powerpc/powerpc64/multiarch/memmove-power7.S
View File

@ -18,21 +18,7 @@
#include <sysdep.h> #include <sysdep.h>
#undef EALIGN #define MEMMOVE __memmove_power7
#define EALIGN(name, alignt, words) \
.section ".text"; \
ENTRY_2(__memmove_power7) \
.align ALIGNARG(alignt); \
EALIGN_W_##words; \
BODY_LABEL(__memmove_power7): \
cfi_startproc; \
LOCALENTRY(__memmove_power7)
#undef END_GEN_TB
#define END_GEN_TB(name, mask) \
cfi_endproc; \
TRACEBACK_MASK(__memmove_power7,mask) \
END_2(__memmove_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/power4/memcmp.S
View File

@ -22,8 +22,12 @@
const char *s2 [r4], const char *s2 [r4],
size_t size [r5]) */ size_t size [r5]) */
#ifndef MEMCMP
# define MEMCMP memcmp
#endif
.machine power4 .machine power4
EALIGN (memcmp, 4, 0) EALIGN (MEMCMP, 4, 0)
CALL_MCOUNT 3 CALL_MCOUNT 3
#define rRTN r3 #define rRTN r3
@ -1360,6 +1364,6 @@ L(duzeroLength):
li rRTN, 0 li rRTN, 0
blr blr
END (memcmp) END (MEMCMP)
libc_hidden_builtin_def (memcmp) libc_hidden_builtin_def (memcmp)
weak_alias (memcmp, bcmp) weak_alias (memcmp, bcmp)

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

@ -21,9 +21,11 @@
/* int [r3] memcmp (const char *s1 [r3], /* int [r3] memcmp (const char *s1 [r3],
const char *s2 [r4], const char *s2 [r4],
size_t size [r5]) */ size_t size [r5]) */
#ifndef MEMCMP
# define MEMCMP memcmp
#endif
.machine power7 .machine power7
EALIGN (memcmp, 4, 0) EALIGN (MEMCMP, 4, 0)
CALL_MCOUNT 3 CALL_MCOUNT 3
#define rRTN r3 #define rRTN r3
@ -1054,6 +1056,6 @@ L(duzeroLength):
li rRTN, 0 li rRTN, 0
blr blr
END (memcmp) END (MEMCMP)
libc_hidden_builtin_def (memcmp) libc_hidden_builtin_def (memcmp)
weak_alias (memcmp, bcmp) weak_alias (memcmp, bcmp)

7
sysdeps/powerpc/powerpc64/power7/memmove.S
View File

@ -27,8 +27,11 @@
If source and destiny overlaps, a optimized backwards memcpy is used If source and destiny overlaps, a optimized backwards memcpy is used
instead. */ instead. */
#ifndef MEMMOVE
# define MEMMOVE memmove
#endif
.machine power7 .machine power7
EALIGN (memmove, 5, 0) EALIGN (MEMMOVE, 5, 0)
CALL_MCOUNT 3 CALL_MCOUNT 3
L(_memmove): L(_memmove):
@ -816,7 +819,7 @@ L(end_unaligned_loop_bwd):
stb r8,-7(r11) stb r8,-7(r11)
/* Return original DST pointer. */ /* Return original DST pointer. */
blr blr
END_GEN_TB (memmove, TB_TOCLESS) END_GEN_TB (MEMMOVE, TB_TOCLESS)
libc_hidden_builtin_def (memmove) libc_hidden_builtin_def (memmove)