X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fcorelow.c;h=2266f2467adc0fd322a7d97aa8c9fbb59694e5ae;hb=45eba0ab7d26435121facb68847fbd0cd4a313c1;hp=0a066f427f527825966102ed4edec5f846e67e16;hpb=e75fdfcad1c868eae5396a95be9dd18010406306;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/corelow.c b/gdb/corelow.c index 0a066f427f..2266f2467a 100644 --- a/gdb/corelow.c +++ b/gdb/corelow.c @@ -1,6 +1,6 @@ /* Core dump and executable file functions below target vector, for GDB. - Copyright (C) 1986-2014 Free Software Foundation, Inc. + Copyright (C) 1986-2017 Free Software Foundation, Inc. This file is part of GDB. @@ -19,8 +19,6 @@ #include "defs.h" #include "arch-utils.h" -#include -#include #include #include #ifdef HAVE_SYS_FILE_H @@ -40,8 +38,6 @@ #include "symfile.h" #include "exec.h" #include "readline/readline.h" -#include "gdb_assert.h" -#include "exceptions.h" #include "solib.h" #include "filenames.h" #include "progspace.h" @@ -84,8 +80,6 @@ static struct core_fns *sniff_core_bfd (bfd *); static int gdb_check_format (bfd *); -static void core_open (char *, int); - static void core_close (struct target_ops *self); static void core_close_cleanup (void *ignore); @@ -135,11 +129,11 @@ sniff_core_bfd (bfd *abfd) { struct core_fns *cf; struct core_fns *yummy = NULL; - int matches = 0;; + int matches = 0; /* Don't sniff if we have support for register sets in CORE_GDBARCH. */ - if (core_gdbarch && gdbarch_regset_from_core_section_p (core_gdbarch)) + if (core_gdbarch && gdbarch_iterate_over_regset_sections_p (core_gdbarch)) return NULL; for (cf = core_file_fns; cf != NULL; cf = cf->next) @@ -240,7 +234,7 @@ add_to_thread_list (bfd *abfd, asection *asect, void *reg_sect_arg) int fake_pid_p = 0; struct inferior *inf; - if (strncmp (bfd_section_name (abfd, asect), ".reg/", 5) != 0) + if (!startswith (bfd_section_name (abfd, asect), ".reg/")) return; core_tid = atoi (bfd_section_name (abfd, asect) + 5); @@ -275,19 +269,18 @@ add_to_thread_list (bfd *abfd, asection *asect, void *reg_sect_arg) /* This routine opens and sets up the core file bfd. */ static void -core_open (char *filename, int from_tty) +core_open (const char *arg, int from_tty) { const char *p; int siggy; struct cleanup *old_chain; char *temp; - bfd *temp_bfd; int scratch_chan; int flags; - volatile struct gdb_exception except; + char *filename; target_preopen (from_tty); - if (!filename) + if (!arg) { if (core_bfd) error (_("No core file specified. (Use `detach' " @@ -296,7 +289,7 @@ core_open (char *filename, int from_tty) error (_("No core file specified.")); } - filename = tilde_expand (filename); + filename = tilde_expand (arg); if (!IS_ABSOLUTE_PATH (filename)) { temp = concat (current_directory, "/", @@ -316,20 +309,19 @@ core_open (char *filename, int from_tty) if (scratch_chan < 0) perror_with_name (filename); - temp_bfd = gdb_bfd_fopen (filename, gnutarget, - write_files ? FOPEN_RUB : FOPEN_RB, - scratch_chan); + gdb_bfd_ref_ptr temp_bfd (gdb_bfd_fopen (filename, gnutarget, + write_files ? FOPEN_RUB : FOPEN_RB, + scratch_chan)); if (temp_bfd == NULL) perror_with_name (filename); - if (!bfd_check_format (temp_bfd, bfd_core) - && !gdb_check_format (temp_bfd)) + if (!bfd_check_format (temp_bfd.get (), bfd_core) + && !gdb_check_format (temp_bfd.get ())) { /* 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_unref (temp_bfd); error (_("\"%s\" is not a core dump: %s"), filename, bfd_errmsg (bfd_get_error ())); } @@ -339,7 +331,7 @@ core_open (char *filename, int from_tty) do_cleanups (old_chain); unpush_target (&core_ops); - core_bfd = temp_bfd; + core_bfd = temp_bfd.release (); old_chain = make_cleanup (core_close_cleanup, 0 /*ignore*/); core_gdbarch = gdbarch_from_bfd (core_bfd); @@ -416,13 +408,16 @@ core_open (char *filename, int from_tty) may be a thread_stratum target loaded on top of target core by now. The layer above should claim threads found in the BFD sections. */ - TRY_CATCH (except, RETURN_MASK_ERROR) + TRY { - target_find_new_threads (); + target_update_thread_list (); } - if (except.reason < 0) - exception_print (gdb_stderr, except); + CATCH (except, RETURN_MASK_ERROR) + { + exception_print (gdb_stderr, except); + } + END_CATCH p = bfd_core_file_failing_command (core_bfd); if (p) @@ -461,6 +456,22 @@ core_open (char *filename, int from_tty) /* Now, set up the frame cache, and print the top of stack. */ reinit_frame_cache (); print_stack_frame (get_selected_frame (NULL), 1, SRC_AND_LOC, 1); + + /* Current thread should be NUM 1 but the user does not know that. + If a program is single threaded gdb in general does not mention + anything about threads. That is why the test is >= 2. */ + if (thread_count () >= 2) + { + TRY + { + thread_command (NULL, from_tty); + } + CATCH (except, RETURN_MASK_ERROR) + { + exception_print (gdb_stderr, except); + } + END_CATCH + } } static void @@ -478,11 +489,11 @@ core_detach (struct target_ops *ops, const char *args, int from_tty) them to core_vec->core_read_registers, as the register set numbered WHICH. - If inferior_ptid's lwp member is zero, do the single-threaded - thing: look for a section named NAME. If inferior_ptid's lwp + If ptid's lwp member is zero, do the single-threaded + thing: look for a section named NAME. If ptid's lwp member is non-zero, do the multi-threaded thing: look for a section named "NAME/LWP", where LWP is the shortest ASCII decimal - representation of inferior_ptid's lwp member. + representation of ptid's lwp member. HUMAN_NAME is a human-readable name for the kind of registers the NAME section contains, for use in error messages. @@ -493,21 +504,24 @@ core_detach (struct target_ops *ops, const char *args, int from_tty) static void get_core_register_section (struct regcache *regcache, + const struct regset *regset, const char *name, + int min_size, int which, const char *human_name, int required) { - static char *section_name = NULL; + static char *section_name; struct bfd_section *section; bfd_size_type size; char *contents; + bool variable_size_section = (regset != NULL + && regset->flags & REGSET_VARIABLE_SIZE); + ptid_t ptid = regcache_get_ptid (regcache); - xfree (section_name); - - if (ptid_get_lwp (inferior_ptid)) + if (ptid_get_lwp (ptid)) section_name = xstrprintf ("%s/%ld", name, - ptid_get_lwp (inferior_ptid)); + ptid_get_lwp (ptid)); else section_name = xstrdup (name); @@ -521,7 +535,18 @@ get_core_register_section (struct regcache *regcache, } size = bfd_section_size (core_bfd, section); - contents = alloca (size); + if (size < min_size) + { + warning (_("Section `%s' in core file too small."), section_name); + return; + } + if (size != min_size && !variable_size_section) + { + warning (_("Unexpected size of section `%s' in core file."), + section_name); + } + + contents = (char *) alloca (size); if (! bfd_get_section_contents (core_bfd, section, contents, (file_ptr) 0, size)) { @@ -530,20 +555,8 @@ get_core_register_section (struct regcache *regcache, return; } - if (core_gdbarch && gdbarch_regset_from_core_section_p (core_gdbarch)) + if (regset != NULL) { - const struct regset *regset; - - regset = gdbarch_regset_from_core_section (core_gdbarch, - name, size); - if (regset == NULL) - { - if (required) - warning (_("Couldn't recognize %s registers in core file."), - human_name); - return; - } - regset->supply_regset (regset, regcache, -1, contents, size); return; } @@ -554,6 +567,34 @@ get_core_register_section (struct regcache *regcache, bfd_section_vma (core_bfd, section))); } +/* Callback for get_core_registers that handles a single core file + register note section. */ + +static void +get_core_registers_cb (const char *sect_name, int size, + const struct regset *regset, + const char *human_name, void *cb_data) +{ + struct regcache *regcache = (struct regcache *) cb_data; + int required = 0; + + if (strcmp (sect_name, ".reg") == 0) + { + required = 1; + if (human_name == NULL) + human_name = "general-purpose"; + } + else if (strcmp (sect_name, ".reg2") == 0) + { + if (human_name == NULL) + human_name = "floating-point"; + } + + /* The 'which' parameter is only used when no regset is provided. + Thus we just set it to -1. */ + get_core_register_section (regcache, regset, sect_name, + size, -1, human_name, required); +} /* Get the registers out of a core file. This is the machine- independent part. Fetch_core_registers is the machine-dependent @@ -566,10 +607,10 @@ static void get_core_registers (struct target_ops *ops, struct regcache *regcache, int regno) { - struct core_regset_section *sect_list; int i; + struct gdbarch *gdbarch; - if (!(core_gdbarch && gdbarch_regset_from_core_section_p (core_gdbarch)) + if (!(core_gdbarch && gdbarch_iterate_over_regset_sections_p (core_gdbarch)) && (core_vec == NULL || core_vec->core_read_registers == NULL)) { fprintf_filtered (gdb_stderr, @@ -577,29 +618,17 @@ get_core_registers (struct target_ops *ops, return; } - sect_list = gdbarch_core_regset_sections (get_regcache_arch (regcache)); - if (sect_list) - while (sect_list->sect_name != NULL) - { - if (strcmp (sect_list->sect_name, ".reg") == 0) - get_core_register_section (regcache, sect_list->sect_name, - 0, sect_list->human_name, 1); - else if (strcmp (sect_list->sect_name, ".reg2") == 0) - get_core_register_section (regcache, sect_list->sect_name, - 2, sect_list->human_name, 0); - else - get_core_register_section (regcache, sect_list->sect_name, - 3, sect_list->human_name, 0); - - sect_list++; - } - + gdbarch = get_regcache_arch (regcache); + if (gdbarch_iterate_over_regset_sections_p (gdbarch)) + gdbarch_iterate_over_regset_sections (gdbarch, + get_core_registers_cb, + (void *) regcache, NULL); else { - get_core_register_section (regcache, - ".reg", 0, "general-purpose", 1); - get_core_register_section (regcache, - ".reg2", 2, "floating-point", 0); + get_core_register_section (regcache, NULL, + ".reg", 0, 0, "general-purpose", 1); + get_core_register_section (regcache, NULL, + ".reg2", 0, 2, "floating-point", 0); } /* Mark all registers not found in the core as unavailable. */ @@ -626,7 +655,7 @@ struct spuid_list static void add_to_spuid_list (bfd *abfd, asection *asect, void *list_p) { - struct spuid_list *list = list_p; + struct spuid_list *list = (struct spuid_list *) list_p; enum bfd_endian byte_order = bfd_big_endian (abfd) ? BFD_ENDIAN_BIG : BFD_ENDIAN_LITTLE; int fd, pos = 0; @@ -738,7 +767,7 @@ core_xfer_partial (struct target_ops *ops, enum target_object object, size = bfd_section_size (core_bfd, section); if (offset >= size) - return 0; + return TARGET_XFER_EOF; size -= offset; if (size > len) size = len; @@ -890,6 +919,16 @@ ignore (struct target_ops *ops, struct gdbarch *gdbarch, return 0; } +/* Implement the to_remove_breakpoint method. */ + +static int +core_remove_breakpoint (struct target_ops *ops, struct gdbarch *gdbarch, + struct bp_target_info *bp_tgt, + enum remove_bp_reason reason) +{ + return 0; +} + /* 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 @@ -924,7 +963,7 @@ core_read_description (struct target_ops *target) return target->beneath->to_read_description (target->beneath); } -static char * +static const char * core_pid_to_str (struct target_ops *ops, ptid_t ptid) { static char buf[64]; @@ -947,7 +986,7 @@ core_pid_to_str (struct target_ops *ops, ptid_t ptid) /* Otherwise, this isn't a "threaded" core -- use the PID field, but only if it isn't a fake PID. */ - inf = find_inferior_pid (ptid_get_pid (ptid)); + inf = find_inferior_ptid (ptid); if (inf != NULL && !inf->fake_pid_p) return normal_pid_to_str (ptid); @@ -956,6 +995,15 @@ core_pid_to_str (struct target_ops *ops, ptid_t ptid) return buf; } +static const char * +core_thread_name (struct target_ops *self, struct thread_info *thr) +{ + if (core_gdbarch + && gdbarch_core_thread_name_p (core_gdbarch)) + return gdbarch_core_thread_name (core_gdbarch, thr); + return NULL; +} + static int core_has_memory (struct target_ops *ops) { @@ -1004,10 +1052,11 @@ init_core_ops (void) core_ops.to_xfer_partial = core_xfer_partial; core_ops.to_files_info = core_files_info; core_ops.to_insert_breakpoint = ignore; - core_ops.to_remove_breakpoint = ignore; + core_ops.to_remove_breakpoint = core_remove_breakpoint; core_ops.to_thread_alive = core_thread_alive; core_ops.to_read_description = core_read_description; core_ops.to_pid_to_str = core_pid_to_str; + core_ops.to_thread_name = core_thread_name; core_ops.to_stratum = process_stratum; core_ops.to_has_memory = core_has_memory; core_ops.to_has_stack = core_has_stack;