OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

powerpc: refactor memchr, memrchr, and rawmemchr 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/memchr-power7.S: Define the
	implementation-specific function name and remove unneeded macros
	definition.
	* sysdeps/powerpc/powerpc64/multiarch/memrchr-power7.S: Likewise.
	* sysdeps/powerpc/powerpc64/multiarch/rawmemchr-power7.S: Likewise.
	* sysdeps/powerpc/powerpc64/power7/memchr.S: Set a default
	function name if not defined and pass as parameter to macros
	accordingly.
	* sysdeps/powerpc/powerpc64/power7/memrchr.S: Likewise.
	* sysdeps/powerpc/powerpc64/power7/rawmemchr.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 18e0054bf7
commit ff06a55aef
7 changed files with 32 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

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

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

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

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

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

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

@ -18,19 +18,6 @@
#include <sysdep.h>
#undef ENTRY
#define ENTRY(name) \
.section ".text"; \
ENTRY_2(__rawmemchr_power7) \
.align ALIGNARG(2); \
BODY_LABEL(__rawmemchr_power7): \
cfi_startproc; \
LOCALENTRY(__rawmemchr_power7)
#undef END
#define END(name) \
cfi_endproc; \
TRACEBACK(__rawmemchr_power7) \
END_2(__rawmemchr_power7)
#define RAWMEMCHR __rawmemchr_power7
#include <sysdeps/powerpc/powerpc64/power7/rawmemchr.S>

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

@ -20,8 +20,12 @@
#include <sysdep.h>
/* int [r3] memchr (char *s [r3], int byte [r4], int size [r5]) */
#ifndef MEMCHR
# define MEMCHR __memchr
#endif
.machine power7
ENTRY (__memchr)
ENTRY (MEMCHR)
CALL_MCOUNT 3
dcbt 0,r3
clrrdi r8,r3,3
@ -190,6 +194,6 @@ L(small_range):
bne cr6,L(done)
blr
END (__memchr)
END (MEMCHR)
weak_alias (__memchr, memchr)
libc_hidden_builtin_def (memchr)

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

@ -20,8 +20,12 @@
#include <sysdep.h>
/* int [r3] memrchr (char *s [r3], int byte [r4], int size [r5]) */
#ifndef MEMRCHR
# define MEMRCHR __memrchr
#endif
.machine power7
ENTRY (__memrchr)
ENTRY (MEMRCHR)
CALL_MCOUNT 3
add r7,r3,r5 /* Calculate the last acceptable address. */
neg r0,r7
@ -192,6 +196,6 @@ L(loop_small):
bne L(loop_small)
blr
END (__memrchr)
END (MEMRCHR)
weak_alias (__memrchr, memrchr)
libc_hidden_builtin_def (memrchr)

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

@ -20,8 +20,12 @@
#include <sysdep.h>
/* int [r3] rawmemchr (void *s [r3], int c [r4]) */
#ifndef RAWMEMCHR
# define RAWMEMCHR __rawmemchr
#endif
.machine power7
ENTRY (__rawmemchr)
ENTRY (RAWMEMCHR)
CALL_MCOUNT 2
dcbt 0,r3
clrrdi r8,r3,3 /* Align the address to doubleword boundary. */
@ -106,6 +110,6 @@ L(done):
srdi r0,r0,3 /* Convert leading zeros to bytes. */
add r3,r8,r0 /* Return address of the matching char. */
blr
END (__rawmemchr)
END (RAWMEMCHR)
weak_alias (__rawmemchr,rawmemchr)
libc_hidden_builtin_def (__rawmemchr)