From: Jim Meyering Date: Thu, 13 Nov 1997 14:22:56 +0000 (+0000) Subject: update from GNU libc X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a97855187e28a1a97bf2cad6ab42d71346ccd39a;p=pspp update from GNU libc --- diff --git a/lib/memcmp.c b/lib/memcmp.c index 2c14977f3e..9f864d1e10 100644 --- a/lib/memcmp.c +++ b/lib/memcmp.c @@ -1,72 +1,83 @@ -/* Copyright (C) 1991, 1993, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1993, 1995, 1997 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. + 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 -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 2, or (at your option) any -later version. + 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 + later version. -This program 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 General Public License for more details. + This program 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 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. */ + 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. */ #ifdef HAVE_CONFIG_H -#include "config.h" +# include "config.h" #endif #undef __ptr_t -#if defined (__cplusplus) || (defined (__STDC__) && __STDC__) -#define __ptr_t void * +#if defined __cplusplus || (defined __STDC__ && __STDC__) +# define __ptr_t void * #else /* Not C++ or ANSI C. */ -#undef const -#define const -#define __ptr_t char * +# undef const +# define const +# define __ptr_t char * #endif /* C++ or ANSI C. */ -#if defined (HAVE_STRING_H) || defined (_LIBC) -#include +#ifndef __P +# if defined __GNUC__ || (defined __STDC__ && __STDC__) +# define __P(args) args +# else +# define __P(args) () +# endif /* GCC. */ +#endif /* Not __P. */ + +#if defined HAVE_STRING_H || defined _LIBC +# include #endif +#undef memcmp + #ifdef _LIBC -#include +# include #else /* Not in the GNU C library. */ -#include +# include /* Type to use for aligned memory operations. This should normally be the biggest type supported by a single load and store. Must be an unsigned type. */ -#define op_t unsigned long int -#define OPSIZ (sizeof(op_t)) +# define op_t unsigned long int +# define OPSIZ (sizeof(op_t)) /* Threshold value for when to enter the unrolled loops. */ -#define OP_T_THRES 16 +# define OP_T_THRES 16 /* Type to use for unaligned operations. */ typedef unsigned char byte; -#ifndef WORDS_BIGENDIAN -#define MERGE(w0, sh_1, w1, sh_2) (((w0) >> (sh_1)) | ((w1) << (sh_2))) -#else -#define MERGE(w0, sh_1, w1, sh_2) (((w0) << (sh_1)) | ((w1) >> (sh_2))) -#endif +# ifndef WORDS_BIGENDIAN +# define MERGE(w0, sh_1, w1, sh_2) (((w0) >> (sh_1)) | ((w1) << (sh_2))) +# else +# define MERGE(w0, sh_1, w1, sh_2) (((w0) << (sh_1)) | ((w1) >> (sh_2))) +# endif #endif /* In the GNU C library. */ #ifdef WORDS_BIGENDIAN -#define CMP_LT_OR_GT(a, b) ((a) > (b) ? 1 : -1) +# define CMP_LT_OR_GT(a, b) ((a) > (b) ? 1 : -1) #else -#define CMP_LT_OR_GT(a, b) memcmp_bytes ((a), (b)) +# define CMP_LT_OR_GT(a, b) memcmp_bytes ((a), (b)) #endif /* BE VERY CAREFUL IF YOU CHANGE THIS CODE! */ @@ -86,9 +97,12 @@ typedef unsigned char byte; /* memcmp_bytes -- Compare A and B bytewise in the byte order of the machine. A and B are known to be different. This is needed only on little-endian machines. */ -#ifdef __GNUC__ + +static int memcmp_bytes __P((op_t, op_t)); + +# ifdef __GNUC__ __inline -#endif +# endif static int memcmp_bytes (a, b) op_t a, b; @@ -109,6 +123,8 @@ memcmp_bytes (a, 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. */ @@ -126,6 +142,7 @@ memcmp_common_alignment (srcp1, srcp2, len) switch (len % 4) { + default: /* Avoid warning about uninitialized local variables. */ case 2: a0 = ((op_t *) srcp1)[0]; b0 = ((op_t *) srcp2)[0]; @@ -196,6 +213,8 @@ memcmp_common_alignment (srcp1, srcp2, 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*. */ @@ -225,6 +244,7 @@ memcmp_not_common_alignment (srcp1, srcp2, len) switch (len % 4) { + default: /* Avoid warning about uninitialized local variables. */ case 2: a1 = ((op_t *) srcp1)[0]; a2 = ((op_t *) srcp1)[1]; @@ -366,6 +386,6 @@ memcmp (s1, s2, len) } #ifdef weak_alias -#undef bcmp +# undef bcmp weak_alias (memcmp, bcmp) #endif diff --git a/lib/obstack.h b/lib/obstack.h index 53d25b449d..3edd3f4285 100644 --- a/lib/obstack.h +++ b/lib/obstack.h @@ -1,23 +1,25 @@ /* obstack.h - object stack macros Copyright (C) 1988,89,90,91,92,93,94,96,97 Free Software Foundation, Inc. - This file is part of the GNU C Library. Its master source is NOT part of the C library, however. The master source lives in /gd/gnu/lib. - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + 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. - The GNU C Library is distributed in the hope that it will be useful, + 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 + later version. + + This program 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 - Library General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + 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. */ /* Summary: @@ -104,9 +106,9 @@ Summary: /* Don't do the contents of this file more than once. */ -#ifndef __OBSTACK_H__ -#define __OBSTACK_H__ - +#ifndef _OBSTACK_H +#define _OBSTACK_H 1 + #ifdef __cplusplus extern "C" { #endif @@ -379,6 +381,11 @@ __extension__ \ _obstack_newchunk (__o, __len); \ (void) 0; }) +#define obstack_empty_p(OBSTACK) \ + __extension__ \ + ({ struct obstack *__o = (OBSTACK); \ + (__o->chunk->prev == 0 && __o->next_free - __o->chunk->contents == 0); }) + #define obstack_grow(OBSTACK,where,length) \ __extension__ \ ({ struct obstack *__o = (OBSTACK); \ @@ -492,6 +499,9 @@ __extension__ \ #define obstack_room(h) \ (unsigned) ((h)->chunk_limit - (h)->next_free) +#define obstack_empty_p(h) \ + ((h)->chunk->prev == 0 && (h)->next_free - (h)->chunk->contents == 0) + /* Note that the call to _obstack_newchunk is enclosed in (..., 0) so that we can avoid having void expressions in the arms of the conditional expression. @@ -587,4 +597,4 @@ __extension__ \ } /* C++ */ #endif -#endif /* not __OBSTACK_H__ */ +#endif /* obstack.h */