X-Git-Url: http://drtracing.org/?a=blobdiff_plain;ds=sidebyside;f=gdb%2Fcorelow.c;h=224719e8b322f6547e55243d92a78b0e03c1c36d;hb=c0272db5854a799a9f3bb3803c3d03d1a62b9ac2;hp=2869eeaaffa7c511d16d877e2e2b11ac3eedf441;hpb=0e9f083f4cb94a9dc861f38ba151aac06efce2b8;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/corelow.c b/gdb/corelow.c index 2869eeaaff..224719e8b3 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-2013 Free Software Foundation, Inc. + Copyright (C) 1986-2016 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 @@ -28,6 +26,7 @@ #endif #include "frame.h" /* required by inferior.h */ #include "inferior.h" +#include "infrun.h" #include "symtab.h" #include "command.h" #include "bfd.h" @@ -39,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" @@ -83,9 +80,7 @@ static struct core_fns *sniff_core_bfd (bfd *); static int gdb_check_format (bfd *); -static void core_open (char *, int); - -static void core_close (void); +static void core_close (struct target_ops *self); static void core_close_cleanup (void *ignore); @@ -138,7 +133,7 @@ sniff_core_bfd (bfd *abfd) /* 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) @@ -192,7 +187,7 @@ gdb_check_format (bfd *abfd) stack spaces as empty. */ static void -core_close (void) +core_close (struct target_ops *self) { if (core_bfd) { @@ -223,7 +218,7 @@ core_close (void) static void core_close_cleanup (void *ignore) { - core_close (); + core_close (NULL); } /* Look for sections whose names start with `.reg/' so that we can @@ -239,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); @@ -274,7 +269,7 @@ 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; @@ -283,10 +278,10 @@ core_open (char *filename, int from_tty) 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' " @@ -295,7 +290,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, "/", @@ -348,7 +343,7 @@ core_open (char *filename, int from_tty) validate_files (); - core_data = XZALLOC (struct target_section_table); + core_data = XCNEW (struct target_section_table); /* Find the data section */ if (build_section_table (core_bfd, @@ -415,13 +410,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) @@ -460,6 +458,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 @@ -492,7 +506,9 @@ 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) @@ -520,7 +536,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 && !(regset->flags & REGSET_VARIABLE_SIZE)) + { + 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)) { @@ -529,20 +556,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; } @@ -553,6 +568,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 @@ -565,10 +608,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, @@ -576,29 +619,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. */ @@ -625,7 +656,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; @@ -649,7 +680,7 @@ add_to_spuid_list (bfd *abfd, asection *asect, void *list_p) the to_xfer_partial interface. */ static LONGEST -get_core_siginfo (bfd *abfd, gdb_byte *readbuf, ULONGEST offset, LONGEST len) +get_core_siginfo (bfd *abfd, gdb_byte *readbuf, ULONGEST offset, ULONGEST len) { asection *section; char *section_name; @@ -672,17 +703,17 @@ get_core_siginfo (bfd *abfd, gdb_byte *readbuf, ULONGEST offset, LONGEST len) return len; } -static LONGEST +static enum target_xfer_status core_xfer_partial (struct target_ops *ops, enum target_object object, const char *annex, gdb_byte *readbuf, const gdb_byte *writebuf, ULONGEST offset, - LONGEST len) + ULONGEST len, ULONGEST *xfered_len) { switch (object) { case TARGET_OBJECT_MEMORY: return section_table_xfer_memory_partial (readbuf, writebuf, - offset, len, + offset, len, xfered_len, core_data->sections, core_data->sections_end, NULL); @@ -698,25 +729,28 @@ core_xfer_partial (struct target_ops *ops, enum target_object object, section = bfd_get_section_by_name (core_bfd, ".auxv"); if (section == NULL) - return -1; + return TARGET_XFER_E_IO; size = bfd_section_size (core_bfd, section); if (offset >= size) - return 0; + return TARGET_XFER_EOF; size -= offset; if (size > len) size = len; - if (size > 0 - && !bfd_get_section_contents (core_bfd, section, readbuf, - (file_ptr) offset, size)) + + if (size == 0) + return TARGET_XFER_EOF; + if (!bfd_get_section_contents (core_bfd, section, readbuf, + (file_ptr) offset, size)) { warning (_("Couldn't read NT_AUXV note in core file.")); - return -1; + return TARGET_XFER_E_IO; } - return size; + *xfered_len = (ULONGEST) size; + return TARGET_XFER_OK; } - return -1; + return TARGET_XFER_E_IO; case TARGET_OBJECT_WCOOKIE: if (readbuf) @@ -730,35 +764,47 @@ core_xfer_partial (struct target_ops *ops, enum target_object object, section = bfd_get_section_by_name (core_bfd, ".wcookie"); if (section == NULL) - return -1; + return TARGET_XFER_E_IO; size = bfd_section_size (core_bfd, section); if (offset >= size) - return 0; + return TARGET_XFER_EOF; size -= offset; if (size > len) size = len; - if (size > 0 - && !bfd_get_section_contents (core_bfd, section, readbuf, - (file_ptr) offset, size)) + + if (size == 0) + return TARGET_XFER_EOF; + if (!bfd_get_section_contents (core_bfd, section, readbuf, + (file_ptr) offset, size)) { warning (_("Couldn't read StackGhost cookie in core file.")); - return -1; + return TARGET_XFER_E_IO; } - return size; + *xfered_len = (ULONGEST) size; + return TARGET_XFER_OK; + } - return -1; + return TARGET_XFER_E_IO; case TARGET_OBJECT_LIBRARIES: if (core_gdbarch && gdbarch_core_xfer_shared_libraries_p (core_gdbarch)) { if (writebuf) - return -1; - return - gdbarch_core_xfer_shared_libraries (core_gdbarch, - readbuf, offset, len); + return TARGET_XFER_E_IO; + else + { + *xfered_len = gdbarch_core_xfer_shared_libraries (core_gdbarch, + readbuf, + offset, len); + + if (*xfered_len == 0) + return TARGET_XFER_EOF; + else + return TARGET_XFER_OK; + } } /* FALL THROUGH */ @@ -767,10 +813,19 @@ core_xfer_partial (struct target_ops *ops, enum target_object object, && gdbarch_core_xfer_shared_libraries_aix_p (core_gdbarch)) { if (writebuf) - return -1; - return - gdbarch_core_xfer_shared_libraries_aix (core_gdbarch, - readbuf, offset, len); + return TARGET_XFER_E_IO; + else + { + *xfered_len + = gdbarch_core_xfer_shared_libraries_aix (core_gdbarch, + readbuf, offset, + len); + + if (*xfered_len == 0) + return TARGET_XFER_EOF; + else + return TARGET_XFER_OK; + } } /* FALL THROUGH */ @@ -789,23 +844,26 @@ core_xfer_partial (struct target_ops *ops, enum target_object object, section = bfd_get_section_by_name (core_bfd, sectionstr); if (section == NULL) - return -1; + return TARGET_XFER_E_IO; size = bfd_section_size (core_bfd, section); if (offset >= size) - return 0; + return TARGET_XFER_EOF; size -= offset; if (size > len) size = len; - if (size > 0 - && !bfd_get_section_contents (core_bfd, section, readbuf, - (file_ptr) offset, size)) + + if (size == 0) + return TARGET_XFER_EOF; + if (!bfd_get_section_contents (core_bfd, section, readbuf, + (file_ptr) offset, size)) { warning (_("Couldn't read SPU section in core file.")); - return -1; + return TARGET_XFER_E_IO; } - return size; + *xfered_len = (ULONGEST) size; + return TARGET_XFER_OK; } else if (readbuf) { @@ -818,21 +876,35 @@ core_xfer_partial (struct target_ops *ops, enum target_object object, list.pos = 0; list.written = 0; bfd_map_over_sections (core_bfd, add_to_spuid_list, &list); - return list.written; + + if (list.written == 0) + return TARGET_XFER_EOF; + else + { + *xfered_len = (ULONGEST) list.written; + return TARGET_XFER_OK; + } } - return -1; + return TARGET_XFER_E_IO; case TARGET_OBJECT_SIGNAL_INFO: if (readbuf) - return get_core_siginfo (core_bfd, readbuf, offset, len); - return -1; + { + LONGEST l = get_core_siginfo (core_bfd, readbuf, offset, len); + + if (l > 0) + { + *xfered_len = len; + return TARGET_XFER_OK; + } + } + return TARGET_XFER_E_IO; default: - if (ops->beneath != NULL) - return ops->beneath->to_xfer_partial (ops->beneath, object, - annex, readbuf, - writebuf, offset, len); - return -1; + return ops->beneath->to_xfer_partial (ops->beneath, object, + annex, readbuf, + writebuf, offset, len, + xfered_len); } } @@ -842,7 +914,8 @@ core_xfer_partial (struct target_ops *ops, enum target_object object, breakpoint_init_inferior). */ static int -ignore (struct gdbarch *gdbarch, struct bp_target_info *bp_tgt) +ignore (struct target_ops *ops, struct gdbarch *gdbarch, + struct bp_target_info *bp_tgt) { return 0; } @@ -869,10 +942,16 @@ static const struct target_desc * core_read_description (struct target_ops *target) { if (core_gdbarch && gdbarch_core_read_description_p (core_gdbarch)) - return gdbarch_core_read_description (core_gdbarch, - target, core_bfd); + { + const struct target_desc *result; - return NULL; + result = gdbarch_core_read_description (core_gdbarch, + target, core_bfd); + if (result != NULL) + return result; + } + + return target->beneath->to_read_description (target->beneath); } static char * @@ -898,7 +977,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); @@ -907,6 +986,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) { @@ -928,7 +1016,8 @@ core_has_registers (struct target_ops *ops) /* Implement the to_info_proc method. */ static void -core_info_proc (struct target_ops *ops, char *args, enum info_proc_what request) +core_info_proc (struct target_ops *ops, const char *args, + enum info_proc_what request) { struct gdbarch *gdbarch = get_current_arch (); @@ -949,17 +1038,16 @@ init_core_ops (void) "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_detach = core_detach; core_ops.to_fetch_registers = get_core_registers; 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_create_inferior = find_default_create_inferior; 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;