* libc/include/string.h (memrchr): Declare.
* libc/string/Makefile.am (ELIX_4_SOURCES): Add memrchr.c. (CHEWOUT_FILES): Add memrchr.def. * libc/string/Makefile.in: Regenerate. * libc/string/memrchr.c: New file.
This commit is contained in:
Corinna Vinschen
parent
cc580eddd3
commit
507b172d8d
@ -1,3 +1,11 @@
|
||||
2012-05-10 Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
|
||||
|
||||
* libc/include/string.h (memrchr): Declare.
|
||||
* libc/string/Makefile.am (ELIX_4_SOURCES): Add memrchr.c.
|
||||
(CHEWOUT_FILES): Add memrchr.def.
|
||||
* libc/string/Makefile.in: Regenerate.
|
||||
* libc/string/memrchr.c: New file.
|
||||
|
||||
2012-05-10 Joel Sherrill <joel.sherrill@oarcorp.com>
|
||||
|
||||
* libc/sys/rtems/machine/_types.h: Add Microblaze.
|
||||
|
||||
@ -58,6 +58,7 @@ char *_EXFUN(index,(const char *, int));
|
||||
_PTR _EXFUN(memccpy,(_PTR, const _PTR, int, size_t));
|
||||
_PTR _EXFUN(mempcpy,(_PTR, const _PTR, size_t));
|
||||
_PTR _EXFUN(memmem, (const _PTR, size_t, const _PTR, size_t));
|
||||
_PTR _EXFUN(memrchr,(const _PTR, int, size_t));
|
||||
char *_EXFUN(rindex,(const char *, int));
|
||||
char *_EXFUN(stpcpy,(char *, const char *));
|
||||
char *_EXFUN(stpncpy,(char *, const char *, size_t));
|
||||
|
||||
@ -103,6 +103,7 @@ ELIX_4_SOURCES =
|
||||
else
|
||||
ELIX_4_SOURCES = \
|
||||
memmem.c \
|
||||
memrchr.c \
|
||||
wcscasecmp.c \
|
||||
wcsncasecmp.c
|
||||
endif !ELIX_LEVEL_3
|
||||
@ -140,7 +141,7 @@ wcsncmp.def wcsncpy.def wcsnlen.def wcspbrk.def \
|
||||
wcsrchr.def wcsspn.def wcsstr.def wcstok.def \
|
||||
wcswidth.def wcsxfrm.def wcwidth.def wmemchr.def \
|
||||
wmemcmp.def wmemcpy.def wmemmove.def wmemset.def \
|
||||
memmem.def
|
||||
memmem.def memrchr.def
|
||||
|
||||
SUFFIXES = .def
|
||||
|
||||
|
||||
@ -102,6 +102,7 @@ am__objects_1 = lib_a-bcopy.$(OBJEXT) lib_a-bzero.$(OBJEXT) \
|
||||
@ELIX_LEVEL_1_FALSE@ lib_a-wcpncpy.$(OBJEXT) \
|
||||
@ELIX_LEVEL_1_FALSE@ lib_a-wcsdup.$(OBJEXT)
|
||||
@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@am__objects_3 = lib_a-memmem.$(OBJEXT) \
|
||||
@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@ lib_a-memrchr.$(OBJEXT) \
|
||||
@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@ lib_a-wcscasecmp.$(OBJEXT) \
|
||||
@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@ lib_a-wcsncasecmp.$(OBJEXT)
|
||||
@USE_LIBTOOL_FALSE@am_lib_a_OBJECTS = $(am__objects_1) \
|
||||
@ -127,6 +128,7 @@ am__objects_4 = bcopy.lo bzero.lo index.lo memchr.lo memcmp.lo \
|
||||
@ELIX_LEVEL_1_FALSE@ strcasestr.lo strchrnul.lo strndup_r.lo \
|
||||
@ELIX_LEVEL_1_FALSE@ wcpcpy.lo wcpncpy.lo wcsdup.lo
|
||||
@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@am__objects_6 = memmem.lo \
|
||||
@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@ memrchr.lo \
|
||||
@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@ wcscasecmp.lo \
|
||||
@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@ wcsncasecmp.lo
|
||||
@USE_LIBTOOL_TRUE@am_libstring_la_OBJECTS = $(am__objects_4) \
|
||||
@ -385,6 +387,7 @@ GENERAL_SOURCES = \
|
||||
@ELIX_LEVEL_1_TRUE@ELIX_2_SOURCES =
|
||||
@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@ELIX_4_SOURCES = \
|
||||
@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@ memmem.c \
|
||||
@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@ memrchr.c \
|
||||
@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@ wcscasecmp.c \
|
||||
@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@ wcsncasecmp.c
|
||||
|
||||
@ -415,7 +418,7 @@ wcsncmp.def wcsncpy.def wcsnlen.def wcspbrk.def \
|
||||
wcsrchr.def wcsspn.def wcsstr.def wcstok.def \
|
||||
wcswidth.def wcsxfrm.def wcwidth.def wmemchr.def \
|
||||
wmemcmp.def wmemcpy.def wmemmove.def wmemset.def \
|
||||
memmem.def
|
||||
memmem.def memrchr.def
|
||||
|
||||
SUFFIXES = .def
|
||||
CHEW = ../../doc/makedoc -f $(srcdir)/../../doc/doc.str
|
||||
@ -975,6 +978,12 @@ lib_a-memmem.o: memmem.c
|
||||
lib_a-memmem.obj: memmem.c
|
||||
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-memmem.obj `if test -f 'memmem.c'; then $(CYGPATH_W) 'memmem.c'; else $(CYGPATH_W) '$(srcdir)/memmem.c'; fi`
|
||||
|
||||
lib_a-memrchr.o: memrchr.c
|
||||
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-memrchr.o `test -f 'memrchr.c' || echo '$(srcdir)/'`memrchr.c
|
||||
|
||||
lib_a-memrchr.obj: memrchr.c
|
||||
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-memrchr.obj `if test -f 'memrchr.c'; then $(CYGPATH_W) 'memrchr.c'; else $(CYGPATH_W) '$(srcdir)/memrchr.c'; fi`
|
||||
|
||||
lib_a-wcscasecmp.o: wcscasecmp.c
|
||||
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-wcscasecmp.o `test -f 'wcscasecmp.c' || echo '$(srcdir)/'`wcscasecmp.c
|
||||
|
||||
|
||||
134
newlib/libc/string/memrchr.c
Normal file
134
newlib/libc/string/memrchr.c
Normal file
@ -0,0 +1,134 @@
|
||||
/*
|
||||
FUNCTION
|
||||
<<memrchr>>---reverse search for character in memory
|
||||
|
||||
INDEX
|
||||
memrchr
|
||||
|
||||
ANSI_SYNOPSIS
|
||||
#include <string.h>
|
||||
void *memrchr(const void *<[src]>, int <[c]>, size_t <[length]>);
|
||||
|
||||
TRAD_SYNOPSIS
|
||||
#include <string.h>
|
||||
void *memrchr(<[src]>, <[c]>, <[length]>)
|
||||
void *<[src]>;
|
||||
void *<[c]>;
|
||||
size_t <[length]>;
|
||||
|
||||
DESCRIPTION
|
||||
This function searches memory starting at <[length]> bytes
|
||||
beyond <<*<[src]>>> backwards for the character <[c]>.
|
||||
The search only ends with the first occurrence of <[c]>; in
|
||||
particular, <<NUL>> does not terminate the search.
|
||||
|
||||
RETURNS
|
||||
If the character <[c]> is found within <[length]> characters
|
||||
of <<*<[src]>>>, a pointer to the character is returned. If
|
||||
<[c]> is not found, then <<NULL>> is returned.
|
||||
|
||||
PORTABILITY
|
||||
<<memrchr>> is a GNU extension.
|
||||
|
||||
<<memrchr>> requires no supporting OS subroutines.
|
||||
|
||||
QUICKREF
|
||||
memrchr
|
||||
*/
|
||||
|
||||
#include <_ansi.h>
|
||||
#include <string.h>
|
||||
#include <limits.h>
|
||||
|
||||
/* Nonzero if X is not aligned on a "long" boundary. */
|
||||
#define UNALIGNED(X) ((long)(X + 1) & (sizeof (long) - 1))
|
||||
|
||||
/* How many bytes are loaded each iteration of the word copy loop. */
|
||||
#define LBLOCKSIZE (sizeof (long))
|
||||
|
||||
/* Threshhold for punting to the bytewise iterator. */
|
||||
#define TOO_SMALL(LEN) ((LEN) < LBLOCKSIZE)
|
||||
|
||||
#if LONG_MAX == 2147483647L
|
||||
#define DETECTNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080)
|
||||
#else
|
||||
#if LONG_MAX == 9223372036854775807L
|
||||
/* Nonzero if X (a long int) contains a NULL byte. */
|
||||
#define DETECTNULL(X) (((X) - 0x0101010101010101) & ~(X) & 0x8080808080808080)
|
||||
#else
|
||||
#error long int is not a 32bit or 64bit type.
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifndef DETECTNULL
|
||||
#error long int is not a 32bit or 64bit byte
|
||||
#endif
|
||||
|
||||
/* DETECTCHAR returns nonzero if (long)X contains the byte used
|
||||
to fill (long)MASK. */
|
||||
#define DETECTCHAR(X,MASK) (DETECTNULL(X ^ MASK))
|
||||
|
||||
_PTR
|
||||
_DEFUN (memrchr, (src_void, c, length),
|
||||
_CONST _PTR src_void _AND
|
||||
int c _AND
|
||||
size_t length)
|
||||
{
|
||||
_CONST unsigned char *src = (_CONST unsigned char *) src_void + length - 1;
|
||||
unsigned char d = c;
|
||||
|
||||
#if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
|
||||
unsigned long *asrc;
|
||||
unsigned long mask;
|
||||
int i;
|
||||
|
||||
while (UNALIGNED (src))
|
||||
{
|
||||
if (!length--)
|
||||
return NULL;
|
||||
if (*src == d)
|
||||
return (void *) src;
|
||||
src--;
|
||||
}
|
||||
|
||||
if (!TOO_SMALL (length))
|
||||
{
|
||||
/* If we get this far, we know that length is large and src is
|
||||
word-aligned. */
|
||||
/* The fast code reads the source one word at a time and only
|
||||
performs the bytewise search on word-sized segments if they
|
||||
contain the search character, which is detected by XORing
|
||||
the word-sized segment with a word-sized block of the search
|
||||
character and then detecting for the presence of NUL in the
|
||||
result. */
|
||||
asrc = (unsigned long *) (src - LBLOCKSIZE + 1);
|
||||
mask = d << 8 | d;
|
||||
mask = mask << 16 | mask;
|
||||
for (i = 32; i < LBLOCKSIZE * 8; i <<= 1)
|
||||
mask = (mask << i) | mask;
|
||||
|
||||
while (length >= LBLOCKSIZE)
|
||||
{
|
||||
if (DETECTCHAR (*asrc, mask))
|
||||
break;
|
||||
length -= LBLOCKSIZE;
|
||||
asrc--;
|
||||
}
|
||||
|
||||
/* If there are fewer than LBLOCKSIZE characters left,
|
||||
then we resort to the bytewise loop. */
|
||||
|
||||
src = (unsigned char *) asrc + LBLOCKSIZE - 1;
|
||||
}
|
||||
|
||||
#endif /* not PREFER_SIZE_OVER_SPEED */
|
||||
|
||||
while (length--)
|
||||
{
|
||||
if (*src == d)
|
||||
return (void *) src;
|
||||
src--;
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user