AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-03 08:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
* sysdeps/generic/strchr.c: Include <memcopy.h> and use reg_char
	for character to search, to help the compiler.
	* sysdeps/generic/strchrnul.c: Likewise.
	* sysdeps/generic/memchr.c: Likewise.
	* sysdeps/generic/memccpy.c: Likewise.
	* sysdeps/generic/rawmemchr.c: Likewise.  Fix comment.

1999-06-13  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
This commit is contained in:
Ulrich Drepper 1999-06-14 09:25:22 +00:00
parent 6d525e7a63
commit 28e351249e
6 changed files with 39 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
1999-06-13 Andreas Schwab <schwab@issan.cs.uni-dortmund.de>
* sysdeps/generic/strchr.c: Include <memcopy.h> and use reg_char
for character to search, to help the compiler.
* sysdeps/generic/strchrnul.c: Likewise.
* sysdeps/generic/memchr.c: Likewise.
* sysdeps/generic/memccpy.c: Likewise.
* sysdeps/generic/rawmemchr.c: Likewise. Fix comment.
1999-06-13 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> 1999-06-13 Andreas Schwab <schwab@issan.cs.uni-dortmund.de>
* sysdeps/m68k/memchr.S: New file. * sysdeps/m68k/memchr.S: New file.

5
sysdeps/generic/memccpy.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991, 1995, 1997 Free Software Foundation, Inc. /* Copyright (C) 1991, 1995, 1997, 1999 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -17,6 +17,7 @@
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
#include <string.h> #include <string.h>
#include <memcopy.h>
#undef __memccpy #undef __memccpy
#undef memccpy #undef memccpy
@ -31,7 +32,7 @@ __memccpy (dest, src, c, n)
{ {
register const char *s = src; register const char *s = src;
register char *d = dest; register char *d = dest;
register const int x = (unsigned char) c; register const reg_char x = (unsigned char) c;
register size_t i = n; register size_t i = n;
while (i-- > 0) while (i-- > 0)

12
sysdeps/generic/memchr.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991, 1993, 1996, 1997 Free Software Foundation, Inc. /* Copyright (C) 1991, 1993, 1996, 1997, 1999 Free Software Foundation, Inc.
Based on strlen implementation by Torbjorn Granlund (tege@sics.se), Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
with help from Dan Sahlin (dan@sics.se) and with help from Dan Sahlin (dan@sics.se) and
commentary by Jim Blandy (jimb@ai.mit.edu); commentary by Jim Blandy (jimb@ai.mit.edu);
@ -33,6 +33,9 @@
#if defined (_LIBC) #if defined (_LIBC)
# include <string.h> # include <string.h>
# include <memcopy.h>
#else
# define reg_char char
#endif #endif
#if defined (HAVE_LIMITS_H) || defined (_LIBC) #if defined (HAVE_LIMITS_H) || defined (_LIBC)
@ -52,16 +55,17 @@
/* Search no more than N bytes of S for C. */ /* Search no more than N bytes of S for C. */
__ptr_t __ptr_t
memchr (s, c, n) memchr (s, c_in, n)
const __ptr_t s; const __ptr_t s;
int c; int c_in;
size_t n; size_t n;
{ {
const unsigned char *char_ptr; const unsigned char *char_ptr;
const unsigned long int *longword_ptr; const unsigned long int *longword_ptr;
unsigned long int longword, magic_bits, charmask; unsigned long int longword, magic_bits, charmask;
unsigned reg_char c;
c = (unsigned char) c; c = (unsigned char) c_in;
/* Handle the first few characters by reading one character at a time. /* Handle the first few characters by reading one character at a time.
Do this until CHAR_PTR is aligned on a longword boundary. */ Do this until CHAR_PTR is aligned on a longword boundary. */

12
sysdeps/generic/rawmemchr.c
View File

@ -33,6 +33,9 @@
#if defined (_LIBC) #if defined (_LIBC)
# include <string.h> # include <string.h>
# include <memcopy.h>
#else
# define reg_char char
#endif #endif
#if defined (HAVE_LIMITS_H) || defined (_LIBC) #if defined (HAVE_LIMITS_H) || defined (_LIBC)
@ -50,17 +53,18 @@
#undef memchr #undef memchr
/* Search no more than N bytes of S for C. */ /* Find the first occurrence of C in S. */
__ptr_t __ptr_t
__rawmemchr (s, c) __rawmemchr (s, c_in)
const __ptr_t s; const __ptr_t s;
int c; int c_in;
{ {
const unsigned char *char_ptr; const unsigned char *char_ptr;
const unsigned long int *longword_ptr; const unsigned long int *longword_ptr;
unsigned long int longword, magic_bits, charmask; unsigned long int longword, magic_bits, charmask;
unsigned reg_char c;
c = (unsigned char) c; c = (unsigned char) c_in;
/* Handle the first few characters by reading one character at a time. /* Handle the first few characters by reading one character at a time.
Do this until CHAR_PTR is aligned on a longword boundary. */ Do this until CHAR_PTR is aligned on a longword boundary. */

10
sysdeps/generic/strchr.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991, 93, 94, 95, 96, 97 Free Software Foundation, Inc. /* Copyright (C) 1991, 93, 94, 95, 96, 97, 99 Free Software Foundation, Inc.
Based on strlen implementation by Torbjorn Granlund (tege@sics.se), Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
with help from Dan Sahlin (dan@sics.se) and with help from Dan Sahlin (dan@sics.se) and
bug fix and commentary by Jim Blandy (jimb@ai.mit.edu); bug fix and commentary by Jim Blandy (jimb@ai.mit.edu);
@ -21,20 +21,22 @@
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
#include <string.h> #include <string.h>
#include <memcopy.h>
#undef strchr #undef strchr
/* Find the first occurrence of C in S. */ /* Find the first occurrence of C in S. */
char * char *
strchr (s, c) strchr (s, c_in)
const char *s; const char *s;
int c; int c_in;
{ {
const unsigned char *char_ptr; const unsigned char *char_ptr;
const unsigned long int *longword_ptr; const unsigned long int *longword_ptr;
unsigned long int longword, magic_bits, charmask; unsigned long int longword, magic_bits, charmask;
unsigned reg_char c;
c = (unsigned char) c; c = (unsigned char) c_in;
/* Handle the first few characters by reading one character at a time. /* Handle the first few characters by reading one character at a time.
Do this until CHAR_PTR is aligned on a longword boundary. */ Do this until CHAR_PTR is aligned on a longword boundary. */

8
sysdeps/generic/strchrnul.c
View File

@ -21,21 +21,23 @@
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
#include <string.h> #include <string.h>
#include <memcopy.h>
#undef __strchrnul #undef __strchrnul
#undef strchrnul #undef strchrnul
/* Find the first occurrence of C in S or the final NUL byte. */ /* Find the first occurrence of C in S or the final NUL byte. */
char * char *
__strchrnul (s, c) __strchrnul (s, c_in)
const char *s; const char *s;
int c; int c_in;
{ {
const unsigned char *char_ptr; const unsigned char *char_ptr;
const unsigned long int *longword_ptr; const unsigned long int *longword_ptr;
unsigned long int longword, magic_bits, charmask; unsigned long int longword, magic_bits, charmask;
unsigned reg_char c;
c = (unsigned char) c; c = (unsigned char) c_in;
/* Handle the first few characters by reading one character at a time. /* Handle the first few characters by reading one character at a time.
Do this until CHAR_PTR is aligned on a longword boundary. */ Do this until CHAR_PTR is aligned on a longword boundary. */