X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fcorelow.c;h=5f1e55faedd41da20110cd153418713f523796b5;hb=3d9434b5ddc141178be232048e3d944955cc1f91;hp=9523f3273192ab60b467fe5807ab334c294d36e7;hpb=c5504eafbce9ab0ea4d9aa7f222d7b75a6c77531;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/corelow.c b/gdb/corelow.c index 9523f32731..5f1e55faed 100644 --- a/gdb/corelow.c +++ b/gdb/corelow.c @@ -1,8 +1,6 @@ /* 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, 2007, 2008, 2009, 2010 - Free Software Foundation, Inc. + Copyright (C) 1986-2014 Free Software Foundation, Inc. This file is part of GDB. @@ -21,7 +19,7 @@ #include "defs.h" #include "arch-utils.h" -#include "gdb_string.h" +#include #include #include #include @@ -47,7 +45,9 @@ #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 @@ -59,15 +59,15 @@ 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 @@ -77,9 +77,6 @@ struct gdbarch *core_gdbarch = NULL; unix child targets. */ static struct target_section_table *core_data; -/* True if we needed to fake the pid of the loaded core inferior. */ -static int core_has_fake_pid = 0; - static void core_files_info (struct target_ops *); static struct core_fns *sniff_core_bfd (bfd *); @@ -88,9 +85,7 @@ static int gdb_check_format (bfd *); static void core_open (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); @@ -100,15 +95,15 @@ 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) @@ -119,7 +114,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) @@ -131,9 +126,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) @@ -142,7 +136,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; @@ -160,20 +155,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) @@ -181,7 +171,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) @@ -198,32 +188,32 @@ 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) { int pid = ptid_get_pid (inferior_ptid); - inferior_ptid = null_ptid; /* Avoid confusion from thread stuff */ - exit_inferior_silent (pid); + 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 out solib state while the bfd is still open. See + comments in clear_solib in solib.c. */ clear_solib (); - xfree (core_data->sections); - xfree (core_data); - core_data = NULL; - core_has_fake_pid = 0; + if (core_data) + { + xfree (core_data->sections); + xfree (core_data); + core_data = NULL; + } - name = bfd_get_filename (core_bfd); - gdb_bfd_close_or_warn (core_bfd); - xfree (name); + gdb_bfd_unref (core_bfd); core_bfd = NULL; } core_vec = NULL; @@ -233,11 +223,11 @@ 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) @@ -246,37 +236,29 @@ add_to_thread_list (bfd *abfd, asection *asect, void *reg_sect_arg) 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; core_tid = atoi (bfd_section_name (abfd, asect) + 5); - if (core_gdbarch - && gdbarch_core_reg_section_encodes_pid (core_gdbarch)) + pid = bfd_core_file_pid (core_bfd); + if (pid == 0) { - uint32_t merged_pid = core_tid; - pid = merged_pid & 0xffff; - lwpid = merged_pid >> 16; - - /* This can happen on solaris core, for example, if we don't - find a NT_PSTATUS note in the core, but do find NT_LWPSTATUS - notes. */ - if (pid == 0) - { - core_has_fake_pid = 1; - pid = CORELOW_PID; - } - } - else - { - core_has_fake_pid = 1; + fake_pid_p = 1; pid = CORELOW_PID; - lwpid = core_tid; } - if (current_inferior ()->pid == 0) - inferior_appeared (current_inferior (), 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); @@ -285,8 +267,8 @@ add_to_thread_list (bfd *abfd, asection *asect, void *reg_sect_arg) /* Warning, Will Robinson, looking at BFD private data! */ if (reg_sect != NULL - && asect->filepos == reg_sect->filepos) /* Did we find .reg? */ - inferior_ptid = ptid; /* 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. */ @@ -301,20 +283,23 @@ core_open (char *filename, int from_tty) bfd *temp_bfd; 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 (!IS_ABSOLUTE_PATH(filename)) + if (!IS_ABSOLUTE_PATH (filename)) { - temp = concat (current_directory, "/", filename, (char *)NULL); + temp = concat (current_directory, "/", + filename, (char *) NULL); xfree (filename); filename = temp; } @@ -326,13 +311,13 @@ 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); @@ -340,27 +325,22 @@ core_open (char *filename, int from_tty) && !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 */ @@ -368,11 +348,12 @@ 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, - &core_data->sections, &core_data->sections_end)) + &core_data->sections, + &core_data->sections_end)) error (_("\"%s\": Can't find sections: %s"), bfd_get_filename (core_bfd), bfd_errmsg (bfd_get_error ())); @@ -393,7 +374,6 @@ core_open (char *filename, int from_tty) init_thread_list (); inferior_ptid = null_ptid; - core_has_fake_pid = 0; /* Need to flush the register cache (and the frame cache) from a previous debug session. If inferior_ptid ends up the same as the @@ -405,7 +385,7 @@ core_open (char *filename, int from_tty) /* Build up thread list from BFD sections, and possibly set the current thread to the .reg/NN section matching the .reg - section. */ + section. */ bfd_map_over_sections (core_bfd, add_to_thread_list, bfd_get_section_by_name (core_bfd, ".reg")); @@ -435,34 +415,55 @@ 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. */ - target_find_new_threads (); + TRY_CATCH (except, RETURN_MASK_ERROR) + { + target_find_new_threads (); + } + + 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); + /* Clearing any previous state of convenience variables. */ + clear_exit_convenience_vars (); + 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 ( - (core_gdbarch != NULL) ? - gdbarch_target_signal_from_host (core_gdbarch, siggy) - : siggy)); + { + /* 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)); + + /* Set the value of the internal variable $_exitsignal, + which holds the signal uncaught by the inferior. */ + set_internalvar_integer (lookup_internalvar ("_exitsignal"), + siggy); + } /* 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); + print_stack_frame (get_selected_frame (NULL), 1, SRC_AND_LOC, 1); } static void -core_detach (struct target_ops *ops, char *args, int from_tty) +core_detach (struct target_ops *ops, const char *args, int from_tty) { if (args) error (_("Too many arguments")); @@ -472,24 +473,6 @@ core_detach (struct target_ops *ops, char *args, int from_tty) printf_filtered (_("No core file now.\n")); } -#ifdef DEPRECATED_IBM6000_TARGET - -/* Resize the core memory's section table, by NUM_ADDED. Returns a - pointer into the first new slot. This will not be necessary when - the rs6000 target is converted to use the standard solib - framework. */ - -struct target_section * -deprecated_core_resize_section_table (int num_added) -{ - int old_count; - - old_count = resize_section_table (core_data, num_added); - return core_data->sections + old_count; -} - -#endif - /* 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. @@ -504,7 +487,8 @@ deprecated_core_resize_section_table (int num_added) 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 (struct regcache *regcache, @@ -520,22 +504,9 @@ get_core_register_section (struct regcache *regcache, xfree (section_name); - if (core_gdbarch - && gdbarch_core_reg_section_encodes_pid (core_gdbarch)) - { - uint32_t merged_pid; - int pid = ptid_get_pid (inferior_ptid); - - if (core_has_fake_pid) - pid = 0; - - merged_pid = ptid_get_lwp (inferior_ptid); - merged_pid = merged_pid << 16 | pid; - - section_name = xstrprintf ("%s/%s", name, plongest (merged_pid)); - } - else if (ptid_get_lwp (inferior_ptid)) - section_name = xstrprintf ("%s/%ld", name, ptid_get_lwp (inferior_ptid)); + if (ptid_get_lwp (inferior_ptid)) + section_name = xstrprintf ("%s/%ld", name, + ptid_get_lwp (inferior_ptid)); else section_name = xstrdup (name); @@ -543,7 +514,8 @@ get_core_register_section (struct regcache *regcache, 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; } @@ -561,7 +533,8 @@ get_core_register_section (struct regcache *regcache, { 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) @@ -583,7 +556,8 @@ get_core_register_section (struct regcache *regcache, /* 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. */ @@ -627,9 +601,9 @@ get_core_registers (struct target_ops *ops, ".reg2", 2, "floating-point", 0); } - /* Supply dummy value for all registers not found in the core. */ + /* Mark all registers not found in the core as unavailable. */ for (i = 0; i < gdbarch_num_regs (get_regcache_arch (regcache)); i++) - if (!regcache_valid_p (regcache, i)) + if (regcache_register_status (regcache, i) == REG_UNKNOWN) regcache_raw_supply (regcache, i, NULL); } @@ -653,7 +627,7 @@ 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; + = 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); @@ -669,10 +643,40 @@ add_to_spuid_list (bfd *abfd, asection *asect, void *list_p) 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, ULONGEST 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, + ULONGEST len) { switch (object) { @@ -694,7 +698,7 @@ 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) @@ -707,25 +711,26 @@ core_xfer_partial (struct target_ops *ops, enum target_object object, (file_ptr) offset, size)) { warning (_("Couldn't read NT_AUXV note in core file.")); - return -1; + return TARGET_XFER_E_IO; } return size; } - return -1; + return TARGET_XFER_E_IO; case TARGET_OBJECT_WCOOKIE: 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; 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) @@ -738,30 +743,43 @@ core_xfer_partial (struct target_ops *ops, enum target_object object, (file_ptr) offset, size)) { warning (_("Couldn't read StackGhost cookie in core file.")); - return -1; + return TARGET_XFER_E_IO; } return size; } - 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 TARGET_XFER_E_IO; 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 TARGET_XFER_E_IO; + 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/". */ + represents this with a fake section called + "SPU/". */ struct bfd_section *section; bfd_size_type size; @@ -771,7 +789,7 @@ 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) @@ -784,7 +802,7 @@ core_xfer_partial (struct target_ops *ops, enum target_object object, (file_ptr) offset, size)) { warning (_("Couldn't read SPU section in core file.")); - return -1; + return TARGET_XFER_E_IO; } return size; @@ -802,22 +820,30 @@ core_xfer_partial (struct target_ops *ops, enum target_object object, bfd_map_over_sections (core_bfd, add_to_spuid_list, &list); return list.written; } - return -1; + return TARGET_XFER_E_IO; + + case TARGET_OBJECT_SIGNAL_INFO: + if (readbuf) + return get_core_siginfo (core_bfd, readbuf, offset, len); + 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); + return TARGET_XFER_E_IO; } } /* 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 (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; } @@ -844,7 +870,8 @@ 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 gdbarch_core_read_description (core_gdbarch, + target, core_bfd); return NULL; } @@ -853,21 +880,31 @@ 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)) - { - char *ret = gdbarch_core_pid_to_str (core_gdbarch, ptid); + return gdbarch_core_pid_to_str (core_gdbarch, ptid); - if (ret != NULL) - return ret; - } + /* Otherwise, if we don't have one, we'll just fallback to + "process", with normal_pid_to_str. */ - if (ptid_get_lwp (ptid) == 0) - xsnprintf (buf, sizeof buf, "
"); - else - xsnprintf (buf, sizeof buf, "Thread %ld", ptid_get_lwp (ptid)); + /* 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; } @@ -889,6 +926,19 @@ 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 @@ -911,11 +961,18 @@ init_core_ops (void) 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 = core_stratum; + 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; + + if (core_target) + internal_error (__FILE__, __LINE__, + _("init_core_ops: core target already exists (\"%s\")."), + core_target->to_longname); + core_target = &core_ops; } void @@ -923,5 +980,5 @@ _initialize_corelow (void) { init_core_ops (); - add_target (&core_ops); + add_target_with_completer (&core_ops, filename_completer); }