mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-15 04:31:49 +08:00
73cc72729a
This patch moves the gdb/gnulib subdirectory to the top level. It adjusts the top-level build system to build gnulib when necessary, and changes gdb to use this. However, gdbserver still builds its own copy of gnulib, just from the new source location. A small hack was needed to ensure that gnulib is only built when gdb is enabled. The Makefile only provides an ordering -- the directory must be mentioned in configdirs to actually be compiled at all. Most of the patch is just a "git mv" of gnulib, though a few minor path adjustments were needed in some files there. Tested by the buildbot. ChangeLog 2019-06-14 Tom Tromey <tom@tromey.com> * MAINTAINERS: Add gnulib. * gnulib: New directory, move from gdb/gnulib. * configure.ac (host_libs): Add gnulib. * configure: Rebuild. * Makefile.def (host_modules, dependencies): Add gnulib. * Makefile.in: Rebuild. gdb/ChangeLog 2019-06-14 Tom Tromey <tom@tromey.com> * gnulib: Move directory to top-level. * configure.ac: Don't configure gnulib. * configure: Rebuild. * common/common-defs.h: Use new path to gnulib. * Makefile.in (GNULIB_BUILDDIR): Now ../gnulib. (GNULIB_H): Remove. (INCGNU): Look in new gnulib location. (HFILES_NO_SRCDIR): Remove gnulib files. (SUBDIR, REQUIRED_SUBDIRS): Remove gnulib. (generated_files): Remove GNULIB_H. ($(LIBGNU), all-lib): Remove targets. (distclean): Don't mention GNULIB_BUILDDIR. ($(GNULIB_BUILDDIR)/Makefile): Remove target. gdb/gdbserver/ChangeLog 2019-06-14 Tom Tromey <tom@tromey.com> * configure.ac: Use new path to gnulib. * configure: Rebuild. * Makefile.in (INCGNU, $(GNULIB_BUILDDIR)/Makefile): Use new path to gnulib. gnulib/ChangeLog 2019-06-14 Tom Tromey <tom@tromey.com> * update-gnulib.sh: Adjust paths. * Makefile.in: Adjust paths. * configure.ac: Adjust paths. Use ACX_LARGEFILE. * configure: Rebuild.
150 lines
4.9 KiB
C
150 lines
4.9 KiB
C
/* Safe automatic memory allocation.
|
|
Copyright (C) 2003, 2006-2007, 2009-2016 Free Software Foundation, Inc.
|
|
Written by Bruno Haible <bruno@clisp.org>, 2003.
|
|
|
|
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 3, 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.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#define _GL_USE_STDLIB_ALLOC 1
|
|
#include <config.h>
|
|
|
|
/* Specification. */
|
|
#include "malloca.h"
|
|
|
|
#include <stdint.h>
|
|
|
|
#include "verify.h"
|
|
|
|
/* The speed critical point in this file is freea() applied to an alloca()
|
|
result: it must be fast, to match the speed of alloca(). The speed of
|
|
mmalloca() and freea() in the other case are not critical, because they
|
|
are only invoked for big memory sizes. */
|
|
|
|
#if HAVE_ALLOCA
|
|
|
|
/* Store the mmalloca() results in a hash table. This is needed to reliably
|
|
distinguish a mmalloca() result and an alloca() result.
|
|
|
|
Although it is possible that the same pointer is returned by alloca() and
|
|
by mmalloca() at different times in the same application, it does not lead
|
|
to a bug in freea(), because:
|
|
- Before a pointer returned by alloca() can point into malloc()ed memory,
|
|
the function must return, and once this has happened the programmer must
|
|
not call freea() on it anyway.
|
|
- Before a pointer returned by mmalloca() can point into the stack, it
|
|
must be freed. The only function that can free it is freea(), and
|
|
when freea() frees it, it also removes it from the hash table. */
|
|
|
|
#define MAGIC_NUMBER 0x1415fb4a
|
|
#define MAGIC_SIZE sizeof (int)
|
|
/* This is how the header info would look like without any alignment
|
|
considerations. */
|
|
struct preliminary_header { void *next; int magic; };
|
|
/* But the header's size must be a multiple of sa_alignment_max. */
|
|
#define HEADER_SIZE \
|
|
(((sizeof (struct preliminary_header) + sa_alignment_max - 1) / sa_alignment_max) * sa_alignment_max)
|
|
union header {
|
|
void *next;
|
|
struct {
|
|
char room[HEADER_SIZE - MAGIC_SIZE];
|
|
int word;
|
|
} magic;
|
|
};
|
|
verify (HEADER_SIZE == sizeof (union header));
|
|
/* We make the hash table quite big, so that during lookups the probability
|
|
of empty hash buckets is quite high. There is no need to make the hash
|
|
table resizable, because when the hash table gets filled so much that the
|
|
lookup becomes slow, it means that the application has memory leaks. */
|
|
#define HASH_TABLE_SIZE 257
|
|
static void * mmalloca_results[HASH_TABLE_SIZE];
|
|
|
|
#endif
|
|
|
|
void *
|
|
mmalloca (size_t n)
|
|
{
|
|
#if HAVE_ALLOCA
|
|
/* Allocate one more word, that serves as an indicator for malloc()ed
|
|
memory, so that freea() of an alloca() result is fast. */
|
|
size_t nplus = n + HEADER_SIZE;
|
|
|
|
if (nplus >= n)
|
|
{
|
|
void *p = malloc (nplus);
|
|
|
|
if (p != NULL)
|
|
{
|
|
size_t slot;
|
|
union header *h = p;
|
|
|
|
p = h + 1;
|
|
|
|
/* Put a magic number into the indicator word. */
|
|
h->magic.word = MAGIC_NUMBER;
|
|
|
|
/* Enter p into the hash table. */
|
|
slot = (uintptr_t) p % HASH_TABLE_SIZE;
|
|
h->next = mmalloca_results[slot];
|
|
mmalloca_results[slot] = p;
|
|
|
|
return p;
|
|
}
|
|
}
|
|
/* Out of memory. */
|
|
return NULL;
|
|
#else
|
|
# if !MALLOC_0_IS_NONNULL
|
|
if (n == 0)
|
|
n = 1;
|
|
# endif
|
|
return malloc (n);
|
|
#endif
|
|
}
|
|
|
|
#if HAVE_ALLOCA
|
|
void
|
|
freea (void *p)
|
|
{
|
|
/* mmalloca() may have returned NULL. */
|
|
if (p != NULL)
|
|
{
|
|
/* Attempt to quickly distinguish the mmalloca() result - which has
|
|
a magic indicator word - and the alloca() result - which has an
|
|
uninitialized indicator word. It is for this test that sa_increment
|
|
additional bytes are allocated in the alloca() case. */
|
|
if (((int *) p)[-1] == MAGIC_NUMBER)
|
|
{
|
|
/* Looks like a mmalloca() result. To see whether it really is one,
|
|
perform a lookup in the hash table. */
|
|
size_t slot = (uintptr_t) p % HASH_TABLE_SIZE;
|
|
void **chain = &mmalloca_results[slot];
|
|
for (; *chain != NULL;)
|
|
{
|
|
union header *h = p;
|
|
if (*chain == p)
|
|
{
|
|
/* Found it. Remove it from the hash table and free it. */
|
|
union header *p_begin = h - 1;
|
|
*chain = p_begin->next;
|
|
free (p_begin);
|
|
return;
|
|
}
|
|
h = *chain;
|
|
chain = &h[-1].next;
|
|
}
|
|
}
|
|
/* At this point, we know it was not a mmalloca() result. */
|
|
}
|
|
}
|
|
#endif
|