1999-05-03 09:29:11 +02:00
|
|
|
/* obstack.c - subroutines used implicitly by object stack macros
|
Update libiberty sources with changes in the gcc mainline.
+2020-01-01 Jakub Jelinek <jakub@redhat.com>
+
+ Update copyright years.
+
+2019-12-06 Tim Ruehsen <tim.ruehsen@gmx.de>
+
+ * make-relative-prefix.c (split_directories):
+ Return early on empty 'name'
+
+2019-11-16 Tim Ruehsen <tim.ruehsen@gmx.de>
+
+ * cp-demangle.c (d_print_init): Remove const from 4th param.
+ (cplus_demangle_fill_name): Initialize d->d_counting.
+ (cplus_demangle_fill_extended_operator): Likewise.
+ (cplus_demangle_fill_ctor): Likewise.
+ (cplus_demangle_fill_dtor): Likewise.
+ (d_make_empty): Likewise.
+ (d_count_templates_scopes): Remobe const from 3rd param,
+ Return on dc->d_counting > 1,
+ Increment dc->d_counting.
+ * cp-demint.c (cplus_demangle_fill_component): Initialize d->d_counting.
+ (cplus_demangle_fill_builtin_type): Likewise.
+ (cplus_demangle_fill_operator): Likewise.
+
+2019-11-16 Eduard-Mihai Burtescu <eddyb@lyken.rs>
+
+ * cplus-dem.c (cplus_demangle): Use rust_demangle directly.
+ (rust_demangle): Remove.
+ * rust-demangle.c (is_prefixed_hash): Rename to is_legacy_prefixed_hash.
+ (parse_lower_hex_nibble): Rename to decode_lower_hex_nibble.
+ (parse_legacy_escape): Rename to decode_legacy_escape.
+ (rust_is_mangled): Remove.
+ (struct rust_demangler): Add.
+ (peek): Add.
+ (next): Add.
+ (struct rust_mangled_ident): Add.
+ (parse_ident): Add.
+ (rust_demangle_sym): Remove.
+ (print_str): Add.
+ (PRINT): Add.
+ (print_ident): Add.
+ (rust_demangle_callback): Add.
+ (struct str_buf): Add.
+ (str_buf_reserve): Add.
+ (str_buf_append): Add.
+ (str_buf_demangle_callback): Add.
+ (rust_demangle): Add.
+ * rust-demangle.h: Remove.
+
+2019-11-15 Miguel Saldivar <saldivarcher@gmail.com>
+
+ * testsuite/demangle-expected: Fix test.
+
+2019-11-04 Kamlesh Kumar <kamleshbhalui@gmail.com>
+
+ * cp-demangle.c (d_expr_primary): Handle
+ nullptr demangling.
+ * testsuite/demangle-expected: Added test.
+
+2019-10-29 Paul Pluzhnikov <ppluzhnikov@google.com>
+
+ * cp-demangle.c (d_number): Avoid signed int overflow.
+
+2019-10-28 Miguel Saldivar <saldivarcher@gmail.com>
+
+ * cp-demangle.c (d_print_mod): Add a space before printing `complex`
+ and `imaginary`, as opposed to after.
+ * testsuite/demangle-expected: Adjust test.
+
+2019-10-03 Eduard-Mihai Burtescu <eddyb@lyken.rs>
+
+ * rust-demangle.c (looks_like_rust): Remove.
+ (rust_is_mangled): Don't check escapes.
+ (is_prefixed_hash): Allow 0-9a-f permutations.
+ (rust_demangle_sym): Don't bail on unknown escapes.
+ * testsuite/rust-demangle-expected: Update 'main::$99$' test.
+
+2019-09-03 Eduard-Mihai Burtescu <eddyb@lyken.rs>
+
+ * rust-demangle.c (unescape): Remove.
+ (parse_lower_hex_nibble): New function.
+ (parse_legacy_escape): New function.
+ (is_prefixed_hash): Use parse_lower_hex_nibble.
+ (looks_like_rust): Use parse_legacy_escape.
+ (rust_demangle_sym): Use parse_legacy_escape.
+ * testsuite/rust-demangle-expected: Add 'llv$u6d$' test.
+
+2019-08-27 Martin Liska <mliska@suse.cz>
+
+ PR lto/91478
+ * simple-object-elf.c (simple_object_elf_copy_lto_debug_sections):
+ First find a WEAK HIDDEN symbol in symbol table that will be
+ preserved. Later, use the symbol name for all removed symbols.
+
+2019-08-12 Martin Liska <mliska@suse.cz>
+
+ * Makefile.in: Add filedescriptor.c.
+ * filedescriptor.c: New file.
+ * lrealpath.c (is_valid_fd): Remove.
diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index 0be45b4ae8..fe738d0db4 100644
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -1,7 +1,7 @@
# Makefile for the libiberty library.
# Originally written by K. Richard Pixley <rich@cygnus.com>.
#
-# Copyright (C) 1990-2019 Free Software Foundation, Inc.
+# Copyright (C) 1990-2020 Free Software Foundation, Inc.
#
# This file is part of the libiberty library.
# Libiberty is free software; you can redistribute it and/or
@@ -127,7 +127,7 @@ CFILES = alloca.c argv.c asprintf.c atexit.c \
calloc.c choose-temp.c clock.c concat.c cp-demangle.c \
cp-demint.c cplus-dem.c crc32.c \
d-demangle.c dwarfnames.c dyn-string.c \
- fdmatch.c ffs.c fibheap.c filename_cmp.c floatformat.c \
+ fdmatch.c ffs.c fibheap.c filedescriptor.c filename_cmp.c floatformat.c \
fnmatch.c fopen_unlocked.c \
getcwd.c getopt.c getopt1.c getpagesize.c getpwd.c getruntime.c \
gettimeofday.c \
@@ -171,6 +171,7 @@ REQUIRED_OFILES = \
./cp-demint.$(objext) ./crc32.$(objext) ./d-demangle.$(objext) \
./dwarfnames.$(objext) ./dyn-string.$(objext) \
./fdmatch.$(objext) ./fibheap.$(objext) \
+ ./filedescriptor.$(objext) \
./filename_cmp.$(objext) ./floatformat.$(objext) \
./fnmatch.$(objext) ./fopen_unlocked.$(objext) \
./getopt.$(objext) ./getopt1.$(objext) ./getpwd.$(objext) \
@@ -756,6 +757,17 @@ $(CONFIGURED_OFILES): stamp-picdir stamp-noasandir
else true; fi
$(COMPILE.c) $(srcdir)/fibheap.c $(OUTPUT_OPTION)
+./filedescriptor.$(objext): $(srcdir)/filedescriptor.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/filedescriptor.c -o pic/$@; \
+ else true; fi
+ if [ x"$(NOASANFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(NOASANFLAG) $(srcdir)/filedescriptor.c -o noasan/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/filedescriptor.c $(OUTPUT_OPTION)
+
+
./filename_cmp.$(objext): $(srcdir)/filename_cmp.c config.h $(INCDIR)/ansidecl.h \
$(INCDIR)/filenames.h $(INCDIR)/hashtab.h \
$(INCDIR)/safe-ctype.h
diff --git a/libiberty/_doprnt.c b/libiberty/_doprnt.c
index d44dc415ed..a739f4304f 100644
--- a/libiberty/_doprnt.c
+++ b/libiberty/_doprnt.c
@@ -1,5 +1,5 @@
/* Provide a version of _doprnt in terms of fprintf.
- Copyright (C) 1998-2019 Free Software Foundation, Inc.
+ Copyright (C) 1998-2020 Free Software Foundation, Inc.
Contributed by Kaveh Ghazi (ghazi@caip.rutgers.edu) 3/29/98
This program is free software; you can redistribute it and/or modify it
diff --git a/libiberty/argv.c b/libiberty/argv.c
index 6444896f99..8c9794db6a 100644
--- a/libiberty/argv.c
+++ b/libiberty/argv.c
@@ -1,5 +1,5 @@
/* Create and destroy argument vectors (argv's)
- Copyright (C) 1992-2019 Free Software Foundation, Inc.
+ Copyright (C) 1992-2020 Free Software Foundation, Inc.
Written by Fred Fish @ Cygnus Support
This file is part of the libiberty library.
diff --git a/libiberty/asprintf.c b/libiberty/asprintf.c
index 5718682f69..6e38e2234d 100644
--- a/libiberty/asprintf.c
+++ b/libiberty/asprintf.c
@@ -1,6 +1,6 @@
/* Like sprintf but provides a pointer to malloc'd storage, which must
be freed by the caller.
- Copyright (C) 1997-2019 Free Software Foundation, Inc.
+ Copyright (C) 1997-2020 Free Software Foundation, Inc.
Contributed by Cygnus Solutions.
This file is part of the libiberty library.
diff --git a/libiberty/choose-temp.c b/libiberty/choose-temp.c
index 72c1b710bd..49a2faaa51 100644
--- a/libiberty/choose-temp.c
+++ b/libiberty/choose-temp.c
@@ -1,5 +1,5 @@
/* Utility to pick a temporary filename prefix.
- Copyright (C) 1996-2019 Free Software Foundation, Inc.
+ Copyright (C) 1996-2020 Free Software Foundation, Inc.
This file is part of the libiberty library.
Libiberty is free software; you can redistribute it and/or
diff --git a/libiberty/clock.c b/libiberty/clock.c
index a3730714bd..0de74657d0 100644
--- a/libiberty/clock.c
+++ b/libiberty/clock.c
@@ -1,5 +1,5 @@
/* ANSI-compatible clock function.
- Copyright (C) 1994-2019 Free Software Foundation, Inc.
+ Copyright (C) 1994-2020 Free Software Foundation, Inc.
This file is part of the libiberty library. This library is free
software; you can redistribute it and/or modify it under the
diff --git
2020-01-17 15:13:22 +01:00
|
|
|
Copyright (C) 1988-2020 Free Software Foundation, Inc.
|
2015-11-09 05:42:45 +01:00
|
|
|
This file is part of the GNU C Library.
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2015-11-09 05:42:45 +01:00
|
|
|
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.
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2015-11-09 05:42:45 +01:00
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
1999-05-03 09:29:11 +02:00
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
2015-11-09 05:42:45 +01:00
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
Lesser General Public License for more details.
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2015-11-09 05:42:45 +01:00
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
|
|
License along with the GNU C Library; if not, see
|
|
|
|
<http://www.gnu.org/licenses/>. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
|
2015-11-09 05:42:45 +01:00
|
|
|
#ifdef _LIBC
|
|
|
|
# include <obstack.h>
|
|
|
|
#else
|
|
|
|
# include <config.h>
|
|
|
|
# include "obstack.h"
|
|
|
|
#endif
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2015-11-09 05:42:45 +01:00
|
|
|
/* NOTE BEFORE MODIFYING THIS FILE: _OBSTACK_INTERFACE_VERSION in
|
|
|
|
obstack.h must be incremented whenever callers compiled using an old
|
|
|
|
obstack.h can no longer properly call the functions in this file. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
/* Comment out all this code if we are using the GNU C Library, and are not
|
|
|
|
actually compiling the library itself, and the installed library
|
|
|
|
supports the same library interface we do. This code is part of the GNU
|
|
|
|
C Library, but also included in many other GNU distributions. Compiling
|
|
|
|
and linking in this code is a waste when using the GNU C library
|
|
|
|
(especially if it is a shared library). Rather than having every GNU
|
2015-11-09 05:42:45 +01:00
|
|
|
program understand 'configure --with-gnu-libc' and omit the object
|
1999-05-03 09:29:11 +02:00
|
|
|
files, it is simpler to just do this in the source for each such file. */
|
2015-11-09 05:42:45 +01:00
|
|
|
#if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
|
|
|
|
# include <gnu-versions.h>
|
|
|
|
# if (_GNU_OBSTACK_INTERFACE_VERSION == _OBSTACK_INTERFACE_VERSION \
|
|
|
|
|| (_GNU_OBSTACK_INTERFACE_VERSION == 1 \
|
|
|
|
&& _OBSTACK_INTERFACE_VERSION == 2 \
|
|
|
|
&& defined SIZEOF_INT && defined SIZEOF_SIZE_T \
|
|
|
|
&& SIZEOF_INT == SIZEOF_SIZE_T))
|
|
|
|
# define _OBSTACK_ELIDE_CODE
|
|
|
|
# endif
|
1999-05-03 09:29:11 +02:00
|
|
|
#endif
|
|
|
|
|
2015-11-09 05:42:45 +01:00
|
|
|
#ifndef _OBSTACK_ELIDE_CODE
|
|
|
|
/* If GCC, or if an oddball (testing?) host that #defines __alignof__,
|
|
|
|
use the already-supplied __alignof__. Otherwise, this must be Gnulib
|
|
|
|
(as glibc assumes GCC); defer to Gnulib's alignof_type. */
|
2015-11-09 05:43:51 +01:00
|
|
|
# if !defined __GNUC__ && !defined __IBM__ALIGNOF__ && !defined __alignof__
|
|
|
|
# if defined __cplusplus
|
|
|
|
template <class type> struct alignof_helper { char __slot1; type __slot2; };
|
|
|
|
# define __alignof__(type) offsetof (alignof_helper<type>, __slot2)
|
|
|
|
# else
|
|
|
|
# define __alignof__(type) \
|
|
|
|
offsetof (struct { char __slot1; type __slot2; }, __slot2)
|
|
|
|
# endif
|
2015-11-09 05:42:45 +01:00
|
|
|
# endif
|
|
|
|
# include <stdlib.h>
|
|
|
|
# include <stdint.h>
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2015-11-09 05:42:45 +01:00
|
|
|
# ifndef MAX
|
|
|
|
# define MAX(a,b) ((a) > (b) ? (a) : (b))
|
|
|
|
# endif
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
/* Determine default alignment. */
|
2015-11-09 05:42:45 +01:00
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
/* If malloc were really smart, it would round addresses to DEFAULT_ALIGNMENT.
|
|
|
|
But in fact it might be less smart and round addresses to as much as
|
2015-11-09 05:42:45 +01:00
|
|
|
DEFAULT_ROUNDING. So we prepare for it to do that.
|
|
|
|
|
|
|
|
DEFAULT_ALIGNMENT cannot be an enum constant; see gnulib's alignof.h. */
|
|
|
|
#define DEFAULT_ALIGNMENT MAX (__alignof__ (long double), \
|
|
|
|
MAX (__alignof__ (uintmax_t), \
|
|
|
|
__alignof__ (void *)))
|
|
|
|
#define DEFAULT_ROUNDING MAX (sizeof (long double), \
|
|
|
|
MAX (sizeof (uintmax_t), \
|
|
|
|
sizeof (void *)))
|
|
|
|
|
|
|
|
/* Call functions with either the traditional malloc/free calling
|
|
|
|
interface, or the mmalloc/mfree interface (that adds an extra first
|
|
|
|
argument), based on the value of use_extra_arg. */
|
|
|
|
|
|
|
|
static void *
|
|
|
|
call_chunkfun (struct obstack *h, size_t size)
|
|
|
|
{
|
|
|
|
if (h->use_extra_arg)
|
|
|
|
return h->chunkfun.extra (h->extra_arg, size);
|
|
|
|
else
|
|
|
|
return h->chunkfun.plain (size);
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2015-11-09 05:42:45 +01:00
|
|
|
static void
|
|
|
|
call_freefun (struct obstack *h, void *old_chunk)
|
|
|
|
{
|
|
|
|
if (h->use_extra_arg)
|
|
|
|
h->freefun.extra (h->extra_arg, old_chunk);
|
|
|
|
else
|
|
|
|
h->freefun.plain (old_chunk);
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
|
|
|
|
/* Initialize an obstack H for use. Specify chunk size SIZE (0 means default).
|
|
|
|
Objects start on multiples of ALIGNMENT (0 means use default).
|
|
|
|
|
2015-11-09 05:42:45 +01:00
|
|
|
Return nonzero if successful, calls obstack_alloc_failed_handler if
|
|
|
|
allocation fails. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2015-11-09 05:42:45 +01:00
|
|
|
static int
|
|
|
|
_obstack_begin_worker (struct obstack *h,
|
|
|
|
_OBSTACK_SIZE_T size, _OBSTACK_SIZE_T alignment)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
2015-11-09 05:42:45 +01:00
|
|
|
struct _obstack_chunk *chunk; /* points to new chunk */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
if (alignment == 0)
|
2015-11-09 05:42:45 +01:00
|
|
|
alignment = DEFAULT_ALIGNMENT;
|
1999-05-03 09:29:11 +02:00
|
|
|
if (size == 0)
|
|
|
|
/* Default size is what GNU malloc can fit in a 4096-byte block. */
|
|
|
|
{
|
|
|
|
/* 12 is sizeof (mhead) and 4 is EXTRA from GNU malloc.
|
2015-11-09 05:42:45 +01:00
|
|
|
Use the values for range checking, because if range checking is off,
|
|
|
|
the extra bytes won't be missed terribly, but if range checking is on
|
|
|
|
and we used a larger request, a whole extra 4096 bytes would be
|
|
|
|
allocated.
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2015-11-09 05:42:45 +01:00
|
|
|
These number are irrelevant to the new GNU malloc. I suspect it is
|
|
|
|
less sensitive to the size of the request. */
|
1999-05-03 09:29:11 +02:00
|
|
|
int extra = ((((12 + DEFAULT_ROUNDING - 1) & ~(DEFAULT_ROUNDING - 1))
|
2015-11-09 05:42:45 +01:00
|
|
|
+ 4 + DEFAULT_ROUNDING - 1)
|
|
|
|
& ~(DEFAULT_ROUNDING - 1));
|
1999-05-03 09:29:11 +02:00
|
|
|
size = 4096 - extra;
|
|
|
|
}
|
|
|
|
|
|
|
|
h->chunk_size = size;
|
|
|
|
h->alignment_mask = alignment - 1;
|
|
|
|
|
2015-11-09 05:45:51 +01:00
|
|
|
chunk = (struct _obstack_chunk *) call_chunkfun (h, h->chunk_size);
|
1999-05-03 09:29:11 +02:00
|
|
|
if (!chunk)
|
|
|
|
(*obstack_alloc_failed_handler) ();
|
2015-11-09 05:45:51 +01:00
|
|
|
h->chunk = chunk;
|
2015-11-09 05:42:45 +01:00
|
|
|
h->next_free = h->object_base = __PTR_ALIGN ((char *) chunk, chunk->contents,
|
|
|
|
alignment - 1);
|
|
|
|
h->chunk_limit = chunk->limit = (char *) chunk + h->chunk_size;
|
1999-05-03 09:29:11 +02:00
|
|
|
chunk->prev = 0;
|
|
|
|
/* The initial chunk now contains no empty object. */
|
|
|
|
h->maybe_empty_object = 0;
|
|
|
|
h->alloc_failed = 0;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2015-11-09 05:42:45 +01:00
|
|
|
_obstack_begin (struct obstack *h,
|
|
|
|
_OBSTACK_SIZE_T size, _OBSTACK_SIZE_T alignment,
|
|
|
|
void *(*chunkfun) (size_t),
|
|
|
|
void (*freefun) (void *))
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
2015-11-09 05:42:45 +01:00
|
|
|
h->chunkfun.plain = chunkfun;
|
|
|
|
h->freefun.plain = freefun;
|
|
|
|
h->use_extra_arg = 0;
|
|
|
|
return _obstack_begin_worker (h, size, alignment);
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2015-11-09 05:42:45 +01:00
|
|
|
int
|
|
|
|
_obstack_begin_1 (struct obstack *h,
|
|
|
|
_OBSTACK_SIZE_T size, _OBSTACK_SIZE_T alignment,
|
|
|
|
void *(*chunkfun) (void *, size_t),
|
|
|
|
void (*freefun) (void *, void *),
|
|
|
|
void *arg)
|
|
|
|
{
|
|
|
|
h->chunkfun.extra = chunkfun;
|
|
|
|
h->freefun.extra = freefun;
|
1999-05-03 09:29:11 +02:00
|
|
|
h->extra_arg = arg;
|
|
|
|
h->use_extra_arg = 1;
|
2015-11-09 05:42:45 +01:00
|
|
|
return _obstack_begin_worker (h, size, alignment);
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Allocate a new current chunk for the obstack *H
|
|
|
|
on the assumption that LENGTH bytes need to be added
|
|
|
|
to the current object, or a new object of length LENGTH allocated.
|
|
|
|
Copies any partial object from the end of the old chunk
|
|
|
|
to the beginning of the new one. */
|
|
|
|
|
|
|
|
void
|
2015-11-09 05:42:45 +01:00
|
|
|
_obstack_newchunk (struct obstack *h, _OBSTACK_SIZE_T length)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
2015-11-09 05:42:45 +01:00
|
|
|
struct _obstack_chunk *old_chunk = h->chunk;
|
|
|
|
struct _obstack_chunk *new_chunk = 0;
|
|
|
|
size_t obj_size = h->next_free - h->object_base;
|
|
|
|
char *object_base;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
/* Compute size for new chunk. */
|
2015-11-09 05:42:45 +01:00
|
|
|
size_t sum1 = obj_size + length;
|
|
|
|
size_t sum2 = sum1 + h->alignment_mask;
|
|
|
|
size_t new_size = sum2 + (obj_size >> 3) + 100;
|
|
|
|
if (new_size < sum2)
|
|
|
|
new_size = sum2;
|
1999-05-03 09:29:11 +02:00
|
|
|
if (new_size < h->chunk_size)
|
|
|
|
new_size = h->chunk_size;
|
|
|
|
|
|
|
|
/* Allocate and initialize the new chunk. */
|
2015-11-09 05:42:45 +01:00
|
|
|
if (obj_size <= sum1 && sum1 <= sum2)
|
2015-11-09 05:45:51 +01:00
|
|
|
new_chunk = (struct _obstack_chunk *) call_chunkfun (h, new_size);
|
1999-05-03 09:29:11 +02:00
|
|
|
if (!new_chunk)
|
2015-11-09 05:42:45 +01:00
|
|
|
(*obstack_alloc_failed_handler)();
|
1999-05-03 09:29:11 +02:00
|
|
|
h->chunk = new_chunk;
|
|
|
|
new_chunk->prev = old_chunk;
|
|
|
|
new_chunk->limit = h->chunk_limit = (char *) new_chunk + new_size;
|
|
|
|
|
2015-11-09 05:42:45 +01:00
|
|
|
/* Compute an aligned object_base in the new chunk */
|
|
|
|
object_base =
|
|
|
|
__PTR_ALIGN ((char *) new_chunk, new_chunk->contents, h->alignment_mask);
|
|
|
|
|
|
|
|
/* Move the existing object to the new chunk. */
|
|
|
|
memcpy (object_base, h->object_base, obj_size);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
/* If the object just copied was the only data in OLD_CHUNK,
|
|
|
|
free that chunk and remove it from the chain.
|
|
|
|
But not if that chunk might contain an empty object. */
|
2015-11-09 05:42:45 +01:00
|
|
|
if (!h->maybe_empty_object
|
|
|
|
&& (h->object_base
|
|
|
|
== __PTR_ALIGN ((char *) old_chunk, old_chunk->contents,
|
|
|
|
h->alignment_mask)))
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
new_chunk->prev = old_chunk->prev;
|
2015-11-09 05:42:45 +01:00
|
|
|
call_freefun (h, old_chunk);
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
|
2015-11-09 05:42:45 +01:00
|
|
|
h->object_base = object_base;
|
1999-05-03 09:29:11 +02:00
|
|
|
h->next_free = h->object_base + obj_size;
|
|
|
|
/* The new chunk certainly contains no empty object yet. */
|
|
|
|
h->maybe_empty_object = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Return nonzero if object OBJ has been allocated from obstack H.
|
|
|
|
This is here for debugging.
|
|
|
|
If you use it in a program, you are probably losing. */
|
|
|
|
|
|
|
|
/* Suppress -Wmissing-prototypes warning. We don't want to declare this in
|
|
|
|
obstack.h because it is just for debugging. */
|
2015-11-09 05:42:45 +01:00
|
|
|
int _obstack_allocated_p (struct obstack *h, void *obj) __attribute_pure__;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
int
|
2015-11-09 05:42:45 +01:00
|
|
|
_obstack_allocated_p (struct obstack *h, void *obj)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
2015-11-09 05:42:45 +01:00
|
|
|
struct _obstack_chunk *lp; /* below addr of any objects in this chunk */
|
|
|
|
struct _obstack_chunk *plp; /* point to previous chunk if any */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
lp = (h)->chunk;
|
|
|
|
/* We use >= rather than > since the object cannot be exactly at
|
|
|
|
the beginning of the chunk but might be an empty object exactly
|
|
|
|
at the end of an adjacent chunk. */
|
2015-11-09 05:42:45 +01:00
|
|
|
while (lp != 0 && ((void *) lp >= obj || (void *) (lp)->limit < obj))
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
plp = lp->prev;
|
|
|
|
lp = plp;
|
|
|
|
}
|
|
|
|
return lp != 0;
|
|
|
|
}
|
2015-11-09 05:42:45 +01:00
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
/* Free objects in obstack H, including OBJ and everything allocate
|
|
|
|
more recently than OBJ. If OBJ is zero, free everything in H. */
|
|
|
|
|
|
|
|
void
|
2015-11-09 05:42:45 +01:00
|
|
|
_obstack_free (struct obstack *h, void *obj)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
2015-11-09 05:42:45 +01:00
|
|
|
struct _obstack_chunk *lp; /* below addr of any objects in this chunk */
|
|
|
|
struct _obstack_chunk *plp; /* point to previous chunk if any */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
lp = h->chunk;
|
|
|
|
/* We use >= because there cannot be an object at the beginning of a chunk.
|
|
|
|
But there can be an empty object at that address
|
|
|
|
at the end of another chunk. */
|
2015-11-09 05:42:45 +01:00
|
|
|
while (lp != 0 && ((void *) lp >= obj || (void *) (lp)->limit < obj))
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
plp = lp->prev;
|
2015-11-09 05:42:45 +01:00
|
|
|
call_freefun (h, lp);
|
1999-05-03 09:29:11 +02:00
|
|
|
lp = plp;
|
|
|
|
/* If we switch chunks, we can't tell whether the new current
|
2015-11-09 05:42:45 +01:00
|
|
|
chunk contains an empty object, so assume that it may. */
|
1999-05-03 09:29:11 +02:00
|
|
|
h->maybe_empty_object = 1;
|
|
|
|
}
|
|
|
|
if (lp)
|
|
|
|
{
|
|
|
|
h->object_base = h->next_free = (char *) (obj);
|
|
|
|
h->chunk_limit = lp->limit;
|
|
|
|
h->chunk = lp;
|
|
|
|
}
|
|
|
|
else if (obj != 0)
|
|
|
|
/* obj is not in any of the chunks! */
|
|
|
|
abort ();
|
|
|
|
}
|
|
|
|
|
2015-11-09 05:42:45 +01:00
|
|
|
_OBSTACK_SIZE_T
|
2005-03-28 07:07:08 +02:00
|
|
|
_obstack_memory_used (struct obstack *h)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
2015-11-09 05:42:45 +01:00
|
|
|
struct _obstack_chunk *lp;
|
|
|
|
_OBSTACK_SIZE_T nbytes = 0;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
for (lp = h->chunk; lp != 0; lp = lp->prev)
|
|
|
|
{
|
|
|
|
nbytes += lp->limit - (char *) lp;
|
|
|
|
}
|
|
|
|
return nbytes;
|
|
|
|
}
|
2015-11-09 05:42:45 +01:00
|
|
|
|
|
|
|
# ifndef _OBSTACK_NO_ERROR_HANDLER
|
1999-05-03 09:29:11 +02:00
|
|
|
/* Define the error handler. */
|
2015-11-09 05:42:45 +01:00
|
|
|
# include <stdio.h>
|
|
|
|
|
|
|
|
/* Exit value used when 'print_and_abort' is used. */
|
|
|
|
# ifdef _LIBC
|
|
|
|
int obstack_exit_failure = EXIT_FAILURE;
|
|
|
|
# else
|
2015-11-09 05:43:51 +01:00
|
|
|
# ifndef EXIT_FAILURE
|
|
|
|
# define EXIT_FAILURE 1
|
|
|
|
# endif
|
|
|
|
# define obstack_exit_failure EXIT_FAILURE
|
2015-11-09 05:42:45 +01:00
|
|
|
# endif
|
|
|
|
|
2015-11-09 05:43:51 +01:00
|
|
|
# if defined _LIBC || (HAVE_LIBINTL_H && ENABLE_NLS)
|
2015-11-09 05:42:45 +01:00
|
|
|
# include <libintl.h>
|
2015-11-09 05:43:51 +01:00
|
|
|
# ifndef _
|
|
|
|
# define _(msgid) gettext (msgid)
|
|
|
|
# endif
|
2015-11-09 05:42:45 +01:00
|
|
|
# else
|
2015-11-09 05:43:51 +01:00
|
|
|
# ifndef _
|
|
|
|
# define _(msgid) (msgid)
|
|
|
|
# endif
|
2015-11-09 05:42:45 +01:00
|
|
|
# endif
|
2015-11-09 05:43:51 +01:00
|
|
|
|
|
|
|
# if !(defined _Noreturn \
|
|
|
|
|| (defined __STDC_VERSION__ && __STDC_VERSION__ >= 201112))
|
|
|
|
# if ((defined __GNUC__ \
|
|
|
|
&& (__GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8))) \
|
|
|
|
|| (defined __SUNPRO_C && __SUNPRO_C >= 0x5110))
|
|
|
|
# define _Noreturn __attribute__ ((__noreturn__))
|
|
|
|
# elif defined _MSC_VER && _MSC_VER >= 1200
|
|
|
|
# define _Noreturn __declspec (noreturn)
|
|
|
|
# else
|
|
|
|
# define _Noreturn
|
|
|
|
# endif
|
1999-05-03 09:29:11 +02:00
|
|
|
# endif
|
|
|
|
|
2015-11-09 05:42:45 +01:00
|
|
|
# ifdef _LIBC
|
|
|
|
# include <libio/iolibio.h>
|
|
|
|
# endif
|
|
|
|
|
|
|
|
static _Noreturn void
|
2005-03-28 07:07:08 +02:00
|
|
|
print_and_abort (void)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
2015-11-09 05:42:45 +01:00
|
|
|
/* Don't change any of these strings. Yes, it would be possible to add
|
|
|
|
the newline to the string and use fputs or so. But this must not
|
|
|
|
happen because the "memory exhausted" message appears in other places
|
|
|
|
like this and the translation should be reused instead of creating
|
|
|
|
a very similar string which requires a separate translation. */
|
|
|
|
# ifdef _LIBC
|
|
|
|
(void) __fxprintf (NULL, "%s\n", _("memory exhausted"));
|
|
|
|
# else
|
|
|
|
fprintf (stderr, "%s\n", _("memory exhausted"));
|
|
|
|
# endif
|
1999-05-03 09:29:11 +02:00
|
|
|
exit (obstack_exit_failure);
|
|
|
|
}
|
|
|
|
|
2015-11-09 05:42:45 +01:00
|
|
|
/* The functions allocating more room by calling 'obstack_chunk_alloc'
|
|
|
|
jump to the handler pointed to by 'obstack_alloc_failed_handler'.
|
|
|
|
This can be set to a user defined function which should either
|
|
|
|
abort gracefully or use longjump - but shouldn't return. This
|
|
|
|
variable by default points to the internal function
|
|
|
|
'print_and_abort'. */
|
|
|
|
void (*obstack_alloc_failed_handler) (void) = print_and_abort;
|
|
|
|
# endif /* !_OBSTACK_NO_ERROR_HANDLER */
|
|
|
|
#endif /* !_OBSTACK_ELIDE_CODE */
|