X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmemcmp.c;h=01810715b0e926daaa1068f2fbb23a7b181ba823;hb=1a2869593e115e4a6c74aaa0b23ca612357403ce;hp=98dcb76a44aeef7ad1cac50ec3fe827d1a52e3c7;hpb=89f2b4892655a929a506eff123c9126a88e2c8eb;p=gnulib.git
diff --git a/lib/memcmp.c b/lib/memcmp.c
index 98dcb76a4..01810715b 100644
--- a/lib/memcmp.c
+++ b/lib/memcmp.c
@@ -1,12 +1,14 @@
-/* Copyright (C) 1991, 1993, 1995, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1993, 1995, 1997, 1998, 2003, 2006, 2009 Free Software
+ Foundation, Inc.
+
Contributed by Torbjorn Granlund (tege@sics.se).
NOTE: The canonical source of this file is maintained with the GNU C Library.
Bugs can be reported to bug-glibc@prep.ai.mit.edu.
- This program is free software; you can redistribute it and/or modify it
+ This program is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2, or (at your option) any
+ Free Software Foundation; either version 3 of the License, or any
later version.
This program is distributed in the hope that it will be useful,
@@ -15,40 +17,26 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
+ along with this program. If not, see . */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
+#ifndef _LIBC
+# include
#endif
-#undef __ptr_t
-#if defined __cplusplus || (defined __STDC__ && __STDC__)
-# define __ptr_t void *
-#else /* Not C++ or ANSI C. */
-# undef const
-# define const
-# define __ptr_t char *
-#endif /* C++ or ANSI C. */
-
-#ifndef __P
-# if defined __GNUC__ || (defined __STDC__ && __STDC__)
-# define __P(args) args
-# else
-# define __P(args) ()
-# endif /* GCC. */
-#endif /* Not __P. */
+#include
-#if defined HAVE_STRING_H || defined _LIBC
-# include
-#endif
+#include
#undef memcmp
#ifdef _LIBC
# include
+# include
+
+# if __BYTE_ORDER == __BIG_ENDIAN
+# define WORDS_BIGENDIAN
+# endif
#else /* Not in the GNU C library. */
@@ -98,22 +86,20 @@ typedef unsigned char byte;
A and B are known to be different.
This is needed only on little-endian machines. */
-static int memcmp_bytes __P((op_t, op_t));
-
# ifdef __GNUC__
__inline
# endif
static int
-memcmp_bytes (long unsigned int a, long unsigned int b)
+memcmp_bytes (op_t a, op_t b)
{
- long int srcp1 = (long int) &a;
- long int srcp2 = (long int) &b;
+ const byte *srcp1 = (const byte *) &a;
+ const byte *srcp2 = (const byte *) &b;
op_t a0, b0;
do
{
- a0 = ((byte *) srcp1)[0];
- b0 = ((byte *) srcp2)[0];
+ a0 = srcp1[0];
+ b0 = srcp2[0];
srcp1 += 1;
srcp2 += 1;
}
@@ -122,8 +108,6 @@ memcmp_bytes (long unsigned int a, long unsigned int b)
}
#endif
-static int memcmp_common_alignment __P((long, long, size_t));
-
/* memcmp_common_alignment -- Compare blocks at SRCP1 and SRCP2 with LEN `op_t'
objects (not LEN bytes!). Both SRCP1 and SRCP2 should be aligned for
memory operations on `op_t's. */
@@ -131,7 +115,7 @@ static int memcmp_common_alignment __P((long, long, size_t));
__inline
#endif
static int
-memcmp_common_alignment (long int srcp1, long int srcp2, size_t len)
+memcmp_common_alignment (uintptr_t srcp1, uintptr_t srcp2, size_t len)
{
op_t a0, a1;
op_t b0, b1;
@@ -209,8 +193,6 @@ memcmp_common_alignment (long int srcp1, long int srcp2, size_t len)
return 0;
}
-static int memcmp_not_common_alignment __P((long, long, size_t));
-
/* memcmp_not_common_alignment -- Compare blocks at SRCP1 and SRCP2 with LEN
`op_t' objects (not LEN bytes!). SRCP2 should be aligned for memory
operations on `op_t', but SRCP1 *should be unaligned*. */
@@ -218,7 +200,7 @@ static int memcmp_not_common_alignment __P((long, long, size_t));
__inline
#endif
static int
-memcmp_not_common_alignment (long int srcp1, long int srcp2, size_t len)
+memcmp_not_common_alignment (uintptr_t srcp1, uintptr_t srcp2, size_t len)
{
op_t a0, a1, a2, a3;
op_t b0, b1, b2, b3;
@@ -322,8 +304,8 @@ rpl_memcmp (const void *s1, const void *s2, size_t len)
{
op_t a0;
op_t b0;
- long int srcp1 = (long int) s1;
- long int srcp2 = (long int) s2;
+ uintptr_t srcp1 = (uintptr_t) s1;
+ uintptr_t srcp2 = (uintptr_t) s2;
op_t res;
if (len >= OP_T_THRES)