mirrors/binutils-gdb
0
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-11-27 03:54:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

gdb: Move dbx_end_psymtab to stabsread, and rename to stabs_end_psymtab

Browse Source 
This function is used by multiple stabs readers (even if not all), and
the comment in stabsread.h even acknowledges it. I believe that the
comment is incorrect in saying that the function should be in dbxread
because not everyone uses it. If any one reader other than dbx uses
it, the function should be in stabsread, in my opinion.

This commit makes also renames the function to stabs_end_psymtab since,
again, this is not specific to dbx/aout format.

struct symloc had to be moved because stabs_end_psymtab dereferences
symloc objects, so stabsread.c must be aware of the full struct.

Approved-By: Tom Tromey <tom@tromey.com>
This commit is contained in:
Guinevere Larsen 2024-09-09 15:06:29 -03:00
parent 5b64a6127f
commit 64a1f185b3
5 changed files with 240 additions and 239 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

257
gdb/dbxread.c
View File

@ -57,39 +57,6 @@
/* Required for the following registry. */
#include "gdb-stabs.h"
/* We put a pointer to this structure in the read_symtab_private field
of the psymtab. */
struct symloc
{
/* Offset within the file symbol table of first local symbol for this
file. */
int ldsymoff;
/* Length (in bytes) of the section of the symbol table devoted to
this file's symbols (actually, the section bracketed may contain
more than just this file's symbols). If ldsymlen is 0, the only
reason for this thing's existence is the dependency list. Nothing
else will happen when it is read in. */
int ldsymlen;
/* The size of each symbol in the symbol file (in external form). */
int symbol_size;
/* Further information needed to locate the symbols if they are in
an ELF file. */
int symbol_offset;
int string_offset;
int file_string_offset;
enum language pst_language;
};
#define LDSYMOFF(p) (((struct symloc *)((p)->read_symtab_private))->ldsymoff)
#define LDSYMLEN(p) (((struct symloc *)((p)->read_symtab_private))->ldsymlen)
#define SYMLOC(p) ((struct symloc *)((p)->read_symtab_private))
#define SYMBOL_SIZE(p) (SYMLOC(p)->symbol_size)
#define SYMBOL_OFFSET(p) (SYMLOC(p)->symbol_offset)
@ -181,28 +148,6 @@ static void record_minimal_symbol (minimal_symbol_reader &,
static legacy_psymtab *start_psymtab (psymtab_storage *, struct objfile *,
const char *, unrelocated_addr, int);
/* Free up old header file tables. */
void
free_header_files (void)
{
if (this_object_header_files)
{
xfree (this_object_header_files);
this_object_header_files = NULL;
}
n_allocated_this_object_header_files = 0;
}
/* Allocate new header file tables. */
void
init_header_files (void)
{
n_allocated_this_object_header_files = 10;
this_object_header_files = XNEWVEC (int, 10);
}
#if 0
static struct type **
explicit_lookup_type (int real_filenum, int index)
@ -853,13 +798,13 @@ read_dbx_symtab (minimal_symbol_reader &reader,
which are not the address. */
&& unrel_val >= pst->unrelocated_text_low ())
{
dbx_end_psymtab (objfile, partial_symtabs,
pst, psymtab_include_list,
includes_used, symnum * dbx->ctx.symbol_size,
unrel_val > pst->unrelocated_text_high ()
? unrel_val : pst->unrelocated_text_high (),
dependency_list, dependencies_used,
textlow_not_set);
stabs_end_psymtab (objfile, partial_symtabs,
pst, psymtab_include_list,
includes_used, symnum * dbx->ctx.symbol_size,
unrel_val > pst->unrelocated_text_high ()
? unrel_val : pst->unrelocated_text_high (),
dependency_list, dependencies_used,
textlow_not_set);
pst = (legacy_psymtab *) 0;
includes_used = 0;
dependencies_used = 0;
@ -949,7 +894,7 @@ read_dbx_symtab (minimal_symbol_reader &reader,
prev_textlow_not_set = textlow_not_set;
/* A zero value is probably an indication for the SunPRO 3.0
compiler. dbx_end_psymtab explicitly tests for zero, so
compiler. stabs_end_psymtab explicitly tests for zero, so
don't relocate it. */
if (nlist.n_value == 0
@ -970,14 +915,14 @@ read_dbx_symtab (minimal_symbol_reader &reader,
if (pst)
{
unrelocated_addr unrel_value = unrelocated_addr (valu);
dbx_end_psymtab (objfile, partial_symtabs,
pst, psymtab_include_list,
includes_used, symnum * dbx->ctx.symbol_size,
unrel_value > pst->unrelocated_text_high ()
? unrel_value
: pst->unrelocated_text_high (),
dependency_list, dependencies_used,
prev_textlow_not_set);
stabs_end_psymtab (objfile, partial_symtabs,
pst, psymtab_include_list,
includes_used, symnum * dbx->ctx.symbol_size,
unrel_value > pst->unrelocated_text_high ()
? unrel_value
: pst->unrelocated_text_high (),
dependency_list, dependencies_used,
prev_textlow_not_set);
pst = (legacy_psymtab *) 0;
includes_used = 0;
dependencies_used = 0;
@ -1601,16 +1546,16 @@ read_dbx_symtab (minimal_symbol_reader &reader,
case N_ENDM:
/* Solaris 2 end of module, finish current partial symbol
table. dbx_end_psymtab will set the high text address of
table. stabs_end_psymtab will set the high text address of
PST to the proper value, which is necessary if a module
compiled without debugging info follows this module. */
if (pst && gdbarch_sofun_address_maybe_missing (gdbarch))
{
dbx_end_psymtab (objfile, partial_symtabs, pst,
psymtab_include_list, includes_used,
symnum * dbx->ctx.symbol_size,
(unrelocated_addr) 0, dependency_list,
dependencies_used, textlow_not_set);
stabs_end_psymtab (objfile, partial_symtabs, pst,
psymtab_include_list, includes_used,
symnum * dbx->ctx.symbol_size,
(unrelocated_addr) 0, dependency_list,
dependencies_used, textlow_not_set);
pst = (legacy_psymtab *) 0;
includes_used = 0;
dependencies_used = 0;
@ -1673,12 +1618,12 @@ read_dbx_symtab (minimal_symbol_reader &reader,
: CORE_ADDR (dbx->ctx.lowest_text_address))
+ text_size));
dbx_end_psymtab (objfile, partial_symtabs,
pst, psymtab_include_list, includes_used,
symnum * dbx->ctx.symbol_size,
(text_end > pst->unrelocated_text_high ()
? text_end : pst->unrelocated_text_high ()),
dependency_list, dependencies_used, textlow_not_set);
stabs_end_psymtab (objfile, partial_symtabs,
pst, psymtab_include_list, includes_used,
symnum * dbx->ctx.symbol_size,
(text_end > pst->unrelocated_text_high ()
? text_end : pst->unrelocated_text_high ()),
dependency_list, dependencies_used, textlow_not_set);
}
}
@ -1714,152 +1659,6 @@ start_psymtab (psymtab_storage *partial_symtabs, struct objfile *objfile,
return result;
}
/* Close off the current usage of PST.
Returns PST or NULL if the partial symtab was empty and thrown away.
FIXME: List variables and peculiarities of same. */
legacy_psymtab *
dbx_end_psymtab (struct objfile *objfile, psymtab_storage *partial_symtabs,
legacy_psymtab *pst,
const char **include_list, int num_includes,
int capping_symbol_offset, unrelocated_addr capping_text,
legacy_psymtab **dependency_list,
int number_dependencies,
int textlow_not_set)
{
int i;
struct gdbarch *gdbarch = objfile->arch ();
dbx_symfile_info *key = dbx_objfile_data_key. get (objfile);
if (capping_symbol_offset != -1)
LDSYMLEN (pst) = capping_symbol_offset - LDSYMOFF (pst);
pst->set_text_high (capping_text);
/* Under Solaris, the N_SO symbols always have a value of 0,
instead of the usual address of the .o file. Therefore,
we have to do some tricks to fill in texthigh and textlow.
The first trick is: if we see a static
or global function, and the textlow for the current pst
is not set (ie: textlow_not_set), then we use that function's
address for the textlow of the pst. */
/* Now, to fill in texthigh, we remember the last function seen
in the .o file. Also, there's a hack in
bfd/elf.c and gdb/elfread.c to pass the ELF st_size field
to here via the misc_info field. Therefore, we can fill in
a reliable texthigh by taking the address plus size of the
last function in the file. */
if (!pst->text_high_valid && key->ctx.last_function_name
&& gdbarch_sofun_address_maybe_missing (gdbarch))
{
int n;
const char *colon = strchr (key->ctx.last_function_name, ':');
if (colon == NULL)
n = 0;
else
n = colon - key->ctx.last_function_name;
char *p = (char *) alloca (n + 2);
strncpy (p, key->ctx.last_function_name, n);
p[n] = 0;
bound_minimal_symbol minsym
= lookup_minimal_symbol (current_program_space, p, objfile,
pst->filename);
if (minsym.minsym == NULL)
{
/* Sun Fortran appends an underscore to the minimal symbol name,
try again with an appended underscore if the minimal symbol
was not found. */
p[n] = '_';
p[n + 1] = 0;
minsym = lookup_minimal_symbol (current_program_space, p, objfile,
pst->filename);
}
if (minsym.minsym)
pst->set_text_high
(unrelocated_addr (CORE_ADDR (minsym.minsym->unrelocated_address ())
+ minsym.minsym->size ()));
key->ctx.last_function_name = NULL;
}
if (!gdbarch_sofun_address_maybe_missing (gdbarch))
;
/* This test will be true if the last .o file is only data. */
else if (textlow_not_set)
pst->set_text_low (pst->unrelocated_text_high ());
else
{
/* If we know our own starting text address, then walk through all other
psymtabs for this objfile, and if any didn't know their ending text
address, set it to our starting address. Take care to not set our
own ending address to our starting address. */
for (partial_symtab *p1 : partial_symtabs->range ())
if (!p1->text_high_valid && p1->text_low_valid && p1 != pst)
p1->set_text_high (pst->unrelocated_text_low ());
}
/* End of kludge for patching Solaris textlow and texthigh. */
pst->end ();
pst->number_of_dependencies = number_dependencies;
if (number_dependencies)
{
pst->dependencies
= partial_symtabs->allocate_dependencies (number_dependencies);
memcpy (pst->dependencies, dependency_list,
number_dependencies * sizeof (legacy_psymtab *));
}
else
pst->dependencies = 0;
for (i = 0; i < num_includes; i++)
{
legacy_psymtab *subpst =
new legacy_psymtab (include_list[i], partial_symtabs, objfile->per_bfd);
subpst->read_symtab_private =
XOBNEW (&objfile->objfile_obstack, struct symloc);
LDSYMOFF (subpst) =
LDSYMLEN (subpst) = 0;
/* We could save slight bits of space by only making one of these,
shared by the entire set of include files. FIXME-someday. */
subpst->dependencies =
partial_symtabs->allocate_dependencies (1);
subpst->dependencies[0] = pst;
subpst->number_of_dependencies = 1;
subpst->legacy_read_symtab = pst->legacy_read_symtab;
subpst->legacy_expand_psymtab = pst->legacy_expand_psymtab;
}
if (num_includes == 0
&& number_dependencies == 0
&& pst->empty ()
&& key->ctx.has_line_numbers == 0)
{
/* Throw away this psymtab, it's empty. */
/* Empty psymtabs happen as a result of header files which don't have
any symbols in them. There can be a lot of them. But this check
is wrong, in that a psymtab with N_SLINE entries but nothing else
is not empty, but we don't realize that. Fixing that without slowing
things down might be tricky. */
partial_symtabs->discard_psymtab (pst);
/* Indicate that psymtab was thrown away. */
pst = NULL;
}
return pst;
}
static void
dbx_expand_psymtab (legacy_psymtab *pst, struct objfile *objfile)

16
gdb/mdebugread.c
View File

@ -2892,7 +2892,7 @@ parse_partial_symbols (minimal_symbol_reader &reader,
const char *basename;
/* A zero value is probably an indication for the
SunPRO 3.0 compiler. dbx_end_psymtab explicitly tests
SunPRO 3.0 compiler. stabs_end_psymtab explicitly tests
for zero, so don't relocate it. */
if (sh.value == 0
@ -3297,7 +3297,7 @@ parse_partial_symbols (minimal_symbol_reader &reader,
case N_ENDM:
/* Solaris 2 end of module, finish current partial
symbol table. dbx_end_psymtab will set the
symbol table. stabs_end_psymtab will set the
high text address of PST to the proper value,
which is necessary if a module compiled without
debugging info follows this module. */
@ -3686,14 +3686,14 @@ parse_partial_symbols (minimal_symbol_reader &reader,
}
}
/* Link pst to FDR. dbx_end_psymtab returns NULL if the psymtab was
/* Link pst to FDR. stabs_end_psymtab returns NULL if the psymtab was
empty and put on the free list. */
fdr_to_pst[f_idx].pst
= dbx_end_psymtab (objfile, partial_symtabs, save_pst,
psymtab_include_list, includes_used,
-1, save_pst->unrelocated_text_high (),
dependency_list, dependencies_used,
textlow_not_set);
= stabs_end_psymtab (objfile, partial_symtabs, save_pst,
psymtab_include_list, includes_used,
-1, save_pst->unrelocated_text_high (),
dependency_list, dependencies_used,
textlow_not_set);
includes_used = 0;
dependencies_used = 0;
}

169
gdb/stabsread.c
View File

@ -33,6 +33,7 @@
#include "symfile.h"
#include "objfiles.h"
#include "aout/stab_gnu.h"
#include "psymtab.h"
#include "libaout.h"
#include "aout/aout64.h"
#include "gdb-stabs.h"
@ -533,6 +534,174 @@ read_type_number (const char **pp, int *typenums)
}
/* Free up old header file tables. */
void
free_header_files (void)
{
if (this_object_header_files)
{
xfree (this_object_header_files);
this_object_header_files = NULL;
}
n_allocated_this_object_header_files = 0;
}
/* Allocate new header file tables. */
void
init_header_files (void)
{
n_allocated_this_object_header_files = 10;
this_object_header_files = XNEWVEC (int, 10);
}
/* Close off the current usage of PST.
Returns PST or NULL if the partial symtab was empty and thrown away.
FIXME: List variables and peculiarities of same. */
legacy_psymtab *
stabs_end_psymtab (struct objfile *objfile, psymtab_storage *partial_symtabs,
legacy_psymtab *pst,
const char **include_list, int num_includes,
int capping_symbol_offset, unrelocated_addr capping_text,
legacy_psymtab **dependency_list,
int number_dependencies,
int textlow_not_set)
{
int i;
struct gdbarch *gdbarch = objfile->arch ();
dbx_symfile_info *key = dbx_objfile_data_key. get (objfile);
if (capping_symbol_offset != -1)
LDSYMLEN (pst) = capping_symbol_offset - LDSYMOFF (pst);
pst->set_text_high (capping_text);
/* Under Solaris, the N_SO symbols always have a value of 0,
instead of the usual address of the .o file. Therefore,
we have to do some tricks to fill in texthigh and textlow.
The first trick is: if we see a static
or global function, and the textlow for the current pst
is not set (ie: textlow_not_set), then we use that function's
address for the textlow of the pst. */
/* Now, to fill in texthigh, we remember the last function seen
in the .o file. Also, there's a hack in
bfd/elf.c and gdb/elfread.c to pass the ELF st_size field
to here via the misc_info field. Therefore, we can fill in
a reliable texthigh by taking the address plus size of the
last function in the file. */
if (!pst->text_high_valid && key->ctx.last_function_name
&& gdbarch_sofun_address_maybe_missing (gdbarch))
{
int n;
const char *colon = strchr (key->ctx.last_function_name, ':');
if (colon == NULL)
n = 0;
else
n = colon - key->ctx.last_function_name;
char *p = (char *) alloca (n + 2);
strncpy (p, key->ctx.last_function_name, n);
p[n] = 0;
bound_minimal_symbol minsym
= lookup_minimal_symbol (current_program_space, p, objfile,
pst->filename);
if (minsym.minsym == NULL)
{
/* Sun Fortran appends an underscore to the minimal symbol name,
try again with an appended underscore if the minimal symbol
was not found. */
p[n] = '_';
p[n + 1] = 0;
minsym = lookup_minimal_symbol (current_program_space, p, objfile,
pst->filename);
}
if (minsym.minsym)
pst->set_text_high
(unrelocated_addr (CORE_ADDR (minsym.minsym->unrelocated_address ())
+ minsym.minsym->size ()));
key->ctx.last_function_name = NULL;
}
if (!gdbarch_sofun_address_maybe_missing (gdbarch))
;
/* This test will be true if the last .o file is only data. */
else if (textlow_not_set)
pst->set_text_low (pst->unrelocated_text_high ());
else
{
/* If we know our own starting text address, then walk through all other
psymtabs for this objfile, and if any didn't know their ending text
address, set it to our starting address. Take care to not set our
own ending address to our starting address. */
for (partial_symtab *p1 : partial_symtabs->range ())
if (!p1->text_high_valid && p1->text_low_valid && p1 != pst)
p1->set_text_high (pst->unrelocated_text_low ());
}
/* End of kludge for patching Solaris textlow and texthigh. */
pst->end ();
pst->number_of_dependencies = number_dependencies;
if (number_dependencies)
{
pst->dependencies
= partial_symtabs->allocate_dependencies (number_dependencies);
memcpy (pst->dependencies, dependency_list,
number_dependencies * sizeof (legacy_psymtab *));
}
else
pst->dependencies = 0;
for (i = 0; i < num_includes; i++)
{
legacy_psymtab *subpst =
new legacy_psymtab (include_list[i], partial_symtabs, objfile->per_bfd);
subpst->read_symtab_private =
XOBNEW (&objfile->objfile_obstack, struct symloc);
LDSYMOFF (subpst) =
LDSYMLEN (subpst) = 0;
/* We could save slight bits of space by only making one of these,
shared by the entire set of include files. FIXME-someday. */
subpst->dependencies =
partial_symtabs->allocate_dependencies (1);
subpst->dependencies[0] = pst;
subpst->number_of_dependencies = 1;
subpst->legacy_read_symtab = pst->legacy_read_symtab;
subpst->legacy_expand_psymtab = pst->legacy_expand_psymtab;
}
if (num_includes == 0
&& number_dependencies == 0
&& pst->empty ()
&& key->ctx.has_line_numbers == 0)
{
/* Throw away this psymtab, it's empty. */
/* Empty psymtabs happen as a result of header files which don't have
any symbols in them. There can be a lot of them. But this check
is wrong, in that a psymtab with N_SLINE entries but nothing else
is not empty, but we don't realize that. Fixing that without slowing
things down might be tricky. */
partial_symtabs->discard_psymtab (pst);
/* Indicate that psymtab was thrown away. */
pst = NULL;
}
return pst;
}
/* Record the namespace that the function defined by SYMBOL was
defined in, if necessary. BLOCK is the associated block; use
OBSTACK for allocation. */

35
gdb/stabsread.h
View File

@ -173,7 +173,7 @@ class psymtab_storage;
/* Functions exported by dbxread.c. These are not in stabsread.c because
they are only used by some stabs readers. */
extern legacy_psymtab *dbx_end_psymtab
extern legacy_psymtab *stabs_end_psymtab
(struct objfile *objfile, psymtab_storage *partial_symtabs,
legacy_psymtab *pst,
const char **include_list, int num_includes,
@ -251,4 +251,37 @@ process_one_symbol (int, int, CORE_ADDR, const char *,
const section_offsets &,
struct objfile *, enum language);
#define LDSYMOFF(p) (((struct symloc *)((p)->read_symtab_private))->ldsymoff)
#define LDSYMLEN(p) (((struct symloc *)((p)->read_symtab_private))->ldsymlen)
/* We put a pointer to this structure in the read_symtab_private field
of the psymtab. */
struct symloc
{
/* Offset within the file symbol table of first local symbol for this
file. */
int ldsymoff;
/* Length (in bytes) of the section of the symbol table devoted to
this file's symbols (actually, the section bracketed may contain
more than just this file's symbols). If ldsymlen is 0, the only
reason for this thing's existence is the dependency list. Nothing
else will happen when it is read in. */
int ldsymlen;
/* The size of each symbol in the symbol file (in external form). */
int symbol_size;
/* Further information needed to locate the symbols if they are in
an ELF file. */
int symbol_offset;
int string_offset;
int file_string_offset;
enum language pst_language;
};
#endif /* STABSREAD_H */

2
gdb/symtab.h
View File

@ -808,7 +808,7 @@ struct minimal_symbol : public general_symbol_info
m_target_flag_2 = target_flag_2;
}
/* Size of this symbol. dbx_end_psymtab in dbxread.c uses this
/* Size of this symbol. stabs_end_psymtab in stabsread.c uses this
information to calculate the end of the partial symtab based on the
address of the last symbol plus the size of the last symbol. */