PowerPC: multiarch strchr for PowerPC32

This commit is contained in:
Adhemerval Zanella 2013-10-14 09:14:43 -05:00
parent 31c81aaa01
commit ba9641477e
7 changed files with 156 additions and 1 deletions

View File

@ -1,3 +1,16 @@
2013-12-06 Adhemerval Zanella <azanella@linux.vnet.ibm.com>
* sysdeps/powerpc/powerpc32/power4/multiarch/rtld-strchr.S: New file.
* sysdeps/powerpc/powerpc32/power4/multiarch/strchr-power7.S: New
file.
* sysdeps/powerpc/powerpc32/power4/multiarch/strchr-ppc32.S: New file.
* sysdeps/powerpc/powerpc/powerpc32/power4/multiarch/strchr.c: New
file: multiarch strchr for PPC32.
* sysdeps/powerpc/powerpc32/power4/multiarch/Makefile: Added strchr
multiarch objects.
* sysdeps/powerpc/powerpc32/power4/multiarch/ifunc-impl-list
(__libc_ifunc_impl_list): Likewise.
2013-12-06 Adhemerval Zanella <azanella@linux.vnet.ibm.com>
* string/strchrnul.c (__strchrnul): Using macro to redefine symbol

View File

@ -7,7 +7,8 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \
rawmemchr-ppc32 strlen-power7 strlen-ppc32 strnlen-power7 \
strnlen-ppc32 strncmp-power7 strncmp-ppc32 \
strcasecmp-power7 strcasecmp_l-power7 strncase-power7 \
strncase_l-power7 strchrnul-power7 strchrnul-ppc32
strncase_l-power7 strchrnul-power7 strchrnul-ppc32 \
strchr-power7 strchr-ppc32
CFLAGS-strncase-power7.c += -mcpu=power7 -funroll-loops
CFLAGS-strncase_l-power7.c += -mcpu=power7 -funroll-loops

View File

@ -173,5 +173,13 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
IFUNC_IMPL_ADD (array, i, strchrnul, 1,
__strchrnul_ppc))
/* Support sysdeps/powerpc/powerpc32/power4/multiarch/strchr.c. */
IFUNC_IMPL (i, name, strchr,
IFUNC_IMPL_ADD (array, i, strchr,
hwcap & PPC_FEATURE_HAS_VSX,
__strchr_power7)
IFUNC_IMPL_ADD (array, i, strchr, 1,
__strchr_ppc))
return i;
}

View File

@ -0,0 +1,18 @@
/* Copyright (C) 2013 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
#include <sysdeps/powerpc/powerpc32/strchr.S>

View File

@ -0,0 +1,39 @@
/* Optimized strchr implementation for PowerPC32/POWER7 using cmpb insn.
Copyright (C) 2013 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
#include <sysdep.h>
#undef ENTRY
#define ENTRY(name) \
.globl C_SYMBOL_NAME(__strchr_power7); \
.type C_SYMBOL_NAME(__strchr_power7),@function; \
C_LABEL(__strchr_power7) \
cfi_startproc;
#undef END
#define END(name) \
cfi_endproc; \
ASM_SIZE_DIRECTIVE(__strchr_power7)
#undef weak_alias
#define weak_alias(name, alias)
#undef libc_hidden_builtin_def
#define libc_hidden_builtin_def(name)
#include <sysdeps/powerpc/powerpc32/power7/strchr.S>

View File

@ -0,0 +1,41 @@
/* PowerPC32 default implementation of strchr.
Copyright (C) 2013 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
#include <sysdep.h>
#ifdef SHARED
# undef ENTRY
# define ENTRY(name) \
.globl C_SYMBOL_NAME(__strchr_ppc); \
.type C_SYMBOL_NAME(__strchr_ppc),@function; \
.align ALIGNARG(2); \
C_LABEL(__strchr_ppc) \
cfi_startproc; \
CALL_MCOUNT
# undef END
# define END(name) \
cfi_endproc; \
ASM_SIZE_DIRECTIVE(__strchr_ppc) \
# undef libc_hidden_builtin_def
# define libc_hidden_builtin_def(name) \
.globl __GI_strchr; __GI_strchr = __strchr_ppc
#endif
#include <sysdeps/powerpc/powerpc32/strchr.S>

View File

@ -0,0 +1,35 @@
/* Multiple versions of strchr.
Copyright (C) 2013 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
/* Define multiple versions only for definition in libc. */
#if defined SHARED && !defined NOT_IN_libc
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
extern __typeof (strchr) __strchr_ppc attribute_hidden;
extern __typeof (strchr) __strchr_power7 attribute_hidden;
/* Avoid DWARF definition DIE on ifunc symbol so that GDB can handle
ifunc symbol properly. */
libc_ifunc (strchr,
(hwcap & PPC_FEATURE_HAS_VSX)
? __strchr_power7
: __strchr_ppc);
weak_alias (strchr, index)
#endif