X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fsymfile.c;h=2671770d17bcde2b26beb5d30b77443c6db2b608;hb=f43845b38ec9ab8ef197a9201b2e9be2913df4b3;hp=5fc516ba5bf276897f7af63198b0eb316ca02a22;hpb=38c2ef12c323230828473d91f3ca7e2d8c654dbf;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/symfile.c b/gdb/symfile.c index 5fc516ba5b..2671770d17 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -1,5 +1,8 @@ /* Generic symbol file reading for the GNU debugger, GDB. - Copyright 1990-1996, 1998, 2000 Free Software Foundation, Inc. + + Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, + 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + Contributed by Cygnus Support, using pieces from other GDB modules. This file is part of GDB. @@ -36,8 +39,8 @@ #include "inferior.h" /* for write_pc */ #include "gdb-stabs.h" #include "obstack.h" +#include "completer.h" -#include #include #include #include "gdb_string.h" @@ -94,8 +97,6 @@ struct complaint unknown_option_complaint = /* External variables and functions referenced. */ -extern int info_verbose; - extern void report_transfer_performance (unsigned long, time_t, time_t); /* Functions this file defines */ @@ -109,18 +110,18 @@ static void set_initial_language (void); static void load_command (char *, int); +static void symbol_file_add_main_1 (char *args, int from_tty, int flags); + static void add_symbol_file_command (char *, int); static void add_shared_symbol_files_command (char *, int); static void cashier_psymtab (struct partial_symtab *); -static int compare_psymbols (const void *, const void *); - -static int compare_symbols (const void *, const void *); - bfd *symfile_bfd_open (char *); +int get_section_index (struct objfile *, char *); + static void find_sym_fns (struct objfile *); static void decrement_reading_symtab (void *); @@ -178,27 +179,27 @@ int symbol_reloading = SYMBOL_RELOADING_DEFAULT; int symbol_reloading = 0; #endif -/* If non-zero, then on HP-UX (i.e., platforms that use somsolib.c), - this variable is interpreted as a threshhold. If adding a new - library's symbol table to those already known to the debugger would - exceed this threshhold, then the shlib's symbols are not added. - - If non-zero on other platforms, shared library symbols will be added - automatically when the inferior is created, new libraries are loaded, - or when attaching to the inferior. This is almost always what users - will want to have happen; but for very large programs, the startup - time will be excessive, and so if this is a problem, the user can - clear this flag and then add the shared library symbols as needed. - Note that there is a potential for confusion, since if the shared +/* If non-zero, shared library symbols will be added automatically + when the inferior is created, new libraries are loaded, or when + attaching to the inferior. This is almost always what users will + want to have happen; but for very large programs, the startup time + will be excessive, and so if this is a problem, the user can clear + this flag and then add the shared library symbols as needed. Note + that there is a potential for confusion, since if the shared library symbols are not loaded, commands like "info fun" will *not* - report all the functions that are actually present. - - Note that HP-UX interprets this variable to mean, "threshhold size - in megabytes, where zero means never add". Other platforms interpret - this variable to mean, "always add if non-zero, never add if zero." - */ + report all the functions that are actually present. */ int auto_solib_add = 1; + +/* For systems that support it, a threshold size in megabytes. If + automatically adding a new library's symbol table to those already + known to the debugger would cause the total shared library symbol + size to exceed this threshhold, then the shlib's symbols are not + added. The threshold is ignored if the user explicitly asks for a + shlib to be added, such as when using the "sharedlibrary" + command. */ + +int auto_solib_limit; /* Since this function is called from within qsort, in an ANSI environment @@ -206,14 +207,13 @@ int auto_solib_add = 1; comparison function takes two "void *" pointers. */ static int -compare_symbols (const PTR s1p, const PTR s2p) +compare_symbols (const void *s1p, const void *s2p) { register struct symbol **s1, **s2; s1 = (struct symbol **) s1p; s2 = (struct symbol **) s2p; - - return (STRCMP (SYMBOL_NAME (*s1), SYMBOL_NAME (*s2))); + return (strcmp (SYMBOL_SOURCE_NAME (*s1), SYMBOL_SOURCE_NAME (*s2))); } /* @@ -239,10 +239,16 @@ compare_symbols (const PTR s1p, const PTR s2p) */ static int -compare_psymbols (const PTR s1p, const PTR s2p) +compare_psymbols (const void *s1p, const void *s2p) { - register char *st1 = SYMBOL_NAME (*(struct partial_symbol **) s1p); - register char *st2 = SYMBOL_NAME (*(struct partial_symbol **) s2p); + register struct partial_symbol **s1, **s2; + register char *st1, *st2; + + s1 = (struct partial_symbol **) s1p; + s2 = (struct partial_symbol **) s2p; + st1 = SYMBOL_SOURCE_NAME (*s1); + st2 = SYMBOL_SOURCE_NAME (*s2); + if ((st1[0] - st2[0]) || !st1[0]) { @@ -254,18 +260,6 @@ compare_psymbols (const PTR s1p, const PTR s2p) } else { - /* Note: I replaced the STRCMP line (commented out below) - * with a simpler "strcmp()" which compares the 2 strings - * from the beginning. (STRCMP is a macro which first compares - * the initial characters, then falls back on strcmp). - * The reason is that the STRCMP line was tickling a C compiler - * bug on HP-UX 10.30, which is avoided with the simpler - * code. The performance gain from the more complicated code - * is negligible, given that we have already checked the - * initial 2 characters above. I reported the compiler bug, - * and once it is fixed the original line can be put back. RT - */ - /* return ( STRCMP (st1 + 2, st2 + 2)); */ return (strcmp (st1, st2)); } } @@ -462,11 +456,13 @@ build_section_addr_info_from_section_table (const struct section_table *start, for (stp = start, oidx = 0; stp != end; stp++) { - if (stp->the_bfd_section->flags & (SEC_ALLOC | SEC_LOAD) + if (bfd_get_section_flags (stp->bfd, + stp->the_bfd_section) & (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].name + = xstrdup (bfd_section_name (stp->bfd, stp->the_bfd_section)); sap->other[oidx].sectindex = stp->the_bfd_section->index; oidx++; } @@ -485,8 +481,8 @@ free_section_addr_info (struct section_addr_info *sap) for (idx = 0; idx < MAX_SECTIONS; idx++) if (sap->other[idx].name) - free (sap->other[idx].name); - free (sap); + xfree (sap->other[idx].name); + xfree (sap); } @@ -583,6 +579,9 @@ syms_from_objfile (struct objfile *objfile, struct section_addr_info *addrs, init_entry_point_info (objfile); find_sym_fns (objfile); + if (objfile->sf == NULL) + return; /* No symbols. */ + /* Make sure that partially constructed symbol tables will be cleaned up if an error occurs during symbol reading. */ old_chain = make_cleanup_free_objfile (objfile); @@ -718,7 +717,9 @@ syms_from_objfile (struct objfile *objfile, struct section_addr_info *addrs, 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) + if (strcmp (bfd_section_name (s->objfile->obfd, + s->the_bfd_section), + addrs->other[i].name) == 0) s_addr = addrs->other[i].addr; /* end added for gdb/13815 */ s->addr -= s->offset; @@ -895,6 +896,9 @@ symbol_file_add (char *name, int from_tty, struct section_addr_info *addrs, } } + if (objfile->sf == NULL) + return objfile; /* No symbols. */ + new_symfile_objfile (objfile, mainline, from_tty); if (target_new_objfile_hook) @@ -903,6 +907,62 @@ symbol_file_add (char *name, int from_tty, struct section_addr_info *addrs, return (objfile); } +/* Call symbol_file_add() with default values and update whatever is + affected by the loading of a new main(). + Used when the file is supplied in the gdb command line + and by some targets with special loading requirements. + The auxiliary function, symbol_file_add_main_1(), has the flags + argument for the switches that can only be specified in the symbol_file + command itself. */ + +void +symbol_file_add_main (char *args, int from_tty) +{ + symbol_file_add_main_1 (args, from_tty, 0); +} + +static void +symbol_file_add_main_1 (char *args, int from_tty, int flags) +{ + symbol_file_add (args, from_tty, NULL, 1, flags); + +#ifdef HPUXHPPA + RESET_HP_UX_GLOBALS (); +#endif + + /* Getting new symbols may change our opinion about + what is frameless. */ + reinit_frame_cache (); + + set_initial_language (); +} + +void +symbol_file_clear (int from_tty) +{ + if ((have_full_symbols () || have_partial_symbols ()) + && from_tty + && !query ("Discard symbol table from `%s'? ", + symfile_objfile->name)) + error ("Not confirmed."); + free_all_objfiles (); + + /* solib descriptors may have handles to objfiles. Since their + storage has just been released, we'd better wipe the solib + descriptors as well. + */ +#if defined(SOLIB_RESTART) + SOLIB_RESTART (); +#endif + + symfile_objfile = NULL; + if (from_tty) + printf_unfiltered ("No symbol file now.\n"); +#ifdef HPUXHPPA + RESET_HP_UX_GLOBALS (); +#endif +} + /* This is the symbol-file command. Read the file, analyze its symbols, and add a struct symtab to a symtab list. The syntax of the command is rather bizarre--(1) buildargv implements various @@ -929,27 +989,7 @@ symbol_file_command (char *args, int from_tty) if (args == NULL) { - if ((have_full_symbols () || have_partial_symbols ()) - && from_tty - && !query ("Discard symbol table from `%s'? ", - symfile_objfile->name)) - error ("Not confirmed."); - free_all_objfiles (); - - /* solib descriptors may have handles to objfiles. Since their - storage has just been released, we'd better wipe the solib - descriptors as well. - */ -#if defined(SOLIB_RESTART) - SOLIB_RESTART (); -#endif - - symfile_objfile = NULL; - if (from_tty) - printf_unfiltered ("No symbol file now.\n"); -#ifdef HPUXHPPA - RESET_HP_UX_GLOBALS (); -#endif + symbol_file_clear (from_tty); } else { @@ -971,15 +1011,8 @@ symbol_file_command (char *args, int from_tty) else { name = *argv; - symbol_file_add (name, from_tty, NULL, 1, flags); -#ifdef HPUXHPPA - RESET_HP_UX_GLOBALS (); -#endif - /* Getting new symbols may change our opinion about - what is frameless. */ - reinit_frame_cache (); - set_initial_language (); + symbol_file_add_main_1 (name, from_tty, flags); } argv++; } @@ -988,7 +1021,6 @@ symbol_file_command (char *args, int from_tty) { error ("no symbol file name was specified"); } - TUIDO (((TuiOpaqueFuncPtr) tuiDisplayMainFunction)); do_cleanups (cleanups); } } @@ -1044,7 +1076,7 @@ symfile_bfd_open (char *name) /* Look down path for it, allocate 2nd new malloc'd copy. */ desc = openp (getenv ("PATH"), 1, name, O_RDONLY | O_BINARY, 0, &absolute_name); -#if defined(__GO32__) || defined(_WIN32) +#if defined(__GO32__) || defined(_WIN32) || defined (__CYGWIN__) if (desc < 0) { char *exename = alloca (strlen (name) + 5); @@ -1055,10 +1087,10 @@ symfile_bfd_open (char *name) #endif if (desc < 0) { - make_cleanup (free, name); + make_cleanup (xfree, name); perror_with_name (name); } - free (name); /* Free 1st new malloc'd copy */ + xfree (name); /* Free 1st new malloc'd copy */ name = absolute_name; /* Keep 2nd malloc'd copy in bfd */ /* It'll be freed in free_objfile(). */ @@ -1066,11 +1098,11 @@ symfile_bfd_open (char *name) if (!sym_bfd) { close (desc); - make_cleanup (free, name); + make_cleanup (xfree, name); error ("\"%s\": can't open to read symbols: %s.", name, bfd_errmsg (bfd_get_error ())); } - sym_bfd->cacheable = true; + sym_bfd->cacheable = 1; if (!bfd_check_format (sym_bfd, bfd_object)) { @@ -1078,13 +1110,25 @@ symfile_bfd_open (char *name) on error it does not free all the storage associated with the bfd). */ bfd_close (sym_bfd); /* This also closes desc */ - make_cleanup (free, name); + make_cleanup (xfree, name); error ("\"%s\": can't read symbols: %s.", name, bfd_errmsg (bfd_get_error ())); } return (sym_bfd); } +/* Return the section index for the given section name. Return -1 if + the section was not found. */ +int +get_section_index (struct objfile *objfile, char *section_name) +{ + asection *sect = bfd_get_section_by_name (objfile->obfd, section_name); + if (sect) + return sect->index; + else + return -1; +} + /* 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 @@ -1110,6 +1154,11 @@ find_sym_fns (struct objfile *objfile) enum bfd_flavour our_flavour = bfd_get_flavour (objfile->obfd); char *our_target = bfd_get_target (objfile->obfd); + if (our_flavour == bfd_target_srec_flavour + || our_flavour == bfd_target_ihex_flavour + || our_flavour == bfd_target_tekhex_flavour) + return; /* No symbols. */ + /* Special kludge for apollo. See dstread.c. */ if (STREQN (our_target, "apollo", 6)) our_flavour = (enum bfd_flavour) -2; @@ -1134,6 +1183,10 @@ load_command (char *arg, int from_tty) if (arg == NULL) arg = get_exec_file (1); target_load (arg, from_tty); + + /* After re-loading the executable, we don't really know which + overlays are mapped any more. */ + overlay_cache_invalid = 1; } /* This version of "load" should be usable for any target. Currently @@ -1148,37 +1201,151 @@ load_command (char *arg, int from_tty) static int download_write_size = 512; static int validate_download = 0; +/* Callback service function for generic_load (bfd_map_over_sections). */ + +static void +add_section_size_callback (bfd *abfd, asection *asec, void *data) +{ + bfd_size_type *sum = data; + + *sum += bfd_get_section_size_before_reloc (asec); +} + +/* Opaque data for load_section_callback. */ +struct load_section_data { + unsigned long load_offset; + unsigned long write_count; + unsigned long data_count; + bfd_size_type total_size; +}; + +/* Callback service function for generic_load (bfd_map_over_sections). */ + +static void +load_section_callback (bfd *abfd, asection *asec, void *data) +{ + struct load_section_data *args = data; + + if (bfd_get_section_flags (abfd, asec) & SEC_LOAD) + { + bfd_size_type size = bfd_get_section_size_before_reloc (asec); + if (size > 0) + { + char *buffer; + struct cleanup *old_chain; + CORE_ADDR lma = bfd_section_lma (abfd, asec) + args->load_offset; + bfd_size_type block_size; + int err; + const char *sect_name = bfd_get_section_name (abfd, asec); + bfd_size_type sent; + + if (download_write_size > 0 && size > download_write_size) + block_size = download_write_size; + else + block_size = size; + + buffer = xmalloc (size); + old_chain = make_cleanup (xfree, buffer); + + /* Is this really necessary? I guess it gives the user something + to look at during a long download. */ + ui_out_message (uiout, 0, "Loading section %s, size 0x%s lma 0x%s\n", + sect_name, paddr_nz (size), paddr_nz (lma)); + + bfd_get_section_contents (abfd, asec, buffer, 0, size); + + sent = 0; + do + { + int len; + bfd_size_type this_transfer = size - sent; + + if (this_transfer >= block_size) + this_transfer = block_size; + len = target_write_memory_partial (lma, buffer, + this_transfer, &err); + if (err) + break; + if (validate_download) + { + /* Broken memories and broken monitors manifest + themselves here when bring new computers to + life. This doubles already slow downloads. */ + /* NOTE: cagney/1999-10-18: A more efficient + implementation might add a verify_memory() + method to the target vector and then use + that. remote.c could implement that method + using the ``qCRC'' packet. */ + char *check = xmalloc (len); + struct cleanup *verify_cleanups = + make_cleanup (xfree, check); + + if (target_read_memory (lma, check, len) != 0) + error ("Download verify read failed at 0x%s", + paddr (lma)); + if (memcmp (buffer, check, len) != 0) + error ("Download verify compare failed at 0x%s", + paddr (lma)); + do_cleanups (verify_cleanups); + } + args->data_count += len; + lma += len; + buffer += len; + args->write_count += 1; + sent += len; + if (quit_flag + || (ui_load_progress_hook != NULL + && ui_load_progress_hook (sect_name, sent))) + error ("Canceled the download"); + + if (show_load_progress != NULL) + show_load_progress (sect_name, sent, size, + args->data_count, args->total_size); + } + while (sent < size); + + if (err != 0) + error ("Memory access error while loading section %s.", sect_name); + + do_cleanups (old_chain); + } + } +} + void generic_load (char *args, int from_tty) { asection *s; bfd *loadfile_bfd; time_t start_time, end_time; /* Start and end times of download */ - unsigned long data_count = 0; /* Number of bytes transferred to memory */ - unsigned long write_count = 0; /* Number of writes needed. */ - unsigned long load_offset; /* offset to add to vma for each section */ char *filename; struct cleanup *old_cleanups; char *offptr; - CORE_ADDR total_size = 0; - CORE_ADDR total_sent = 0; + struct load_section_data cbdata; + CORE_ADDR entry; + + cbdata.load_offset = 0; /* Offset to add to vma for each section. */ + cbdata.write_count = 0; /* Number of writes needed. */ + cbdata.data_count = 0; /* Number of bytes written to target memory. */ + cbdata.total_size = 0; /* Total size of all bfd sectors. */ /* Parse the input argument - the user can specify a load offset as a second argument. */ filename = xmalloc (strlen (args) + 1); - old_cleanups = make_cleanup (free, filename); + old_cleanups = make_cleanup (xfree, filename); strcpy (filename, args); offptr = strchr (filename, ' '); if (offptr != NULL) { char *endptr; - load_offset = strtoul (offptr, &endptr, 0); + + cbdata.load_offset = strtoul (offptr, &endptr, 0); if (offptr == endptr) error ("Invalid download offset:%s\n", offptr); *offptr = '\0'; } else - load_offset = 0; + cbdata.load_offset = 0; /* Open the file for loading. */ loadfile_bfd = bfd_openr (filename, gnutarget); @@ -1199,123 +1366,24 @@ generic_load (char *args, int from_tty) bfd_errmsg (bfd_get_error ())); } - for (s = loadfile_bfd->sections; s; s = s->next) - if (s->flags & SEC_LOAD) - total_size += bfd_get_section_size_before_reloc (s); + bfd_map_over_sections (loadfile_bfd, add_section_size_callback, + (void *) &cbdata.total_size); start_time = time (NULL); - for (s = loadfile_bfd->sections; s; s = s->next) - { - if (s->flags & SEC_LOAD) - { - CORE_ADDR size = bfd_get_section_size_before_reloc (s); - if (size > 0) - { - char *buffer; - struct cleanup *old_chain; - CORE_ADDR lma = s->lma + load_offset; - CORE_ADDR block_size; - int err; - const char *sect_name = bfd_get_section_name (loadfile_bfd, s); - CORE_ADDR sent; - - if (download_write_size > 0 && size > download_write_size) - block_size = download_write_size; - else - block_size = size; - - buffer = xmalloc (size); - old_chain = make_cleanup (free, buffer); - - /* Is this really necessary? I guess it gives the user something - to look at during a long download. */ -#ifdef UI_OUT - ui_out_message (uiout, 0, "Loading section %s, size 0x%s lma 0x%s\n", - sect_name, paddr_nz (size), paddr_nz (lma)); -#else - fprintf_unfiltered (gdb_stdout, - "Loading section %s, size 0x%s lma 0x%s\n", - sect_name, paddr_nz (size), paddr_nz (lma)); -#endif - - bfd_get_section_contents (loadfile_bfd, s, buffer, 0, size); - - sent = 0; - do - { - CORE_ADDR len; - CORE_ADDR this_transfer = size - sent; - if (this_transfer >= block_size) - this_transfer = block_size; - len = target_write_memory_partial (lma, buffer, - this_transfer, &err); - if (err) - break; - if (validate_download) - { - /* Broken memories and broken monitors manifest - themselves here when bring new computers to - life. This doubles already slow downloads. */ - /* NOTE: cagney/1999-10-18: A more efficient - implementation might add a verify_memory() - method to the target vector and then use - that. remote.c could implement that method - using the ``qCRC'' packet. */ - char *check = xmalloc (len); - struct cleanup *verify_cleanups = make_cleanup (free, check); - if (target_read_memory (lma, check, len) != 0) - error ("Download verify read failed at 0x%s", - paddr (lma)); - if (memcmp (buffer, check, len) != 0) - error ("Download verify compare failed at 0x%s", - paddr (lma)); - do_cleanups (verify_cleanups); - } - data_count += len; - lma += len; - buffer += len; - write_count += 1; - sent += len; - total_sent += len; - if (quit_flag - || (ui_load_progress_hook != NULL - && ui_load_progress_hook (sect_name, sent))) - error ("Canceled the download"); - - if (show_load_progress != NULL) - show_load_progress (sect_name, sent, size, total_sent, total_size); - } - while (sent < size); - - if (err != 0) - error ("Memory access error while loading section %s.", sect_name); - - do_cleanups (old_chain); - } - } - } + bfd_map_over_sections (loadfile_bfd, load_section_callback, &cbdata); end_time = time (NULL); - { - CORE_ADDR entry; - entry = bfd_get_start_address (loadfile_bfd); -#ifdef UI_OUT - ui_out_text (uiout, "Start address "); - ui_out_field_fmt (uiout, "address", "0x%s" , paddr_nz (entry)); - ui_out_text (uiout, ", load size "); - ui_out_field_fmt (uiout, "load-size", "%ld" , data_count); - ui_out_text (uiout, "\n"); -#else - fprintf_unfiltered (gdb_stdout, - "Start address 0x%s , load size %ld\n", - paddr_nz (entry), data_count); -#endif - /* We were doing this in remote-mips.c, I suspect it is right - for other targets too. */ - write_pc (entry); - } + entry = bfd_get_start_address (loadfile_bfd); + ui_out_text (uiout, "Start address "); + ui_out_field_fmt (uiout, "address", "0x%s", paddr_nz (entry)); + ui_out_text (uiout, ", load size "); + ui_out_field_fmt (uiout, "load-size", "%lu", cbdata.data_count); + ui_out_text (uiout, "\n"); + /* We were doing this in remote-mips.c, I suspect it is right + for other targets too. */ + write_pc (entry); /* FIXME: are we supposed to call symbol_file_add or not? According to a comment from remote-mips.c (where a call to symbol_file_add was @@ -1323,8 +1391,8 @@ generic_load (char *args, int from_tty) loaded in. remote-nindy.c had no call to symbol_file_add, but remote-vx.c does. */ - print_transfer_performance (gdb_stdout, data_count, write_count, - end_time - start_time); + print_transfer_performance (gdb_stdout, cbdata.data_count, + cbdata.write_count, end_time - start_time); do_cleanups (old_cleanups); } @@ -1339,7 +1407,8 @@ void report_transfer_performance (unsigned long data_count, time_t start_time, time_t end_time) { - print_transfer_performance (gdb_stdout, data_count, end_time - start_time, 0); + print_transfer_performance (gdb_stdout, data_count, + end_time - start_time, 0); } void @@ -1348,36 +1417,25 @@ print_transfer_performance (struct ui_file *stream, unsigned long write_count, unsigned long time_count) { -#ifdef UI_OUT ui_out_text (uiout, "Transfer rate: "); if (time_count > 0) { - ui_out_field_fmt (uiout, "transfer-rate", "%ld", + ui_out_field_fmt (uiout, "transfer-rate", "%lu", (data_count * 8) / time_count); ui_out_text (uiout, " bits/sec"); } else { - ui_out_field_fmt (uiout, "transferred-bits", "%ld", (data_count * 8)); + ui_out_field_fmt (uiout, "transferred-bits", "%lu", (data_count * 8)); ui_out_text (uiout, " bits in <1 sec"); } if (write_count > 0) { ui_out_text (uiout, ", "); - ui_out_field_fmt (uiout, "write-rate", "%ld", data_count / write_count); + ui_out_field_fmt (uiout, "write-rate", "%lu", data_count / write_count); ui_out_text (uiout, " bytes/write"); } ui_out_text (uiout, ".\n"); -#else - fprintf_unfiltered (stream, "Transfer rate: "); - if (time_count > 0) - fprintf_unfiltered (stream, "%ld bits/sec", (data_count * 8) / time_count); - else - fprintf_unfiltered (stream, "%ld bits in <1 sec", (data_count * 8)); - if (write_count > 0) - fprintf_unfiltered (stream, ", %ld bytes/write", data_count / write_count); - fprintf_unfiltered (stream, ".\n"); -#endif } /* This function allows the addition of incrementally linked object files. @@ -1411,7 +1469,7 @@ add_symbol_file_command (char *args, int from_tty) } sect_opts[SECT_OFF_MAX]; struct section_addr_info section_addrs; - struct cleanup *my_cleanups; + struct cleanup *my_cleanups = make_cleanup (null_cleanup, NULL); dont_repeat (); @@ -1447,7 +1505,7 @@ add_symbol_file_command (char *args, int from_tty) { /* The first argument is the file name. */ filename = tilde_expand (arg); - my_cleanups = make_cleanup (free, filename); + make_cleanup (xfree, filename); } else if (argcnt == 1) @@ -1645,11 +1703,11 @@ reread_symbols (void) /* FIXME: Do we have to free a whole linked list, or is this enough? */ if (objfile->global_psymbols.list) - mfree (objfile->md, objfile->global_psymbols.list); + xmfree (objfile->md, objfile->global_psymbols.list); memset (&objfile->global_psymbols, 0, sizeof (objfile->global_psymbols)); if (objfile->static_psymbols.list) - mfree (objfile->md, objfile->static_psymbols.list); + xmfree (objfile->md, objfile->static_psymbols.list); memset (&objfile->static_psymbols, 0, sizeof (objfile->static_psymbols)); @@ -1679,13 +1737,13 @@ reread_symbols (void) /* obstack_specify_allocation also initializes the obstack so it is empty. */ obstack_specify_allocation (&objfile->psymbol_cache.cache, 0, 0, - xmalloc, free); + xmalloc, xfree); obstack_specify_allocation (&objfile->psymbol_obstack, 0, 0, - xmalloc, free); + xmalloc, xfree); obstack_specify_allocation (&objfile->symbol_obstack, 0, 0, - xmalloc, free); + xmalloc, xfree); obstack_specify_allocation (&objfile->type_obstack, 0, 0, - xmalloc, free); + xmalloc, xfree); if (build_objfile_section_table (objfile)) { error ("Can't find the file sections in `%s': %s", @@ -1773,11 +1831,11 @@ add_filename_language (char *ext, enum language lang) if (fl_table_next >= fl_table_size) { fl_table_size += 10; - filename_language_table = realloc (filename_language_table, - fl_table_size); + filename_language_table = xrealloc (filename_language_table, + fl_table_size); } - filename_language_table[fl_table_next].ext = strsave (ext); + filename_language_table[fl_table_next].ext = xstrdup (ext); filename_language_table[fl_table_next].lang = lang; fl_table_next++; } @@ -1835,8 +1893,8 @@ set_ext_lang_command (char *args, int from_tty) /* query ("Really make files of type %s '%s'?", */ /* ext_args, language_str (lang)); */ - free (filename_language_table[i].ext); - filename_language_table[i].ext = strsave (ext_args); + xfree (filename_language_table[i].ext); + filename_language_table[i].ext = xstrdup (ext_args); filename_language_table[i].lang = lang; } } @@ -2138,7 +2196,7 @@ cashier_psymtab (struct partial_symtab *pst) 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. The return value 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 @@ -2395,11 +2453,11 @@ init_psymbol_list (struct objfile *objfile, int total_symbols) if (objfile->global_psymbols.list) { - mfree (objfile->md, (PTR) objfile->global_psymbols.list); + xmfree (objfile->md, (PTR) objfile->global_psymbols.list); } if (objfile->static_psymbols.list) { - mfree (objfile->md, (PTR) objfile->static_psymbols.list); + xmfree (objfile->md, (PTR) objfile->static_psymbols.list); } /* Current best guess is that approximately a twentieth @@ -2466,6 +2524,7 @@ init_psymbol_list (struct objfile *objfile, int total_symbols) section_is_overlay(sect): true if section's VMA != LMA pc_in_mapped_range(pc,sec): true if pc belongs to section's VMA pc_in_unmapped_range(...): true if pc belongs to section's LMA + sections_overlap(sec1, sec2): true if mapped sec1 and sec2 ranges overlap overlay_mapped_address(...): map an address from section's LMA to VMA overlay_unmapped_address(...): map an address from section's VMA to LMA symbol_overlayed_address(...): Return a "current" address for symbol: @@ -2475,7 +2534,7 @@ init_psymbol_list (struct objfile *objfile, int total_symbols) /* Overlay debugging state: */ -int overlay_debugging = 0; /* 0 == off, 1 == manual, -1 == auto */ +enum overlay_debugging_state overlay_debugging = ovly_off; int overlay_cache_invalid = 0; /* True if need to refresh mapped state */ /* Target vector for refreshing overlay mapped state */ @@ -2489,6 +2548,8 @@ void (*target_overlay_update) (struct obj_section *) = simple_overlay_update; int section_is_overlay (asection *section) { + /* FIXME: need bfd *, so we can use bfd_section_lma methods. */ + if (overlay_debugging) if (section && section->lma != 0 && section->vma != section->lma) @@ -2530,9 +2591,9 @@ overlay_is_mapped (struct obj_section *osect) switch (overlay_debugging) { default: - case 0: + case ovly_off: return 0; /* overlay debugging off */ - case -1: /* overlay debugging automatic */ + case ovly_auto: /* overlay debugging automatic */ /* Unles there is a target_overlay_update function, there's really nothing useful to do here (can't really go auto) */ if (target_overlay_update) @@ -2546,7 +2607,7 @@ overlay_is_mapped (struct obj_section *osect) (*target_overlay_update) (osect); } /* fall thru to manual case */ - case 1: /* overlay debugging manual */ + case ovly_on: /* overlay debugging manual */ return osect->ovly_mapped == 1; } } @@ -2575,6 +2636,8 @@ section_is_mapped (asection *section) CORE_ADDR pc_in_unmapped_range (CORE_ADDR pc, asection *section) { + /* FIXME: need bfd *, so we can use bfd_section_lma methods. */ + int size; if (overlay_debugging) @@ -2593,6 +2656,8 @@ pc_in_unmapped_range (CORE_ADDR pc, asection *section) CORE_ADDR pc_in_mapped_range (CORE_ADDR pc, asection *section) { + /* FIXME: need bfd *, so we can use bfd_section_vma methods. */ + int size; if (overlay_debugging) @@ -2605,6 +2670,22 @@ pc_in_mapped_range (CORE_ADDR pc, asection *section) return 0; } + +/* Return true if the mapped ranges of sections A and B overlap, false + otherwise. */ +int +sections_overlap (asection *a, asection *b) +{ + /* FIXME: need bfd *, so we can use bfd_section_vma methods. */ + + CORE_ADDR a_start = a->vma; + CORE_ADDR a_end = a->vma + bfd_get_section_size_before_reloc (a); + CORE_ADDR b_start = b->vma; + CORE_ADDR b_end = b->vma + bfd_get_section_size_before_reloc (b); + + return (a_start < b_end && b_start < a_end); +} + /* Function: overlay_unmapped_address (PC, SECTION) Returns the address corresponding to PC in the unmapped (load) range. May be the same as PC. */ @@ -2612,6 +2693,8 @@ pc_in_mapped_range (CORE_ADDR pc, asection *section) CORE_ADDR overlay_unmapped_address (CORE_ADDR pc, asection *section) { + /* FIXME: need bfd *, so we can use bfd_section_lma methods. */ + if (overlay_debugging) if (section && section_is_overlay (section) && pc_in_mapped_range (pc, section)) @@ -2627,6 +2710,8 @@ overlay_unmapped_address (CORE_ADDR pc, asection *section) CORE_ADDR overlay_mapped_address (CORE_ADDR pc, asection *section) { + /* FIXME: need bfd *, so we can use bfd_section_vma methods. */ + if (overlay_debugging) if (section && section_is_overlay (section) && pc_in_unmapped_range (pc, section)) @@ -2783,11 +2868,11 @@ the 'overlay manual' command."); /* Next, make a pass and unmap any sections that are overlapped by this new section: */ ALL_OBJSECTIONS (objfile2, sec2) - if (sec2->ovly_mapped && - sec != sec2 && - sec->the_bfd_section != sec2->the_bfd_section && - (pc_in_mapped_range (sec2->addr, sec->the_bfd_section) || - pc_in_mapped_range (sec2->endaddr, sec->the_bfd_section))) + if (sec2->ovly_mapped + && sec != sec2 + && sec->the_bfd_section != sec2->the_bfd_section + && sections_overlap (sec->the_bfd_section, + sec2->the_bfd_section)) { if (info_verbose) printf_filtered ("Note: section %s unmapped by overlap\n", @@ -2837,7 +2922,8 @@ the 'overlay manual' command."); static void overlay_auto_command (char *args, int from_tty) { - overlay_debugging = -1; + overlay_debugging = ovly_auto; + enable_overlay_breakpoints (); if (info_verbose) printf_filtered ("Automatic overlay debugging enabled."); } @@ -2849,7 +2935,8 @@ overlay_auto_command (char *args, int from_tty) static void overlay_manual_command (char *args, int from_tty) { - overlay_debugging = 1; + overlay_debugging = ovly_on; + disable_overlay_breakpoints (); if (info_verbose) printf_filtered ("Overlay debugging enabled."); } @@ -2861,7 +2948,8 @@ overlay_manual_command (char *args, int from_tty) static void overlay_off_command (char *args, int from_tty) { - overlay_debugging = 0; + overlay_debugging = ovly_off; + disable_overlay_breakpoints (); if (info_verbose) printf_filtered ("Overlay debugging disabled."); } @@ -2948,7 +3036,7 @@ static void simple_free_overlay_table (void) { if (cache_ovly_table) - free (cache_ovly_table); + xfree (cache_ovly_table); cache_novlys = 0; cache_ovly_table = NULL; cache_ovly_table_base = 0; @@ -2960,7 +3048,7 @@ static void simple_free_overlay_region_table (void) { if (cache_ovly_region_table) - free (cache_ovly_region_table); + xfree (cache_ovly_region_table); cache_novly_regions = 0; cache_ovly_region_table = NULL; cache_ovly_region_table_base = 0; @@ -2972,6 +3060,7 @@ simple_free_overlay_region_table (void) static void read_target_long_array (CORE_ADDR memaddr, unsigned int *myaddr, int len) { + /* FIXME (alloca): Not safe if array is very large. */ char *buf = alloca (len * TARGET_LONG_BYTES); int i; @@ -2986,30 +3075,35 @@ read_target_long_array (CORE_ADDR memaddr, unsigned int *myaddr, int len) static int simple_read_overlay_table (void) { - struct minimal_symbol *msym; + struct minimal_symbol *novlys_msym, *ovly_table_msym; simple_free_overlay_table (); - msym = lookup_minimal_symbol ("_novlys", 0, 0); - if (msym != NULL) - cache_novlys = read_memory_integer (SYMBOL_VALUE_ADDRESS (msym), 4); - else - return 0; /* failure */ - cache_ovly_table = (void *) xmalloc (cache_novlys * sizeof (*cache_ovly_table)); - if (cache_ovly_table != NULL) + novlys_msym = lookup_minimal_symbol ("_novlys", NULL, NULL); + if (! novlys_msym) { - msym = lookup_minimal_symbol ("_ovly_table", 0, 0); - if (msym != NULL) - { - cache_ovly_table_base = SYMBOL_VALUE_ADDRESS (msym); - read_target_long_array (cache_ovly_table_base, - (int *) cache_ovly_table, - cache_novlys * 4); - } - else - return 0; /* failure */ + error ("Error reading inferior's overlay table: " + "couldn't find `_novlys' variable\n" + "in inferior. Use `overlay manual' mode."); + return 0; } - else - return 0; /* failure */ + + ovly_table_msym = lookup_minimal_symbol ("_ovly_table", NULL, NULL); + if (! ovly_table_msym) + { + error ("Error reading inferior's overlay table: couldn't find " + "`_ovly_table' array\n" + "in inferior. Use `overlay manual' mode."); + return 0; + } + + cache_novlys = read_memory_integer (SYMBOL_VALUE_ADDRESS (novlys_msym), 4); + cache_ovly_table + = (void *) xmalloc (cache_novlys * sizeof (*cache_ovly_table)); + cache_ovly_table_base = SYMBOL_VALUE_ADDRESS (ovly_table_msym); + read_target_long_array (cache_ovly_table_base, + (int *) cache_ovly_table, + cache_novlys * 4); + return 1; /* SUCCESS */ } @@ -3022,7 +3116,7 @@ simple_read_overlay_region_table (void) struct minimal_symbol *msym; simple_free_overlay_region_table (); - msym = lookup_minimal_symbol ("_novly_regions", 0, 0); + msym = lookup_minimal_symbol ("_novly_regions", NULL, NULL); if (msym != NULL) cache_novly_regions = read_memory_integer (SYMBOL_VALUE_ADDRESS (msym), 4); else @@ -3030,7 +3124,7 @@ simple_read_overlay_region_table (void) cache_ovly_region_table = (void *) xmalloc (cache_novly_regions * 12); if (cache_ovly_region_table != NULL) { - msym = lookup_minimal_symbol ("_ovly_region_table", 0, 0); + msym = lookup_minimal_symbol ("_ovly_region_table", NULL, NULL); if (msym != NULL) { cache_ovly_region_table_base = SYMBOL_VALUE_ADDRESS (msym); @@ -3059,23 +3153,25 @@ static int simple_overlay_update_1 (struct obj_section *osect) { int i, size; + bfd *obfd = osect->objfile->obfd; + asection *bsect = osect->the_bfd_section; size = bfd_get_section_size_before_reloc (osect->the_bfd_section); for (i = 0; i < cache_novlys; i++) - if (cache_ovly_table[i][VMA] == osect->the_bfd_section->vma && - cache_ovly_table[i][LMA] == osect->the_bfd_section->lma /* && - cache_ovly_table[i][SIZE] == size */ ) + if (cache_ovly_table[i][VMA] == bfd_section_vma (obfd, bsect) + && cache_ovly_table[i][LMA] == bfd_section_lma (obfd, bsect) + /* && cache_ovly_table[i][SIZE] == size */ ) { read_target_long_array (cache_ovly_table_base + i * TARGET_LONG_BYTES, (int *) cache_ovly_table[i], 4); - if (cache_ovly_table[i][VMA] == osect->the_bfd_section->vma && - cache_ovly_table[i][LMA] == osect->the_bfd_section->lma /* && - cache_ovly_table[i][SIZE] == size */ ) + if (cache_ovly_table[i][VMA] == bfd_section_vma (obfd, bsect) + && cache_ovly_table[i][LMA] == bfd_section_lma (obfd, bsect) + /* && cache_ovly_table[i][SIZE] == size */ ) { osect->ovly_mapped = cache_ovly_table[i][MAPPED]; return 1; } - else /* Warning! Warning! Target's ovly table has changed! */ + else /* Warning! Warning! Target's ovly table has changed! */ return 0; } return 0; @@ -3100,7 +3196,7 @@ simple_overlay_update (struct obj_section *osect) if (cache_ovly_table != NULL) /* Does its cached location match what's currently in the symtab? */ if (cache_ovly_table_base == - SYMBOL_VALUE_ADDRESS (lookup_minimal_symbol ("_ovly_table", 0, 0))) + SYMBOL_VALUE_ADDRESS (lookup_minimal_symbol ("_ovly_table", NULL, NULL))) /* Then go ahead and try to look up this single section in the cache */ if (simple_overlay_update_1 (osect)) /* Found it! We're done. */ @@ -3110,23 +3206,23 @@ simple_overlay_update (struct obj_section *osect) Or else we want all the sections, in which case it's actually more efficient to read the whole table in one block anyway. */ - if (simple_read_overlay_table () == 0) /* read failed? No table? */ - { - warning ("Failed to read the target overlay mapping table."); - return; - } + if (! simple_read_overlay_table ()) + return; + /* Now may as well update all sections, even if only one was requested. */ ALL_OBJSECTIONS (objfile, osect) if (section_is_overlay (osect->the_bfd_section)) { int i, size; + bfd *obfd = osect->objfile->obfd; + asection *bsect = osect->the_bfd_section; size = bfd_get_section_size_before_reloc (osect->the_bfd_section); for (i = 0; i < cache_novlys; i++) - if (cache_ovly_table[i][VMA] == osect->the_bfd_section->vma && - cache_ovly_table[i][LMA] == osect->the_bfd_section->lma /* && - cache_ovly_table[i][SIZE] == size */ ) - { /* obj_section matches i'th entry in ovly_table */ + if (cache_ovly_table[i][VMA] == bfd_section_vma (obfd, bsect) + && cache_ovly_table[i][LMA] == bfd_section_lma (obfd, bsect) + /* && cache_ovly_table[i][SIZE] == size */ ) + { /* obj_section matches i'th entry in ovly_table */ osect->ovly_mapped = cache_ovly_table[i][MAPPED]; break; /* finished with inner for loop: break out */ } @@ -3143,7 +3239,7 @@ _initialize_symfile (void) "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.", &cmdlist); - c->completer = filename_completer; + set_cmd_completer (c, filename_completer); c = add_cmd ("add-symbol-file", class_files, add_symbol_file_command, "Usage: add-symbol-file FILE ADDR [-s -s ...]\n\ @@ -3151,9 +3247,9 @@ Load the symbols from FILE, assuming FILE has been dynamically loaded.\n\ ADDR is the starting address of the file's text.\n\ The optional arguments are section-name section-address pairs and\n\ should be specified if the data and bss segments are not contiguous\n\ -with the text. SECT is a section name to be loaded at SECT_ADDR.", +with the text. SECT is a section name to be loaded at SECT_ADDR.", &cmdlist); - c->completer = filename_completer; + set_cmd_completer (c, filename_completer); c = add_cmd ("add-shared-symbol-files", class_files, add_shared_symbol_files_command, @@ -3165,7 +3261,7 @@ with the text. SECT is a section name to be loaded at SECT_ADDR.", c = add_cmd ("load", class_files, load_command, "Dynamically load FILE into the running program, and record its symbols\n\ for access from GDB.", &cmdlist); - c->completer = filename_completer; + set_cmd_completer (c, filename_completer); add_show_from_set (add_set_cmd ("symbol-reloading", class_support, var_boolean, @@ -3206,7 +3302,7 @@ for access from GDB.", &cmdlist); "Set mapping between filename extension and source language.\n\ Usage: set extension-language .foo bar", &setlist); - c->function.cfunc = set_ext_lang_command; + set_cmd_cfunc (c, set_ext_lang_command); add_info ("extensions", info_ext_lang_command, "All filename extensions associated with a source language.");