X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fcorelow.c;h=9d0047124fdc89388f5d860c4cfb4511c737de00;hb=a5ee0f0c4d286ed3437ded51e904016b1e26209d;hp=68219c512c611a3e9902f8986c1aeaf40d8ea0f4;hpb=81a9a963a1d5374ada16859384e378b5561f4b2a;p=deliverable%2Fbinutils-gdb.git
diff --git a/gdb/corelow.c b/gdb/corelow.c
index 68219c512c..9d0047124f 100644
--- a/gdb/corelow.c
+++ b/gdb/corelow.c
@@ -1,13 +1,14 @@
/* Core dump and executable file functions below target vector, for GDB.
- Copyright 1986, 1987, 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
- 1998, 1999, 2000, 2001
+
+ 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.
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,
@@ -16,11 +17,10 @@
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., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ along with this program. If not, see . */
#include "defs.h"
+#include "arch-utils.h"
#include "gdb_string.h"
#include
#include
@@ -37,15 +37,25 @@
#include "gdbcore.h"
#include "gdbthread.h"
#include "regcache.h"
+#include "regset.h"
#include "symfile.h"
-
-#ifndef O_BINARY
-#define O_BINARY 0
+#include "exec.h"
+#include "readline/readline.h"
+#include "gdb_assert.h"
+#include "exceptions.h"
+#include "solib.h"
+#include "filenames.h"
+#include "progspace.h"
+#include "objfiles.h"
+
+
+#ifndef O_LARGEFILE
+#define O_LARGEFILE 0
#endif
-/* List of all available core_fns. On gdb startup, each core file register
- reader calls add_core_fns() to register information on each core format it
- is prepared to read. */
+/* List of all available core_fns. On gdb startup, each core file
+ register reader calls deprecated_add_core_fns() to register
+ information on each core format it is prepared to read. */
static struct core_fns *core_file_fns = NULL;
@@ -54,37 +64,46 @@ static struct core_fns *core_file_fns = NULL;
static struct core_fns *core_vec = NULL;
-static void core_files_info (struct target_ops *);
+/* FIXME: kettenis/20031023: Eventually this variable should
+ disappear. */
-#ifdef SOLIB_ADD
-static int solib_add_stub (PTR);
-#endif
+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;
+
+/* 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 *);
-static boolean gdb_check_format (bfd *);
+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_cleanup (void *ignore);
-static void get_core_registers (int);
-
-static void add_to_thread_list (bfd *, asection *, PTR);
-
-static int ignore (CORE_ADDR, char *);
-
-static int core_file_thread_alive (ptid_t tid);
+static void add_to_thread_list (bfd *, asection *, void *);
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
@@ -92,7 +111,7 @@ struct target_ops core_ops;
handle. */
void
-add_core_fns (struct core_fns *cf)
+deprecated_add_core_fns (struct core_fns *cf)
{
cf->next = core_file_fns;
core_file_fns = cf;
@@ -123,6 +142,10 @@ 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. */
+ if (core_gdbarch && gdbarch_regset_from_core_section_p (core_gdbarch))
+ return NULL;
+
for (cf = core_file_fns; cf != NULL; cf = cf->next)
{
if (cf->core_sniffer (cf, abfd))
@@ -133,12 +156,12 @@ sniff_core_bfd (bfd *abfd)
}
if (matches > 1)
{
- warning ("\"%s\": ambiguous core format, %d handlers match",
+ warning (_("\"%s\": ambiguous core format, %d handlers match"),
bfd_get_filename (abfd), matches);
}
else if (matches == 0)
{
- warning ("\"%s\": no core file handler recognizes format, using default",
+ warning (_("\"%s\": no core file handler recognizes format, using default"),
bfd_get_filename (abfd));
}
if (yummy == NULL)
@@ -160,7 +183,7 @@ default_check_format (bfd *abfd)
/* Attempt to recognize core file formats that BFD rejects. */
-static boolean
+static int
gdb_check_format (bfd *abfd)
{
struct core_fns *cf;
@@ -178,7 +201,6 @@ gdb_check_format (bfd *abfd)
/* Discard all vestiges of any previous core file and mark data and stack
spaces as empty. */
-/* ARGSUSED */
static void
core_close (int quitting)
{
@@ -186,28 +208,26 @@ core_close (int quitting)
if (core_bfd)
{
+ int pid = ptid_get_pid (inferior_ptid);
inferior_ptid = null_ptid; /* Avoid confusion from thread stuff */
+ exit_inferior_silent (pid);
/* Clear out solib state while the bfd is still open. See
comments in clear_solib in solib.c. */
-#ifdef CLEAR_SOLIB
- CLEAR_SOLIB ();
-#endif
+ clear_solib ();
+
+ xfree (core_data->sections);
+ xfree (core_data);
+ core_data = NULL;
+ core_has_fake_pid = 0;
name = bfd_get_filename (core_bfd);
- if (!bfd_close (core_bfd))
- warning ("cannot close \"%s\": %s",
- name, bfd_errmsg (bfd_get_error ()));
+ gdb_bfd_close_or_warn (core_bfd);
xfree (name);
core_bfd = NULL;
- if (core_ops.to_sections)
- {
- xfree (core_ops.to_sections);
- core_ops.to_sections = NULL;
- core_ops.to_sections_end = NULL;
- }
}
core_vec = NULL;
+ core_gdbarch = NULL;
}
static void
@@ -216,40 +236,57 @@ core_close_cleanup (void *ignore)
core_close (0/*ignored*/);
}
-#ifdef SOLIB_ADD
-/* Stub function for catch_errors around shared library hacking. FROM_TTYP
- is really an int * which points to from_tty. */
-
-static int
-solib_add_stub (PTR from_ttyp)
-{
- SOLIB_ADD (NULL, *(int *) from_ttyp, ¤t_target, auto_solib_add);
- re_enable_breakpoints_in_shlibs ();
- return 0;
-}
-#endif /* SOLIB_ADD */
-
/* 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, PTR reg_sect_arg)
+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;
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);
+
+ if (core_gdbarch
+ && gdbarch_core_reg_section_encodes_pid (core_gdbarch))
+ {
+ 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;
+ pid = CORELOW_PID;
+ lwpid = core_tid;
+ }
+
+ if (current_inferior ()->pid == 0)
+ inferior_appeared (current_inferior (), pid);
+
+ ptid = ptid_build (pid, lwpid, 0);
- add_thread (pid_to_ptid (thread_id));
+ 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 */
+ inferior_ptid = ptid; /* Yes, make it current */
}
/* This routine opens and sets up the core file bfd. */
@@ -262,44 +299,52 @@ core_open (char *filename, int from_tty)
struct cleanup *old_chain;
char *temp;
bfd *temp_bfd;
- int ontop;
int scratch_chan;
+ int flags;
target_preopen (from_tty);
if (!filename)
{
- error (core_bfd ?
- "No core file specified. (Use `detach' to stop debugging a core file.)"
- : "No core file specified.");
+ if (core_bfd)
+ 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, NULL);
+ temp = concat (current_directory, "/", filename, (char *)NULL);
xfree (filename);
filename = temp;
}
old_chain = make_cleanup (xfree, filename);
- scratch_chan = open (filename, O_BINARY | ( write_files ? O_RDWR : O_RDONLY ), 0);
+ flags = O_BINARY | O_LARGEFILE;
+ if (write_files)
+ flags |= O_RDWR;
+ else
+ flags |= O_RDONLY;
+ scratch_chan = open (filename, flags, 0);
if (scratch_chan < 0)
perror_with_name (filename);
- temp_bfd = bfd_fdopenr (filename, gnutarget, scratch_chan);
+ temp_bfd = 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);
- error ("\"%s\" is not a core dump: %s",
+ error (_("\"%s\" is not a core dump: %s"),
filename, bfd_errmsg (bfd_get_error ()));
}
@@ -310,25 +355,91 @@ core_open (char *filename, int from_tty)
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 */
core_vec = sniff_core_bfd (core_bfd);
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))
- error ("\"%s\": Can't find sections: %s",
+ 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 ()));
- set_gdbarch_from_file (core_bfd);
+ /* If we have no exec file, try to set the architecture from the
+ core file. We don't do this unconditionally since an exec file
+ typically contains more information that helps us determine the
+ architecture than a core file. */
+ if (!exec_bfd)
+ set_gdbarch_from_file (core_bfd);
- ontop = !push_target (&core_ops);
+ push_target (&core_ops);
discard_cleanups (old_chain);
+ /* 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 ();
+
+ 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
+ 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 ();
+
+ /* 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 (ptid_equal (inferior_ptid, null_ptid))
+ {
+ /* 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 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. */
+ target_find_new_threads ();
+
p = bfd_core_file_failing_command (core_bfd);
if (p)
- printf_filtered ("Core was generated by `%s'.\n", p);
+ printf_filtered (_("Core was generated by `%s'.\n"), p);
siggy = bfd_core_file_failing_signal (core_bfd);
if (siggy > 0)
@@ -336,59 +447,58 @@ core_open (char *filename, int from_tty)
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)));
-
- /* Build up thread list from BFD sections. */
-
- init_thread_list ();
- bfd_map_over_sections (core_bfd, add_to_thread_list,
- bfd_get_section_by_name (core_bfd, ".reg"));
+ 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 (ontop)
- {
- /* Fetch all registers from core file. */
- target_fetch_registers (-1);
-
- /* Add symbols and section mappings for any shared libraries. */
-#ifdef SOLIB_ADD
- catch_errors (solib_add_stub, &from_tty, (char *) 0,
- RETURN_MASK_ALL);
-#endif
+ /* 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. */
- flush_cached_frames ();
- select_frame (get_current_frame (), 0);
- print_stack_frame (selected_frame, selected_frame_level, 1);
- }
- else
- {
- warning (
- "you won't be able to access this core file until you terminate\n\
-your %s; do ``info files''", target_longname);
- }
+ /* 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);
+ error (_("Too many arguments"));
+ unpush_target (ops);
reinit_frame_cache ();
if (from_tty)
- printf_filtered ("No core file now.\n");
+ 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.
- 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.
@@ -397,26 +507,43 @@ core_detach (char *args, int from_tty)
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)
{
- char section_name[100];
- sec_ptr section;
+ static char *section_name = NULL;
+ struct bfd_section *section;
bfd_size_type size;
char *contents;
- if (PIDGET (inferior_ptid))
- sprintf (section_name, "%s/%d", name, PIDGET (inferior_ptid));
+ 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));
else
- strcpy (section_name, name);
+ section_name = xstrdup (name);
section = bfd_get_section_by_name (core_bfd, section_name);
if (! section)
{
if (required)
- warning ("Couldn't find %s registers in core file.\n", human_name);
+ warning (_("Couldn't find %s registers in core file."), human_name);
return;
}
@@ -425,12 +552,30 @@ get_core_register_section (char *name,
if (! bfd_get_section_contents (core_bfd, section, contents,
(file_ptr) 0, size))
{
- warning ("Couldn't read %s registers from `%s' section in core file.\n",
+ warning (_("Couldn't read %s registers from `%s' section in core file."),
human_name, name);
return;
}
- core_vec->core_read_registers (contents, size, which,
+ if (core_gdbarch && gdbarch_regset_from_core_section_p (core_gdbarch))
+ {
+ 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;
+ }
+
+ gdb_assert (core_vec);
+ core_vec->core_read_registers (regcache, contents, size, which,
((CORE_ADDR)
bfd_section_vma (core_bfd, section)));
}
@@ -442,38 +587,237 @@ get_core_register_section (char *name,
/* We just get all the registers, so we don't use regno. */
-/* ARGSUSED */
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_vec == NULL
- || core_vec->core_read_registers == NULL)
+ if (!(core_gdbarch && gdbarch_regset_from_core_section_p (core_gdbarch))
+ && (core_vec == NULL || core_vec->core_read_registers == NULL))
{
fprintf_filtered (gdb_stderr,
"Can't fetch registers from this type of core file\n");
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++;
+ }
+
+ else
+ {
+ get_core_register_section (regcache,
+ ".reg", 0, "general-purpose", 1);
+ get_core_register_section (regcache,
+ ".reg2", 2, "floating-point", 0);
+ }
- registers_fetched ();
+ /* Supply dummy value for all registers not found in the core. */
+ for (i = 0; i < gdbarch_num_regs (get_regcache_arch (regcache)); i++)
+ if (!regcache_valid_p (regcache, i))
+ 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;
+}
+
+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)
+{
+ switch (object)
+ {
+ case TARGET_OBJECT_MEMORY:
+ return section_table_xfer_memory_partial (readbuf, writebuf,
+ offset, len,
+ core_data->sections,
+ core_data->sections_end,
+ NULL);
+
+ case TARGET_OBJECT_AUXV:
+ if (readbuf)
+ {
+ /* When the aux vector is stored in core file, BFD
+ represents this with a fake section called ".auxv". */
+
+ struct bfd_section *section;
+ bfd_size_type size;
+
+ section = bfd_get_section_by_name (core_bfd, ".auxv");
+ 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 NT_AUXV note in core file."));
+ return -1;
+ }
+
+ return size;
+ }
+ return -1;
+
+ case TARGET_OBJECT_WCOOKIE:
+ if (readbuf)
+ {
+ /* When the StackGhost cookie is stored in core file, BFD
+ 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;
+
+ 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 StackGhost cookie in core file."));
+ return -1;
+ }
+
+ return size;
+ }
+ 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_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;
+
+ default:
+ if (ops->beneath != NULL)
+ 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). */
static int
-ignore (CORE_ADDR addr, char *contents)
+ignore (struct gdbarch *gdbarch, struct bp_target_info *bp_tgt)
{
return 0;
}
@@ -486,11 +830,73 @@ ignore (CORE_ADDR addr, char *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];
+ 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. */
+ if (!core_has_fake_pid)
+ 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);
+}
+
/* Fill in core_ops with its defined operations and properties. */
static void
@@ -503,37 +909,33 @@ init_core_ops (void)
core_ops.to_open = core_open;
core_ops.to_close = core_close;
core_ops.to_attach = find_default_attach;
- core_ops.to_require_attach = find_default_require_attach;
core_ops.to_detach = core_detach;
- core_ops.to_require_detach = find_default_require_detach;
core_ops.to_fetch_registers = get_core_registers;
- core_ops.to_xfer_memory = xfer_memory;
+ 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_clone_and_follow_inferior = find_default_clone_and_follow_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_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 (&core_ops);
}