PowerPC: multiarch memchr for PowerPC32

This commit is contained in:
Adhemerval Zanella 2013-10-14 07:57:14 -05:00
parent 87da8bdbe1
commit 1c62e6d960
7 changed files with 140 additions and 2 deletions

View File

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

View File

@ -51,9 +51,13 @@
#undef memchr
#undef __memchr
#ifndef MEMCHR
# define MEMCHR __memchr
#endif
/* Search no more than N bytes of S for C. */
__ptr_t
__memchr (s, c_in, n)
MEMCHR (s, c_in, n)
const __ptr_t s;
int c_in;
size_t n;

View File

@ -2,5 +2,6 @@ ifeq ($(subdir),string)
sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \
memcpy-ppc32 memcmp-power7 memcmp-ppc32 memset-power7 \
memset-power6 memset-ppc32 bzero-power7 bzero-power6 \
bzero-ppc32 mempcpy-power7 mempcpy-ppc32
bzero-ppc32 mempcpy-power7 mempcpy-ppc32 memchr-power7 \
memchr-ppc32
endif

View File

@ -91,5 +91,13 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
IFUNC_IMPL_ADD (array, i, mempcpy, 1,
__mempcpy_ppc))
/* Support sysdeps/powerpc/powerpc32/power4/multiarch/memchr.c. */
IFUNC_IMPL (i, name, memchr,
IFUNC_IMPL_ADD (array, i, memchr,
hwcap & PPC_FEATURE_HAS_VSX,
__memchr_power7)
IFUNC_IMPL_ADD (array, i, memchr, 1,
__memchr_ppc))
return i;
}

View File

@ -0,0 +1,40 @@
/* Optimized memchr implementation for PowerPC32/POWER7 using cmpb insn.
Copyright (C) 2010-2013 Free Software Foundation, Inc.
Contributed by Luis Machado <luisgpm@br.ibm.com>.
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(__memchr_power7); \
.type C_SYMBOL_NAME(__memchr_power7),@function; \
C_LABEL(__memchr_power7) \
cfi_startproc;
#undef END
#define END(name) \
cfi_endproc; \
ASM_SIZE_DIRECTIVE(__memchr_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/memchr.S>

View File

@ -0,0 +1,34 @@
/* PowerPC32 default implementation of memchr.
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 <string.h>
#define MEMCHR __memchr_ppc
#undef weak_alias
#define weak_alias(a, b)
#ifdef SHARED
# undef libc_hidden_builtin_def
# define libc_hidden_builtin_def(name) \
__hidden_ver1 (__memchr_ppc, __GI_memchr, __memchr_ppc);
#endif
extern __typeof (memchr) __memchr_ppc attribute_hidden;
#include <string/memchr.c>

View File

@ -0,0 +1,38 @@
/* Multiple versions of memchr.
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/>. */
#ifndef NOT_IN_libc
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
extern __typeof (__memchr) __memchr_ppc attribute_hidden;
extern __typeof (__memchr) __memchr_power7 attribute_hidden;
/* Avoid DWARF definition DIE on ifunc symbol so that GDB can handle
ifunc symbol properly. */
libc_ifunc (__memchr,
(hwcap & PPC_FEATURE_HAS_VSX)
? __memchr_power7
: __memchr_ppc);
weak_alias (__memchr, memchr)
libc_hidden_builtin_def (memchr)
#else
#include <string/memchr.c>
#endif