From cc1e2f4fac77eaeaa6f57ef0b9e2ef012e619238 Mon Sep 17 00:00:00 2001 From: kevinb Date: Tue, 21 Mar 2000 22:37:41 +0000 Subject: [PATCH] Make sure section addresses from a shared object are correctly set in a new struct objfile. --- gdb/ChangeLog | 17 ++++ gdb/solib.c | 16 ++-- gdb/symfile.c | 58 ++++++++++++- gdb/symfile.h | 258 +++++++++++++++++++++++++++++++++------------------------- gdb/symtab.h | 24 ------ 5 files changed, 225 insertions(+), 148 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2a4df9b8f7..877f89a87c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,20 @@ +2000-03-21 Kevin Buettner + + * symtab.h (MAX_SECTIONS, struct section_addr_info, + symbol_file_add): Move declarations from here... + * symfile.h: ...to here. + + * solib.c (symbol_add_stub): Make symbol_file_add () aware of + all section addresses, not just .text. + * symfile.h, symfile.c (free_section_addr_info, + build_section_addr_info_from_section_table): New functions. + + * symfile.h (MAX_SECTIONS): Increase value to 40. + * symfile.c (syms_from_objfile): Add bounds check prior to + accessing ``other'' array in a section_addr_info_struct. + Remove unused variable section_offsets. + (add_symbol_file_command): Remove unused variable text_addr. + 2000-03-21 Eli Zaretskii * breakpoint.c (bpstat_stop_status): Don't stop if a read diff --git a/gdb/solib.c b/gdb/solib.c index edfcb22864..621bd6cc42 100644 --- a/gdb/solib.c +++ b/gdb/solib.c @@ -1155,6 +1155,7 @@ symbol_add_stub (arg) { register struct so_list *so = (struct so_list *) arg; /* catch_errs bogon */ CORE_ADDR text_addr = 0; + struct section_addr_info *sap; /* Have we already loaded this shared object? */ ALL_OBJFILES (so->objfile) @@ -1181,15 +1182,12 @@ symbol_add_stub (arg) + LM_ADDR (so); } - { - struct section_addr_info section_addrs; - - memset (§ion_addrs, 0, sizeof (section_addrs)); - section_addrs.text_addr = text_addr; - - so->objfile = symbol_file_add (so->so_name, so->from_tty, - §ion_addrs, 0, OBJF_SHARED); - } + sap = build_section_addr_info_from_section_table (so->sections, + so->sections_end); + sap->text_addr = text_addr; + so->objfile = symbol_file_add (so->so_name, so->from_tty, + sap, 0, OBJF_SHARED); + free_section_addr_info (sap); return (1); } diff --git a/gdb/symfile.c b/gdb/symfile.c index fb332967af..53f9e76bb5 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -461,6 +461,58 @@ find_lowest_section (abfd, sect, obj) *lowest = sect; } + +/* Build (allocate and populate) a section_addr_info struct from + an existing section table. */ + +extern struct section_addr_info * +build_section_addr_info_from_section_table (const struct section_table *start, + const struct section_table *end) +{ + struct section_addr_info *sap; + const struct section_table *stp; + int oidx; + + sap = xmalloc (sizeof (struct section_addr_info)); + memset (sap, 0, sizeof (struct section_addr_info)); + + for (stp = start, oidx = 0; stp != end; stp++) + { + if (strcmp (stp->the_bfd_section->name, ".text") == 0) + sap->text_addr = stp->addr; + else if (strcmp (stp->the_bfd_section->name, ".data") == 0) + sap->data_addr = stp->addr; + else if (strcmp (stp->the_bfd_section->name, ".bss") == 0) + sap->bss_addr = stp->addr; + + if (stp->the_bfd_section->flags & (SEC_ALLOC | SEC_LOAD) + && oidx < MAX_SECTIONS) + { + sap->other[oidx].addr = stp->addr; + sap->other[oidx].name = xstrdup (stp->the_bfd_section->name); + sap->other[oidx].sectindex = stp->the_bfd_section->index; + oidx++; + } + } + + return sap; +} + + +/* Free all memory allocated by build_section_addr_info_from_section_table. */ + +extern void +free_section_addr_info (struct section_addr_info *sap) +{ + int idx; + + for (idx = 0; idx < MAX_SECTIONS; idx++) + if (sap->other[idx].name) + free (sap->other[idx].name); + free (sap); +} + + /* Parse the user's idea of an offset for dynamic linking, into our idea of how to represent it for fast symbol reading. This is the default version of the sym_fns.sym_offsets function for symbol readers that @@ -531,7 +583,6 @@ syms_from_objfile (objfile, addrs, mainline, verbo) int mainline; int verbo; { - struct section_offsets *section_offsets; asection *lower_sect; asection *sect; CORE_ADDR lower_offset; @@ -738,7 +789,9 @@ syms_from_objfile (objfile, addrs, mainline, verbo) else if (strcmp (s->the_bfd_section->name, ".bss") == 0) s_addr = addrs->bss_addr; else - for (i = 0; !s_addr && addrs->other[i].name; i++) + for (i = 0; + !s_addr && i < MAX_SECTIONS && addrs->other[i].name; + i++) if (strcmp (s->the_bfd_section->name, addrs->other[i].name) == 0) s_addr = addrs->other[i].addr; /* end added for gdb/13815 */ @@ -1460,7 +1513,6 @@ add_symbol_file_command (args, from_tty) int from_tty; { char *name = NULL; - CORE_ADDR text_addr; int flags = OBJF_USERLOADED; char *arg; int expecting_option = 0; diff --git a/gdb/symfile.h b/gdb/symfile.h index 0363e1e1d2..5d3ee1de78 100644 --- a/gdb/symfile.h +++ b/gdb/symfile.h @@ -2,21 +2,22 @@ Copyright (C) 1990, 1991, 1992, 1993, 1994, 1996 Free Software Foundation, Inc. -This file is part of GDB. + This file is part of GDB. -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 -(at your option) any later version. + 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 + (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. + 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, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #if !defined (SYMFILE_H) #define SYMFILE_H @@ -31,89 +32,111 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ it allows us to throw away duplicate psymbols and set all pointers to the single saved instance. */ -struct psymbol_allocation_list { +struct psymbol_allocation_list + { - /* Pointer to beginning of dynamically allocated array of pointers to - partial symbols. The array is dynamically expanded as necessary to - accommodate more pointers. */ + /* Pointer to beginning of dynamically allocated array of pointers to + partial symbols. The array is dynamically expanded as necessary to + accommodate more pointers. */ - struct partial_symbol **list; + struct partial_symbol **list; - /* Pointer to next available slot in which to store a pointer to a partial - symbol. */ + /* Pointer to next available slot in which to store a pointer to a partial + symbol. */ - struct partial_symbol **next; + struct partial_symbol **next; - /* Number of allocated pointer slots in current dynamic array (not the - number of bytes of storage). The "next" pointer will always point - somewhere between list[0] and list[size], and when at list[size] the - array will be expanded on the next attempt to store a pointer. */ + /* Number of allocated pointer slots in current dynamic array (not the + number of bytes of storage). The "next" pointer will always point + somewhere between list[0] and list[size], and when at list[size] the + array will be expanded on the next attempt to store a pointer. */ - int size; + int size; + }; + +/* Define an array of addresses to accommodate non-contiguous dynamic + loading of modules. This is for use when entering commands, so we + can keep track of the section names until we read the file and + can map them to bfd sections. This structure is also used by + solib.c to communicate the section addresses in shared objects to + symbol_file_add (). */ + +#define MAX_SECTIONS 40 +struct section_addr_info +{ + /* Sections whose names are always known to gdb. */ + CORE_ADDR text_addr; + CORE_ADDR data_addr; + CORE_ADDR bss_addr; + /* Sections whose names are file format dependant. */ + struct other_sections + { + CORE_ADDR addr; + char *name; + int sectindex; + } other[MAX_SECTIONS]; }; /* Structure to keep track of symbol reading functions for various object file types. */ -struct sym_fns { +struct sym_fns + { - /* BFD flavour that we handle, or (as a special kludge, see xcoffread.c, - (enum bfd_flavour)-1 for xcoff). */ + /* BFD flavour that we handle, or (as a special kludge, see xcoffread.c, + (enum bfd_flavour)-1 for xcoff). */ - enum bfd_flavour sym_flavour; + enum bfd_flavour sym_flavour; - /* Initializes anything that is global to the entire symbol table. It is - called during symbol_file_add, when we begin debugging an entirely new - program. */ + /* Initializes anything that is global to the entire symbol table. It is + called during symbol_file_add, when we begin debugging an entirely new + program. */ - void (*sym_new_init) PARAMS ((struct objfile *)); + void (*sym_new_init) PARAMS ((struct objfile *)); - /* Reads any initial information from a symbol file, and initializes the - struct sym_fns SF in preparation for sym_read(). It is called every - time we read a symbol file for any reason. */ + /* Reads any initial information from a symbol file, and initializes the + struct sym_fns SF in preparation for sym_read(). It is called every + time we read a symbol file for any reason. */ - void (*sym_init) PARAMS ((struct objfile *)); + void (*sym_init) PARAMS ((struct objfile *)); - /* sym_read (objfile, addr, mainline) - Reads a symbol file into a psymtab (or possibly a symtab). - OBJFILE is the objfile struct for the file we are reading. - SECTION_OFFSETS - are the offset between the file's specified section addresses and - their true addresses in memory. - MAINLINE is 1 if this is the - main symbol table being read, and 0 if a secondary - symbol file (e.g. shared library or dynamically loaded file) - is being read. */ + /* sym_read (objfile, mainline) + Reads a symbol file into a psymtab (or possibly a symtab). + OBJFILE is the objfile struct for the file we are reading. + MAINLINE is 1 if this is the + main symbol table being read, and 0 if a secondary + symbol file (e.g. shared library or dynamically loaded file) + is being read. */ - void (*sym_read) PARAMS ((struct objfile *, struct section_offsets *, int)); + void (*sym_read) PARAMS ((struct objfile *, int)); - /* Called when we are finished with an objfile. Should do all cleanup - that is specific to the object file format for the particular objfile. */ - - void (*sym_finish) PARAMS ((struct objfile *)); + /* Called when we are finished with an objfile. Should do all cleanup + that is specific to the object file format for the particular objfile. */ - /* This function produces a file-dependent section_offsets structure, - allocated in the objfile's storage, and based on the parameter. - The parameter is currently a CORE_ADDR (FIXME!) for backward compatibility - with the higher levels of GDB. It should probably be changed to - a string, where NULL means the default, and others are parsed in a file - dependent way. The result of this function is handed in to sym_read. */ + void (*sym_finish) PARAMS ((struct objfile *)); - struct section_offsets *(*sym_offsets) PARAMS ((struct objfile *, CORE_ADDR)); + /* This function produces a file-dependent section_offsets structure, + allocated in the objfile's storage, and based on the parameter. + The parameter is currently a CORE_ADDR (FIXME!) for backward compatibility + with the higher levels of GDB. It should probably be changed to + a string, where NULL means the default, and others are parsed in a file + dependent way. */ - /* Finds the next struct sym_fns. They are allocated and initialized - in whatever module implements the functions pointed to; an - initializer calls add_symtab_fns to add them to the global chain. */ + void (*sym_offsets) PARAMS ((struct objfile *, struct section_addr_info *)); - struct sym_fns *next; + /* Finds the next struct sym_fns. They are allocated and initialized + in whatever module implements the functions pointed to; an + initializer calls add_symtab_fns to add them to the global chain. */ -}; + struct sym_fns *next; + + }; /* The default version of sym_fns.sym_offsets for readers that don't do anything special. */ -extern struct section_offsets * -default_symfile_offsets PARAMS ((struct objfile *objfile, CORE_ADDR addr)); +extern void +default_symfile_offsets PARAMS ((struct objfile * objfile, struct section_addr_info *)); extern void @@ -126,15 +149,15 @@ extend_psymbol_list PARAMS ((struct psymbol_allocation_list *, extern void add_psymbol_to_list PARAMS ((char *, int, namespace_enum, enum address_class, - struct psymbol_allocation_list *, long, CORE_ADDR, + struct psymbol_allocation_list *, long, CORE_ADDR, enum language, struct objfile *)); extern void -add_psymbol_with_dem_name_to_list PARAMS ((char *, int, char *, int, namespace_enum, - enum address_class, - struct psymbol_allocation_list *, - long, CORE_ADDR, - enum language, struct objfile *)); +add_psymbol_with_dem_name_to_list PARAMS ((char *, int, char *, int, namespace_enum, + enum address_class, + struct psymbol_allocation_list *, + long, CORE_ADDR, + enum language, struct objfile *)); extern void init_psymbol_list PARAMS ((struct objfile *, int)); @@ -143,7 +166,7 @@ extern void sort_pst_symbols PARAMS ((struct partial_symtab *)); extern struct symtab * -allocate_symtab PARAMS ((char *, struct objfile *)); + allocate_symtab PARAMS ((char *, struct objfile *)); extern int free_named_symtabs PARAMS ((char *)); @@ -158,16 +181,33 @@ extern void init_entry_point_info PARAMS ((struct objfile *)); extern void -syms_from_objfile PARAMS ((struct objfile *, CORE_ADDR, int, int)); +syms_from_objfile PARAMS ((struct objfile *, struct section_addr_info *, int, int)); extern void new_symfile_objfile PARAMS ((struct objfile *, int, int)); +extern struct objfile * +symbol_file_add PARAMS ((char *, int, struct section_addr_info *, int, int)); + +/* Build (allocate and populate) a section_addr_info struct from + an existing section table. */ + +struct section_table; +extern struct section_addr_info * +build_section_addr_info_from_section_table (const struct section_table *start, + const struct section_table *end); + +/* Free all memory allocated by build_section_addr_info_from_section_table. */ + +extern void +free_section_addr_info (struct section_addr_info *); + + extern struct partial_symtab * -start_psymtab_common PARAMS ((struct objfile *, struct section_offsets *, - char *, CORE_ADDR, - struct partial_symbol **, - struct partial_symbol **)); + start_psymtab_common PARAMS ((struct objfile *, struct section_offsets *, + char *, CORE_ADDR, + struct partial_symbol **, + struct partial_symbol **)); /* Sorting your symbols for fast lookup or alphabetical printing. */ @@ -182,14 +222,14 @@ sort_symtab_syms PARAMS ((struct symtab *)); Returns the address of the copy. */ extern char * -obsavestring PARAMS ((char *, int, struct obstack *)); + obsavestring PARAMS ((char *, int, struct obstack *)); /* Concatenate strings S1, S2 and S3; return the new string. Space is found in the symbol_obstack. */ extern char * -obconcat PARAMS ((struct obstack *obstackp, const char *, const char *, - const char *)); + obconcat PARAMS ((struct obstack * obstackp, const char *, const char *, + const char *)); /* Variables */ @@ -202,39 +242,36 @@ obconcat PARAMS ((struct obstack *obstackp, const char *, const char *, this threshhold, solibs' symbol tables will not be loaded. On other platforms, > 0 means, "always auto load". - */ + */ extern int auto_solib_add; /* From symfile.c */ extern CORE_ADDR -entry_point_address PARAMS ((void)); + entry_point_address PARAMS ((void)); extern struct partial_symtab * -allocate_psymtab PARAMS ((char *, struct objfile *)); + allocate_psymtab PARAMS ((char *, struct objfile *)); extern void discard_psymtab PARAMS ((struct partial_symtab *)); extern void find_lowest_section PARAMS ((bfd *, asection *, PTR)); -extern bfd * symfile_bfd_open PARAMS ((char *)); - -/* Remote targets may wish to use this as their load function. */ -extern void generic_load PARAMS ((char *name, int from_tty)); +extern bfd *symfile_bfd_open PARAMS ((char *)); /* Utility functions for overlay sections: */ extern int overlay_debugging; extern int overlay_cache_invalid; /* return the "mapped" overlay section containing the PC */ -extern asection * -find_pc_mapped_section PARAMS ((CORE_ADDR)); +extern asection * + find_pc_mapped_section PARAMS ((CORE_ADDR)); /* return any overlay section containing the PC (even in its LMA region) */ extern asection * -find_pc_overlay PARAMS ((CORE_ADDR)); + find_pc_overlay PARAMS ((CORE_ADDR)); /* return true if the section is an overlay */ extern int @@ -246,55 +283,52 @@ section_is_mapped PARAMS ((asection *)); /* return true if pc belongs to section's VMA */ extern CORE_ADDR -pc_in_mapped_range PARAMS ((CORE_ADDR, asection *)); + pc_in_mapped_range PARAMS ((CORE_ADDR, asection *)); /* return true if pc belongs to section's LMA */ extern CORE_ADDR -pc_in_unmapped_range PARAMS ((CORE_ADDR, asection *)); + pc_in_unmapped_range PARAMS ((CORE_ADDR, asection *)); /* map an address from a section's LMA to its VMA */ extern CORE_ADDR -overlay_mapped_address PARAMS ((CORE_ADDR, asection *)); + overlay_mapped_address PARAMS ((CORE_ADDR, asection *)); /* map an address from a section's VMA to its LMA */ extern CORE_ADDR -overlay_unmapped_address PARAMS ((CORE_ADDR, asection *)); + overlay_unmapped_address PARAMS ((CORE_ADDR, asection *)); /* convert an address in an overlay section (force into VMA range) */ -extern CORE_ADDR -symbol_overlayed_address PARAMS ((CORE_ADDR, asection *)); +extern CORE_ADDR + symbol_overlayed_address PARAMS ((CORE_ADDR, asection *)); /* From dwarfread.c */ extern void -dwarf_build_psymtabs PARAMS ((struct objfile *, struct section_offsets *, int, - file_ptr, unsigned int, file_ptr, unsigned int)); +dwarf_build_psymtabs PARAMS ((struct objfile *, int, file_ptr, unsigned int, + file_ptr, unsigned int)); /* From dwarf2read.c */ -extern int dwarf2_has_info PARAMS ((bfd *abfd)); +extern int dwarf2_has_info PARAMS ((bfd * abfd)); + +extern void dwarf2_build_psymtabs PARAMS ((struct objfile *, int)); -extern void dwarf2_build_psymtabs PARAMS ((struct objfile *, - struct section_offsets *, - int)); /* From mdebugread.c */ /* Hack to force structures to exist before use in parameter list. */ struct ecoff_debug_hack -{ - struct ecoff_debug_swap *a; - struct ecoff_debug_info *b; -}; + { + struct ecoff_debug_swap *a; + struct ecoff_debug_info *b; + }; extern void mdebug_build_psymtabs PARAMS ((struct objfile *, const struct ecoff_debug_swap *, - struct ecoff_debug_info *, - struct section_offsets *)); + struct ecoff_debug_info *)); extern void elfmdebug_build_psymtabs PARAMS ((struct objfile *, const struct ecoff_debug_swap *, - asection *, - struct section_offsets *)); + asection *)); -#endif /* !defined(SYMFILE_H) */ +#endif /* !defined(SYMFILE_H) */ diff --git a/gdb/symtab.h b/gdb/symtab.h index 5e3267a614..dffb26ae06 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -837,27 +837,6 @@ struct section_offsets (sizeof (struct section_offsets) \ + sizeof (((struct section_offsets *) 0)->offsets) * (SECT_OFF_MAX-1)) -/* Define an array of addresses to accommodate non-contiguous dynamic - loading of modules. This is for use when entering commands, so we - can keep track of the section names until we read the file and - can map them to bfd sections. */ - -#define MAX_SECTIONS 12 -struct section_addr_info -{ - /* Sections whose names are always known to gdb. */ - CORE_ADDR text_addr; - CORE_ADDR data_addr; - CORE_ADDR bss_addr; - /* Sections whose names are file format dependant. */ - struct other_sections - { - CORE_ADDR addr; - char *name; - int sectindex; - } other[MAX_SECTIONS]; -}; - /* Each source file or header is represented by a struct symtab. These objects are chained through the `next' field. */ @@ -1437,9 +1416,6 @@ extern struct symtab * extern void clear_solib PARAMS ((void)); -extern struct objfile * -symbol_file_add PARAMS ((char *, int, struct section_addr_info *, int, int)); - /* source.c */ extern int -- 2.11.0