X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fcorelow.c;h=3e405dee1bc3b89f9dc0cd9bfe57859bb673cb1e;hb=feb129926a8d12656f1ca4b7a8bb10268d3af4fb;hp=e4e663fd36df1d34b461f151fa376b46b25ce795;hpb=2b57629364528ef2fd913154e58f626123d51f1c;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/corelow.c b/gdb/corelow.c index e4e663fd36..3e405dee1b 100644 --- a/gdb/corelow.c +++ b/gdb/corelow.c @@ -1,41 +1,49 @@ /* Core dump and executable file functions below target vector, for GDB. - Copyright 1986, 1987, 1989, 1991, 1992, 1993, 1994, 1995 + Copyright 1986, 87, 89, 91, 92, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc. -This file is part of GDB. + This file is part of GDB. -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include "defs.h" #include "gdb_string.h" #include #include #include -#include "frame.h" /* required by inferior.h */ +#include +#include "frame.h" /* required by inferior.h */ #include "inferior.h" #include "symtab.h" #include "command.h" #include "bfd.h" #include "target.h" #include "gdbcore.h" -#include "thread.h" +#include "gdbthread.h" + +/* List of all available core_fns. On gdb startup, each core file register + reader calls add_core_fns() to register information on each core format it + is prepared to read. */ + +static struct core_fns *core_file_fns = NULL; static void core_files_info PARAMS ((struct target_ops *)); #ifdef SOLIB_ADD -static int solib_add_stub PARAMS ((char *)); +static int solib_add_stub PARAMS ((PTR)); #endif static void core_open PARAMS ((char *, int)); @@ -46,6 +54,34 @@ static void core_close PARAMS ((int)); static void get_core_registers PARAMS ((int)); +static void add_to_thread_list PARAMS ((bfd *, asection *, PTR)); + +static int ignore PARAMS ((CORE_ADDR, char *)); + +static char *core_file_to_sym_file PARAMS ((char *)); + +static int core_file_thread_alive PARAMS ((int tid)); + +static void init_core_ops PARAMS ((void)); + +void _initialize_corelow PARAMS ((void)); + +struct target_ops core_ops; + +/* Link a new core_fns into the global core_file_fns list. Called on gdb + startup by the _initialize routine in each core file register reader, to + register information about each format the the reader is prepared to + handle. */ + +void +add_core_fns (cf) + struct core_fns *cf; +{ + cf->next = core_file_fns; + core_file_fns = cf; +} + + /* Discard all vestiges of any previous core file and mark data and stack spaces as empty. */ @@ -56,22 +92,25 @@ core_close (quitting) { char *name; - inferior_pid = 0; /* Avoid confusion from thread stuff */ - if (core_bfd) { + inferior_pid = 0; /* Avoid confusion from thread stuff */ + + /* Clear out solib state while the bfd is still open. See + comments in clear_solib in solib.c. */ +#ifdef CLEAR_SOLIB + CLEAR_SOLIB (); +#endif + name = bfd_get_filename (core_bfd); if (!bfd_close (core_bfd)) warning ("cannot close \"%s\": %s", name, bfd_errmsg (bfd_get_error ())); free (name); core_bfd = NULL; -#ifdef CLEAR_SOLIB - CLEAR_SOLIB (); -#endif if (core_ops.to_sections) { - free ((PTR)core_ops.to_sections); + free ((PTR) core_ops.to_sections); core_ops.to_sections = NULL; core_ops.to_sections_end = NULL; } @@ -82,11 +121,12 @@ core_close (quitting) /* Stub function for catch_errors around shared library hacking. FROM_TTYP is really an int * which points to from_tty. */ -static int +static int solib_add_stub (from_ttyp) - char *from_ttyp; + PTR from_ttyp; { - SOLIB_ADD (NULL, *(int *)from_ttyp, ¤t_target); + SOLIB_ADD (NULL, *(int *) from_ttyp, ¤t_target); + re_enable_breakpoints_in_shlibs (); return 0; } #endif /* SOLIB_ADD */ @@ -112,7 +152,8 @@ add_to_thread_list (abfd, asect, reg_sect_arg) /* Warning, Will Robinson, looking at BFD private data! */ - if (asect->filepos == reg_sect->filepos) /* Did we find .reg? */ + if (reg_sect != NULL + && asect->filepos == reg_sect->filepos) /* Did we find .reg? */ inferior_pid = thread_id; /* Yes, make it current */ } @@ -134,9 +175,9 @@ core_open (filename, from_tty) target_preopen (from_tty); if (!filename) { - error (core_bfd ? - "No core file specified. (Use `detach' to stop debugging a core file.)" - : "No core file specified."); + error (core_bfd ? + "No core file specified. (Use `detach' to stop debugging a core file.)" + : "No core file specified."); } filename = tilde_expand (filename); @@ -161,19 +202,19 @@ core_open (filename, from_tty) { /* Do it after the err msg */ /* FIXME: should be checking for errors from bfd_close (for one thing, - on error it does not free all the storage associated with the - bfd). */ - make_cleanup (bfd_close, temp_bfd); + on error it does not free all the storage associated with the + bfd). */ + make_cleanup ((make_cleanup_func) bfd_close, temp_bfd); error ("\"%s\" is not a core dump: %s", filename, bfd_errmsg (bfd_get_error ())); } /* Looks semi-reasonable. Toss the old core file and work on the new. */ - discard_cleanups (old_chain); /* Don't free filename any more */ + discard_cleanups (old_chain); /* Don't free filename any more */ unpush_target (&core_ops); core_bfd = temp_bfd; - old_chain = make_cleanup (core_close, core_bfd); + old_chain = make_cleanup ((make_cleanup_func) core_close, core_bfd); validate_files (); @@ -208,15 +249,8 @@ core_open (filename, from_tty) /* Add symbols and section mappings for any shared libraries. */ #ifdef SOLIB_ADD - catch_errors (solib_add_stub, &from_tty, (char *)0, + catch_errors (solib_add_stub, &from_tty, (char *) 0, RETURN_MASK_ALL); - - /* solib_add_stub usually modifies current_target.to_sections, which - has to be reflected in core_ops to enable proper freeing of - the to_sections vector in core_close and correct section - mapping in xfer_memory and core_files_info. */ - core_ops.to_sections = current_target.to_sections; - core_ops.to_sections_end = current_target.to_sections_end; #endif /* Now, set up the frame cache, and print the top of stack. */ @@ -227,7 +261,7 @@ core_open (filename, from_tty) else { warning ( -"you won't be able to access this core file until you terminate\n\ + "you won't be able to access this core file until you terminate\n\ your %s; do ``info files''", target_longname); } } @@ -259,7 +293,16 @@ get_core_registers (regno) sec_ptr reg_sec; unsigned size; char *the_regs; - char secname[10]; + char secname[30]; + enum bfd_flavour our_flavour = bfd_get_flavour (core_bfd); + struct core_fns *cf = NULL; + + if (core_file_fns == NULL) + { + fprintf_filtered (gdb_stderr, + "Can't fetch registers from this type of core file\n"); + return; + } /* Thread support. If inferior_pid is non-zero, then we have found a core file with threads (or multiple processes). In that case, we need to @@ -277,14 +320,29 @@ get_core_registers (regno) goto cant; size = bfd_section_size (core_bfd, reg_sec); the_regs = alloca (size); - if (bfd_get_section_contents (core_bfd, reg_sec, the_regs, (file_ptr)0, size)) + /* Look for the core functions that match this flavor. Default to the + first one if nothing matches. */ + for (cf = core_file_fns; cf != NULL; cf = cf->next) + { + if (our_flavour == cf->core_flavour) + { + break; + } + } + if (cf == NULL) { - fetch_core_registers (the_regs, size, 0, - (unsigned) bfd_section_vma (abfd,reg_sec)); + cf = core_file_fns; + } + if (cf != NULL && + bfd_get_section_contents (core_bfd, reg_sec, the_regs, (file_ptr) 0, size) && + cf->core_read_registers != NULL) + { + (cf->core_read_registers (the_regs, size, 0, + (unsigned) bfd_section_vma (abfd, reg_sec))); } else { -cant: + cant: fprintf_filtered (gdb_stderr, "Couldn't fetch registers from core file: %s\n", bfd_errmsg (bfd_get_error ())); @@ -296,25 +354,89 @@ cant: { size = bfd_section_size (core_bfd, reg_sec); the_regs = alloca (size); - if (bfd_get_section_contents (core_bfd, reg_sec, the_regs, (file_ptr)0, - size)) + if (cf != NULL && + bfd_get_section_contents (core_bfd, reg_sec, the_regs, (file_ptr) 0, size) && + cf->core_read_registers != NULL) { - fetch_core_registers (the_regs, size, 2, - (unsigned) bfd_section_vma (abfd,reg_sec)); + (cf->core_read_registers (the_regs, size, 2, + (unsigned) bfd_section_vma (abfd, reg_sec))); } else { - fprintf_filtered (gdb_stderr, - "Couldn't fetch register set 2 from core file: %s\n", + fprintf_filtered (gdb_stderr, + "Couldn't fetch register set 2 from core file: %s\n", bfd_errmsg (bfd_get_error ())); } } registers_fetched (); } +static char * +core_file_to_sym_file (core) + char *core; +{ + CONST char *failing_command; + char *p; + char *temp; + bfd *temp_bfd; + int scratch_chan; + + if (!core) + error ("No core file specified."); + + core = tilde_expand (core); + if (core[0] != '/') + { + temp = concat (current_directory, "/", core, NULL); + core = temp; + } + + scratch_chan = open (core, write_files ? O_RDWR : O_RDONLY, 0); + if (scratch_chan < 0) + perror_with_name (core); + + temp_bfd = bfd_fdopenr (core, gnutarget, scratch_chan); + if (temp_bfd == NULL) + perror_with_name (core); + + if (!bfd_check_format (temp_bfd, bfd_core)) + { + /* Do it after the err msg */ + /* FIXME: should be checking for errors from bfd_close (for one thing, + on error it does not free all the storage associated with the + bfd). */ + make_cleanup ((make_cleanup_func) bfd_close, temp_bfd); + error ("\"%s\" is not a core dump: %s", + core, bfd_errmsg (bfd_get_error ())); + } + + /* Find the data section */ + if (build_section_table (temp_bfd, &core_ops.to_sections, + &core_ops.to_sections_end)) + error ("\"%s\": Can't find sections: %s", + bfd_get_filename (temp_bfd), bfd_errmsg (bfd_get_error ())); + + failing_command = bfd_core_file_failing_command (temp_bfd); + + bfd_close (temp_bfd); + + /* If we found a filename, remember that it is probably saved + relative to the executable that created it. If working directory + isn't there now, we may not be able to find the executable. Rather + than trying to be sauve about finding it, just check if the file + exists where we are now. If not, then punt and tell our client + we couldn't find the sym file. + */ + p = (char *) failing_command; + if ((p != NULL) && (access (p, F_OK) != 0)) + p = NULL; + + return p; +} + static void core_files_info (t) - struct target_ops *t; + struct target_ops *t; { print_section_info (t, core_bfd); } @@ -330,51 +452,64 @@ ignore (addr, contents) return 0; } -struct target_ops core_ops = { - "core", /* to_shortname */ - "Local core dump file", /* to_longname */ - "Use a core file as a target. Specify the filename of the core file.", /* to_doc */ - core_open, /* to_open */ - core_close, /* to_close */ - find_default_attach, /* to_attach */ - core_detach, /* to_detach */ - 0, /* to_resume */ - 0, /* to_wait */ - get_core_registers, /* to_fetch_registers */ - 0, /* to_store_registers */ - 0, /* to_prepare_to_store */ - xfer_memory, /* to_xfer_memory */ - core_files_info, /* to_files_info */ - ignore, /* to_insert_breakpoint */ - ignore, /* to_remove_breakpoint */ - 0, /* to_terminal_init */ - 0, /* to_terminal_inferior */ - 0, /* to_terminal_ours_for_output */ - 0, /* to_terminal_ours */ - 0, /* to_terminal_info */ - 0, /* to_kill */ - 0, /* to_load */ - 0, /* to_lookup_symbol */ - find_default_create_inferior, /* to_create_inferior */ - 0, /* to_mourn_inferior */ - 0, /* to_can_run */ - 0, /* to_notice_signals */ - 0, /* to_thread_alive */ - 0, /* to_stop */ - core_stratum, /* to_stratum */ - 0, /* to_next */ - 0, /* to_has_all_memory */ - 1, /* to_has_memory */ - 1, /* to_has_stack */ - 1, /* to_has_registers */ - 0, /* to_has_execution */ - 0, /* to_sections */ - 0, /* to_sections_end */ - OPS_MAGIC, /* to_magic */ -}; + +/* Okay, let's be honest: threads gleaned from a core file aren't + exactly lively, are they? On the other hand, if we don't claim + that each & every one is alive, then we don't get any of them + to appear in an "info thread" command, which is quite a useful + behaviour. + */ +static int +core_file_thread_alive (tid) + int tid; +{ + return 1; +} + +/* Fill in core_ops with its defined operations and properties. */ + +static void +init_core_ops () +{ + core_ops.to_shortname = "core"; + core_ops.to_longname = "Local core dump file"; + core_ops.to_doc = + "Use a core file as a target. Specify the filename of the core file."; + core_ops.to_open = core_open; + core_ops.to_close = core_close; + core_ops.to_attach = find_default_attach; + core_ops.to_require_attach = find_default_require_attach; + core_ops.to_detach = core_detach; + core_ops.to_require_detach = find_default_require_detach; + core_ops.to_fetch_registers = get_core_registers; + core_ops.to_xfer_memory = xfer_memory; + core_ops.to_files_info = core_files_info; + core_ops.to_insert_breakpoint = ignore; + core_ops.to_remove_breakpoint = ignore; + core_ops.to_create_inferior = find_default_create_inferior; + core_ops.to_clone_and_follow_inferior = find_default_clone_and_follow_inferior; + core_ops.to_thread_alive = core_file_thread_alive; + core_ops.to_core_file_to_sym_file = core_file_to_sym_file; + core_ops.to_stratum = core_stratum; + core_ops.to_has_memory = 1; + core_ops.to_has_stack = 1; + core_ops.to_has_registers = 1; + core_ops.to_magic = OPS_MAGIC; +} + +/* non-zero if we should not do the add_target call in + _initialize_corelow; not initialized (i.e., bss) so that + the target can initialize it (i.e., data) if appropriate. + This needs to be set at compile time because we don't know + for sure whether the target's initialize routine is called + before us or after us. */ +int coreops_suppress_target; void -_initialize_corelow() +_initialize_corelow () { - add_target (&core_ops); + init_core_ops (); + + if (!coreops_suppress_target) + add_target (&core_ops); }