along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-#include <stdio.h>
#include "defs.h"
#include "symtab.h"
#include "gdbtypes.h"
#include "target.h"
#include "value.h"
#include "symfile.h"
+#include "objfiles.h"
#include "gdbcmd.h"
#include "breakpoint.h"
-#include "state.h"
#include <obstack.h>
#include <assert.h>
#include <fcntl.h>
#include <string.h>
#include <sys/stat.h>
+#include <ctype.h>
/* Global variables owned by this file */
-CORE_ADDR entry_point; /* Where execution starts in symfile */
-struct sym_fns *symtab_fns = NULL; /* List of all available sym_fns. */
+int readnow_symbol_files; /* Read full symbols immediately */
/* External variables and functions referenced. */
extern int info_verbose;
-extern CORE_ADDR startup_file_start; /* From blockframe.c */
-extern CORE_ADDR startup_file_end; /* From blockframe.c */
-
/* Functions this file defines */
static void
static void
add_symbol_file_command PARAMS ((char *, int));
-static struct objfile *
-symbol_file_add_digested PARAMS ((sfd *, int));
-
static void
cashier_psymtab PARAMS ((struct partial_symtab *));
static int
compare_symbols PARAMS ((const void *, const void *));
-static struct objfile *
-symfile_open PARAMS ((char *, int));
-
-static struct sym_fns *
-symfile_init PARAMS ((struct objfile *));
+static bfd *
+symfile_bfd_open PARAMS ((char *));
static void
-clear_symtab_users_once PARAMS ((void));
-
-/* Saves the sym_fns of the current symbol table, so we can call
- the right XXX_new_init function when we free it. FIXME. This
- should be extended to calling the new_init function for each
- existing symtab or psymtab, since the main symbol file and
- subsequent added symbol files can have different types. */
-
-static struct sym_fns *symfile_fns;
+find_sym_fns PARAMS ((struct objfile *));
-/* When we need to allocate a new type, we need to know which type_obstack
- to allocate the type on, since there is one for each objfile. The places
- where types are allocated are deeply buried in function call hierarchies
- which know nothing about objfiles, so rather than trying to pass a
- particular objfile down to them, we just do an end run around them and
- set current_objfile to be whatever objfile we expect to be using at the
- time types are being allocated. For instance, when we start reading
- symbols for a particular objfile, we set current_objfile to point to that
- objfile, and when we are done, we set it back to NULL, to ensure that we
- never put a type someplace other than where we are expecting to put it.
- FIXME: Maybe we should review the entire type handling system and
- see if there is a better way to avoid this problem. */
-
-struct objfile *current_objfile = NULL;
+void
+clear_symtab_users_once PARAMS ((void));
-/* The object file that the main symbol table was loaded from (e.g. the
- argument to the "symbol-file" or "file" command). */
+/* List of all available sym_fns. On gdb startup, each object file reader
+ calls add_symtab_fns() to register information on each format it is
+ prepared to read. */
-struct objfile *symfile_objfile = NULL;
+static struct sym_fns *symtab_fns = NULL;
/* Structures with which to manage partial symbol allocation. */
return pst->symtab;
}
+/* Initialize entry point information for this objfile. */
+
+void
+init_entry_point_info (objfile)
+ struct objfile *objfile;
+{
+ /* Save startup file's range of PC addresses to help blockframe.c
+ decide where the bottom of the stack is. */
+
+ if (bfd_get_file_flags (objfile -> obfd) & EXEC_P)
+ {
+ /* Executable file -- record its entry point so we'll recognize
+ the startup file because it contains the entry point. */
+ objfile -> ei.entry_point = bfd_get_start_address (objfile -> obfd);
+ }
+ else
+ {
+ /* Examination of non-executable.o files. Short-circuit this stuff. */
+ /* ~0 will not be in any file, we hope. */
+ objfile -> ei.entry_point = ~0;
+ /* set the startup file to be an empty range. */
+ objfile -> ei.entry_file_lowpc = 0;
+ objfile -> ei.entry_file_highpc = 0;
+ }
+}
+
/* Process a symbol file, as either the main file or as a dynamically
loaded file.
int verbo;
{
asection *text_sect;
- struct sym_fns *sf;
- bfd *sym_bfd = objfile->obfd;
/* There is a distinction between having no symbol table
(we refuse to read the file, leaving the old set of symbols around)
and having no debugging symbols in your symbol table (we read
- the file and end up with a mostly empty symbol table). */
+ the file and end up with a mostly empty symbol table).
- if (!(bfd_get_file_flags (sym_bfd) & HAS_SYMS))
- return;
+ FIXME: This strategy works correctly when the debugging symbols are
+ intermixed with "normal" symbols. However, when the debugging symbols
+ are separate, such as with ELF/DWARF, it is perfectly plausible for
+ the symbol table to be missing but still have all the DWARF info
+ intact. Thus in general it is wrong to assume that having no symbol
+ table implies no debugging information. */
- /* Save startup file's range of PC addresses to help blockframe.c
- decide where the bottom of the stack is. */
- if (bfd_get_file_flags (sym_bfd) & EXEC_P)
- {
- /* Executable file -- record its entry point so we'll recognize
- the startup file because it contains the entry point. */
- entry_point = bfd_get_start_address (sym_bfd);
- }
- else
- {
- /* Examination of non-executable.o files. Short-circuit this stuff. */
- /* ~0 will not be in any file, we hope. */
- entry_point = ~0;
- /* set the startup file to be an empty range. */
- startup_file_start = 0;
- startup_file_end = 0;
- }
+ if (!(bfd_get_file_flags (objfile -> obfd) & HAS_SYMS))
+ return;
- sf = symfile_init (objfile);
+ init_entry_point_info (objfile);
+ find_sym_fns (objfile);
if (mainline)
{
/* Since no error yet, throw away the old symbol table. */
- if (symfile_objfile)
- free_objfile (symfile_objfile);
- symfile_objfile = NULL;
+ if (symfile_objfile != NULL)
+ {
+ free_objfile (symfile_objfile);
+ symfile_objfile = NULL;
+ }
- (*sf->sym_new_init) ();
+ (*objfile -> sf -> sym_new_init) (objfile);
/* For mainline, caller didn't know the specified address of the
text section. We fix that here. */
- text_sect = bfd_get_section_by_name (sym_bfd, ".text");
- addr = bfd_section_vma (sym_bfd, text_sect);
- }
- /* Allow complaints to appear for this new file, and record how
- verbose to be. */
+ text_sect = bfd_get_section_by_name (objfile -> obfd, ".text");
+ addr = bfd_section_vma (objfile -> obfd, text_sect);
+ }
- clear_complaints(1, verbo);
+ /* Initialize symbol reading routines for this objfile, allow complaints to
+ appear for this new file, and record how verbose to be, then do the
+ initial symbol reading for this file. */
- (*sf->sym_read) (sf, addr, mainline);
+ (*objfile -> sf -> sym_init) (objfile);
+ clear_complaints (1, verbo);
+ (*objfile -> sf -> sym_read) (objfile, addr, mainline);
/* Don't allow char * to have a typename (else would get caddr_t.) */
/* Ditto void *. FIXME should do this for all the builtin types. */
TYPE_NAME (lookup_pointer_type (builtin_type_char)) = 0;
TYPE_NAME (lookup_pointer_type (builtin_type_void)) = 0;
+ /* Mark the objfile has having had initial symbol read attempted. Note
+ that this does not mean we found any symbols... */
+
+ objfile -> flags |= OBJF_SYMS;
+}
+
+/* Perform required actions immediately after either reading in the initial
+ symbols for a new objfile, or mapping in the symbols from a reusable
+ objfile. */
+
+void
+new_symfile_objfile (objfile, mainline, verbo)
+ struct objfile *objfile;
+ int mainline;
+ int verbo;
+{
if (mainline)
{
/* OK, make it the "real" symbol file. */
symfile_objfile = objfile;
- symfile_fns = sf;
}
/* If we have wiped out any old symbol tables, clean up. */
clear_symtab_users_once ();
/* We're done reading the symbol file; finish off complaints. */
- clear_complaints(0, verbo);
-
- /* Setup the breakpoint(s) for trapping longjmp(), as it may have been
- defined by this new file. */
- create_longjmp_breakpoint();
-}
-
-/* Reload a predigested symbol file from a dumped state file.
-
- FIXME: For now, we load only the first dumped objfile that we
- find, for two reasons. (1) Our custom malloc and mmap'd sbrk
- implementation only supports one mmap'd objfile at a time, so we
- can only create state files with one dumped objfile in them and
- would have no way to deal with multiple dumped objfiles when reading
- the state file back in even if we could create them. (2) We currently
- have no way to select a specific objfile to load from a state file
- containing a dump of more than one objfile, so we just select the
- first one we encounter. */
-
-static struct objfile *
-symbol_file_add_digested (asfd, from_tty)
- sfd *asfd;
- int from_tty;
-{
- struct objfile *objfile;
- bfd *sym_bfd;
-
- /* First locate and map in the dumped symbol information */
-
- objfile = objfile_from_statefile (asfd);
+ clear_complaints (0, verbo);
- /* Push this file onto the head of the linked list of other such files. */
-
- objfile -> next = object_files;
- object_files = objfile;
-
-#if 0 /* FIXME: Things to deal with... */
- objfile -> obfd = abfd;
- objfile -> mtime = bfd_get_mtime (abfd);
- obstack_full_begin (&objfile -> psymbol_obstack, 0, 0, xmalloc, free);
- obstack_full_begin (&objfile -> symbol_obstack, 0, 0, xmalloc, free);
- obstack_full_begin (&objfile -> type_obstack, 0, 0, xmalloc, free);
-#endif
+ /* Fixup all the breakpoints that may have been redefined by this
+ symbol file. */
+ breakpoint_re_set ();
}
/* Process a symbol file, as either the main file or as a dynamically
Upon failure, jumps back to command level (never returns). */
struct objfile *
-symbol_file_add (name, from_tty, addr, mainline, dumpable)
+symbol_file_add (name, from_tty, addr, mainline, mapped, readnow)
char *name;
int from_tty;
CORE_ADDR addr;
int mainline;
- int dumpable;
+ int mapped;
+ int readnow;
{
struct objfile *objfile;
- bfd *sym_bfd;
-
- objfile = symfile_open (name, dumpable);
- sym_bfd = objfile->obfd;
+ struct partial_symtab *psymtab;
+ bfd *abfd;
- /* There is a distinction between having no symbol table
+ /* Open a bfd for the file and then check to see if the file has a
+ symbol table. There is a distinction between having no symbol table
(we refuse to read the file, leaving the old set of symbols around)
- and having no debugging symbols in your symbol table (we read
- the file and end up with a mostly empty symbol table, but with lots
- of stuff in the minimal symbol table). */
-
- if (!(bfd_get_file_flags (sym_bfd) & HAS_SYMS))
+ and having no debugging symbols in the symbol table (we read the file
+ and end up with a mostly empty symbol table, but with lots of stuff in
+ the minimal symbol table). We need to make the decision about whether
+ to continue with the file before allocating and building a objfile.
+
+ FIXME: This strategy works correctly when the debugging symbols are
+ intermixed with "normal" symbols. However, when the debugging symbols
+ are separate, such as with ELF/DWARF, it is perfectly plausible for
+ the symbol table to be missing but still have all the DWARF info
+ intact. Thus in general it is wrong to assume that having no symbol
+ table implies no debugging information. */
+
+ abfd = symfile_bfd_open (name);
+ if (!(bfd_get_file_flags (abfd) & HAS_SYMS))
{
error ("%s has no symbol-table", name);
}
&& mainline
&& from_tty
&& !query ("Load new symbol table from \"%s\"? ", name))
- error ("Not confirmed.");
+ error ("Not confirmed.");
+
+ objfile = allocate_objfile (abfd, mapped);
- if (from_tty || info_verbose)
+ /* If the objfile uses a mapped symbol file, and we have a psymtab for
+ it, then skip reading any symbols at this time. */
+
+ if ((objfile -> flags & OBJF_MAPPED) && (objfile -> flags & OBJF_SYMS))
{
- printf_filtered ("Reading symbols from %s...", name);
- wrap_here ("");
- fflush (stdout);
+ /* We mapped in an existing symbol table file that already has had
+ initial symbol reading performed, so we can skip that part. Notify
+ the user that instead of reading the symbols, they have been mapped.
+ */
+ if (from_tty || info_verbose)
+ {
+ printf_filtered ("Mapped symbols for %s...", name);
+ wrap_here ("");
+ fflush (stdout);
+ }
+ init_entry_point_info (objfile);
+ find_sym_fns (objfile);
}
+ else
+ {
+ /* We either created a new mapped symbol table, mapped an existing
+ symbol table file which has not had initial symbol reading
+ performed, or need to read an unmapped symbol table. */
+ if (from_tty || info_verbose)
+ {
+ printf_filtered ("Reading symbols from %s...", name);
+ wrap_here ("");
+ fflush (stdout);
+ }
+ syms_from_objfile (objfile, addr, mainline, from_tty);
+ }
+
+ new_symfile_objfile (objfile, mainline, from_tty);
+
+ /* We now have at least a partial symbol table. Check to see if the
+ user requested that all symbols be read on initial access via either
+ the gdb startup command line or on a per symbol file basis. Expand
+ all partial symbol tables for this objfile if so. */
+
+ if (readnow || readnow_symbol_files)
+ {
+ if (from_tty || info_verbose)
+ {
+ printf_filtered ("expanding to full symbols...");
+ wrap_here ("");
+ fflush (stdout);
+ }
- syms_from_objfile (objfile, addr, mainline, from_tty);
+ for (psymtab = objfile -> psymtabs;
+ psymtab != NULL;
+ psymtab = psymtab -> next)
+ {
+ psymtab_to_symtab (psymtab);
+ }
+ }
if (from_tty || info_verbose)
{
printf_filtered ("done.\n");
fflush (stdout);
}
+
return (objfile);
}
int from_tty;
{
char **argv;
- char *name;
+ char *name = NULL;
struct cleanup *cleanups;
- struct objfile *objfile;
- struct partial_symtab *psymtab;
- sfd *sym_sfd;
- int dumpable = 0;
+ int mapped = 0;
int readnow = 0;
dont_repeat ();
if (args == NULL)
{
- if (symfile_objfile)
- {
- if ((have_full_symbols () || have_partial_symbols ())
- && from_tty
- && !query ("Discard symbol table from `%s'? ",
- symfile_objfile -> name))
- error ("Not confirmed.");
- free_objfile (symfile_objfile);
- }
+ if ((have_full_symbols () || have_partial_symbols ())
+ && from_tty
+ && !query ("Discard symbol table from `%s'? ",
+ symfile_objfile -> name))
+ error ("Not confirmed.");
+ free_all_objfiles ();
symfile_objfile = NULL;
- /* FIXME, this does not account for the main file and subsequent
- files (shared libs, dynloads, etc) having different formats.
- It only calls the cleanup routine for the main file's format. */
- if (symfile_fns)
+ if (from_tty)
{
- (*symfile_fns -> sym_new_init) ();
- free (symfile_fns);
- symfile_fns = 0;
+ printf ("No symbol file now.\n");
}
}
else
{
if ((argv = buildargv (args)) == NULL)
{
- fatal ("virtual memory exhausted.", 0);
+ nomem (0);
}
cleanups = make_cleanup (freeargv, (char *) argv);
-
- name = *argv;
- while (*++argv != NULL)
+ while (*argv != NULL)
{
- if (strcmp (*argv, "dumpable"))
+ if (strcmp (*argv, "-mapped") == 0)
{
- dumpable = 1;
+ mapped = 1;
}
- else if (strcmp (*argv, "readnow"))
+ else if (strcmp (*argv, "-readnow") == 0)
{
readnow = 1;
}
- }
-
- if (name != NULL)
- {
- if ((sym_sfd = sfd_fopen (name, "r")) != NULL)
+ else if (**argv == '-')
{
- (void) symbol_file_add_digested (sym_sfd, from_tty);
+ error ("unknown option `%s'", *argv);
}
else
{
- /* Getting new symbols may change our opinion about what is
- frameless. */
- reinit_frame_cache ();
- objfile = symbol_file_add (name, from_tty, (CORE_ADDR)0, 1,
- dumpable);
- if (readnow)
- {
- for (psymtab = objfile -> psymtabs;
- psymtab != NULL;
- psymtab = psymtab -> next)
- {
- (void) psymtab_to_symtab (psymtab);
- }
- }
+ name = *argv;
}
+ argv++;
+ }
+
+ if (name == NULL)
+ {
+ error ("no symbol file name was specified");
+ }
+ else
+ {
+ /* Getting new symbols may change our opinion about what is
+ frameless. */
+ reinit_frame_cache ();
+ symbol_file_add (name, from_tty, (CORE_ADDR)0, 1, mapped, readnow);
}
do_cleanups (cleanups);
}
}
-/* Open NAME and hand it off to BFD for preliminary analysis. Result
- is newly malloc'd struct objfile *, which includes a newly malloc'd`
- copy of NAME (tilde-expanded and made absolute).
+/* Open file specified by NAME and hand it off to BFD for preliminary
+ analysis. Result is a newly initialized bfd *, which includes a newly
+ malloc'd` copy of NAME (tilde-expanded and made absolute).
In case of trouble, error() is called. */
-static struct objfile *
-symfile_open (name, dumpable)
+static bfd *
+symfile_bfd_open (name)
char *name;
- int dumpable;
{
bfd *sym_bfd;
int desc;
char *absolute_name;
- struct objfile *objfile;
name = tilde_expand (name); /* Returns 1st new malloc'd copy */
/* Look down path for it, allocate 2nd new malloc'd copy. */
desc = openp (getenv ("PATH"), 1, name, O_RDONLY, 0, &absolute_name);
- if (desc < 0) {
- make_cleanup (free, name);
- perror_with_name (name);
- }
+ if (desc < 0)
+ {
+ make_cleanup (free, name);
+ perror_with_name (name);
+ }
free (name); /* Free 1st new malloc'd copy */
name = absolute_name; /* Keep 2nd malloc'd copy in bfd */
+ /* It'll be freed in free_objfile(). */
sym_bfd = bfd_fdopenr (name, NULL, desc);
if (!sym_bfd)
{
close (desc);
make_cleanup (free, name);
- error ("Could not open `%s' to read symbols: %s",
- name, bfd_errmsg (bfd_error));
+ error ("\"%s\": can't open to read symbols: %s.", name,
+ bfd_errmsg (bfd_error));
}
- if (!bfd_check_format (sym_bfd, bfd_object)) {
- bfd_close (sym_bfd); /* This also closes desc */
- make_cleanup (free, name);
- error ("\"%s\": can't read symbols: %s.",
- name, bfd_errmsg (bfd_error));
- }
+ if (!bfd_check_format (sym_bfd, bfd_object))
+ {
+ bfd_close (sym_bfd); /* This also closes desc */
+ make_cleanup (free, name);
+ error ("\"%s\": can't read symbols: %s.", name,
+ bfd_errmsg (bfd_error));
+ }
- objfile = allocate_objfile (sym_bfd, name, dumpable);
- return objfile;
+ return (sym_bfd);
}
-/* Link a new symtab_fns into the global symtab_fns list.
- Called by various _initialize routines. */
+/* Link a new symtab_fns into the global symtab_fns list. Called on gdb
+ startup by the _initialize routine in each object file format reader,
+ to register information about each format the the reader is prepared
+ to handle. */
void
add_symtab_fns (sf)
/* Initialize to read symbols from the symbol file sym_bfd. It either
- returns or calls error(). The result is a malloc'd struct sym_fns
- that contains cached information about the symbol file. */
+ returns or calls error(). The result is an initialized struct sym_fns
+ in the objfile structure, that contains cached information about the
+ symbol file. */
-static struct sym_fns *
-symfile_init (objfile)
+static void
+find_sym_fns (objfile)
struct objfile *objfile;
{
- struct sym_fns *sf, *sf2;
- bfd *sym_bfd = objfile->obfd;
+ struct sym_fns *sf;
- for (sf = symtab_fns; sf != NULL; sf = sf->next)
+ for (sf = symtab_fns; sf != NULL; sf = sf -> next)
{
- if (!strncmp (bfd_get_target (sym_bfd), sf->sym_name, sf->sym_namelen))
+ if (strncmp (bfd_get_target (objfile -> obfd),
+ sf -> sym_name, sf -> sym_namelen) == 0)
{
- sf2 = (struct sym_fns *)xmalloc (sizeof (*sf2));
- /* FIXME, who frees this? */
- *sf2 = *sf;
- sf2->objfile = objfile;
- sf2->sym_bfd = sym_bfd;
- sf2->sym_private = 0; /* Not alloc'd yet */
- (*sf2->sym_init) (sf2);
- return sf2;
+ objfile -> sf = sf;
+ return;
}
}
error ("I'm sorry, Dave, I can't do that. Symbol format `%s' unknown.",
- bfd_get_target (sym_bfd));
- return 0; /* Appease lint. */
+ bfd_get_target (objfile -> obfd));
}
\f
/* This function runs the load command of our current target. */
/* ARGSUSED */
static void
-add_symbol_file_command (arg_string, from_tty)
- char *arg_string;
+add_symbol_file_command (args, from_tty)
+ char *args;
int from_tty;
{
- char *name;
+ char *name = NULL;
CORE_ADDR text_addr;
+ char *arg;
+ int readnow = 0;
+ int mapped = 0;
- /* Getting new symbols may change our opinion about what is
- frameless. */
- reinit_frame_cache ();
+ dont_repeat ();
- if (arg_string == 0)
- error ("add-symbol-file takes a file name and an address");
+ if (args == NULL)
+ {
+ error ("add-symbol-file takes a file name and an address");
+ }
- arg_string = tilde_expand (arg_string);
- make_cleanup (free, arg_string);
+ /* Make a copy of the string that we can safely write into. */
- for( ; *arg_string == ' '; arg_string++ );
- name = arg_string;
- for( ; *arg_string && *arg_string != ' ' ; arg_string++ );
- *arg_string++ = (char) 0;
+ args = strdup (args);
+ make_cleanup (free, args);
- if (name[0] == 0)
- error ("add-symbol-file takes a file name and an address");
+ /* Pick off any -option args and the file name. */
- text_addr = parse_and_eval_address (arg_string);
+ while ((*args != '\000') && (name == NULL))
+ {
+ while (isspace (*args)) {args++;}
+ arg = args;
+ while ((*args != '\000') && !isspace (*args)) {args++;}
+ if (*args != '\000')
+ {
+ *args++ = '\000';
+ }
+ if (*arg != '-')
+ {
+ name = arg;
+ }
+ else if (strcmp (arg, "-mapped") == 0)
+ {
+ mapped = 1;
+ }
+ else if (strcmp (arg, "-readnow") == 0)
+ {
+ readnow = 1;
+ }
+ else
+ {
+ error ("unknown option `%s'", arg);
+ }
+ }
- dont_repeat ();
+ /* After picking off any options and the file name, args should be
+ left pointing at the remainder of the command line, which should
+ be the address expression to evaluate. */
+
+ if ((name == NULL) || (*args == '\000') )
+ {
+ error ("add-symbol-file takes a file name and an address");
+ }
+ name = tilde_expand (name);
+ make_cleanup (free, name);
+
+ text_addr = parse_and_eval_address (args);
if (!query ("add symbol table from file \"%s\" at text_addr = %s?\n",
name, local_hex_string (text_addr)))
error ("Not confirmed.");
- (void) symbol_file_add (name, 0, text_addr, 0, 0);
+ /* Getting new symbols may change our opinion about what is
+ frameless. */
+
+ reinit_frame_cache ();
+
+ symbol_file_add (name, 0, text_addr, 0, mapped, readnow);
}
\f
/* Re-read symbols if a symbol-file has changed. */
struct objfile *objfile;
long new_modtime;
int reread_one = 0;
+ struct stat new_statbuf;
+ int res;
/* With the addition of shared libraries, this should be modified,
the load time should be saved in the partial symbol tables, since
the_big_top:
for (objfile = object_files; objfile; objfile = objfile->next) {
if (objfile->obfd) {
- new_modtime = bfd_get_mtime (objfile->obfd);
+#ifdef IBM6000_TARGET
+ /* If this object is from a shared library, then you should
+ stat on the library name, not member name. */
+
+ if (objfile->obfd->my_archive)
+ res = stat (objfile->obfd->my_archive->filename, &new_statbuf);
+ else
+#endif
+ res = stat (objfile->name, &new_statbuf);
+ if (res != 0) {
+ /* FIXME, should use print_sys_errmsg but it's not filtered. */
+ printf_filtered ("`%s' has disappeared; keeping its symbols.\n",
+ objfile->name);
+ continue;
+ }
+ new_modtime = new_statbuf.st_mtime;
if (new_modtime != objfile->mtime) {
printf_filtered ("`%s' has changed; re-reading symbols.\n",
objfile->name);
if (reread_one)
breakpoint_re_set ();
}
-
\f
/* Functions to handle complaints during symbol reading. */
symtab = (struct symtab *)
obstack_alloc (&objfile -> symbol_obstack, sizeof (struct symtab));
- (void) memset (symtab, 0, sizeof (*symtab));
+ memset (symtab, 0, sizeof (*symtab));
symtab -> filename = obsavestring (filename, strlen (filename),
&objfile -> symbol_obstack);
symtab -> fullname = NULL;
{
struct partial_symtab *psymtab;
- psymtab = (struct partial_symtab *)
- obstack_alloc (&objfile -> psymbol_obstack,
- sizeof (struct partial_symtab));
- (void) memset (psymtab, 0, sizeof (struct partial_symtab));
+ if (objfile -> free_psymtabs)
+ {
+ psymtab = objfile -> free_psymtabs;
+ objfile -> free_psymtabs = psymtab -> next;
+ }
+ else
+ psymtab = (struct partial_symtab *)
+ obstack_alloc (&objfile -> psymbol_obstack,
+ sizeof (struct partial_symtab));
+
+ memset (psymtab, 0, sizeof (struct partial_symtab));
psymtab -> filename = obsavestring (filename, strlen (filename),
&objfile -> psymbol_obstack);
psymtab -> symtab = NULL;
static int clear_symtab_users_queued;
static int clear_symtab_users_done;
-static void
+void
clear_symtab_users_once ()
{
/* Enforce once-per-`do_cleanups'-semantics */
free_named_symtabs (name)
char *name;
{
- register struct symtab *s;
- register struct symtab *prev;
- register struct partial_symtab *ps;
- struct blockvector *bv;
- int blewit = 0;
-
#if 0
/* FIXME: With the new method of each objfile having it's own
psymtab list, this function needs serious rethinking. In particular,
why was it ever necessary to toss psymtabs with specific compilation
unit filenames, as opposed to all psymtabs from a particular symbol
- file. */
+ file? -- fnf
+ Well, the answer is that some systems permit reloading of particular
+ compilation units. We want to blow away any old info about these
+ compilation units, regardless of which objfiles they arrived in. --gnu. */
+
+ register struct symtab *s;
+ register struct symtab *prev;
+ register struct partial_symtab *ps;
+ struct blockvector *bv;
+ int blewit = 0;
/* We only wack things if the symbol-reload switch is set. */
if (!symbol_reloading)
psymtab -> statics_offset = static_syms - objfile -> static_psymbols.list;
return (psymtab);
}
+\f
+/* Debugging versions of functions that are usually inline macros
+ (see symfile.h). */
+
+#if 0 /* Don't quite work nowadays... */
+
+/* Add a symbol with a long value to a psymtab.
+ Since one arg is a struct, we pass in a ptr and deref it (sigh). */
+
+void
+add_psymbol_to_list (name, namelength, namespace, class, list, val)
+ char *name;
+ int namelength;
+ enum namespace namespace;
+ enum address_class class;
+ struct psymbol_allocation_list *list;
+ long val;
+{
+ ADD_PSYMBOL_VT_TO_LIST (name, namelength, namespace, class, (*list), val,
+ SYMBOL_VALUE);
+}
+
+/* Add a symbol with a CORE_ADDR value to a psymtab. */
+
+void
+add_psymbol_addr_to_list (name, namelength, namespace, class, list, val)
+ char *name;
+ int namelength;
+ enum namespace namespace;
+ enum address_class class;
+ struct psymbol_allocation_list *list;
+ CORE_ADDR val;
+{
+ ADD_PSYMBOL_VT_TO_LIST (name, namelength, namespace, class, (*list), val,
+ SYMBOL_VALUE_ADDRESS);
+}
+#endif /* 0 */
\f
void
_initialize_symfile ()