projects
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
XCOFF archive sanity check
[binutils-gdb.git]
/
bfd
/
stabs.c
diff --git
a/bfd/stabs.c
b/bfd/stabs.c
index eb610872330a7da333c45bc4823e23c47cc12395..1cce2ae4f3fc17cbd6abaf6ef3990a62b969f3f4 100644
(file)
--- a/
bfd/stabs.c
+++ b/
bfd/stabs.c
@@
-1,13
+1,12
@@
/* Stabs in sections linking support.
/* Stabs in sections linking support.
- Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
- Free Software Foundation, Inc.
+ Copyright (C) 1996-2023 Free Software Foundation, Inc.
Written by Ian Lance Taylor, Cygnus Support.
This file is part of BFD, the Binary File Descriptor library.
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
Written by Ian Lance Taylor, Cygnus Support.
This file is part of BFD, the Binary File Descriptor library.
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
of the License, or
+ the Free Software Foundation; either version
3
of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@
-17,13
+16,15
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
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., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+ MA 02110-1301, USA. */
+
/* This file contains support for linking stabs in sections, as used
on COFF and ELF. */
/* This file contains support for linking stabs in sections, as used
on COFF and ELF. */
-#include "bfd.h"
#include "sysdep.h"
#include "sysdep.h"
+#include "bfd.h"
#include "libbfd.h"
#include "aout/stab_gnu.h"
#include "safe-ctype.h"
#include "libbfd.h"
#include "aout/stab_gnu.h"
#include "safe-ctype.h"
@@
-125,8
+126,8
@@
stab_link_includes_newfunc (struct bfd_hash_entry *entry,
/* Allocate the structure if it has not already been allocated by a
subclass. */
if (ret == NULL)
/* Allocate the structure if it has not already been allocated by a
subclass. */
if (ret == NULL)
- ret =
bfd_hash_allocate (table,
-
sizeof (struct stab_link_includes_entry));
+ ret =
(struct stab_link_includes_entry *)
+
bfd_hash_allocate (table,
sizeof (struct stab_link_includes_entry));
if (ret == NULL)
return NULL;
if (ret == NULL)
return NULL;
@@
-143,7
+144,7
@@
stab_link_includes_newfunc (struct bfd_hash_entry *entry,
/* This function is called for each input file from the add_symbols
pass of the linker. */
/* This function is called for each input file from the add_symbols
pass of the linker. */
-b
fd_boolean
+b
ool
_bfd_link_section_stabs (bfd *abfd,
struct stab_info *sinfo,
asection *stabsec,
_bfd_link_section_stabs (bfd *abfd,
struct stab_info *sinfo,
asection *stabsec,
@@
-151,7
+152,7
@@
_bfd_link_section_stabs (bfd *abfd,
void * *psecinfo,
bfd_size_type *pstring_offset)
{
void * *psecinfo,
bfd_size_type *pstring_offset)
{
- b
fd_boolean
first;
+ b
ool
first;
bfd_size_type count, amt;
struct stab_section_info *secinfo;
bfd_byte *stabbuf = NULL;
bfd_size_type count, amt;
struct stab_section_info *secinfo;
bfd_byte *stabbuf = NULL;
@@
-161,48
+162,51
@@
_bfd_link_section_stabs (bfd *abfd,
bfd_size_type *pstridx;
if (stabsec->size == 0
bfd_size_type *pstridx;
if (stabsec->size == 0
- || stabstrsec->size == 0)
+ || stabstrsec->size == 0
+ || (stabsec->flags & SEC_HAS_CONTENTS) == 0
+ || (stabstrsec->flags & SEC_HAS_CONTENTS) == 0)
/* This file does not contain stabs debugging information. */
/* This file does not contain stabs debugging information. */
- return
TRUE
;
+ return
true
;
if (stabsec->size % STABSIZE != 0)
/* Something is wrong with the format of these stab symbols.
Don't try to optimize them. */
if (stabsec->size % STABSIZE != 0)
/* Something is wrong with the format of these stab symbols.
Don't try to optimize them. */
- return
TRUE
;
+ return
true
;
if ((stabstrsec->flags & SEC_RELOC) != 0)
/* We shouldn't see relocations in the strings, and we aren't
prepared to handle them. */
if ((stabstrsec->flags & SEC_RELOC) != 0)
/* We shouldn't see relocations in the strings, and we aren't
prepared to handle them. */
- return
TRUE
;
+ return
true
;
- if ((stabsec->output_section != NULL
- && bfd_is_abs_section (stabsec->output_section))
- || (stabstrsec->output_section != NULL
- && bfd_is_abs_section (stabstrsec->output_section)))
+ if (bfd_is_abs_section (stabsec->output_section)
+ || bfd_is_abs_section (stabstrsec->output_section))
/* At least one of the sections is being discarded from the
link, so we should just ignore them. */
/* At least one of the sections is being discarded from the
link, so we should just ignore them. */
- return
TRUE
;
+ return
true
;
- first =
FALSE
;
+ first =
false
;
if (sinfo->stabstr == NULL)
{
if (sinfo->stabstr == NULL)
{
+ flagword flags;
+
/* Initialize the stabs information we need to keep track of. */
/* Initialize the stabs information we need to keep track of. */
- first =
TRUE
;
+ first =
true
;
sinfo->strings = _bfd_stringtab_init ();
if (sinfo->strings == NULL)
goto error_return;
/* Make sure the first byte is zero. */
sinfo->strings = _bfd_stringtab_init ();
if (sinfo->strings == NULL)
goto error_return;
/* Make sure the first byte is zero. */
- (void) _bfd_stringtab_add (sinfo->strings, "",
TRUE, TRUE
);
- if (! bfd_hash_table_init
_n
(&sinfo->includes,
-
stab_link_includes_newfunc,
-
251
))
+ (void) _bfd_stringtab_add (sinfo->strings, "",
true, true
);
+ if (! bfd_hash_table_init (&sinfo->includes,
+ stab_link_includes_newfunc,
+
sizeof (struct stab_link_includes_entry)
))
goto error_return;
goto error_return;
- sinfo->stabstr = bfd_make_section_anyway (abfd, ".stabstr");
+ flags = (SEC_HAS_CONTENTS | SEC_READONLY | SEC_DEBUGGING
+ | SEC_LINKER_CREATED);
+ sinfo->stabstr = bfd_make_section_anyway_with_flags (abfd, ".stabstr",
+ flags);
if (sinfo->stabstr == NULL)
goto error_return;
if (sinfo->stabstr == NULL)
goto error_return;
- sinfo->stabstr->flags |= (SEC_HAS_CONTENTS | SEC_READONLY
- | SEC_DEBUGGING | SEC_LINKER_CREATED);
}
/* Initialize the information we are going to store for this .stab
}
/* Initialize the information we are going to store for this .stab
@@
-265,21
+269,22
@@
_bfd_link_section_stabs (bfd *abfd,
++skip;
continue;
}
++skip;
continue;
}
- first =
FALSE
;
+ first =
false
;
}
/* Store the string in the hash table, and record the index. */
symstroff = stroff + bfd_get_32 (abfd, sym + STRDXOFF);
if (symstroff >= stabstrsec->size)
{
}
/* Store the string in the hash table, and record the index. */
symstroff = stroff + bfd_get_32 (abfd, sym + STRDXOFF);
if (symstroff >= stabstrsec->size)
{
- (*_bfd_error_handler)
- (_("%B(%A+0x%lx): Stabs entry has invalid string index."),
+ _bfd_error_handler
+ /* xgettext:c-format */
+ (_("%pB(%pA+%#lx): stabs entry has invalid string index"),
abfd, stabsec, (long) (sym - stabbuf));
bfd_set_error (bfd_error_bad_value);
goto error_return;
}
string = (char *) stabstrbuf + symstroff;
abfd, stabsec, (long) (sym - stabbuf));
bfd_set_error (bfd_error_bad_value);
goto error_return;
}
string = (char *) stabstrbuf + symstroff;
- *pstridx = _bfd_stringtab_add (sinfo->strings, string,
TRUE, TRUE
);
+ *pstridx = _bfd_stringtab_add (sinfo->strings, string,
true, true
);
/* An N_BINCL symbol indicates the start of the stabs entries
for a header file. We need to scan ahead to the next N_EINCL
/* An N_BINCL symbol indicates the start of the stabs entries
for a header file. We need to scan ahead to the next N_EINCL
@@
-334,7
+339,7
@@
_bfd_link_section_stabs (bfd *abfd,
if (num_chars >= buf_len)
{
buf_len += 32 * 1024;
if (num_chars >= buf_len)
{
buf_len += 32 * 1024;
- symb =
bfd_realloc
(symb, buf_len);
+ symb =
(char *) bfd_realloc_or_free
(symb, buf_len);
if (symb == NULL)
goto error_return;
symb_rover = symb + num_chars;
if (symb == NULL)
goto error_return;
symb_rover = symb + num_chars;
@@
-359,7
+364,7
@@
_bfd_link_section_stabs (bfd *abfd,
/* If we have already included a header file with the same
value, then replaced this one with an N_EXCL symbol. */
incl_entry = (struct stab_link_includes_entry * )
/* If we have already included a header file with the same
value, then replaced this one with an N_EXCL symbol. */
incl_entry = (struct stab_link_includes_entry * )
- bfd_hash_lookup (&sinfo->includes, string,
TRUE, TRUE
);
+ bfd_hash_lookup (&sinfo->includes, string,
true, true
);
if (incl_entry == NULL)
goto error_return;
if (incl_entry == NULL)
goto error_return;
@@
-372,7
+377,7
@@
_bfd_link_section_stabs (bfd *abfd,
/* Record this symbol, so that we can set the value
correctly. */
amt = sizeof *ne;
/* Record this symbol, so that we can set the value
correctly. */
amt = sizeof *ne;
- ne = bfd_alloc (abfd, amt);
+ ne =
(struct stab_excl_list *)
bfd_alloc (abfd, amt);
if (ne == NULL)
goto error_return;
ne->offset = sym - stabbuf;
if (ne == NULL)
goto error_return;
ne->offset = sym - stabbuf;
@@
-385,12
+390,14
@@
_bfd_link_section_stabs (bfd *abfd,
{
/* This is the first time we have seen this header file
with this set of stabs strings. */
{
/* This is the first time we have seen this header file
with this set of stabs strings. */
- t = bfd_hash_allocate (&sinfo->includes, sizeof *t);
+ t = (struct stab_link_includes_totals *)
+ bfd_hash_allocate (&sinfo->includes, sizeof *t);
if (t == NULL)
goto error_return;
t->sum_chars = sum_chars;
t->num_chars = num_chars;
if (t == NULL)
goto error_return;
t->sum_chars = sum_chars;
t->num_chars = num_chars;
- t->symb = bfd_realloc (symb, num_chars); /* Trim data down. */
+ /* Trim data down. */
+ t->symb = symb = (char *) bfd_realloc_or_free (symb, num_chars);
t->next = incl_entry->totals;
incl_entry->totals = t;
}
t->next = incl_entry->totals;
incl_entry->totals = t;
}
@@
-430,7
+437,7
@@
_bfd_link_section_stabs (bfd *abfd,
++nest;
else if (incl_type == (int) N_EXCL)
/* Keep existing exclusion marks. */
++nest;
else if (incl_type == (int) N_EXCL)
/* Keep existing exclusion marks. */
- continue;
+ continue;
else if (nest == 0)
{
*incl_pstridx = (bfd_size_type) -1;
else if (nest == 0)
{
*incl_pstridx = (bfd_size_type) -1;
@@
-455,8
+462,8
@@
_bfd_link_section_stabs (bfd *abfd,
for that section. */
stabsec->size = (count - skip) * STABSIZE;
if (stabsec->size == 0)
for that section. */
stabsec->size = (count - skip) * STABSIZE;
if (stabsec->size == 0)
- stabsec->flags |= SEC_EXCLUDE;
- stabstrsec->flags |= SEC_EXCLUDE;
+ stabsec->flags |= SEC_EXCLUDE
| SEC_KEEP
;
+ stabstrsec->flags |= SEC_EXCLUDE
| SEC_KEEP
;
sinfo->stabstr->size = _bfd_stringtab_size (sinfo->strings);
/* Calculate the `cumulative_skips' array now that stabs have been
sinfo->stabstr->size = _bfd_stringtab_size (sinfo->strings);
/* Calculate the `cumulative_skips' array now that stabs have been
@@
-468,7
+475,7
@@
_bfd_link_section_stabs (bfd *abfd,
bfd_size_type *pskips;
amt = count * sizeof (bfd_size_type);
bfd_size_type *pskips;
amt = count * sizeof (bfd_size_type);
- secinfo->cumulative_skips = bfd_alloc (abfd, amt);
+ secinfo->cumulative_skips =
(bfd_size_type *)
bfd_alloc (abfd, amt);
if (secinfo->cumulative_skips == NULL)
goto error_return;
if (secinfo->cumulative_skips == NULL)
goto error_return;
@@
-486,14
+493,12
@@
_bfd_link_section_stabs (bfd *abfd,
BFD_ASSERT (offset != 0);
}
BFD_ASSERT (offset != 0);
}
- return
TRUE
;
+ return
true
;
error_return:
error_return:
- if (stabbuf != NULL)
- free (stabbuf);
- if (stabstrbuf != NULL)
- free (stabstrbuf);
- return FALSE;
+ free (stabbuf);
+ free (stabstrbuf);
+ return false;
}
\f
/* This function is called for each input file before the stab
}
\f
/* This function is called for each input file before the stab
@@
-502,11
+507,11
@@
_bfd_link_section_stabs (bfd *abfd,
any entries have been deleted.
*/
any entries have been deleted.
*/
-b
fd_boolean
+b
ool
_bfd_discard_section_stabs (bfd *abfd,
asection *stabsec,
void * psecinfo,
_bfd_discard_section_stabs (bfd *abfd,
asection *stabsec,
void * psecinfo,
- b
fd_boolean
(*reloc_symbol_deleted_p) (bfd_vma, void *),
+ b
ool
(*reloc_symbol_deleted_p) (bfd_vma, void *),
void * cookie)
{
bfd_size_type count, amt;
void * cookie)
{
bfd_size_type count, amt;
@@
-517,26
+522,26
@@
_bfd_discard_section_stabs (bfd *abfd,
bfd_size_type *pstridx;
int deleting;
bfd_size_type *pstridx;
int deleting;
- if (stabsec->size == 0)
+ if (stabsec->size == 0
|| (stabsec->flags & SEC_HAS_CONTENTS) == 0
)
/* This file does not contain stabs debugging information. */
/* This file does not contain stabs debugging information. */
- return
FALSE
;
+ return
false
;
if (stabsec->size % STABSIZE != 0)
/* Something is wrong with the format of these stab symbols.
Don't try to optimize them. */
if (stabsec->size % STABSIZE != 0)
/* Something is wrong with the format of these stab symbols.
Don't try to optimize them. */
- return
FALSE
;
+ return
false
;
if ((stabsec->output_section != NULL
&& bfd_is_abs_section (stabsec->output_section)))
/* At least one of the sections is being discarded from the
link, so we should just ignore them. */
if ((stabsec->output_section != NULL
&& bfd_is_abs_section (stabsec->output_section)))
/* At least one of the sections is being discarded from the
link, so we should just ignore them. */
- return
FALSE
;
+ return
false
;
- /* We should have initialized our data in _bfd_link_s
tab_section
s.
+ /* We should have initialized our data in _bfd_link_s
ection_stab
s.
If there was some bizarre error reading the string sections, though,
we might not have. Bail rather than asserting. */
if (psecinfo == NULL)
If there was some bizarre error reading the string sections, though,
we might not have. Bail rather than asserting. */
if (psecinfo == NULL)
- return
FALSE
;
+ return
false
;
count = stabsec->rawsize / STABSIZE;
secinfo = (struct stab_section_info *) psecinfo;
count = stabsec->rawsize / STABSIZE;
secinfo = (struct stab_section_info *) psecinfo;
@@
-608,7
+613,7
@@
_bfd_discard_section_stabs (bfd *abfd,
/* Shrink the stabsec as needed. */
stabsec->size -= skip * STABSIZE;
if (stabsec->size == 0)
/* Shrink the stabsec as needed. */
stabsec->size -= skip * STABSIZE;
if (stabsec->size == 0)
- stabsec->flags |= SEC_EXCLUDE;
+ stabsec->flags |= SEC_EXCLUDE
| SEC_KEEP
;
/* Recalculate the `cumulative_skips' array now that stabs have been
deleted for this section. */
/* Recalculate the `cumulative_skips' array now that stabs have been
deleted for this section. */
@@
-621,7
+626,7
@@
_bfd_discard_section_stabs (bfd *abfd,
if (secinfo->cumulative_skips == NULL)
{
amt = count * sizeof (bfd_size_type);
if (secinfo->cumulative_skips == NULL)
{
amt = count * sizeof (bfd_size_type);
- secinfo->cumulative_skips = bfd_alloc (abfd, amt);
+ secinfo->cumulative_skips =
(bfd_size_type *)
bfd_alloc (abfd, amt);
if (secinfo->cumulative_skips == NULL)
goto error_return;
}
if (secinfo->cumulative_skips == NULL)
goto error_return;
}
@@
-643,15
+648,14
@@
_bfd_discard_section_stabs (bfd *abfd,
return skip > 0;
error_return:
return skip > 0;
error_return:
- if (stabbuf != NULL)
- free (stabbuf);
- return FALSE;
+ free (stabbuf);
+ return false;
}
/* Write out the stab section. This is called with the relocated
contents. */
}
/* Write out the stab section. This is called with the relocated
contents. */
-b
fd_boolean
+b
ool
_bfd_write_section_stabs (bfd *output_bfd,
struct stab_info *sinfo,
asection *stabsec,
_bfd_write_section_stabs (bfd *output_bfd,
struct stab_info *sinfo,
asection *stabsec,
@@
-722,12
+726,12
@@
_bfd_write_section_stabs (bfd *output_bfd,
/* Write out the .stabstr section. */
/* Write out the .stabstr section. */
-b
fd_boolean
+b
ool
_bfd_write_stab_strings (bfd *output_bfd, struct stab_info *sinfo)
{
if (bfd_is_abs_section (sinfo->stabstr->output_section))
/* The section was discarded from the link. */
_bfd_write_stab_strings (bfd *output_bfd, struct stab_info *sinfo)
{
if (bfd_is_abs_section (sinfo->stabstr->output_section))
/* The section was discarded from the link. */
- return
TRUE
;
+ return
true
;
BFD_ASSERT ((sinfo->stabstr->output_offset
+ _bfd_stringtab_size (sinfo->strings))
BFD_ASSERT ((sinfo->stabstr->output_offset
+ _bfd_stringtab_size (sinfo->strings))
@@
-737,16
+741,16
@@
_bfd_write_stab_strings (bfd *output_bfd, struct stab_info *sinfo)
(file_ptr) (sinfo->stabstr->output_section->filepos
+ sinfo->stabstr->output_offset),
SEEK_SET) != 0)
(file_ptr) (sinfo->stabstr->output_section->filepos
+ sinfo->stabstr->output_offset),
SEEK_SET) != 0)
- return
FALSE
;
+ return
false
;
if (! _bfd_stringtab_emit (output_bfd, sinfo->strings))
if (! _bfd_stringtab_emit (output_bfd, sinfo->strings))
- return
FALSE
;
+ return
false
;
/* We no longer need the stabs information. */
_bfd_stringtab_free (sinfo->strings);
bfd_hash_table_free (&sinfo->includes);
/* We no longer need the stabs information. */
_bfd_stringtab_free (sinfo->strings);
bfd_hash_table_free (&sinfo->includes);
- return
TRUE
;
+ return
true
;
}
/* Adjust an address in the .stab section. Given OFFSET within
}
/* Adjust an address in the .stab section. Given OFFSET within