X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=gdb%2Fcorelow.c;h=8371b58b2b9c611a900b7ef46e3e11949be976af;hb=2eea244095a1f8c2a19ca349984f902307f7fa11;hp=2ccbd5b025815aa55fd48c2d9a6abc333cc483bf;hpb=9353355fa3d730a3ffa21e35fef78cfb6475effa;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/corelow.c b/gdb/corelow.c index 2ccbd5b025..8371b58b2b 100644 --- a/gdb/corelow.c +++ b/gdb/corelow.c @@ -1,14 +1,12 @@ /* Core dump and executable file functions below target vector, for GDB. - Copyright (C) 1986, 1987, 1989, 1991, 1992, 1993, 1994, 1995, 1996, - 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. + Copyright (C) 1986-2013 Free Software Foundation, Inc. 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 + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -17,9 +15,7 @@ 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., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see . */ #include "defs.h" #include "arch-utils.h" @@ -46,10 +42,12 @@ #include "gdb_assert.h" #include "exceptions.h" #include "solib.h" - -#ifndef O_BINARY -#define O_BINARY 0 -#endif +#include "filenames.h" +#include "progspace.h" +#include "objfiles.h" +#include "gdb_bfd.h" +#include "completer.h" +#include "filestuff.h" #ifndef O_LARGEFILE #define O_LARGEFILE 0 @@ -61,15 +59,23 @@ static struct core_fns *core_file_fns = NULL; -/* The core_fns for a core file handler that is prepared to read the core - file currently open on core_bfd. */ +/* The core_fns for a core file handler that is prepared to read the + core file currently open on core_bfd. */ static struct core_fns *core_vec = NULL; /* FIXME: kettenis/20031023: Eventually this variable should disappear. */ -struct gdbarch *core_gdbarch = NULL; +static struct gdbarch *core_gdbarch = NULL; + +/* Per-core data. Currently, only the section table. Note that these + target sections are *not* mapped in the current address spaces' set + of target sections --- those should come only from pure executable + or shared library bfds. The core bfd sections are an + implementation detail of the core target, just like ptrace is for + unix child targets. */ +static struct target_section_table *core_data; static void core_files_info (struct target_ops *); @@ -79,30 +85,27 @@ static int gdb_check_format (bfd *); static void core_open (char *, int); -static void core_detach (char *, int); +static void core_detach (struct target_ops *ops, char *, int); -static void core_close (int); +static void core_close (void); static void core_close_cleanup (void *ignore); -static void get_core_registers (int); - static void add_to_thread_list (bfd *, asection *, void *); -static int ignore (CORE_ADDR, bfd_byte *); - -static int core_file_thread_alive (ptid_t tid); - static void init_core_ops (void); void _initialize_corelow (void); -struct target_ops core_ops; +static struct target_ops core_ops; + +/* An arbitrary identifier for the core inferior. */ +#define CORELOW_PID 1 -/* 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. */ +/* 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 reader is + prepared to handle. */ void deprecated_add_core_fns (struct core_fns *cf) @@ -113,7 +116,7 @@ deprecated_add_core_fns (struct core_fns *cf) /* The default function that core file handlers can use to examine a core file BFD and decide whether or not to accept the job of - reading the core file. */ + reading the core file. */ int default_core_sniffer (struct core_fns *our_fns, bfd *abfd) @@ -125,9 +128,8 @@ default_core_sniffer (struct core_fns *our_fns, bfd *abfd) } /* Walk through the list of core functions to find a set that can - handle the core file open on ABFD. Default to the first one in the - list if nothing matches. Returns pointer to set that is - selected. */ + handle the core file open on ABFD. Returns pointer to set that is + selected. */ static struct core_fns * sniff_core_bfd (bfd *abfd) @@ -136,7 +138,8 @@ sniff_core_bfd (bfd *abfd) struct core_fns *yummy = NULL; int matches = 0;; - /* Don't sniff if we have support for register sets in CORE_GDBARCH. */ + /* Don't sniff if we have support for register sets in + CORE_GDBARCH. */ if (core_gdbarch && gdbarch_regset_from_core_section_p (core_gdbarch)) return NULL; @@ -154,20 +157,15 @@ sniff_core_bfd (bfd *abfd) bfd_get_filename (abfd), matches); } else if (matches == 0) - { - warning (_("\"%s\": no core file handler recognizes format, using default"), - bfd_get_filename (abfd)); - } - if (yummy == NULL) - { - yummy = core_file_fns; - } + error (_("\"%s\": no core file handler recognizes format"), + bfd_get_filename (abfd)); + return (yummy); } /* The default is to reject every core file format we see. Either BFD has to recognize it, or we have to provide a function in the - core file handler that recognizes it. */ + core file handler that recognizes it. */ int default_check_format (bfd *abfd) @@ -175,7 +173,7 @@ default_check_format (bfd *abfd) return (0); } -/* Attempt to recognize core file formats that BFD rejects. */ +/* Attempt to recognize core file formats that BFD rejects. */ static int gdb_check_format (bfd *abfd) @@ -192,38 +190,33 @@ gdb_check_format (bfd *abfd) return (0); } -/* Discard all vestiges of any previous core file and mark data and stack - spaces as empty. */ +/* Discard all vestiges of any previous core file and mark data and + stack spaces as empty. */ static void -core_close (int quitting) +core_close (void) { - char *name; - if (core_bfd) { - inferior_ptid = null_ptid; /* 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 (); -#else + int pid = ptid_get_pid (inferior_ptid); + inferior_ptid = null_ptid; /* Avoid confusion from thread + stuff. */ + if (pid != 0) + exit_inferior_silent (pid); + + /* Clear out solib state while the bfd is still open. See + comments in clear_solib in solib.c. */ 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 ())); - xfree (name); - core_bfd = NULL; - if (core_ops.to_sections) + if (core_data) { - xfree (core_ops.to_sections); - core_ops.to_sections = NULL; - core_ops.to_sections_end = NULL; + xfree (core_data->sections); + xfree (core_data); + core_data = NULL; } + + gdb_bfd_unref (core_bfd); + core_bfd = NULL; } core_vec = NULL; core_gdbarch = NULL; @@ -232,30 +225,52 @@ core_close (int quitting) static void core_close_cleanup (void *ignore) { - core_close (0/*ignored*/); + core_close (); } -/* Look for sections whose names start with `.reg/' so that we can extract the - list of threads in a core file. */ +/* Look for sections whose names start with `.reg/' so that we can + extract the list of threads in a core file. */ static void add_to_thread_list (bfd *abfd, asection *asect, void *reg_sect_arg) { - int thread_id; + ptid_t ptid; + int core_tid; + int pid, lwpid; asection *reg_sect = (asection *) reg_sect_arg; + int fake_pid_p = 0; + struct inferior *inf; if (strncmp (bfd_section_name (abfd, asect), ".reg/", 5) != 0) return; - thread_id = atoi (bfd_section_name (abfd, asect) + 5); + core_tid = atoi (bfd_section_name (abfd, asect) + 5); - add_thread (pid_to_ptid (thread_id)); + pid = bfd_core_file_pid (core_bfd); + if (pid == 0) + { + fake_pid_p = 1; + pid = CORELOW_PID; + } + + lwpid = core_tid; + + inf = current_inferior (); + if (inf->pid == 0) + { + inferior_appeared (inf, pid); + inf->fake_pid_p = fake_pid_p; + } + + ptid = ptid_build (pid, lwpid, 0); + + add_thread (ptid); /* Warning, Will Robinson, looking at BFD private data! */ if (reg_sect != NULL - && asect->filepos == reg_sect->filepos) /* Did we find .reg? */ - inferior_ptid = pid_to_ptid (thread_id); /* Yes, make it current */ + && asect->filepos == reg_sect->filepos) /* Did we find .reg? */ + inferior_ptid = ptid; /* Yes, make it current. */ } /* This routine opens and sets up the core file bfd. */ @@ -268,23 +283,25 @@ core_open (char *filename, int from_tty) struct cleanup *old_chain; char *temp; bfd *temp_bfd; - int ontop; int scratch_chan; int flags; + volatile struct gdb_exception except; target_preopen (from_tty); if (!filename) { if (core_bfd) - error (_("No core file specified. (Use `detach' to stop debugging a core file.)")); + error (_("No core file specified. (Use `detach' " + "to stop debugging a core file.)")); else error (_("No core file specified.")); } filename = tilde_expand (filename); - if (filename[0] != '/') + if (!IS_ABSOLUTE_PATH (filename)) { - temp = concat (current_directory, "/", filename, (char *)NULL); + temp = concat (current_directory, "/", + filename, (char *) NULL); xfree (filename); filename = temp; } @@ -296,41 +313,36 @@ core_open (char *filename, int from_tty) flags |= O_RDWR; else flags |= O_RDONLY; - scratch_chan = open (filename, flags, 0); + scratch_chan = gdb_open_cloexec (filename, flags, 0); if (scratch_chan < 0) perror_with_name (filename); - temp_bfd = bfd_fopen (filename, gnutarget, - write_files ? FOPEN_RUB : FOPEN_RB, - scratch_chan); + 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, bfd_core) + && !gdb_check_format (temp_bfd)) { /* 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); + /* 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 ())); } - /* Looks semi-reasonable. Toss the old core file and work on the new. */ + /* Looks semi-reasonable. Toss the old core file and work on the + new. */ - discard_cleanups (old_chain); /* Don't free filename any more */ + do_cleanups (old_chain); unpush_target (&core_ops); core_bfd = temp_bfd; old_chain = make_cleanup (core_close_cleanup, 0 /*ignore*/); - /* FIXME: kettenis/20031023: This is very dangerous. The - CORE_GDBARCH that results from this call may very well be - different from CURRENT_GDBARCH. However, its methods may only - work if it is selected as the current architecture, because they - rely on swapped data (see gdbarch.c). We should get rid of that - swapped data. */ core_gdbarch = gdbarch_from_bfd (core_bfd); /* Find a suitable core file handler to munch on core_bfd */ @@ -338,9 +350,12 @@ core_open (char *filename, int from_tty) validate_files (); + core_data = XZALLOC (struct target_section_table); + /* Find the data section */ - if (build_section_table (core_bfd, &core_ops.to_sections, - &core_ops.to_sections_end)) + if (build_section_table (core_bfd, + &core_data->sections, + &core_data->sections_end)) error (_("\"%s\": Can't find sections: %s"), bfd_get_filename (core_bfd), bfd_errmsg (bfd_get_error ())); @@ -351,81 +366,129 @@ core_open (char *filename, int from_tty) if (!exec_bfd) set_gdbarch_from_file (core_bfd); - ontop = !push_target (&core_ops); + push_target (&core_ops); discard_cleanups (old_chain); - /* This is done first, before anything has a chance to query the - inferior for information such as symbols. */ - post_create_inferior (&core_ops, from_tty); - - p = bfd_core_file_failing_command (core_bfd); - if (p) - printf_filtered (_("Core was generated by `%s'.\n"), p); + /* Do this before acknowledging the inferior, so if + post_create_inferior throws (can happen easilly if you're loading + a core file with the wrong exec), we aren't left with threads + from the previous inferior. */ + init_thread_list (); - siggy = bfd_core_file_failing_signal (core_bfd); - if (siggy > 0) - /* NOTE: target_signal_from_host() converts a target signal value - into gdb's internal signal value. Unfortunately gdb's internal - value is called ``target_signal'' and this function got the - name ..._from_host(). */ - printf_filtered (_("Program terminated with signal %d, %s.\n"), siggy, - target_signal_to_string (target_signal_from_host (siggy))); + inferior_ptid = null_ptid; - /* Build up thread list from BFD sections. */ + /* Need to flush the register cache (and the frame cache) from a + previous debug session. If inferior_ptid ends up the same as the + last debug session --- e.g., b foo; run; gcore core1; step; gcore + core2; core core1; core core2 --- then there's potential for + get_current_regcache to return the cached regcache of the + previous session, and the frame cache being stale. */ + registers_changed (); - init_thread_list (); + /* Build up thread list from BFD sections, and possibly set the + current thread to the .reg/NN section matching the .reg + section. */ bfd_map_over_sections (core_bfd, add_to_thread_list, bfd_get_section_by_name (core_bfd, ".reg")); - if (ontop) + if (ptid_equal (inferior_ptid, null_ptid)) { - /* Fetch all registers from core file. */ - target_fetch_registers (-1); + /* Either we found no .reg/NN section, and hence we have a + non-threaded core (single-threaded, from gdb's perspective), + or for some reason add_to_thread_list couldn't determine + which was the "main" thread. The latter case shouldn't + usually happen, but we're dealing with input here, which can + always be broken in different ways. */ + struct thread_info *thread = first_thread_of_process (-1); + + if (thread == NULL) + { + inferior_appeared (current_inferior (), CORELOW_PID); + inferior_ptid = pid_to_ptid (CORELOW_PID); + add_thread_silent (inferior_ptid); + } + else + switch_to_thread (thread->ptid); + } + + post_create_inferior (&core_ops, from_tty); - /* Now, set up the frame cache, and print the top of stack. */ - flush_cached_frames (); - select_frame (get_current_frame ()); - print_stack_frame (get_selected_frame (NULL), 1, SRC_AND_LOC); + /* Now go through the target stack looking for threads since there + 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) + { + target_find_new_threads (); } - else + + if (except.reason < 0) + exception_print (gdb_stderr, except); + + p = bfd_core_file_failing_command (core_bfd); + if (p) + printf_filtered (_("Core was generated by `%s'.\n"), p); + + siggy = bfd_core_file_failing_signal (core_bfd); + if (siggy > 0) { - warning ( - "you won't be able to access this core file until you terminate\n\ -your %s; do ``info files''", target_longname); + /* If we don't have a CORE_GDBARCH to work with, assume a native + core (map gdb_signal from host signals). If we do have + CORE_GDBARCH to work with, but no gdb_signal_from_target + implementation for that gdbarch, as a fallback measure, + assume the host signal mapping. It'll be correct for native + cores, but most likely incorrect for cross-cores. */ + enum gdb_signal sig = (core_gdbarch != NULL + && gdbarch_gdb_signal_from_target_p (core_gdbarch) + ? gdbarch_gdb_signal_from_target (core_gdbarch, + siggy) + : gdb_signal_from_host (siggy)); + + printf_filtered (_("Program terminated with signal %s, %s.\n"), + gdb_signal_to_name (sig), gdb_signal_to_string (sig)); } + + /* Fetch all registers from core file. */ + target_fetch_registers (get_current_regcache (), -1); + + /* 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); } static void -core_detach (char *args, int from_tty) +core_detach (struct target_ops *ops, char *args, int from_tty) { if (args) error (_("Too many arguments")); - unpush_target (&core_ops); + unpush_target (ops); reinit_frame_cache (); if (from_tty) printf_filtered (_("No core file now.\n")); } - /* Try to retrieve registers from a section in core_bfd, and supply them to core_vec->core_read_registers, as the register set numbered WHICH. - If inferior_ptid is zero, do the single-threaded thing: look for a - section named NAME. If inferior_ptid is non-zero, do the - multi-threaded thing: look for a section named "NAME/PID", where - PID is the shortest ASCII decimal representation of inferior_ptid. + If inferior_ptid's lwp member is zero, do the single-threaded + thing: look for a section named NAME. If inferior_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. HUMAN_NAME is a human-readable name for the kind of registers the NAME section contains, for use in error messages. If REQUIRED is non-zero, print an error if the core file doesn't - have a section by the appropriate name. Otherwise, just do nothing. */ + have a section by the appropriate name. Otherwise, just do + nothing. */ static void -get_core_register_section (char *name, +get_core_register_section (struct regcache *regcache, + const char *name, int which, - char *human_name, + const char *human_name, int required) { static char *section_name = NULL; @@ -434,8 +497,10 @@ get_core_register_section (char *name, char *contents; xfree (section_name); - if (PIDGET (inferior_ptid)) - section_name = xstrprintf ("%s/%d", name, PIDGET (inferior_ptid)); + + if (ptid_get_lwp (inferior_ptid)) + section_name = xstrprintf ("%s/%ld", name, + ptid_get_lwp (inferior_ptid)); else section_name = xstrdup (name); @@ -443,7 +508,8 @@ get_core_register_section (char *name, if (! section) { if (required) - warning (_("Couldn't find %s registers in core file."), human_name); + warning (_("Couldn't find %s registers in core file."), + human_name); return; } @@ -461,7 +527,8 @@ get_core_register_section (char *name, { const struct regset *regset; - regset = gdbarch_regset_from_core_section (core_gdbarch, name, size); + regset = gdbarch_regset_from_core_section (core_gdbarch, + name, size); if (regset == NULL) { if (required) @@ -470,12 +537,12 @@ get_core_register_section (char *name, return; } - regset->supply_regset (regset, current_regcache, -1, contents, size); + regset->supply_regset (regset, regcache, -1, contents, size); return; } gdb_assert (core_vec); - core_vec->core_read_registers (contents, size, which, + core_vec->core_read_registers (regcache, contents, size, which, ((CORE_ADDR) bfd_section_vma (core_bfd, section))); } @@ -483,14 +550,17 @@ get_core_register_section (char *name, /* Get the registers out of a core file. This is the machine- independent part. Fetch_core_registers is the machine-dependent - part, typically implemented in the xm-file for each architecture. */ + part, typically implemented in the xm-file for each + architecture. */ /* We just get all the registers, so we don't use regno. */ static void -get_core_registers (int regno) +get_core_registers (struct target_ops *ops, + struct regcache *regcache, int regno) { - int status; + struct core_regset_section *sect_list; + int i; if (!(core_gdbarch && gdbarch_regset_from_core_section_p (core_gdbarch)) && (core_vec == NULL || core_vec->core_read_registers == NULL)) @@ -500,34 +570,116 @@ get_core_registers (int regno) return; } - get_core_register_section (".reg", 0, "general-purpose", 1); - get_core_register_section (".reg2", 2, "floating-point", 0); - get_core_register_section (".reg-xfp", 3, "extended floating-point", 0); + 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++; + } - deprecated_registers_fetched (); + else + { + get_core_register_section (regcache, + ".reg", 0, "general-purpose", 1); + get_core_register_section (regcache, + ".reg2", 2, "floating-point", 0); + } + + /* Mark all registers not found in the core as unavailable. */ + for (i = 0; i < gdbarch_num_regs (get_regcache_arch (regcache)); i++) + if (regcache_register_status (regcache, i) == REG_UNKNOWN) + regcache_raw_supply (regcache, i, NULL); } static void core_files_info (struct target_ops *t) { - print_section_info (t, core_bfd); + print_section_info (core_data, core_bfd); } +struct spuid_list +{ + gdb_byte *buf; + ULONGEST offset; + LONGEST len; + ULONGEST pos; + ULONGEST written; +}; + +static void +add_to_spuid_list (bfd *abfd, asection *asect, void *list_p) +{ + struct spuid_list *list = list_p; + enum bfd_endian byte_order + = bfd_big_endian (abfd) ? BFD_ENDIAN_BIG : BFD_ENDIAN_LITTLE; + int fd, pos = 0; + + sscanf (bfd_section_name (abfd, asect), "SPU/%d/regs%n", &fd, &pos); + if (pos == 0) + return; + + if (list->pos >= list->offset && list->pos + 4 <= list->offset + list->len) + { + store_unsigned_integer (list->buf + list->pos - list->offset, + 4, byte_order, fd); + list->written += 4; + } + list->pos += 4; +} + +/* Read siginfo data from the core, if possible. Returns -1 on + failure. Otherwise, returns the number of bytes read. ABFD is the + core file's BFD; READBUF, OFFSET, and LEN are all as specified by + the to_xfer_partial interface. */ + +static LONGEST +get_core_siginfo (bfd *abfd, gdb_byte *readbuf, ULONGEST offset, LONGEST len) +{ + asection *section; + char *section_name; + const char *name = ".note.linuxcore.siginfo"; + + if (ptid_get_lwp (inferior_ptid)) + section_name = xstrprintf ("%s/%ld", name, + ptid_get_lwp (inferior_ptid)); + else + section_name = xstrdup (name); + + section = bfd_get_section_by_name (abfd, section_name); + xfree (section_name); + if (section == NULL) + return -1; + + if (!bfd_get_section_contents (abfd, section, readbuf, offset, len)) + return -1; + + return len; +} + static LONGEST 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) + const gdb_byte *writebuf, ULONGEST offset, + LONGEST len) { switch (object) { case TARGET_OBJECT_MEMORY: - if (readbuf) - return (*ops->deprecated_xfer_memory) (offset, readbuf, len, - 0/*write*/, NULL, ops); - if (writebuf) - return (*ops->deprecated_xfer_memory) (offset, readbuf, len, - 1/*write*/, NULL, ops); - return -1; + return section_table_xfer_memory_partial (readbuf, writebuf, + offset, len, + core_data->sections, + core_data->sections_end, + NULL); case TARGET_OBJECT_AUXV: if (readbuf) @@ -537,7 +689,6 @@ core_xfer_partial (struct target_ops *ops, enum target_object object, struct bfd_section *section; bfd_size_type size; - char *contents; section = bfd_get_section_by_name (core_bfd, ".auxv"); if (section == NULL) @@ -565,11 +716,11 @@ core_xfer_partial (struct target_ops *ops, enum target_object object, if (readbuf) { /* When the StackGhost cookie is stored in core file, BFD - represents this with a fake section called ".wcookie". */ + represents this with a fake section called + ".wcookie". */ struct bfd_section *section; bfd_size_type size; - char *contents; section = bfd_get_section_by_name (core_bfd, ".wcookie"); if (section == NULL) @@ -593,20 +744,99 @@ core_xfer_partial (struct target_ops *ops, enum target_object object, } return -1; + 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); + } + /* FALL THROUGH */ + + case TARGET_OBJECT_LIBRARIES_AIX: + if (core_gdbarch + && 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); + } + /* FALL THROUGH */ + + case TARGET_OBJECT_SPU: + if (readbuf && annex) + { + /* When the SPU contexts are stored in a core file, BFD + represents this with a fake section called + "SPU/". */ + + struct bfd_section *section; + bfd_size_type size; + char sectionstr[100]; + + xsnprintf (sectionstr, sizeof sectionstr, "SPU/%s", annex); + + section = bfd_get_section_by_name (core_bfd, sectionstr); + if (section == NULL) + return -1; + + size = bfd_section_size (core_bfd, section); + if (offset >= size) + return 0; + size -= offset; + if (size > len) + size = len; + if (size > 0 + && !bfd_get_section_contents (core_bfd, section, readbuf, + (file_ptr) offset, size)) + { + warning (_("Couldn't read SPU section in core file.")); + return -1; + } + + return size; + } + else if (readbuf) + { + /* NULL annex requests list of all present spuids. */ + struct spuid_list list; + + list.buf = readbuf; + list.offset = offset; + list.len = len; + list.pos = 0; + list.written = 0; + bfd_map_over_sections (core_bfd, add_to_spuid_list, &list); + return list.written; + } + return -1; + + case TARGET_OBJECT_SIGNAL_INFO: + if (readbuf) + return get_core_siginfo (core_bfd, readbuf, offset, len); + return -1; + default: if (ops->beneath != NULL) - return ops->beneath->to_xfer_partial (ops->beneath, object, annex, - readbuf, writebuf, offset, len); + return ops->beneath->to_xfer_partial (ops->beneath, object, + annex, readbuf, + writebuf, offset, len); return -1; } } /* If mourn is being called in all the right places, this could be say - `gdb internal error' (since generic_mourn calls breakpoint_init_inferior). */ + `gdb internal error' (since generic_mourn calls + breakpoint_init_inferior). */ static int -ignore (CORE_ADDR addr, bfd_byte *contents) +ignore (struct gdbarch *gdbarch, struct bp_target_info *bp_tgt) { return 0; } @@ -619,11 +849,89 @@ ignore (CORE_ADDR addr, bfd_byte *contents) behaviour. */ static int -core_file_thread_alive (ptid_t tid) +core_thread_alive (struct target_ops *ops, ptid_t ptid) { return 1; } +/* Ask the current architecture what it knows about this core file. + That will be used, in turn, to pick a better architecture. This + wrapper could be avoided if targets got a chance to specialize + core_ops. */ + +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); + + return NULL; +} + +static char * +core_pid_to_str (struct target_ops *ops, ptid_t ptid) +{ + static char buf[64]; + struct inferior *inf; + int pid; + + /* The preferred way is to have a gdbarch/OS specific + implementation. */ + if (core_gdbarch + && gdbarch_core_pid_to_str_p (core_gdbarch)) + return gdbarch_core_pid_to_str (core_gdbarch, ptid); + + /* Otherwise, if we don't have one, we'll just fallback to + "process", with normal_pid_to_str. */ + + /* Try the LWPID field first. */ + pid = ptid_get_lwp (ptid); + if (pid != 0) + return normal_pid_to_str (pid_to_ptid (pid)); + + /* 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)); + if (inf != NULL && !inf->fake_pid_p) + return normal_pid_to_str (ptid); + + /* No luck. We simply don't have a valid PID to print. */ + xsnprintf (buf, sizeof buf, "
"); + return buf; +} + +static int +core_has_memory (struct target_ops *ops) +{ + return (core_bfd != NULL); +} + +static int +core_has_stack (struct target_ops *ops) +{ + return (core_bfd != NULL); +} + +static int +core_has_registers (struct target_ops *ops) +{ + return (core_bfd != NULL); +} + +/* Implement the to_info_proc method. */ + +static void +core_info_proc (struct target_ops *ops, char *args, enum info_proc_what request) +{ + struct gdbarch *gdbarch = get_current_arch (); + + /* Since this is the core file target, call the 'core_info_proc' + method on gdbarch, not 'info_proc'. */ + if (gdbarch_core_info_proc_p (gdbarch)) + gdbarch_core_info_proc (gdbarch, args, request); +} + /* Fill in core_ops with its defined operations and properties. */ static void @@ -639,32 +947,31 @@ init_core_ops (void) core_ops.to_detach = core_detach; core_ops.to_fetch_registers = get_core_registers; core_ops.to_xfer_partial = core_xfer_partial; - core_ops.deprecated_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_thread_alive = core_file_thread_alive; - 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_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_stratum = process_stratum; + core_ops.to_has_memory = core_has_memory; + core_ops.to_has_stack = core_has_stack; + core_ops.to_has_registers = core_has_registers; + core_ops.to_info_proc = core_info_proc; 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; + if (core_target) + internal_error (__FILE__, __LINE__, + _("init_core_ops: core target already exists (\"%s\")."), + core_target->to_longname); + core_target = &core_ops; +} void _initialize_corelow (void) { init_core_ops (); - if (!coreops_suppress_target) - add_target (&core_ops); + add_target_with_completer (&core_ops, filename_completer); }