de1c3ebb59
* misc/bits/syslog.h (syslog): When __va_arg_pack is defined, implement as __extern_always_inline function. (vsyslog): Define as __extern_always_inline function unconditionally. * libio/bits/stdio2.h (sprintf, snprintf, printf, fprintf): When __va_arg_pack is defined, implement as __extern_always_inline functions. (vsprintf, vsnprintf, vprintf, vfprintf): Define as __extern_always_inline functions unconditionally. * libio/bits/stdio.h (vprintf): Ifdef out the inline when bits/stdio2.h will be included. * wcsmbs/bits/wchar2.h (__swprintf_alias): New redirect. (swprintf, wprintf, fwprintf): When __va_arg_pack is defined, implement as __extern_always_inline functions. (vswprintf, vwprintf, vfwprintf): Define as __extern_always_inline functions unconditionally. * debug/tst-chk1.c (do_test): Enable remaining tests for C++. 2007-09-03 Jakub Jelinek <jakub@redhat.com> * misc/sys/cdefs.h (__extern_inline, __extern_always_inline): Only define in C++ for GCC 4.3+, in C++ always use __gnu_inline__ attribute. * include/features.h (__USE_EXTERN_INLINES): Define only when __extern_inline is defined. * stdlib/stdlib.h: Include bits/stdlib.h when __extern_always_inline is defined instead of when not __cplusplus. * misc/sys/syslog.h: Include bits/syslog.h when __extern_always_inline is defined instead of when not __cplusplus. * socket/sys/socket.h: Include bits/socket2.h when __extern_always_inline is defined instead of when not __cplusplus. * libio/stdio.h: Include bits/stdio2.h when __extern_always_inline is defined instead of when not __cplusplus. * posix/unistd.h: Include bits/unistd.h when __extern_always_inline is defined instead of when not __cplusplus. * string/string.h: Include bits/string3.h when __extern_always_inline is defined instead of when not __cplusplus. * wcsmbs/wchar.h: Include bits/wchar2.h when __extern_always_inline is defined instead of when not __cplusplus. (btowc, wctob): Don't guard the inlines with ifndef __cplusplus. * io/fcntl.h: Don't include bits/fcntl2.h if __extern_always_inline is not defined. * misc/bits/syslog-ldbl.h: Guard *_chk stuff with defined __extern_always_inline instead of !defined __cplusplus. * libio/bits/stdio-ldbl.h: Likewise. * wcsmbs/bits/wchar-ldbl.h: Likewise. * misc/bits/syslog.h (syslog): Don't define for C++. (vsyslog): Use __extern_always_inline function for C++ instead of a macro. * libio/bits/stdio.h (__STDIO_INLINE): Define to __extern_inline whenever that macro is defined. (vprintf): Don't provide the inline for C++. (fread_unlocked, fwrite_unlocked): Don't define the macros for C++. * libio/bits/stdio2.h (sprintf, snprintf, printf, fprintf): Don't define the macros for C++. (vsprintf, vsnprintf, vprintf, vfprintf): Define as __extern_always_inline functions for C++. * io/sys/stat.h (stat, lstat, fstat, fstatat, mknod, mknodat, stat64, lstat64, fstat64, fstatat64): Don't define if not __USE_EXTERN_INLINES. * wcsmbs/bits/wchar2.h: Fix #error message. (swprintf, wprintf, fwprintf): Don't define the macros for C++. (vswprintf, vwprintf, vfwprintf): Define using __extern_always_inline functions for C++. * string/bits/string3.h: Don't #undef macros if __cplusplus. (memcpy, memmove, mempcpy, memset, bcopy, bzero, strcpy, stpcpy, strncpy, strcat, strncat): Define as __extern_always_inline functions instead of macros for C++. * math/bits/cmathcalls.h: Guard __extern_inline routines with defined __extern_inline. * sysdeps/alpha/fpu/bits/mathinline.h (__MATH_INLINE): Define to __extern_inline whenever that macro is defined. * sysdeps/ia64/fpu/bits/mathinline.h (__MATH_INLINE): Likewise. * sysdeps/i386/fpu/bits/mathinline.h (__MATH_INLINE): Likewise. * sysdeps/i386/i486/bits/string.h (__STRING_INLINE): Likewise. * sysdeps/s390/bits/string.h (__STRING_INLINE): Likewise. * sysdeps/s390/fpu/bits/mathinline.h (__MATH_INLINE): Likewise. * sysdeps/powerpc/fpu/bits/mathinline.h (__MATH_INLINE): Likewise. * sysdeps/x86_64/fpu/bits/mathinline.h (__MATH_INLINE): Likewise. * sysdeps/sparc/fpu/bits/mathinline.h (__MATH_INLINE): Likewise. * sysdeps/unix/sysv/linux/sys/sysmacros.h (gnu_dev_major, gnu_dev_minor, gnu_dev_makedev): Remove __extern_inline from prototypes. Only provide __extern_inline routines if __USE_EXTERN_INLINES. * debug/Makefile: Add rules to build and run tst-{,lfs}chk{4,5,6} tests. * debug/tst-chk1.c (do_prepare, do_test): Allow compilation as C++. For now avoid some *printf tests in C++. Skip all testing if __USE_FORTIFY_LEVEL is defined, but __extern_always_inline macro is not. * debug/tst-chk4.cc: New file. * debug/tst-chk5.cc: New file. * debug/tst-chk6.cc: New file. * debug/tst-lfschk4.cc: New file. * debug/tst-lfschk5.cc: New file. * debug/tst-lfschk6.cc: New file. * include/wchar.h (__vfwprintf_chk, __vswprintf_chk): Avoid prototypes in C++. * include/stdio.h (__sprintf_chk, __snprintf_chk, __vsprintf_chk, __vsnprintf_chk, __printf_chk, __fprintf_chk, __vprintf_chk, __vfprintf_chk, __fgets_unlocked_chk, __fgets_chk): Likewise.
232 lines
6.4 KiB
C
232 lines
6.4 KiB
C
/* Optimized, inlined string functions. S/390 version.
|
|
Copyright (C) 2000, 2001, 2007 Free Software Foundation, Inc.
|
|
Contributed by Martin Schwidefsky (schwidefsky@de.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, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#ifndef _STRING_H
|
|
# error "Never use <bits/string.h> directly; include <string.h> instead."
|
|
#endif
|
|
|
|
/* The s390 processors can access unaligned multi-byte variables. */
|
|
#define _STRING_ARCH_unaligned 1
|
|
|
|
/* We only provide optimizations if the user selects them and if
|
|
GNU CC is used. */
|
|
#if !defined __NO_STRING_INLINES && defined __USE_STRING_INLINES \
|
|
&& defined __GNUC__ && __GNUC__ >= 2
|
|
|
|
#ifndef __STRING_INLINE
|
|
# ifndef __extern_inline
|
|
# define __STRING_INLINE inline
|
|
# else
|
|
# define __STRING_INLINE __extern_inline
|
|
# endif
|
|
#endif
|
|
|
|
#define _HAVE_STRING_ARCH_strlen 1
|
|
#ifndef _FORCE_INLINES
|
|
__STRING_INLINE size_t
|
|
strlen (__const char *__str)
|
|
{
|
|
char *__ptr, *__tmp;
|
|
|
|
__ptr = (char *) 0;
|
|
__tmp = (char *) __str;
|
|
__asm__ __volatile__ (" la 0,0\n"
|
|
"0: srst %0,%1\n"
|
|
" jo 0b\n"
|
|
: "+&a" (__ptr), "+&a" (__tmp) :
|
|
: "cc", "memory", "0" );
|
|
return (size_t) (__ptr - __str);
|
|
}
|
|
#endif
|
|
|
|
/* Copy SRC to DEST. */
|
|
#define _HAVE_STRING_ARCH_strcpy 1
|
|
#ifndef _FORCE_INLINES
|
|
__STRING_INLINE char *
|
|
strcpy (char *__dest, __const char *__src)
|
|
{
|
|
char *tmp = __dest;
|
|
|
|
__asm__ __volatile__ (" la 0,0\n"
|
|
"0: mvst %0,%1\n"
|
|
" jo 0b"
|
|
: "+&a" (__dest), "+&a" (__src) :
|
|
: "cc", "memory", "0" );
|
|
return tmp;
|
|
}
|
|
#endif
|
|
|
|
#define _HAVE_STRING_ARCH_strncpy 1
|
|
#ifndef _FORCE_INLINES
|
|
__STRING_INLINE char *
|
|
strncpy (char *__dest, __const char *__src, size_t __n)
|
|
{
|
|
char *__ret = __dest;
|
|
char *__ptr;
|
|
size_t __diff;
|
|
|
|
if (__n > 0) {
|
|
__diff = (size_t) (__dest - __src);
|
|
__ptr = (char *) __src;
|
|
__asm__ __volatile__ (" j 1f\n"
|
|
"0: la %0,1(%0)\n"
|
|
"1: icm 0,1,0(%0)\n"
|
|
" stc 0,0(%2,%0)\n"
|
|
" jz 3f\n"
|
|
#if defined(__s390x__)
|
|
" brctg %1,0b\n"
|
|
#else
|
|
" brct %1,0b\n"
|
|
#endif
|
|
" j 4f\n"
|
|
"2: la %0,1(%0)\n"
|
|
" stc 0,0(%2,%0)\n"
|
|
#if defined(__s390x__)
|
|
"3: brctg %1,2b\n"
|
|
#else
|
|
"3: brct %1,2b\n"
|
|
#endif
|
|
"4:"
|
|
: "+&a" (__ptr), "+&a" (__n) : "a" (__diff)
|
|
: "cc", "memory", "0" );
|
|
}
|
|
return __ret;
|
|
}
|
|
#endif
|
|
|
|
/* Append SRC onto DEST. */
|
|
#define _HAVE_STRING_ARCH_strcat 1
|
|
#ifndef _FORCE_INLINES
|
|
__STRING_INLINE char *
|
|
strcat(char *__dest, const char *__src)
|
|
{
|
|
char *__ret = __dest;
|
|
char *__ptr, *__tmp;
|
|
|
|
/* Move __ptr to the end of __dest. */
|
|
__ptr = (char *) 0;
|
|
__tmp = __dest;
|
|
__asm__ __volatile__ (" la 0,0\n"
|
|
"0: srst %0,%1\n"
|
|
" jo 0b\n"
|
|
: "+&a" (__ptr), "+&a" (__tmp) :
|
|
: "cc", "0" );
|
|
|
|
/* Now do the copy. */
|
|
__asm__ __volatile__ (" la 0,0\n"
|
|
"0: mvst %0,%1\n"
|
|
" jo 0b"
|
|
: "+&a" (__ptr), "+&a" (__src) :
|
|
: "cc", "memory", "0" );
|
|
return __ret;
|
|
}
|
|
#endif
|
|
|
|
/* Append no more than N characters from SRC onto DEST. */
|
|
#define _HAVE_STRING_ARCH_strncat 1
|
|
#ifndef _FORCE_INLINES
|
|
__STRING_INLINE char *
|
|
strncat (char *__dest, __const char *__src, size_t __n)
|
|
{
|
|
char *__ret = __dest;
|
|
char *__ptr, *__tmp;
|
|
size_t __diff;
|
|
|
|
if (__n > 0) {
|
|
/* Move __ptr to the end of __dest. */
|
|
__ptr = (char *) 0;
|
|
__tmp = __dest;
|
|
__asm__ __volatile__ (" la 0,0\n"
|
|
"0: srst %0,%1\n"
|
|
" jo 0b\n"
|
|
: "+&a" (__ptr), "+&a" (__tmp) :
|
|
: "cc", "memory", "0" );
|
|
|
|
__diff = (size_t) (__ptr - __src);
|
|
__tmp = (char *) __src;
|
|
__asm__ __volatile__ (" j 1f\n"
|
|
"0: la %0,1(%0)\n"
|
|
"1: icm 0,1,0(%0)\n"
|
|
" stc 0,0(%2,%0)\n"
|
|
" jz 2f\n"
|
|
#if defined(__s390x__)
|
|
" brctg %1,0b\n"
|
|
#else
|
|
" brct %1,0b\n"
|
|
#endif
|
|
" slr 0,0\n"
|
|
" stc 0,1(%2,%0)\n"
|
|
"2:"
|
|
: "+&a" (__tmp), "+&a" (__n) : "a" (__diff)
|
|
: "cc", "memory", "0" );
|
|
|
|
}
|
|
return __ret;
|
|
}
|
|
#endif
|
|
|
|
/* Search N bytes of S for C. */
|
|
#define _HAVE_STRING_ARCH_memchr 1
|
|
#ifndef _FORCE_INLINES
|
|
__STRING_INLINE void *
|
|
memchr (__const void *__str, int __c, size_t __n)
|
|
{
|
|
char *__ptr, *__tmp;
|
|
|
|
__tmp = (char *) __str;
|
|
__ptr = (char *) __tmp + __n;
|
|
__asm__ __volatile__ (" lhi 0,0xff\n"
|
|
" nr 0,%2\n"
|
|
"0: srst %0,%1\n"
|
|
" jo 0b\n"
|
|
" brc 13,1f\n"
|
|
" la %0,0\n"
|
|
"1:"
|
|
: "+&a" (__ptr), "+&a" (__tmp) : "d" (__c)
|
|
: "cc", "memory", "0" );
|
|
return __ptr;
|
|
}
|
|
#endif
|
|
|
|
/* Search N bytes of S for C. */
|
|
#define _HAVE_STRING_ARCH_memchr 1
|
|
#ifndef _FORCE_INLINES
|
|
__STRING_INLINE int
|
|
strcmp (__const char *__s1, __const char *__s2)
|
|
{
|
|
char *__p1, *__p2;
|
|
int __ret;
|
|
|
|
__p1 = (char *) __s1;
|
|
__p2 = (char *) __s2;
|
|
__asm__ __volatile__ (" slr 0,0\n"
|
|
"0: clst %1,%2\n"
|
|
" jo 0b\n"
|
|
" ipm %0\n"
|
|
" srl %0,28"
|
|
: "=d" (__ret), "+&a" (__p1), "+&a" (__p2) :
|
|
: "cc", "memory", "0" );
|
|
__ret = (__ret == 0) ? 0 : (__ret == 1) ? -1 : 1;
|
|
return __ret;
|
|
}
|
|
#endif
|
|
|
|
#endif /* Use string inlines && GNU CC. */
|