/* Work with executable files, for GDB.
- Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
- 1998, 1999, 2000, 2001, 2002, 2003, 2007, 2008, 2009
- Free Software Foundation, Inc.
+ Copyright (C) 1988-2016 Free Software Foundation, Inc.
This file is part of GDB.
#include "target.h"
#include "gdbcmd.h"
#include "language.h"
+#include "filenames.h"
#include "symfile.h"
#include "objfiles.h"
#include "completer.h"
#include "exec.h"
#include "observer.h"
#include "arch-utils.h"
+#include "gdbthread.h"
+#include "progspace.h"
+#include "gdb_bfd.h"
+#include "gcore.h"
#include <fcntl.h>
#include "readline/readline.h"
-#include "gdb_string.h"
-
#include "gdbcore.h"
#include <ctype.h>
-#include "gdb_stat.h"
-
-#include "xcoffsolib.h"
-
-struct vmap *map_vmap (bfd *, bfd *);
+#include <sys/stat.h>
+#include "solist.h"
+#include <algorithm>
void (*deprecated_file_changed_hook) (char *);
/* Prototypes for local functions */
-static void exec_close (int);
-
static void file_command (char *, int);
static void set_section_command (char *, int);
/* The target vector for executable files. */
-struct target_ops exec_ops;
-
-/* The Binary File Descriptor handle for the executable file. */
-
-bfd *exec_bfd = NULL;
-long exec_bfd_mtime = 0;
+static struct target_ops exec_ops;
/* Whether to open exec and core files read-only or read-write. */
}
-struct vmap *vmap;
-
static void
-exec_open (char *args, int from_tty)
+exec_open (const char *args, int from_tty)
{
target_preopen (from_tty);
exec_file_attach (args, from_tty);
}
-static void
-exec_close (int quitting)
-{
- int need_symtab_cleanup = 0;
- struct vmap *vp, *nxt;
-
- for (nxt = vmap; nxt != NULL;)
- {
- vp = nxt;
- nxt = vp->nxt;
-
- /* if there is an objfile associated with this bfd,
- free_objfile() will do proper cleanup of objfile *and* bfd. */
-
- if (vp->objfile)
- {
- free_objfile (vp->objfile);
- need_symtab_cleanup = 1;
- }
- else if (vp->bfd != exec_bfd)
- /* FIXME-leak: We should be freeing vp->name too, I think. */
- if (!bfd_close (vp->bfd))
- warning (_("cannot close \"%s\": %s"),
- vp->name, bfd_errmsg (bfd_get_error ()));
-
- /* FIXME: This routine is #if 0'd in symfile.c. What should we
- be doing here? Should we just free everything in
- vp->objfile->symtabs? Should free_objfile do that?
- FIXME-as-well: free_objfile already free'd vp->name, so it isn't
- valid here. */
- free_named_symtabs (vp->name);
- xfree (vp);
- }
-
- vmap = NULL;
+/* Close and clear exec_bfd. If we end up with no target sections to
+ read memory from, this unpushes the exec_ops target. */
+void
+exec_close (void)
+{
if (exec_bfd)
{
- char *name = bfd_get_filename (exec_bfd);
+ bfd *abfd = exec_bfd;
- if (!bfd_close (exec_bfd))
- warning (_("cannot close \"%s\": %s"),
- name, bfd_errmsg (bfd_get_error ()));
- xfree (name);
+ gdb_bfd_unref (abfd);
+
+ /* Removing target sections may close the exec_ops target.
+ Clear exec_bfd before doing so to prevent recursion. */
exec_bfd = NULL;
exec_bfd_mtime = 0;
- }
- if (exec_ops.to_sections)
- {
- xfree (exec_ops.to_sections);
- exec_ops.to_sections = NULL;
- exec_ops.to_sections_end = NULL;
+ remove_target_sections (&exec_bfd);
+
+ xfree (exec_filename);
+ exec_filename = NULL;
}
}
+/* This is the target_close implementation. Clears all target
+ sections and closes all executable bfds from all program spaces. */
+
+static void
+exec_close_1 (struct target_ops *self)
+{
+ struct program_space *ss;
+ struct cleanup *old_chain;
+
+ old_chain = save_current_program_space ();
+ ALL_PSPACES (ss)
+ {
+ set_current_program_space (ss);
+ clear_section_table (current_target_sections);
+ exec_close ();
+ }
+
+ do_cleanups (old_chain);
+}
+
void
exec_file_clear (int from_tty)
{
/* Remove exec file. */
- unpush_target (&exec_ops);
+ exec_close ();
if (from_tty)
printf_unfiltered (_("No executable file now.\n"));
}
-/* Process the first arg in ARGS as the new exec file.
+/* Returns non-zero if exceptions E1 and E2 are equal. Returns zero
+ otherwise. */
+
+static int
+exception_print_same (struct gdb_exception e1, struct gdb_exception e2)
+{
+ const char *msg1 = e1.message;
+ const char *msg2 = e2.message;
+
+ if (msg1 == NULL)
+ msg1 = "";
+ if (msg2 == NULL)
+ msg2 = "";
+
+ return (e1.reason == e2.reason
+ && e1.error == e2.error
+ && strcmp (msg1, msg2) == 0);
+}
+
+/* See gdbcore.h. */
+
+void
+exec_file_locate_attach (int pid, int defer_bp_reset, int from_tty)
+{
+ char *exec_file, *full_exec_path = NULL;
+ struct cleanup *old_chain;
+ struct gdb_exception prev_err = exception_none;
+
+ /* Do nothing if we already have an executable filename. */
+ exec_file = (char *) get_exec_file (0);
+ if (exec_file != NULL)
+ return;
+
+ /* Try to determine a filename from the process itself. */
+ exec_file = target_pid_to_exec_file (pid);
+ if (exec_file == NULL)
+ {
+ warning (_("No executable has been specified and target does not "
+ "support\n"
+ "determining executable automatically. "
+ "Try using the \"file\" command."));
+ return;
+ }
+
+ /* If gdb_sysroot is not empty and the discovered filename
+ is absolute then prefix the filename with gdb_sysroot. */
+ if (*gdb_sysroot != '\0' && IS_ABSOLUTE_PATH (exec_file))
+ {
+ full_exec_path = exec_file_find (exec_file, NULL);
+ if (full_exec_path == NULL)
+ return;
+ }
+ else
+ {
+ /* It's possible we don't have a full path, but rather just a
+ filename. Some targets, such as HP-UX, don't provide the
+ full path, sigh.
+
+ Attempt to qualify the filename against the source path.
+ (If that fails, we'll just fall back on the original
+ filename. Not much more we can do...) */
+ if (!source_full_path_of (exec_file, &full_exec_path))
+ full_exec_path = xstrdup (exec_file);
+ }
+
+ old_chain = make_cleanup (xfree, full_exec_path);
+ make_cleanup (free_current_contents, &prev_err.message);
+
+ /* exec_file_attach and symbol_file_add_main may throw an error if the file
+ cannot be opened either locally or remotely.
+
+ This happens for example, when the file is first found in the local
+ sysroot (above), and then disappears (a TOCTOU race), or when it doesn't
+ exist in the target filesystem, or when the file does exist, but
+ is not readable.
+
+ Even without a symbol file, the remote-based debugging session should
+ continue normally instead of ending abruptly. Hence we catch thrown
+ errors/exceptions in the following code. */
+ TRY
+ {
+ exec_file_attach (full_exec_path, from_tty);
+ }
+ CATCH (err, RETURN_MASK_ERROR)
+ {
+ if (err.message != NULL)
+ warning ("%s", err.message);
+
+ prev_err = err;
+
+ /* Save message so it doesn't get trashed by the catch below. */
+ prev_err.message = xstrdup (err.message);
+ }
+ END_CATCH
+
+ TRY
+ {
+ if (defer_bp_reset)
+ current_inferior ()->symfile_flags |= SYMFILE_DEFER_BP_RESET;
+ symbol_file_add_main (full_exec_path, from_tty);
+ }
+ CATCH (err, RETURN_MASK_ERROR)
+ {
+ if (!exception_print_same (prev_err, err))
+ warning ("%s", err.message);
+ }
+ END_CATCH
+ current_inferior ()->symfile_flags &= ~SYMFILE_DEFER_BP_RESET;
+
+ do_cleanups (old_chain);
+}
+
+/* Set FILENAME as the new exec file.
This function is intended to be behave essentially the same
as exec_file_command, except that the latter will detect when
given a pid but not a exec pathname, and the attach command could
figure out the pathname from the pid. (In this case, we shouldn't
ask the user whether the current target should be shut down --
- we're supplying the exec pathname late for good reason.)
-
- ARGS is assumed to be the filename. */
+ we're supplying the exec pathname late for good reason.) */
void
-exec_file_attach (char *filename, int from_tty)
+exec_file_attach (const char *filename, int from_tty)
{
+ struct cleanup *cleanups;
+
+ /* First, acquire a reference to the current exec_bfd. We release
+ this at the end of the function; but acquiring it now lets the
+ BFD cache return it if this call refers to the same file. */
+ gdb_bfd_ref (exec_bfd);
+ cleanups = make_cleanup_bfd_unref (exec_bfd);
+
/* Remove any previous exec file. */
- unpush_target (&exec_ops);
+ exec_close ();
/* Now open and digest the file the user requested, if any. */
}
else
{
- char *scratch_pathname;
+ int load_via_target = 0;
+ char *scratch_pathname, *canonical_pathname;
int scratch_chan;
+ struct target_section *sections = NULL, *sections_end = NULL;
+ char **matching;
- scratch_chan = openp (getenv ("PATH"), OPF_TRY_CWD_FIRST, filename,
- write_files ? O_RDWR | O_BINARY : O_RDONLY | O_BINARY, 0,
- &scratch_pathname);
-#if defined(__GO32__) || defined(_WIN32) || defined(__CYGWIN__)
- if (scratch_chan < 0)
+ if (is_target_filename (filename))
{
- char *exename = alloca (strlen (filename) + 5);
- strcat (strcpy (exename, filename), ".exe");
- scratch_chan = openp (getenv ("PATH"), OPF_TRY_CWD_FIRST, exename,
- write_files ? O_RDWR | O_BINARY : O_RDONLY | O_BINARY, 0,
- &scratch_pathname);
+ if (target_filesystem_is_local ())
+ filename += strlen (TARGET_SYSROOT_PREFIX);
+ else
+ load_via_target = 1;
}
-#endif
- if (scratch_chan < 0)
- perror_with_name (filename);
- exec_bfd = bfd_fopen (scratch_pathname, gnutarget,
- write_files ? FOPEN_RUB : FOPEN_RB,
- scratch_chan);
- if (!exec_bfd)
+ if (load_via_target)
{
- close (scratch_chan);
- error (_("\"%s\": could not open as an executable file: %s"),
- scratch_pathname, bfd_errmsg (bfd_get_error ()));
+ /* gdb_bfd_fopen does not support "target:" filenames. */
+ if (write_files)
+ warning (_("writing into executable files is "
+ "not supported for %s sysroots"),
+ TARGET_SYSROOT_PREFIX);
+
+ scratch_pathname = xstrdup (filename);
+ make_cleanup (xfree, scratch_pathname);
+
+ scratch_chan = -1;
+
+ canonical_pathname = scratch_pathname;
+ }
+ else
+ {
+ scratch_chan = openp (getenv ("PATH"), OPF_TRY_CWD_FIRST,
+ filename, write_files ?
+ O_RDWR | O_BINARY : O_RDONLY | O_BINARY,
+ &scratch_pathname);
+#if defined(__GO32__) || defined(_WIN32) || defined(__CYGWIN__)
+ if (scratch_chan < 0)
+ {
+ char *exename = (char *) alloca (strlen (filename) + 5);
+
+ strcat (strcpy (exename, filename), ".exe");
+ scratch_chan = openp (getenv ("PATH"), OPF_TRY_CWD_FIRST,
+ exename, write_files ?
+ O_RDWR | O_BINARY
+ : O_RDONLY | O_BINARY,
+ &scratch_pathname);
+ }
+#endif
+ if (scratch_chan < 0)
+ perror_with_name (filename);
+
+ make_cleanup (xfree, scratch_pathname);
+
+ /* gdb_bfd_open (and its variants) prefers canonicalized
+ pathname for better BFD caching. */
+ canonical_pathname = gdb_realpath (scratch_pathname);
+ make_cleanup (xfree, canonical_pathname);
}
- /* At this point, scratch_pathname and exec_bfd->name both point to the
- same malloc'd string. However exec_close() will attempt to free it
- via the exec_bfd->name pointer, so we need to make another copy and
- leave exec_bfd as the new owner of the original copy. */
- scratch_pathname = xstrdup (scratch_pathname);
- make_cleanup (xfree, scratch_pathname);
+ if (write_files && !load_via_target)
+ exec_bfd = gdb_bfd_fopen (canonical_pathname, gnutarget,
+ FOPEN_RUB, scratch_chan);
+ else
+ exec_bfd = gdb_bfd_open (canonical_pathname, gnutarget, scratch_chan);
- if (!bfd_check_format (exec_bfd, bfd_object))
+ if (!exec_bfd)
{
- /* Make sure to close exec_bfd, or else "run" might try to use
- it. */
- exec_close (0);
- error (_("\"%s\": not in executable format: %s"),
+ error (_("\"%s\": could not open as an executable file: %s."),
scratch_pathname, bfd_errmsg (bfd_get_error ()));
}
- /* FIXME - This should only be run for RS6000, but the ifdef is a poor
- way to accomplish. */
-#ifdef DEPRECATED_IBM6000_TARGET
- /* Setup initial vmap. */
+ /* gdb_realpath_keepfile resolves symlinks on the local
+ filesystem and so cannot be used for "target:" files. */
+ gdb_assert (exec_filename == NULL);
+ if (load_via_target)
+ exec_filename = xstrdup (bfd_get_filename (exec_bfd));
+ else
+ exec_filename = gdb_realpath_keepfile (scratch_pathname);
- map_vmap (exec_bfd, 0);
- if (vmap == NULL)
+ if (!bfd_check_format_matches (exec_bfd, bfd_object, &matching))
{
/* Make sure to close exec_bfd, or else "run" might try to use
it. */
- exec_close (0);
- error (_("\"%s\": can't find the file sections: %s"),
- scratch_pathname, bfd_errmsg (bfd_get_error ()));
+ exec_close ();
+ error (_("\"%s\": not in executable format: %s"),
+ scratch_pathname,
+ gdb_bfd_errmsg (bfd_get_error (), matching));
}
-#endif /* DEPRECATED_IBM6000_TARGET */
- if (build_section_table (exec_bfd, &exec_ops.to_sections,
- &exec_ops.to_sections_end))
+ if (build_section_table (exec_bfd, §ions, §ions_end))
{
/* Make sure to close exec_bfd, or else "run" might try to use
it. */
- exec_close (0);
+ exec_close ();
error (_("\"%s\": can't find the file sections: %s"),
scratch_pathname, bfd_errmsg (bfd_get_error ()));
}
set_gdbarch_from_file (exec_bfd);
- push_target (&exec_ops);
+ /* Add the executable's sections to the current address spaces'
+ list of sections. This possibly pushes the exec_ops
+ target. */
+ add_target_sections (&exec_bfd, sections, sections_end);
+ xfree (sections);
/* Tell display code (if any) about the changed file name. */
if (deprecated_exec_file_display_hook)
(*deprecated_exec_file_display_hook) (filename);
}
+
+ do_cleanups (cleanups);
+
bfd_cache_close_all ();
observer_notify_executable_changed ();
}
be called from file_command(), which also calls symbol_file_command()
which can take multiple args.
- If ARGS is NULL, we just want to close the exec file. */
+ If ARGS is NULL, we just want to close the exec file. */
static void
exec_file_command (char *args, int from_tty)
if (args)
{
+ struct cleanup *cleanups;
+
/* Scan through the args and pick up the first non option arg
as the filename. */
argv = gdb_buildargv (args);
- make_cleanup_freeargv (argv);
+ cleanups = make_cleanup_freeargv (argv);
for (; (*argv != NULL) && (**argv == '-'); argv++)
{;
filename = tilde_expand (*argv);
make_cleanup (xfree, filename);
exec_file_attach (filename, from_tty);
+
+ do_cleanups (cleanups);
}
else
exec_file_attach (NULL, from_tty);
}
-/* Set both the exec file and the symbol file, in one command.
+/* Set both the exec file and the symbol file, in one command.
What a novelty. Why did GDB go through four major releases before this
command was added? */
}
\f
-/* Locate all mappable sections of a BFD file.
+/* Locate all mappable sections of a BFD file.
table_pp_char is a char * to get it through bfd_map_over_sections;
we cast it back to its proper type. */
add_to_section_table (bfd *abfd, struct bfd_section *asect,
void *table_pp_char)
{
- struct section_table **table_pp = (struct section_table **) table_pp_char;
+ struct target_section **table_pp = (struct target_section **) table_pp_char;
flagword aflag;
+ gdb_assert (abfd == asect->owner);
+
/* Check the section flags, but do not discard zero-length sections, since
some symbols may still be attached to this section. For instance, we
encountered on sparc-solaris 2.10 a shared library with an empty .bss
if (!(aflag & SEC_ALLOC))
return;
- (*table_pp)->bfd = abfd;
+ (*table_pp)->owner = NULL;
(*table_pp)->the_bfd_section = asect;
(*table_pp)->addr = bfd_section_vma (abfd, asect);
(*table_pp)->endaddr = (*table_pp)->addr + bfd_section_size (abfd, asect);
(*table_pp)++;
}
+/* See exec.h. */
+
+void
+clear_section_table (struct target_section_table *table)
+{
+ xfree (table->sections);
+ table->sections = table->sections_end = NULL;
+}
+
+/* Resize section table TABLE by ADJUSTMENT.
+ ADJUSTMENT may be negative, in which case the caller must have already
+ removed the sections being deleted.
+ Returns the old size. */
+
+static int
+resize_section_table (struct target_section_table *table, int adjustment)
+{
+ int old_count;
+ int new_count;
+
+ old_count = table->sections_end - table->sections;
+
+ new_count = adjustment + old_count;
+
+ if (new_count)
+ {
+ table->sections = XRESIZEVEC (struct target_section, table->sections,
+ new_count);
+ table->sections_end = table->sections + new_count;
+ }
+ else
+ clear_section_table (table);
+
+ return old_count;
+}
+
/* Builds a section table, given args BFD, SECTABLE_PTR, SECEND_PTR.
Returns 0 if OK, 1 on error. */
int
-build_section_table (struct bfd *some_bfd, struct section_table **start,
- struct section_table **end)
+build_section_table (struct bfd *some_bfd, struct target_section **start,
+ struct target_section **end)
{
unsigned count;
count = bfd_count_sections (some_bfd);
if (*start)
xfree (* start);
- *start = (struct section_table *) xmalloc (count * sizeof (**start));
+ *start = XNEWVEC (struct target_section, count);
*end = *start;
bfd_map_over_sections (some_bfd, add_to_section_table, (char *) end);
if (*end > *start + count)
- internal_error (__FILE__, __LINE__, _("failed internal consistency check"));
+ internal_error (__FILE__, __LINE__,
+ _("failed internal consistency check"));
/* We could realloc the table, but it probably loses for most files. */
return 0;
}
-\f
-static void
-bfdsec_to_vmap (struct bfd *abfd, struct bfd_section *sect, void *arg3)
+
+/* Add the sections array defined by [SECTIONS..SECTIONS_END[ to the
+ current set of target sections. */
+
+void
+add_target_sections (void *owner,
+ struct target_section *sections,
+ struct target_section *sections_end)
{
- struct vmap_and_bfd *vmap_bfd = (struct vmap_and_bfd *) arg3;
- struct vmap *vp;
+ int count;
+ struct target_section_table *table = current_target_sections;
- vp = vmap_bfd->pvmap;
+ count = sections_end - sections;
- if ((bfd_get_section_flags (abfd, sect) & SEC_LOAD) == 0)
+ if (count > 0)
+ {
+ int space = resize_section_table (table, count);
+ int i;
+
+ for (i = 0; i < count; ++i)
+ {
+ table->sections[space + i] = sections[i];
+ table->sections[space + i].owner = owner;
+ }
+
+ /* If these are the first file sections we can provide memory
+ from, push the file_stratum target. */
+ if (!target_is_pushed (&exec_ops))
+ push_target (&exec_ops);
+ }
+}
+
+/* Add the sections of OBJFILE to the current set of target sections. */
+
+void
+add_target_sections_of_objfile (struct objfile *objfile)
+{
+ struct target_section_table *table = current_target_sections;
+ struct obj_section *osect;
+ int space;
+ unsigned count = 0;
+ struct target_section *ts;
+
+ if (objfile == NULL)
return;
- if (strcmp (bfd_section_name (abfd, sect), ".text") == 0)
+ /* Compute the number of sections to add. */
+ ALL_OBJFILE_OSECTIONS (objfile, osect)
{
- vp->tstart = bfd_section_vma (abfd, sect);
- vp->tend = vp->tstart + bfd_section_size (abfd, sect);
- vp->tvma = bfd_section_vma (abfd, sect);
- vp->toffs = sect->filepos;
+ if (bfd_get_section_size (osect->the_bfd_section) == 0)
+ continue;
+ count++;
}
- else if (strcmp (bfd_section_name (abfd, sect), ".data") == 0)
+
+ if (count == 0)
+ return;
+
+ space = resize_section_table (table, count);
+
+ ts = table->sections + space;
+
+ ALL_OBJFILE_OSECTIONS (objfile, osect)
{
- vp->dstart = bfd_section_vma (abfd, sect);
- vp->dend = vp->dstart + bfd_section_size (abfd, sect);
- vp->dvma = bfd_section_vma (abfd, sect);
+ if (bfd_get_section_size (osect->the_bfd_section) == 0)
+ continue;
+
+ gdb_assert (ts < table->sections + space + count);
+
+ ts->addr = obj_section_addr (osect);
+ ts->endaddr = obj_section_endaddr (osect);
+ ts->the_bfd_section = osect->the_bfd_section;
+ ts->owner = (void *) objfile;
+
+ ts++;
}
- /* Silently ignore other types of sections. (FIXME?) */
}
-/* Make a vmap for ABFD which might be a member of the archive ARCH.
- Return the new vmap. */
+/* Remove all target sections owned by OWNER.
+ OWNER must be the same value passed to add_target_sections. */
-struct vmap *
-map_vmap (bfd *abfd, bfd *arch)
+void
+remove_target_sections (void *owner)
{
- struct vmap_and_bfd vmap_bfd;
- struct vmap *vp, **vpp;
+ struct target_section *src, *dest;
+ struct target_section_table *table = current_target_sections;
+
+ gdb_assert (owner != NULL);
+
+ dest = table->sections;
+ for (src = table->sections; src < table->sections_end; src++)
+ if (src->owner != owner)
+ {
+ /* Keep this section. */
+ if (dest < src)
+ *dest = *src;
+ dest++;
+ }
+
+ /* If we've dropped any sections, resize the section table. */
+ if (dest < src)
+ {
+ int old_count;
- vp = (struct vmap *) xmalloc (sizeof (*vp));
- memset ((char *) vp, '\0', sizeof (*vp));
- vp->nxt = 0;
- vp->bfd = abfd;
- vp->name = bfd_get_filename (arch ? arch : abfd);
- vp->member = arch ? bfd_get_filename (abfd) : "";
+ old_count = resize_section_table (table, dest - src);
- vmap_bfd.pbfd = arch;
- vmap_bfd.pvmap = vp;
- bfd_map_over_sections (abfd, bfdsec_to_vmap, &vmap_bfd);
+ /* If we don't have any more sections to read memory from,
+ remove the file_stratum target from the stack. */
+ if (old_count + (dest - src) == 0)
+ {
+ struct program_space *pspace;
- /* Find the end of the list and append. */
- for (vpp = &vmap; *vpp; vpp = &(*vpp)->nxt)
- ;
- *vpp = vp;
+ ALL_PSPACES (pspace)
+ if (pspace->target_sections.sections
+ != pspace->target_sections.sections_end)
+ return;
- return vp;
+ unpush_target (&exec_ops);
+ }
+ }
}
+
\f
-/* Read or write the exec file.
- Args are address within a BFD file, address within gdb address-space,
- length, and a flag indicating whether to read or write.
+enum target_xfer_status
+exec_read_partial_read_only (gdb_byte *readbuf, ULONGEST offset,
+ ULONGEST len, ULONGEST *xfered_len)
+{
+ /* It's unduly pedantic to refuse to look at the executable for
+ read-only pieces; so do the equivalent of readonly regions aka
+ QTro packet. */
+ if (exec_bfd != NULL)
+ {
+ asection *s;
+ bfd_size_type size;
+ bfd_vma vma;
- Result is a length:
+ for (s = exec_bfd->sections; s; s = s->next)
+ {
+ if ((s->flags & SEC_LOAD) == 0
+ || (s->flags & SEC_READONLY) == 0)
+ continue;
- 0: We cannot handle this address and length.
- > 0: We have handled N bytes starting at this address.
- (If N == length, we did it all.) We might be able
- to handle more bytes beyond this length, but no
- promises.
- < 0: We cannot handle this address, but if somebody
- else handles (-N) bytes, we can start from there.
+ vma = s->vma;
+ size = bfd_get_section_size (s);
+ if (vma <= offset && offset < (vma + size))
+ {
+ ULONGEST amt;
- The same routine is used to handle both core and exec files;
- we just tail-call it with more arguments to select between them. */
+ amt = (vma + size) - offset;
+ if (amt > len)
+ amt = len;
-int
-xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len, int write,
- struct mem_attrib *attrib, struct target_ops *target)
+ amt = bfd_get_section_contents (exec_bfd, s,
+ readbuf, offset - vma, amt);
+
+ if (amt == 0)
+ return TARGET_XFER_EOF;
+ else
+ {
+ *xfered_len = amt;
+ return TARGET_XFER_OK;
+ }
+ }
+ }
+ }
+
+ /* Indicate failure to find the requested memory block. */
+ return TARGET_XFER_E_IO;
+}
+
+/* Appends all read-only memory ranges found in the target section
+ table defined by SECTIONS and SECTIONS_END, starting at (and
+ intersected with) MEMADDR for LEN bytes. Returns the augmented
+ VEC. */
+
+static VEC(mem_range_s) *
+section_table_available_memory (VEC(mem_range_s) *memory,
+ CORE_ADDR memaddr, ULONGEST len,
+ struct target_section *sections,
+ struct target_section *sections_end)
{
- int res;
- struct section_table *p;
- CORE_ADDR nextsectaddr, memend;
- struct obj_section *section = NULL;
+ struct target_section *p;
+
+ for (p = sections; p < sections_end; p++)
+ {
+ if ((bfd_get_section_flags (p->the_bfd_section->owner,
+ p->the_bfd_section)
+ & SEC_READONLY) == 0)
+ continue;
- if (len <= 0)
- internal_error (__FILE__, __LINE__, _("failed internal consistency check"));
+ /* Copy the meta-data, adjusted. */
+ if (mem_ranges_overlap (p->addr, p->endaddr - p->addr, memaddr, len))
+ {
+ ULONGEST lo1, hi1, lo2, hi2;
+ struct mem_range *r;
+
+ lo1 = memaddr;
+ hi1 = memaddr + len;
+
+ lo2 = p->addr;
+ hi2 = p->endaddr;
+
+ r = VEC_safe_push (mem_range_s, memory, NULL);
+
+ r->start = std::max (lo1, lo2);
+ r->length = std::min (hi1, hi2) - r->start;
+ }
+ }
- if (overlay_debugging)
+ return memory;
+}
+
+enum target_xfer_status
+section_table_read_available_memory (gdb_byte *readbuf, ULONGEST offset,
+ ULONGEST len, ULONGEST *xfered_len)
+{
+ VEC(mem_range_s) *available_memory = NULL;
+ struct target_section_table *table;
+ struct cleanup *old_chain;
+ mem_range_s *r;
+ int i;
+
+ table = target_get_section_table (&exec_ops);
+ available_memory = section_table_available_memory (available_memory,
+ offset, len,
+ table->sections,
+ table->sections_end);
+
+ old_chain = make_cleanup (VEC_cleanup(mem_range_s),
+ &available_memory);
+
+ normalize_mem_ranges (available_memory);
+
+ for (i = 0;
+ VEC_iterate (mem_range_s, available_memory, i, r);
+ i++)
{
- section = find_pc_overlay (memaddr);
- if (pc_in_unmapped_range (memaddr, section))
- memaddr = overlay_mapped_address (memaddr, section);
+ if (mem_ranges_overlap (r->start, r->length, offset, len))
+ {
+ CORE_ADDR end;
+ enum target_xfer_status status;
+
+ /* Get the intersection window. */
+ end = std::min<CORE_ADDR> (offset + len, r->start + r->length);
+
+ gdb_assert (end - offset <= len);
+
+ if (offset >= r->start)
+ status = exec_read_partial_read_only (readbuf, offset,
+ end - offset,
+ xfered_len);
+ else
+ {
+ *xfered_len = r->start - offset;
+ status = TARGET_XFER_UNAVAILABLE;
+ }
+ do_cleanups (old_chain);
+ return status;
+ }
}
+ do_cleanups (old_chain);
- memend = memaddr + len;
- nextsectaddr = memend;
+ *xfered_len = len;
+ return TARGET_XFER_UNAVAILABLE;
+}
+
+enum target_xfer_status
+section_table_xfer_memory_partial (gdb_byte *readbuf, const gdb_byte *writebuf,
+ ULONGEST offset, ULONGEST len,
+ ULONGEST *xfered_len,
+ struct target_section *sections,
+ struct target_section *sections_end,
+ const char *section_name)
+{
+ int res;
+ struct target_section *p;
+ ULONGEST memaddr = offset;
+ ULONGEST memend = memaddr + len;
- for (p = target->to_sections; p < target->to_sections_end; p++)
+ if (len == 0)
+ internal_error (__FILE__, __LINE__,
+ _("failed internal consistency check"));
+
+ for (p = sections; p < sections_end; p++)
{
- if (overlay_debugging && section
- && strcmp (section->the_bfd_section->name,
- p->the_bfd_section->name) != 0)
- continue; /* not the section we need */
+ struct bfd_section *asect = p->the_bfd_section;
+ bfd *abfd = asect->owner;
+
+ if (section_name && strcmp (section_name, asect->name) != 0)
+ continue; /* not the section we need. */
if (memaddr >= p->addr)
{
if (memend <= p->endaddr)
{
/* Entire transfer is within this section. */
- if (write)
- res = bfd_set_section_contents (p->bfd, p->the_bfd_section,
- myaddr, memaddr - p->addr,
+ if (writebuf)
+ res = bfd_set_section_contents (abfd, asect,
+ writebuf, memaddr - p->addr,
len);
else
- res = bfd_get_section_contents (p->bfd, p->the_bfd_section,
- myaddr, memaddr - p->addr,
+ res = bfd_get_section_contents (abfd, asect,
+ readbuf, memaddr - p->addr,
len);
- return (res != 0) ? len : 0;
+
+ if (res != 0)
+ {
+ *xfered_len = len;
+ return TARGET_XFER_OK;
+ }
+ else
+ return TARGET_XFER_EOF;
}
else if (memaddr >= p->endaddr)
{
{
/* This section overlaps the transfer. Just do half. */
len = p->endaddr - memaddr;
- if (write)
- res = bfd_set_section_contents (p->bfd, p->the_bfd_section,
- myaddr, memaddr - p->addr,
+ if (writebuf)
+ res = bfd_set_section_contents (abfd, asect,
+ writebuf, memaddr - p->addr,
len);
else
- res = bfd_get_section_contents (p->bfd, p->the_bfd_section,
- myaddr, memaddr - p->addr,
+ res = bfd_get_section_contents (abfd, asect,
+ readbuf, memaddr - p->addr,
len);
- return (res != 0) ? len : 0;
+ if (res != 0)
+ {
+ *xfered_len = len;
+ return TARGET_XFER_OK;
+ }
+ else
+ return TARGET_XFER_EOF;
}
}
- else
- nextsectaddr = min (nextsectaddr, p->addr);
}
- if (nextsectaddr >= memend)
- return 0; /* We can't help */
+ return TARGET_XFER_EOF; /* We can't help. */
+}
+
+static struct target_section_table *
+exec_get_section_table (struct target_ops *ops)
+{
+ return current_target_sections;
+}
+
+static enum target_xfer_status
+exec_xfer_partial (struct target_ops *ops, enum target_object object,
+ const char *annex, gdb_byte *readbuf,
+ const gdb_byte *writebuf,
+ ULONGEST offset, ULONGEST len, ULONGEST *xfered_len)
+{
+ struct target_section_table *table = target_get_section_table (ops);
+
+ if (object == TARGET_OBJECT_MEMORY)
+ return section_table_xfer_memory_partial (readbuf, writebuf,
+ offset, len, xfered_len,
+ table->sections,
+ table->sections_end,
+ NULL);
else
- return -(nextsectaddr - memaddr); /* Next boundary where we can help */
+ return TARGET_XFER_E_IO;
}
\f
void
-print_section_info (struct target_ops *t, bfd *abfd)
+print_section_info (struct target_section_table *t, bfd *abfd)
{
- struct section_table *p;
+ struct gdbarch *gdbarch = gdbarch_from_bfd (abfd);
+ struct target_section *p;
/* FIXME: 16 is not wide enough when gdbarch_addr_bit > 64. */
- int wid = gdbarch_addr_bit (gdbarch_from_bfd (abfd)) <= 32 ? 8 : 16;
+ int wid = gdbarch_addr_bit (gdbarch) <= 32 ? 8 : 16;
printf_filtered ("\t`%s', ", bfd_get_filename (abfd));
wrap_here (" ");
printf_filtered (_("file type %s.\n"), bfd_get_target (abfd));
if (abfd == exec_bfd)
- printf_filtered (_("\tEntry point: %s\n"),
- paddress (bfd_get_start_address (abfd)));
- for (p = t->to_sections; p < t->to_sections_end; p++)
{
+ /* gcc-3.4 does not like the initialization in
+ <p == t->sections_end>. */
+ bfd_vma displacement = 0;
+ bfd_vma entry_point;
+
+ for (p = t->sections; p < t->sections_end; p++)
+ {
+ struct bfd_section *psect = p->the_bfd_section;
+ bfd *pbfd = psect->owner;
+
+ if ((bfd_get_section_flags (pbfd, psect) & (SEC_ALLOC | SEC_LOAD))
+ != (SEC_ALLOC | SEC_LOAD))
+ continue;
+
+ if (bfd_get_section_vma (pbfd, psect) <= abfd->start_address
+ && abfd->start_address < (bfd_get_section_vma (pbfd, psect)
+ + bfd_get_section_size (psect)))
+ {
+ displacement = p->addr - bfd_get_section_vma (pbfd, psect);
+ break;
+ }
+ }
+ if (p == t->sections_end)
+ warning (_("Cannot find section for the entry point of %s."),
+ bfd_get_filename (abfd));
+
+ entry_point = gdbarch_addr_bits_remove (gdbarch,
+ bfd_get_start_address (abfd)
+ + displacement);
+ printf_filtered (_("\tEntry point: %s\n"),
+ paddress (gdbarch, entry_point));
+ }
+ for (p = t->sections; p < t->sections_end; p++)
+ {
+ struct bfd_section *psect = p->the_bfd_section;
+ bfd *pbfd = psect->owner;
+
printf_filtered ("\t%s", hex_string_custom (p->addr, wid));
printf_filtered (" - %s", hex_string_custom (p->endaddr, wid));
/* FIXME: i18n: Need to rewrite this sentence. */
if (info_verbose)
printf_filtered (" @ %s",
- hex_string_custom (p->the_bfd_section->filepos, 8));
- printf_filtered (" is %s", bfd_section_name (p->bfd, p->the_bfd_section));
- if (p->bfd != abfd)
- printf_filtered (" in %s", bfd_get_filename (p->bfd));
+ hex_string_custom (psect->filepos, 8));
+ printf_filtered (" is %s", bfd_section_name (pbfd, psect));
+ if (pbfd != abfd)
+ printf_filtered (" in %s", bfd_get_filename (pbfd));
printf_filtered ("\n");
}
}
static void
exec_files_info (struct target_ops *t)
{
- print_section_info (t, exec_bfd);
-
- if (vmap)
- {
- struct vmap *vp;
-
- printf_unfiltered (_("\tMapping info for file `%s'.\n"), vmap->name);
- printf_unfiltered ("\t %*s %*s %*s %*s %8.8s %s\n",
- strlen_paddr (), "tstart",
- strlen_paddr (), "tend",
- strlen_paddr (), "dstart",
- strlen_paddr (), "dend",
- "section",
- "file(member)");
-
- for (vp = vmap; vp; vp = vp->nxt)
- printf_unfiltered ("\t0x%s 0x%s 0x%s 0x%s %s%s%s%s\n",
- paddr (vp->tstart),
- paddr (vp->tend),
- paddr (vp->dstart),
- paddr (vp->dend),
- vp->name,
- *vp->member ? "(" : "", vp->member,
- *vp->member ? ")" : "");
- }
+ if (exec_bfd)
+ print_section_info (current_target_sections, exec_bfd);
+ else
+ puts_filtered (_("\t<no file loaded>\n"));
}
static void
set_section_command (char *args, int from_tty)
{
- struct section_table *p;
+ struct target_section *p;
char *secname;
unsigned seclen;
unsigned long secaddr;
char secprint[100];
long offset;
+ struct target_section_table *table;
if (args == 0)
error (_("Must specify section name and its virtual address"));
- /* Parse out section name */
+ /* Parse out section name. */
for (secname = args; !isspace (*args); args++);
seclen = args - secname;
- /* Parse out new virtual address */
+ /* Parse out new virtual address. */
secaddr = parse_and_eval_address (args);
- for (p = exec_ops.to_sections; p < exec_ops.to_sections_end; p++)
+ table = current_target_sections;
+ for (p = table->sections; p < table->sections_end; p++)
{
- if (!strncmp (secname, bfd_section_name (exec_bfd, p->the_bfd_section), seclen)
- && bfd_section_name (exec_bfd, p->the_bfd_section)[seclen] == '\0')
+ if (!strncmp (secname, bfd_section_name (p->bfd,
+ p->the_bfd_section), seclen)
+ && bfd_section_name (p->bfd, p->the_bfd_section)[seclen] == '\0')
{
offset = secaddr - p->addr;
p->addr += offset;
void
exec_set_section_address (const char *filename, int index, CORE_ADDR address)
{
- struct section_table *p;
+ struct target_section *p;
+ struct target_section_table *table;
- for (p = exec_ops.to_sections; p < exec_ops.to_sections_end; p++)
+ table = current_target_sections;
+ for (p = table->sections; p < table->sections_end; p++)
{
- if (strcmp (filename, p->bfd->filename) == 0
+ if (filename_cmp (filename, p->the_bfd_section->owner->filename) == 0
&& index == p->the_bfd_section->index)
{
p->endaddr += address - p->addr;
breakpoint_init_inferior). */
static int
-ignore (struct bp_target_info *bp_tgt)
+ignore (struct target_ops *ops, struct gdbarch *gdbarch,
+ struct bp_target_info *bp_tgt)
{
return 0;
}
-/* Find mapped memory. */
+/* Implement the to_remove_breakpoint method. */
+
+static int
+exec_remove_breakpoint (struct target_ops *ops, struct gdbarch *gdbarch,
+ struct bp_target_info *bp_tgt,
+ enum remove_bp_reason reason)
+{
+ return 0;
+}
-extern void
-exec_set_find_memory_regions (int (*func) (int (*) (CORE_ADDR,
- unsigned long,
- int, int, int,
- void *),
- void *))
+static int
+exec_has_memory (struct target_ops *ops)
{
- exec_ops.to_find_memory_regions = func;
+ /* We can provide memory if we have any file/target sections to read
+ from. */
+ return (current_target_sections->sections
+ != current_target_sections->sections_end);
}
-static char *exec_make_note_section (bfd *, int *);
+static char *
+exec_make_note_section (struct target_ops *self, bfd *obfd, int *note_size)
+{
+ error (_("Can't create a corefile"));
+}
/* Fill in the exec file target vector. Very few entries need to be
defined. */
exec_ops.to_doc = "Use an executable file as a target.\n\
Specify the filename of the executable file.";
exec_ops.to_open = exec_open;
- exec_ops.to_close = exec_close;
- exec_ops.to_attach = find_default_attach;
- exec_ops.deprecated_xfer_memory = xfer_memory;
+ exec_ops.to_close = exec_close_1;
+ exec_ops.to_xfer_partial = exec_xfer_partial;
+ exec_ops.to_get_section_table = exec_get_section_table;
exec_ops.to_files_info = exec_files_info;
exec_ops.to_insert_breakpoint = ignore;
- exec_ops.to_remove_breakpoint = ignore;
- exec_ops.to_create_inferior = find_default_create_inferior;
+ exec_ops.to_remove_breakpoint = exec_remove_breakpoint;
exec_ops.to_stratum = file_stratum;
- exec_ops.to_has_memory = 1;
+ exec_ops.to_has_memory = exec_has_memory;
exec_ops.to_make_corefile_notes = exec_make_note_section;
+ exec_ops.to_find_memory_regions = objfile_find_memory_regions;
exec_ops.to_magic = OPS_MAGIC;
}
show_write_files,
&setlist, &showlist);
- add_target (&exec_ops);
-}
-
-static char *
-exec_make_note_section (bfd *obfd, int *note_size)
-{
- error (_("Can't create a corefile"));
+ add_target_with_completer (&exec_ops, filename_completer);
}
projects / deliverable / binutils-gdb.git / blobdiff