/* Generic symbol file reading for the GNU debugger, GDB.
- Copyright 1990, 1991 Free Software Foundation, Inc.
+ Copyright 1990, 1991, 1992 Free Software Foundation, Inc.
Contributed by Cygnus Support, using pieces from other GDB modules.
This file is part of GDB.
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 "gdbcore.h"
#include "frame.h"
#include "target.h"
#include <string.h>
#include <sys/stat.h>
+/* Global variables owned by this file */
+
CORE_ADDR entry_point; /* Where execution starts in symfile */
+int readnow_symbol_files; /* Read full symbols immediately */
-extern int info_verbose;
+/* External variables and functions referenced. */
-extern void qsort ();
-extern char *getenv ();
-extern char *rindex ();
+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 struct objfile *symfile_open ();
-static struct sym_fns *symfile_init ();
-static void clear_symtab_users_once ();
-static void free_all_psymtabs ();
-static void free_all_symtabs ();
+static void
+load_command PARAMS ((char *, int));
-/* List of all available sym_fns. */
+static void
+add_symbol_file_command PARAMS ((char *, int));
-struct sym_fns *symtab_fns = NULL;
+static void
+cashier_psymtab PARAMS ((struct partial_symtab *));
-/* 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 int
+compare_psymbols PARAMS ((const void *, const void *));
-static struct sym_fns *symfile_fns;
+static int
+compare_symbols PARAMS ((const void *, const void *));
-/* Allocate an obstack to hold objects that should be freed
- when we load a new symbol table.
- This includes the symbols made by dbxread
- and the types that are not permanent. */
+static bfd *
+symfile_bfd_open PARAMS ((char *));
-struct obstack obstack1;
+static void
+find_sym_fns PARAMS ((struct objfile *));
+
+static void
+clear_symtab_users_once PARAMS ((void));
-struct obstack *symbol_obstack = &obstack1;
+/* 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. */
-/* This obstack will be used for partial_symbol objects. It can
- probably actually be the same as the symbol_obstack above, but I'd
- like to keep them seperate for now. If I want to later, I'll
- replace one with the other. */
+static struct sym_fns *symtab_fns = NULL;
-struct obstack obstack2;
+/* 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 obstack *psymbol_obstack = &obstack2;
+struct objfile *current_objfile = NULL;
/* The object file that the main symbol table was loaded from (e.g. the
argument to the "symbol-file" or "file" command). */
-struct objfile *symfile_objfile = 0;
+struct objfile *symfile_objfile = NULL;
/* Structures with which to manage partial symbol allocation. */
/* Structure to manage complaints about symbol file contents. */
struct complaint complaint_root[1] = {
- {(char *)0, 0, complaint_root},
+ {(char *) 0, 0, complaint_root},
};
/* Some actual complaints. */
/* In the following sort, we always make sure that
register debug symbol declarations always come before regular
debug symbol declarations (as might happen when parameters are
- then put into registers by the compiler). */
+ then put into registers by the compiler).
+
+ Since this function is called from within qsort, in an ANSI environment
+ it must conform to the prototype for qsort, which specifies that the
+ comparison function takes two "void *" pointers. */
static int
-compare_symbols (s1, s2)
- struct symbol **s1, **s2;
+compare_symbols (s1p, s2p)
+ const PTR s1p;
+ const PTR s2p;
{
+ register struct symbol **s1, **s2;
register int namediff;
+ s1 = (struct symbol **) s1p;
+ s2 = (struct symbol **) s2p;
+
/* Compare the initial characters. */
namediff = SYMBOL_NAME (*s1)[0] - SYMBOL_NAME (*s2)[0];
if (namediff != 0) return namediff;
- (SYMBOL_CLASS (*s1) == LOC_REGISTER));
}
+/*
+
+LOCAL FUNCTION
+
+ compare_psymbols -- compare two partial symbols by name
+
+DESCRIPTION
+
+ Given pointer to two partial symbol table entries, compare
+ them by name and return -N, 0, or +N (ala strcmp). Typically
+ used by sorting routines like qsort().
+
+NOTES
+
+ Does direct compare of first two characters before punting
+ and passing to strcmp for longer compares. Note that the
+ original version had a bug whereby two null strings or two
+ identically named one character strings would return the
+ comparison of memory following the null byte.
+
+ */
+
+static int
+compare_psymbols (s1p, s2p)
+ const PTR s1p;
+ const PTR s2p;
+{
+ register char *st1 = SYMBOL_NAME ((struct partial_symbol *) s1p);
+ register char *st2 = SYMBOL_NAME ((struct partial_symbol *) s2p);
+
+ if ((st1[0] - st2[0]) || !st1[0])
+ {
+ return (st1[0] - st2[0]);
+ }
+ else if ((st1[1] - st2[1]) || !st1[1])
+ {
+ return (st1[1] - st2[1]);
+ }
+ else
+ {
+ return (strcmp (st1 + 2, st2 + 2));
+ }
+}
+
+void
+sort_pst_symbols (pst)
+ struct partial_symtab *pst;
+{
+ /* Sort the global list; don't sort the static list */
+
+ qsort (pst -> objfile -> global_psymbols.list + pst -> globals_offset,
+ pst -> n_global_syms, sizeof (struct partial_symbol),
+ compare_psymbols);
+}
+
/* Call sort_block_syms to sort alphabetically the symbols of one block. */
void
sort_all_symtab_syms ()
{
register struct symtab *s;
+ register struct objfile *objfile;
- for (s = symtab_list; s; s = s->next)
+ for (objfile = object_files; objfile != NULL; objfile = objfile -> next)
{
- sort_symtab_syms (s);
+ for (s = objfile -> symtabs; s != NULL; s = s -> next)
+ {
+ sort_symtab_syms (s);
+ }
}
}
Returns the address of the copy. */
char *
-obsavestring (ptr, size)
+obsavestring (ptr, size, obstackp)
char *ptr;
int size;
+ struct obstack *obstackp;
{
- register char *p = (char *) obstack_alloc (symbol_obstack, size + 1);
+ register char *p = (char *) obstack_alloc (obstackp, size + 1);
/* Open-coded bcopy--saves function call time.
These strings are usually short. */
{
Space is found in the symbol_obstack. */
char *
-obconcat (s1, s2, s3)
- char *s1, *s2, *s3;
+obconcat (obstackp, s1, s2, s3)
+ struct obstack *obstackp;
+ const char *s1, *s2, *s3;
{
register int len = strlen (s1) + strlen (s2) + strlen (s3) + 1;
- register char *val = (char *) obstack_alloc (symbol_obstack, len);
+ register char *val = (char *) obstack_alloc (obstackp, len);
strcpy (val, s1);
strcat (val, s2);
strcat (val, s3);
return val;
}
-\f
-/* Accumulate the misc functions in bunches of 127.
- At the end, copy them all into one newly allocated structure. */
-
-#define MISC_BUNCH_SIZE 127
-
-struct misc_bunch
-{
- struct misc_bunch *next;
- struct misc_function contents[MISC_BUNCH_SIZE];
-};
-
-/* Bunch currently being filled up.
- The next field points to chain of filled bunches. */
-
-static struct misc_bunch *misc_bunch;
-
-/* Number of slots filled in current bunch. */
-
-static int misc_bunch_index;
-
-/* Total number of misc functions recorded so far. */
-
-static int misc_count;
-
-void
-init_misc_bunches ()
-{
- misc_count = 0;
- misc_bunch = 0;
- misc_bunch_index = MISC_BUNCH_SIZE;
-}
-
-void
-prim_record_misc_function (name, address, misc_type)
- char *name;
- CORE_ADDR address;
- enum misc_function_type misc_type;
-{
- register struct misc_bunch *new;
-
- if (misc_bunch_index == MISC_BUNCH_SIZE)
- {
- new = (struct misc_bunch *) xmalloc (sizeof (struct misc_bunch));
- misc_bunch_index = 0;
- new->next = misc_bunch;
- misc_bunch = new;
- }
- misc_bunch->contents[misc_bunch_index].name = name;
- misc_bunch->contents[misc_bunch_index].address = address;
- misc_bunch->contents[misc_bunch_index].type = misc_type;
- misc_bunch->contents[misc_bunch_index].misc_info = 0;
- misc_bunch_index++;
- misc_count++;
-}
-
-static int
-compare_misc_functions (fn1, fn2)
- struct misc_function *fn1, *fn2;
-{
- /* Return a signed result based on unsigned comparisons
- so that we sort into unsigned numeric order. */
- if (fn1->address < fn2->address)
- return -1;
- if (fn1->address > fn2->address)
- return 1;
- return 0;
-}
-
-/* ARGSUSED */
-void
-discard_misc_bunches (foo)
- int foo;
-{
- register struct misc_bunch *next;
-
- while (misc_bunch)
- {
- next = misc_bunch->next;
- free (misc_bunch);
- misc_bunch = next;
- }
-}
-
-/* After adding things to the vector, sort or re-sort it into address order. */
-void
-sort_misc_function_vector ()
-{
- qsort (misc_function_vector, misc_function_count,
- sizeof (struct misc_function),
- compare_misc_functions);
-}
-
-/* Compact duplicate entries out of the misc function vector by walking
- through the vector and compacting out entries with duplicate addresses
- and matching names.
-
- When files contain multiple sources of symbol information, it is
- possible for the misc function vector to contain many duplicate entries.
- As an example, SVR4 systems use ELF formatted object files, which
- usually contain at least two different types of symbol tables (a
- standard ELF one and a smaller dynamic linking table), as well as
- DWARF debugging information for files compiled with -g.
-
- Without compacting, the misc function vector for gdb itself contains
- over a 1000 duplicates, about a third of the total table size. Aside
- from the potential trap of not noticing that two successive entries
- identify the same location, this duplication impacts the time required
- to linearly scan the table, which is done in a number of places. So
- just do one linear scan here and toss out the duplicates.
-
- Note that the strings themselves are allocated on the symbol_obstack,
- so we can't easily reclaim their memory. They will get automatically
- freed when the symbol table is freed.
-
- Also note we only go up to the next to last entry within the loop
- and then copy the last entry explicitly after the loop terminates.
-
- Since the different sources of information for each symbol may
- have different levels of "completeness", we may have duplicates
- that have one entry with type "mf_unknown" and the other with a
- known type. So if the one we are leaving alone has type mf_unknown,
- overwrite it's type with the type from the one we are compacting out.
-*/
-
-
-static void
-compact_misc_function_vector ()
-{
- struct misc_function *copyfrom;
- struct misc_function *copyto;
-
- copyfrom = copyto = misc_function_vector;
- while (copyfrom < misc_function_vector + misc_function_count - 1)
- {
- if (copyfrom -> address == (copyfrom + 1) -> address
- && (strcmp (copyfrom -> name, (copyfrom + 1) -> name) == 0))
- {
- if ((copyfrom + 1) -> type == mf_unknown)
- {
- (copyfrom + 1) -> type = copyfrom -> type;
- }
- copyfrom++;
- }
- else
- {
- *copyto++ = *copyfrom++;
- }
- }
- *copyto++ = *copyfrom++;
- misc_function_count = copyto - misc_function_vector;
- misc_function_vector = (struct misc_function *)
- xrealloc (misc_function_vector,
- misc_function_count * sizeof (struct misc_function));
-
-}
-
-/* INCLINK nonzero means bunches are from an incrementally-linked file.
- Add them to the existing bunches.
- Otherwise INCLINK is zero, and we start from scratch. */
-void
-condense_misc_bunches (inclink)
- int inclink;
-{
- register int i, j;
- register struct misc_bunch *bunch;
-
- if (inclink)
- {
- misc_function_vector
- = (struct misc_function *)
- xrealloc (misc_function_vector, (misc_count + misc_function_count)
- * sizeof (struct misc_function));
- j = misc_function_count;
- }
- else
- {
- misc_function_vector
- = (struct misc_function *)
- xmalloc (misc_count * sizeof (struct misc_function));
- j = 0;
- }
-
- bunch = misc_bunch;
- while (bunch)
- {
- for (i = 0; i < misc_bunch_index; i++, j++)
- {
- misc_function_vector[j] = bunch->contents[i];
-#ifdef NAMES_HAVE_UNDERSCORE
- if (misc_function_vector[j].name[0] == '_')
- misc_function_vector[j].name++;
-#endif
-#ifdef SOME_NAMES_HAVE_DOT
- if (misc_function_vector[j].name[0] == '.')
- misc_function_vector[j].name++;
-#endif
-
- }
- bunch = bunch->next;
- misc_bunch_index = MISC_BUNCH_SIZE;
- }
-
- if (misc_function_count + misc_count != j) /* DEBUG */
- printf_filtered ("Function counts are off! %d + %d != %d\n",
- misc_function_count, misc_count, j);
-
- misc_function_count = j;
-
- /* Sort the misc functions by address. */
-
- sort_misc_function_vector ();
-
- /* Compact out any duplicates. */
-
- compact_misc_function_vector ();
-}
-
/* Get the symbol table that corresponds to a partial_symtab.
This is fast after the first time you do it. In fact, there
FROM_TTY says how verbose to be. MAINLINE specifies whether this
is the main symbol file, or whether it's an extra symbol file such
as dynamically loaded code. If !mainline, ADDR is the address
- where the text segment was loaded. */
+ where the text segment was loaded. If VERBO, the caller has printed
+ a verbose message about the symbol reading (and complaints can be
+ more terse about it). */
void
-syms_from_objfile (objfile, addr, mainline)
+syms_from_objfile (objfile, addr, mainline, verbo)
struct objfile *objfile;
CORE_ADDR addr;
int mainline;
+ 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). */
- if (!(bfd_get_file_flags (sym_bfd) & HAS_SYMS))
+ if (!(bfd_get_file_flags (objfile -> obfd) & HAS_SYMS))
return;
/* 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)
+
+ 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. */
- entry_point = bfd_get_start_address (sym_bfd);
+ entry_point = bfd_get_start_address (objfile -> obfd);
}
else
{
startup_file_end = 0;
}
- sf = symfile_init (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 = 0;
+ 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);
+
+ text_sect = bfd_get_section_by_name (objfile -> obfd, ".text");
+ addr = bfd_section_vma (objfile -> obfd, text_sect);
}
- clear_complaints(); /* Allow complaints to appear for this new file. */
+ /* 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. */
{
/* 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);
+
+ /* 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
loaded file.
FROM_TTY says how verbose to be. MAINLINE specifies whether this
is the main symbol file, or whether it's an extra symbol file such
as dynamically loaded code. If !mainline, ADDR is the address
- where the text segment was loaded. */
+ where the text segment was loaded.
-void
-symbol_file_add (name, from_tty, addr, mainline)
+ Upon success, returns a pointer to the objfile that was added.
+ Upon failure, jumps back to command level (never returns). */
+
+struct objfile *
+symbol_file_add (name, from_tty, addr, mainline, mapped, readnow)
char *name;
int from_tty;
CORE_ADDR addr;
int mainline;
+ int mapped;
+ int readnow;
{
struct objfile *objfile;
- bfd *sym_bfd;
-
- objfile = symfile_open (name);
- sym_bfd = objfile->obfd;
+ struct partial_symtab *psymtab;
+ bfd *abfd;
+ int mapped_it;
- /* 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 misc function vector). */
-
- 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);
}
- if ((symtab_list || partial_symtab_list)
+ if ((have_full_symbols () || have_partial_symbols ())
&& mainline
&& from_tty
&& !query ("Load new symbol table from \"%s\"? ", name))
- error ("Not confirmed.");
+ error ("Not confirmed.");
+
+ objfile = allocate_objfile (abfd, mapped);
+
+ /* If the objfile uses a mapped symbol file, and we have a psymtab for
+ it, then skip reading any symbols at this time. */
- if (from_tty)
+ if ((objfile -> flags & OBJF_MAPPED) && (objfile -> psymtabs != NULL))
{
- printf_filtered ("Reading symbols from %s...", name);
- wrap_here ("");
- fflush (stdout);
+ /* We mapped in an existing symbol table file that already has had
+ the psymbols read in. 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);
+ }
}
+ else
+ {
+ /* We either created a new mapped symbol table, mapped an existing
+ symbol table file with no partial symbols, 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);
+ }
+
+ /* 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. */
- syms_from_objfile (objfile, addr, mainline);
+ readnow |= readnow_symbol_files;
+ if (readnow)
+ {
+ if (from_tty || info_verbose)
+ {
+ printf_filtered ("expanding to full symbols...");
+ wrap_here ("");
+ fflush (stdout);
+ }
+
+ for (psymtab = objfile -> psymtabs;
+ psymtab != NULL;
+ psymtab = psymtab -> next)
+ {
+ (void) psymtab_to_symtab (psymtab);
+ }
+ }
- if (from_tty)
+ if (from_tty || info_verbose)
{
printf_filtered ("done.\n");
fflush (stdout);
}
+
+ return (objfile);
}
/* This is the symbol-file command. Read the file, analyze its symbols,
- and add a struct symtab to symtab_list. */
+ and add a struct symtab to a symtab list. */
void
-symbol_file_command (name, from_tty)
- char *name;
+symbol_file_command (args, from_tty)
+ char *args;
int from_tty;
{
+ char **argv;
+ char *name = NULL;
+ struct cleanup *cleanups;
+ struct objfile *objfile;
+ int mapped = 0;
+ int readnow = 0;
dont_repeat ();
- if (name == 0)
+ if (args == NULL)
{
- if (symfile_objfile) {
- if ((symtab_list || partial_symtab_list)
- && from_tty
- && !query ("Discard symbol table from `%s'? ",
- symfile_objfile->name))
- error ("Not confirmed.");
- free_objfile (symfile_objfile);
- }
- symfile_objfile = 0;
- /* 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) {
- (*symfile_fns->sym_new_init) ();
- free (symfile_fns);
- symfile_fns = 0;
- }
- return;
+ 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;
}
+ else
+ {
+ if ((argv = buildargv (args)) == NULL)
+ {
+ nomem (0);
+ }
+ cleanups = make_cleanup (freeargv, (char *) argv);
+ while (*argv != NULL)
+ {
+ if (strcmp (*argv, "-mapped") == 0)
+ {
+ mapped = 1;
+ }
+ else if (strcmp (*argv, "-readnow") == 0)
+ {
+ readnow = 1;
+ }
+ else if (**argv == '-')
+ {
+ error ("unknown option `%s'", *argv);
+ }
+ else
+ {
+ name = *argv;
+ }
+ argv++;
+ }
- /* Getting new symbols may change our opinion about what is
- frameless. */
- reinit_frame_cache ();
-
- symbol_file_add (name, from_tty, (CORE_ADDR)0, 1);
+ 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 ();
+ objfile = 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)
+static bfd *
+symfile_bfd_open (name)
char *name;
{
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 objfile and bfd */
+ name = absolute_name; /* Keep 2nd malloc'd copy in bfd */
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));
- }
-
- objfile = allocate_objfile (sym_bfd, name);
- return objfile;
-}
-
-
-/* Allocate a new objfile struct, fill it in as best we can, and return it.
- FIXME-soon! Eventually, the objfile will contain the obstack in which
- the symtabs and psymtabs are contained, so they can all be blown away
- cheaply and easily. */
-
-struct objfile *
-allocate_objfile (abfd, filename)
- bfd *abfd;
- char *filename;
-{
- struct objfile *objfile;
-
- objfile = (struct objfile *) xmalloc (sizeof (struct objfile));
- bzero (objfile, sizeof (*objfile));
-
- objfile->obfd = abfd;
- objfile->name = filename;
-
- objfile->symtabs = 0; /* Don't have any yet */
- objfile->psymtabs = 0; /* Don't have any yet */
-
- objfile->mtime = bfd_get_mtime (abfd);
-
- /* Chain it to the list. */
- objfile->next = object_files;
- object_files = objfile;
-
- return objfile;
-}
-
-
-/* Destroy an objfile and all the symtabs and psymtabs under it. */
-
-void
-free_objfile (objfile)
- struct objfile *objfile;
-{
- struct objfile *ofp;
-
- if (objfile->name)
- free (objfile->name);
- if (objfile->obfd)
- bfd_close (objfile->obfd);
-
- /* Remove it from the chain of all objfiles. */
- if (object_files == objfile)
- object_files = objfile->next;
- else for (ofp = object_files; ofp; ofp = ofp->next) {
- if (ofp->next == objfile)
- ofp->next = objfile->next;
- }
-
- /* FIXME! This should only free those associated with the objfile
- being passed to us. THIS IS A KLUDGE TO BOOTSTRAP US. */
- free_all_psymtabs ();
- free_all_symtabs ();
+ 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));
+ }
- free (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;
- 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. */
-void
+static void
load_command (arg, from_tty)
char *arg;
int from_tty;
It does not modify any state in the target, only in the debugger. */
/* ARGSUSED */
-void
-add_symbol_file_command (arg_string, from_tty)
- char *arg_string;
+static void
+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;
+ int mapped;
- /* Getting new symbols may change our opinion about what is
- frameless. */
- reinit_frame_cache ();
+ dont_repeat ();
+
+ if (args == NULL)
+ {
+ error ("add-symbol-file takes a file name and an address");
+ }
- if (arg_string == 0)
- error ("add-symbol-file takes a file name and an address");
+ /* Make a copy of the string that we can safely write into. */
- arg_string = tilde_expand (arg_string);
- make_cleanup (free, arg_string);
+ args = strdup (args);
+ make_cleanup (free, args);
- for( ; *arg_string == ' '; arg_string++ );
- name = arg_string;
- for( ; *arg_string && *arg_string != ' ' ; arg_string++ );
- *arg_string++ = (char) 0;
+ /* Pick off any -option args and the file name. */
+
+ 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);
+ }
+ }
- if (name[0] == 0)
- error ("add-symbol-file takes a file name and an address");
+ /* 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. */
- text_addr = parse_and_eval_address (arg_string);
+ if ((name == NULL) || (*args == '\000') )
+ {
+ error ("add-symbol-file takes a file name and an address");
+ }
+ name = tilde_expand (name);
+ make_cleanup (free, name);
- dont_repeat ();
+ 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.");
- symbol_file_add (name, 0, text_addr, 0);
+ /* Getting new symbols may change our opinion about what is
+ frameless. */
+
+ reinit_frame_cache ();
+
+ (void) 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
different tables may come from different source files. FIXME.
This routine should then walk down each partial symbol table
- and see if the symbol table that it originates from has been changed
- */
+ and see if the symbol table that it originates from has been changed */
+the_big_top:
for (objfile = object_files; objfile; objfile = objfile->next) {
if (objfile->obfd) {
- objfile->obfd->mtime_set = false; /* Force it to reread. */
- new_modtime = bfd_get_mtime (objfile->obfd);
+#ifdef IBM6000
+ /* 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);
/* FIXME, this should use a different command...that would only
- affect this objfile's symbols. */
+ affect this objfile's symbols, and would reset objfile->mtime.
+ (objfile->mtime = new_modtime;)
+ HOWEVER, that command isn't written yet -- so call symbol_file_
+ command, and restart the scan from the top, because it munges
+ the object_files list. */
symbol_file_command (objfile->name, 0);
- objfile->mtime = new_modtime;
reread_one = 1;
+ goto the_big_top; /* Start over. */
}
}
}
if (reread_one)
breakpoint_re_set ();
}
-
-/* This function is really horrible, but to avoid it, there would need
- to be more filling in of forward references. */
-void
-fill_in_vptr_fieldno (type)
- struct type *type;
-{
- if (TYPE_VPTR_FIELDNO (type) < 0)
- {
- int i;
- for (i = 1; i < TYPE_N_BASECLASSES (type); i++)
- {
- fill_in_vptr_fieldno (TYPE_BASECLASS (type, i));
- if (TYPE_VPTR_FIELDNO (TYPE_BASECLASS (type, i)) >= 0)
- {
- TYPE_VPTR_FIELDNO (type)
- = TYPE_VPTR_FIELDNO (TYPE_BASECLASS (type, i));
- TYPE_VPTR_BASETYPE (type)
- = TYPE_VPTR_BASETYPE (TYPE_BASECLASS (type, i));
- break;
- }
- }
- }
-}
\f
/* Functions to handle complaints during symbol reading. */
static unsigned stop_whining = 0;
+/* Should each complaint be self explanatory, or should we assume that
+ a series of complaints is being produced?
+ case 0: self explanatory message.
+ case 1: First message of a series that must start off with explanation.
+ case 2: Subsequent message, when user already knows we are reading
+ symbols and we can just state our piece. */
+
+static int complaint_series = 0;
+
/* Print a complaint about the input symbols, and link the complaint block
into a chain for later handling. */
if (complaint->counter > stop_whining)
return;
wrap_here ("");
- if (!info_verbose) {
+
+ switch (complaint_series + (info_verbose << 1)) {
+
+ /* Isolated messages, must be self-explanatory. */
+ case 0:
+ puts_filtered ("During symbol reading, ");
+ wrap_here("");
+ printf_filtered (complaint->message, val);
+ puts_filtered (".\n");
+ break;
+
+ /* First of a series, without `set verbose'. */
+ case 1:
puts_filtered ("During symbol reading...");
+ printf_filtered (complaint->message, val);
+ puts_filtered ("...");
+ wrap_here("");
+ complaint_series++;
+ break;
+
+ /* Subsequent messages of a series, or messages under `set verbose'.
+ (We'll already have produced a "Reading in symbols for XXX..." message
+ and will clean up at the end with a newline.) */
+ default:
+ printf_filtered (complaint->message, val);
+ puts_filtered ("...");
+ wrap_here("");
}
- printf_filtered (complaint->message, val);
- puts_filtered ("...");
- wrap_here("");
- if (!info_verbose)
- puts_filtered ("\n");
}
-/* Clear out all complaint counters that have ever been incremented. */
+/* Clear out all complaint counters that have ever been incremented.
+ If sym_reading is 1, be less verbose about successive complaints,
+ since the messages are appearing all together during a command that
+ reads symbols (rather than scattered around as psymtabs get fleshed
+ out into symtabs at random times). If noisy is 1, we are in a
+ noisy symbol reading command, and our caller will print enough
+ context for the user to figure it out. */
void
-clear_complaints ()
+clear_complaints (sym_reading, noisy)
+ int sym_reading;
+ int noisy;
{
struct complaint *p;
for (p = complaint_root->next; p != complaint_root; p = p->next)
p->counter = 0;
+
+ if (!sym_reading && !noisy && complaint_series > 1) {
+ /* Terminate previous series, since caller won't. */
+ puts_filtered ("\n");
+ }
+
+ complaint_series = sym_reading? 1 + noisy: 0;
}
\f
enum language
deduce_language_from_filename (filename)
char *filename;
{
- char *c = rindex (filename, '.');
+ char *c = strrchr (filename, '.');
if (!c) ; /* Get default. */
else if(!strcmp(c,".mod"))
symtab->free_ptr
initialize any EXTRA_SYMTAB_INFO
possibly free_named_symtabs (symtab->filename);
- symtab->next = symtab_list;
- symtab_list = symtab;
*/
struct symtab *
-allocate_symtab(name, objfile)
- char *name;
- struct objfile *objfile;
+allocate_symtab (filename, objfile)
+ char *filename;
+ struct objfile *objfile;
{
register struct symtab *symtab;
- symtab = (struct symtab *) xmalloc (sizeof (struct symtab));
- bzero (symtab, sizeof (*symtab));
- symtab->filename = name;
- symtab->fullname = NULL;
- symtab->nlines = 0;
- symtab->line_charpos = 0;
- symtab->version = 0;
- symtab->language = deduce_language_from_filename (name);
+ symtab = (struct symtab *)
+ obstack_alloc (&objfile -> symbol_obstack, sizeof (struct symtab));
+ (void) memset (symtab, 0, sizeof (*symtab));
+ symtab -> filename = obsavestring (filename, strlen (filename),
+ &objfile -> symbol_obstack);
+ symtab -> fullname = NULL;
+ symtab -> language = deduce_language_from_filename (filename);
/* Hook it to the objfile it comes from */
- symtab->objfile = objfile;
- symtab->objfile_chain = objfile->symtabs;
- objfile->symtabs = symtab;
+
+ symtab -> objfile = objfile;
+ symtab -> next = objfile -> symtabs;
+ objfile -> symtabs = symtab;
#ifdef INIT_EXTRA_SYMTAB_INFO
- INIT_EXTRA_SYMTAB_INFO(symtab);
+ INIT_EXTRA_SYMTAB_INFO (symtab);
#endif
- return symtab;
+ return (symtab);
+}
+
+struct partial_symtab *
+allocate_psymtab (filename, objfile)
+ char *filename;
+ struct objfile *objfile;
+{
+ struct partial_symtab *psymtab;
+
+ 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));
+
+ (void) memset (psymtab, 0, sizeof (struct partial_symtab));
+ psymtab -> filename = obsavestring (filename, strlen (filename),
+ &objfile -> psymbol_obstack);
+ psymtab -> symtab = NULL;
+
+ /* Hook it to the objfile it comes from */
+
+ psymtab -> objfile = objfile;
+ psymtab -> next = objfile -> psymtabs;
+ objfile -> psymtabs = psymtab;
+
+ return (psymtab);
}
+
\f
/* clear_symtab_users_once:
int i;
/* Find its previous psymtab in the chain */
- for (ps = partial_symtab_list; ps; ps = ps->next) {
+ for (ps = pst->objfile->psymtabs; ps; ps = ps->next) {
if (ps == pst)
break;
pprev = ps;
if (ps) {
/* Unhook it from the chain. */
- if (ps == partial_symtab_list)
- partial_symtab_list = ps->next;
+ if (ps == pst->objfile->psymtabs)
+ pst->objfile->psymtabs = ps->next;
else
pprev->next = ps->next;
/* We need to cashier any psymtab that has this one as a dependency... */
again:
- for (ps = partial_symtab_list; ps; ps = ps->next) {
+ for (ps = pst->objfile->psymtabs; ps; ps = ps->next) {
for (i = 0; i < ps->number_of_dependencies; i++) {
if (ps->dependencies[i] == pst) {
cashier_psymtab (ps);
it is not called for subsidiary files such as .h files.
Return value is 1 if we blew away the environment, 0 if not.
+ FIXME. The return valu appears to never be used.
FIXME. I think this is not the best way to do this. We should
work on being gentler to the environment while still cleaning up
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. */
+
/* We only wack things if the symbol-reload switch is set. */
if (!symbol_reloading)
return 0;
;
}
- /* FIXME, what about the misc function vector? */
+ /* FIXME, what about the minimal symbol table? */
return blewit;
+#else
+ return (0);
+#endif
}
\f
-/*
- * Free all partial_symtab storage.
- */
-static void
-free_all_psymtabs()
-{
- obstack_free (psymbol_obstack, 0);
- obstack_init (psymbol_obstack);
- partial_symtab_list = (struct partial_symtab *) 0;
-}
-
-/* Free all the symtabs that are currently installed,
- and all storage associated with them.
- Leaves us in a consistent state with no symtabs installed. */
-
-static void
-free_all_symtabs ()
-{
- register struct symtab *s, *snext;
+/* Allocate and partially fill a partial symtab. It will be
+ completely filled at the end of the symbol list.
- /* All values will be invalid because their types will be! */
-
- clear_value_history ();
- clear_displays ();
- clear_internalvars ();
-#if defined (CLEAR_SOLIB)
- CLEAR_SOLIB ();
-#endif
- set_default_breakpoint (0, 0, 0, 0);
+ SYMFILE_NAME is the name of the symbol-file we are reading from, and ADDR
+ is the address relative to which its symbols are (incremental) or 0
+ (normal). */
- current_source_symtab = 0;
- for (s = symtab_list; s; s = snext)
- {
- snext = s->next;
- free_symtab (s);
- }
- symtab_list = 0;
- obstack_free (symbol_obstack, 0);
- obstack_init (symbol_obstack);
-
- if (misc_function_vector)
- free (misc_function_vector);
- misc_function_count = 0;
- misc_function_vector = 0;
- clear_pc_function_cache();
+struct partial_symtab *
+start_psymtab_common (objfile, addr,
+ filename, textlow, global_syms, static_syms)
+ struct objfile *objfile;
+ CORE_ADDR addr;
+ char *filename;
+ CORE_ADDR textlow;
+ struct partial_symbol *global_syms;
+ struct partial_symbol *static_syms;
+{
+ struct partial_symtab *psymtab;
+
+ psymtab = allocate_psymtab (filename, objfile);
+ psymtab -> addr = addr;
+ psymtab -> textlow = textlow;
+ psymtab -> texthigh = psymtab -> textlow; /* default */
+ psymtab -> globals_offset = global_syms - objfile -> global_psymbols.list;
+ psymtab -> statics_offset = static_syms - objfile -> static_psymbols.list;
+ return (psymtab);
}
+
\f
void
_initialize_symfile ()
{
add_com ("symbol-file", class_files, symbol_file_command,
- "Load symbol table from executable file FILE.\n\
+ "Load symbol table from executable file FILE.\n\
The `file' command can also load symbol tables, as well as setting the file\n\
to execute.");
for access from GDB.");
add_show_from_set
- (add_set_cmd ("complaints", class_support, var_uinteger,
+ (add_set_cmd ("complaints", class_support, var_zinteger,
(char *)&stop_whining,
"Set max number of complaints about incorrect symbols.",
&setlist),
&setlist),
&showlist);
- obstack_init (symbol_obstack);
- obstack_init (psymbol_obstack);
}
projects / binutils-gdb.git / blobdiff