X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=gdb%2Fcorelow.c;h=c7d4318e0014b61354752381758e6e5a4dcfb760;hb=f962539ad23759af4ba8f7eece1946fdc2f50876;hp=1775a6695f9de17a9f73579d1494629abe3f6f83;hpb=7bc112c1b9bc6e6346e2afff9174fe4adbce909f;p=binutils-gdb.git diff --git a/gdb/corelow.c b/gdb/corelow.c index 1775a6695f9..c7d4318e001 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-2015 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); @@ -139,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) @@ -275,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; @@ -285,9 +279,10 @@ core_open (char *filename, int from_tty) 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 +291,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, "/", @@ -418,7 +413,7 @@ core_open (char *filename, int from_tty) sections. */ TRY_CATCH (except, RETURN_MASK_ERROR) { - target_find_new_threads (); + target_update_thread_list (); } if (except.reason < 0) @@ -461,6 +456,19 @@ 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_CATCH (except, RETURN_MASK_ERROR) + { + thread_command (NULL, from_tty); + } + if (except.reason < 0) + exception_print (gdb_stderr, except); + } } static void @@ -493,7 +501,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) @@ -521,6 +531,17 @@ get_core_register_section (struct regcache *regcache, } size = bfd_section_size (core_bfd, section); + 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 = alloca (size); if (! bfd_get_section_contents (core_bfd, section, contents, (file_ptr) 0, size)) @@ -530,20 +551,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 +563,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 +603,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 +614,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. */ @@ -738,7 +763,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; @@ -871,12 +896,10 @@ core_xfer_partial (struct target_ops *ops, enum target_object object, return TARGET_XFER_E_IO; default: - if (ops->beneath != NULL) - return ops->beneath->to_xfer_partial (ops->beneath, object, - annex, readbuf, - writebuf, offset, len, - xfered_len); - return TARGET_XFER_E_IO; + return ops->beneath->to_xfer_partial (ops->beneath, object, + annex, readbuf, + writebuf, offset, len, + xfered_len); } } @@ -949,7 +972,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);