X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fcorelow.c;h=bf4a5fc7263b83406515289ae213e831e3631b42;hb=41270571562fe1b32a38ba7a49dac8a9e416d1c8;hp=7059358e40214269cfd0d9223e236b6e9cbc5ef7;hpb=16726dd15bd0813ad15462947b1e7eb066c2c31b;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/corelow.c b/gdb/corelow.c index 7059358e40..bf4a5fc726 100644 --- a/gdb/corelow.c +++ b/gdb/corelow.c @@ -1,5 +1,5 @@ /* Core dump and executable file functions below target vector, for GDB. - Copyright 1986, 1987, 1989, 1991, 1992, 1993, 1994 + Copyright 1986, 1987, 1989, 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. This file is part of GDB. @@ -32,43 +32,50 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "gdbcore.h" #include "thread.h" -static void -core_files_info PARAMS ((struct target_ops *)); +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 ((char *)); #endif -static void -core_close PARAMS ((int)); +static void core_open PARAMS ((char *, int)); -static void -get_core_registers PARAMS ((int)); +static void core_detach PARAMS ((char *, int)); -/* Discard all vestiges of any previous core file - and mark data and stack spaces as empty. */ +static void core_close PARAMS ((int)); + +static void get_core_registers PARAMS ((int)); + +/* Discard all vestiges of any previous core file and mark data and stack + spaces as empty. */ /* ARGSUSED */ static void core_close (quitting) int quitting; { + char *name; + inferior_pid = 0; /* Avoid confusion from thread stuff */ - if (core_bfd) { - free (bfd_get_filename (core_bfd)); - bfd_close (core_bfd); - core_bfd = NULL; + if (core_bfd) + { + 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 (); + CLEAR_SOLIB (); #endif - if (core_ops.to_sections) { - free ((PTR)core_ops.to_sections); - core_ops.to_sections = NULL; - core_ops.to_sections_end = NULL; + if (core_ops.to_sections) + { + free ((PTR)core_ops.to_sections); + core_ops.to_sections = NULL; + core_ops.to_sections_end = NULL; + } } - } } #ifdef SOLIB_ADD @@ -109,9 +116,9 @@ add_to_thread_list (abfd, asect, reg_sect_arg) inferior_pid = thread_id; /* Yes, make it current */ } -/* This routine opens and sets up the core file bfd */ +/* This routine opens and sets up the core file bfd. */ -void +static void core_open (filename, from_tty) char *filename; int from_tty; @@ -127,35 +134,38 @@ core_open (filename, from_tty) target_preopen (from_tty); if (!filename) { - error (core_bfd? + error (core_bfd ? "No core file specified. (Use `detach' to stop debugging a core file.)" : "No core file specified."); } filename = tilde_expand (filename); - if (filename[0] != '/') { - temp = concat (current_directory, "/", filename, NULL); - free (filename); - filename = temp; - } + if (filename[0] != '/') + { + temp = concat (current_directory, "/", filename, NULL); + free (filename); + filename = temp; + } old_chain = make_cleanup (free, filename); - scratch_chan = open (filename, write_files? O_RDWR: O_RDONLY, 0); + scratch_chan = open (filename, write_files ? O_RDWR : O_RDONLY, 0); if (scratch_chan < 0) perror_with_name (filename); temp_bfd = bfd_fdopenr (filename, gnutarget, scratch_chan); if (temp_bfd == NULL) - { - perror_with_name (filename); - } + perror_with_name (filename); 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 (bfd_close, temp_bfd); - error ("\"%s\" is not a core dump: %s", filename, bfd_errmsg(bfd_get_error ())); + 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. */ @@ -170,8 +180,8 @@ core_open (filename, from_tty) /* Find the data section */ if (build_section_table (core_bfd, &core_ops.to_sections, &core_ops.to_sections_end)) - error ("Can't find sections in `%s': %s", bfd_get_filename(core_bfd), - bfd_errmsg (bfd_get_error ())); + error ("\"%s\": Can't find sections: %s", + bfd_get_filename (core_bfd), bfd_errmsg (bfd_get_error ())); ontop = !push_target (&core_ops); discard_cleanups (old_chain); @@ -183,7 +193,7 @@ core_open (filename, from_tty) siggy = bfd_core_file_failing_signal (core_bfd); if (siggy > 0) printf_filtered ("Program terminated with signal %d, %s.\n", siggy, - safe_strsignal (siggy)); + safe_strsignal (siggy)); /* Build up thread list from BFD sections. */ @@ -191,35 +201,38 @@ core_open (filename, from_tty) bfd_map_over_sections (core_bfd, add_to_thread_list, bfd_get_section_by_name (core_bfd, ".reg")); - if (ontop) { - /* Fetch all registers from core file */ - target_fetch_registers (-1); + if (ontop) + { + /* Fetch all registers from core file. */ + target_fetch_registers (-1); - /* Add symbols and section mappings for any shared libraries */ + /* Add symbols and section mappings for any shared libraries. */ #ifdef SOLIB_ADD - 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; + 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 */ - flush_cached_frames (); - select_frame (get_current_frame (), 0); - print_stack_frame (selected_frame, selected_frame_level, 1); - } else { - warning ( + /* Now, set up the frame cache, and print the top of stack. */ + flush_cached_frames (); + select_frame (get_current_frame (), 0); + print_stack_frame (selected_frame, selected_frame_level, 1); + } + else + { + warning ( "you won't be able to access this core file until you terminate\n\ your %s; do ``info files''", target_longname); - } + } } -void +static void core_detach (args, from_tty) char *args; int from_tty; @@ -237,6 +250,7 @@ core_detach (args, from_tty) part, typically implemented in the xm-file for each architecture. */ /* We just get all the registers, so we don't use regno. */ + /* ARGSUSED */ static void get_core_registers (regno) @@ -259,7 +273,8 @@ get_core_registers (regno) strcpy (secname, ".reg"); reg_sec = bfd_get_section_by_name (core_bfd, secname); - if (!reg_sec) goto cant; + if (!reg_sec) + 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)) @@ -270,28 +285,31 @@ get_core_registers (regno) else { cant: - fprintf_filtered (gdb_stderr, "Couldn't fetch registers from core file: %s\n", - bfd_errmsg (bfd_get_error ())); + fprintf_filtered (gdb_stderr, + "Couldn't fetch registers from core file: %s\n", + bfd_errmsg (bfd_get_error ())); } /* Now do it again for the float registers, if they exist. */ reg_sec = bfd_get_section_by_name (core_bfd, ".reg2"); - if (reg_sec) { - 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)) - { - fetch_core_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", - bfd_errmsg (bfd_get_error ())); - } - } - registers_fetched(); + if (reg_sec) + { + 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)) + { + fetch_core_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", + bfd_errmsg (bfd_get_error ())); + } + } + registers_fetched (); } static void @@ -313,23 +331,45 @@ ignore (addr, contents) } struct target_ops core_ops = { - "core", "Local core dump file", - "Use a core file as a target. Specify the filename of the core file.", - core_open, core_close, - find_default_attach, core_detach, 0, 0, /* resume, wait */ - get_core_registers, - 0, 0, /* store_regs, prepare_to_store */ - xfer_memory, core_files_info, - ignore, ignore, /* core_insert_breakpoint, core_remove_breakpoint, */ - 0, 0, 0, 0, 0, /* terminal stuff */ - 0, 0, 0, /* kill, load, lookup sym */ - find_default_create_inferior, 0, /* mourn_inferior */ - 0, /* can_run */ - 0, /* notice_signals */ - core_stratum, 0, /* next */ - 0, 1, 1, 1, 0, /* all mem, mem, stack, regs, exec */ - 0, 0, /* section pointers */ - OPS_MAGIC, /* Always the last thing */ + "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_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 */ }; void