darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

merge from gcc

Browse source
This commit is contained in:
DJ Delorie 2002-06-06 12:55:24 +00:00
parent 7217313c59
commit 1889369086
6 changed files with 124 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
include/ChangeLog
View file

@ -1,3 +1,30 @@
2002-06-06 DJ Delorie <dj@redhat.com>
* hashtab.h (htab): Rearrange new members for backward
compatibility.
(htab_create): Don't use a macro that requires other headers.
2002-06-05 Geoffrey Keating <geoffk@redhat.com>
* hashtab.h (htab_create): Restore prototype for backward
compatibility.
(htab_try_create): Likewise.
2002-05-22 Geoffrey Keating <geoffk@redhat.com>
* hashtab.h (struct htab): Update for change to length specifier.
2002-05-10 Geoffrey Keating <geoffk@redhat.com>
* hashtab.h (GTY): Define if undefined.
(htab_alloc): New typedef.
(htab_free): New typedef.
(struct htab): Support gengtype; allow user-specified memory
allocation.
(htab_create_alloc): New.
(htab_create): Replace with #define.
(htab_try_create): Delete.
2002-05-31 Michal Ludvig <mludvig@suse.cz>
* elf/dwarf2.h (DW_CFA_low_user, DW_CFA_high_user): Renamed

37
include/hashtab.h
View file

@ -38,6 +38,10 @@ extern "C" {
#include <ansidecl.h>
#ifndef GTY
#define GTY(X)
#endif
/* The type for a hash code. */
typedef unsigned int hashval_t;
@ -63,12 +67,21 @@ typedef void (*htab_del) PARAMS ((void *));
htab_traverse. Return 1 to continue scan, 0 to stop. */
typedef int (*htab_trav) PARAMS ((void **, void *));
/* Memory-allocation function, with the same functionality as calloc().
Iff it returns NULL, the hash table implementation will pass an error
code back to the user, so if your code doesn't handle errors,
best if you use xcalloc instead. */
typedef PTR (*htab_alloc) PARAMS ((size_t, size_t));
/* We also need a free() routine. */
typedef void (*htab_free) PARAMS ((PTR));
/* Hash tables are of the following type. The structure
(implementation) of this type is not needed for using the hash
tables. All work with hash table should be executed only through
functions mentioned below. */
struct htab
struct htab GTY(())
{
/* Pointer to hash function. */
htab_hash hash_f;
@ -80,7 +93,7 @@ struct htab
htab_del del_f;
/* Table itself. */
PTR *entries;
PTR * GTY ((use_param (""), length ("%h.size"))) entries;
/* Current size (in entries) of the hash table */
size_t size;
@ -99,9 +112,9 @@ struct htab
of collisions fixed for time of work with the hash table. */
unsigned int collisions;
/* This is non-zero if we are allowed to return NULL for function calls
that allocate memory. */
int return_allocation_failure;
/* Pointers to allocate/free functions. */
htab_alloc alloc_f;
htab_free free_f;
};
typedef struct htab *htab_t;
@ -111,14 +124,14 @@ enum insert_option {NO_INSERT, INSERT};
/* The prototypes of the package functions. */
extern htab_t htab_create PARAMS ((size_t, htab_hash,
htab_eq, htab_del));
extern htab_t htab_create_alloc PARAMS ((size_t, htab_hash,
htab_eq, htab_del,
htab_alloc, htab_free));
/* Backward-compatibility functions. */
extern htab_t htab_create PARAMS ((size_t, htab_hash, htab_eq, htab_del));
extern htab_t htab_try_create PARAMS ((size_t, htab_hash, htab_eq, htab_del));
/* This function is like htab_create, but may return NULL if memory
allocation fails, and also signals that htab_find_slot_with_hash and
htab_find_slot are allowed to return NULL when inserting. */
extern htab_t htab_try_create PARAMS ((size_t, htab_hash,
htab_eq, htab_del));
extern void htab_delete PARAMS ((htab_t));
extern void htab_empty PARAMS ((htab_t));

23
libiberty/ChangeLog
View file

@ -1,3 +1,22 @@
2002-06-05 Geoffrey Keating <geoffk@redhat.com>
* hashtab.c (htab_create): New stub function for backward
compatibility.
(htab_try_create): Likewise.
2002-06-03 Geoffrey Keating <geoffk@redhat.com>
* hashtab.c (htab_create): Delete.
(htab_try_create): Delete.
(htab_create_alloc): New.
(htab_delete): Support user-specified memory allocation.
(htab_expand): Likewise.
2002-05-22 Roman Lechtchinsky <rl@cs.tu-berlin.de>
* configure.in: Fix typo in the code checking for sys_errlist.
* configure: Regenerated.
2002-05-13 Andreas Schwab <schwab@suse.de>
* config.table: Use mh-x86pic also for x86-64.
@ -30,7 +49,7 @@
2002-03-30 Bryce McKinlay <bryce@waitaki.otago.ac.nz>
* cp-demangle.c (java_demangle_v3): Don't try to release "demangled"
* cp-demangle.c (java_demangle_v3): Don't try to release "demangled"
if it is NULL.
2002-03-27 DJ Delorie <dj@redhat.com>
@ -89,7 +108,7 @@
* xmalloc.c (xmalloc_fail): Clarify error message.
2002-02-21 Jim Blandy <jimb@redhat.com>
2002-02-22 Jim Blandy <jimb@redhat.com>
* splay-tree.c (splay_tree_xmalloc_allocate,
splay_tree_xmalloc_deallocate): New functions.

2
libiberty/configure vendored
View file

@ -2860,7 +2860,7 @@ else
#include "confdefs.h"
int *p;
int main() {
extern int $v []; p = &$v;
extern int $v []; p = $v;
; return 0; }
EOF
if { (eval echo configure:2867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

2
libiberty/configure.in
View file

@ -401,7 +401,7 @@ if test -z "${setobjs}"; then
for v in $vars; do
AC_MSG_CHECKING([for $v])
AC_CACHE_VAL(libiberty_cv_var_$v,
[AC_TRY_LINK([int *p;], [extern int $v []; p = &$v;],
[AC_TRY_LINK([int *p;], [extern int $v []; p = $v;],
[eval "libiberty_cv_var_$v=yes"],
[eval "libiberty_cv_var_$v=no"])])
if eval "test \"`echo '$libiberty_cv_var_'$v`\" = yes"; then

98
libiberty/hashtab.c
View file

@ -158,8 +158,42 @@ eq_pointer (p1, p2)
/* This function creates table with length slightly longer than given
source length. Created hash table is initiated as empty (all the
hash table entries are EMPTY_ENTRY). The function returns the
created hash table. Memory allocation must not fail. */
created hash table, or NULL if memory allocation fails. */
htab_t
htab_create_alloc (size, hash_f, eq_f, del_f, alloc_f, free_f)
size_t size;
htab_hash hash_f;
htab_eq eq_f;
htab_del del_f;
htab_alloc alloc_f;
htab_free free_f;
{
htab_t result;
size = higher_prime_number (size);
result = (htab_t) (*alloc_f) (1, sizeof (struct htab));
if (result == NULL)
return NULL;
result->entries = (PTR *) (*alloc_f) (size, sizeof (PTR));
if (result->entries == NULL)
{
if (free_f != NULL)
(*free_f) (result);
return NULL;
}
result->size = size;
result->hash_f = hash_f;
result->eq_f = eq_f;
result->del_f = del_f;
result->alloc_f = alloc_f;
result->free_f = free_f;
return result;
}
/* These functions exist solely for backward compatibility. */
#undef htab_create
htab_t
htab_create (size, hash_f, eq_f, del_f)
size_t size;
@ -167,24 +201,9 @@ htab_create (size, hash_f, eq_f, del_f)
htab_eq eq_f;
htab_del del_f;
{
htab_t result;
size = higher_prime_number (size);
result = (htab_t) xcalloc (1, sizeof (struct htab));
result->entries = (PTR *) xcalloc (size, sizeof (PTR));
result->size = size;
result->hash_f = hash_f;
result->eq_f = eq_f;
result->del_f = del_f;
result->return_allocation_failure = 0;
return result;
return htab_create_alloc (size, hash_f, eq_f, del_f, xcalloc, free);
}
/* This function creates table with length slightly longer than given
source length. The created hash table is initiated as empty (all the
hash table entries are EMPTY_ENTRY). The function returns the created
hash table. Memory allocation may fail; it may return NULL. */
htab_t
htab_try_create (size, hash_f, eq_f, del_f)
size_t size;
@ -192,26 +211,7 @@ htab_try_create (size, hash_f, eq_f, del_f)
htab_eq eq_f;
htab_del del_f;
{
htab_t result;
size = higher_prime_number (size);
result = (htab_t) calloc (1, sizeof (struct htab));
if (result == NULL)
return NULL;
result->entries = (PTR *) calloc (size, sizeof (PTR));
if (result->entries == NULL)
{
free (result);
return NULL;
}
result->size = size;
result->hash_f = hash_f;
result->eq_f = eq_f;
result->del_f = del_f;
result->return_allocation_failure = 1;
return result;
return htab_create_alloc (size, hash_f, eq_f, del_f, calloc, free);
}
/* This function frees all memory allocated for given hash table.
@ -229,8 +229,11 @@ htab_delete (htab)
&& htab->entries[i] != DELETED_ENTRY)
(*htab->del_f) (htab->entries[i]);
free (htab->entries);
free (htab);
if (htab->free_f != NULL)
{
(*htab->free_f) (htab->entries);
(*htab->free_f) (htab);
}
}
/* This function clears all entries in the given hash table. */
@ -302,21 +305,17 @@ htab_expand (htab)
PTR *oentries;
PTR *olimit;
PTR *p;
PTR *nentries;
oentries = htab->entries;
olimit = oentries + htab->size;
htab->size = higher_prime_number (htab->size * 2);
if (htab->return_allocation_failure)
{
PTR *nentries = (PTR *) calloc (htab->size, sizeof (PTR *));
if (nentries == NULL)
return 0;
htab->entries = nentries;
}
else
htab->entries = (PTR *) xcalloc (htab->size, sizeof (PTR *));
nentries = (PTR *) (*htab->alloc_f) (htab->size, sizeof (PTR *));
if (nentries == NULL)
return 0;
htab->entries = nentries;
htab->n_elements -= htab->n_deleted;
htab->n_deleted = 0;
@ -337,7 +336,8 @@ htab_expand (htab)
}
while (p < olimit);
free (oentries);
if (htab->free_f != NULL)
(*htab->free_f) (oentries);
return 1;
}