diff options
| author | Wainer dos Santos Moschetta <wainersm@linux.vnet.ibm.com> | 2017-04-11 14:18:35 -0300 |
|---|---|---|
| committer | Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com> | 2017-04-11 17:13:55 -0300 |
| commit | ff06a55aef1a1826dadcebfee8baeaa10ce705a0 (patch) | |
| tree | 36da2d7e166f6165abedca5413d0485749500b94 /sysdeps/powerpc/powerpc64/power7 | |
| parent | 18e0054bf7c57cb5e6b90961be167164d58b1098 (diff) | |
| download | glibc-ff06a55aef1a1826dadcebfee8baeaa10ce705a0.tar.gz | |
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.
Diffstat (limited to 'sysdeps/powerpc/powerpc64/power7')
| -rw-r--r-- | sysdeps/powerpc/powerpc64/power7/memchr.S | 8 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc64/power7/memrchr.S | 8 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc64/power7/rawmemchr.S | 8 |
3 files changed, 18 insertions, 6 deletions
diff --git a/sysdeps/powerpc/powerpc64/power7/memchr.S b/sysdeps/powerpc/powerpc64/power7/memchr.S index 6ef665f2eb..5e9707aa02 100644 --- a/sysdeps/powerpc/powerpc64/power7/memchr.S +++ b/sysdeps/powerpc/powerpc64/power7/memchr.S @@ -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) diff --git a/sysdeps/powerpc/powerpc64/power7/memrchr.S b/sysdeps/powerpc/powerpc64/power7/memrchr.S index 4e86400437..4276768915 100644 --- a/sysdeps/powerpc/powerpc64/power7/memrchr.S +++ b/sysdeps/powerpc/powerpc64/power7/memrchr.S @@ -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) diff --git a/sysdeps/powerpc/powerpc64/power7/rawmemchr.S b/sysdeps/powerpc/powerpc64/power7/rawmemchr.S index b99ad62b0d..48afb75943 100644 --- a/sysdeps/powerpc/powerpc64/power7/rawmemchr.S +++ b/sysdeps/powerpc/powerpc64/power7/rawmemchr.S @@ -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) |