X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Finf-ptrace.c;h=fc8ab87c5d589970567e64085fd256caffa9813d;hb=410978029e935ae8dd85153f327c53d5b5804ae0;hp=9d711c087184aa4783bc08407bc428ad395bca75;hpb=e2e0b3e57f11bb2539724fc955af7e22380613c1;p=deliverable%2Fbinutils-gdb.git
diff --git a/gdb/inf-ptrace.c b/gdb/inf-ptrace.c
index 9d711c0871..fc8ab87c5d 100644
--- a/gdb/inf-ptrace.c
+++ b/gdb/inf-ptrace.c
@@ -1,14 +1,13 @@
/* Low-level child interface to ptrace.
- Copyright 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996,
- 1998, 1999, 2000, 2001, 2002, 2004, 2005
- Free Software Foundation, Inc.
+ Copyright (C) 1988-1996, 1998-2002, 2004-2012 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,16 +16,14 @@
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 "command.h"
#include "inferior.h"
#include "inflow.h"
+#include "terminal.h"
#include "gdbcore.h"
-#include "observer.h"
#include "regcache.h"
#include "gdb_assert.h"
@@ -35,177 +32,195 @@
#include "gdb_wait.h"
#include
+#include "inf-ptrace.h"
#include "inf-child.h"
+#include "gdbthread.h"
-/* HACK: Save the ptrace ops returned by inf_ptrace_target. */
-static struct target_ops *ptrace_ops_hack;
+
-static void
-inf_ptrace_kill_inferior (void)
+#ifdef PT_GET_PROCESS_STATE
+
+static int
+inf_ptrace_follow_fork (struct target_ops *ops, int follow_child)
{
- int status;
- int pid = PIDGET (inferior_ptid);
+ pid_t pid, fpid;
+ ptrace_state_t pe;
- if (pid == 0)
- return;
+ pid = ptid_get_pid (inferior_ptid);
- /* This once used to call "kill" to kill the inferior just in case
- the inferior was still running. As others have noted in the past
- (kingdon) there shouldn't be any way to get here if the inferior
- is still running -- else there's a major problem elsewere in GDB
- and it needs to be fixed.
-
- The kill call causes problems under HP-UX 10, so it's been
- removed; if this causes problems we'll deal with them as they
- arise. */
- ptrace (PT_KILL, pid, (PTRACE_TYPE_ARG3) 0, 0);
- wait (&status);
- target_mourn_inferior ();
-}
+ if (ptrace (PT_GET_PROCESS_STATE, pid,
+ (PTRACE_TYPE_ARG3)&pe, sizeof pe) == -1)
+ perror_with_name (("ptrace"));
-/* Resume execution of the inferior process. If STEP is nonzero,
- single-step it. If SIGNAL is nonzero, give it that signal. */
+ gdb_assert (pe.pe_report_event == PTRACE_FORK);
+ fpid = pe.pe_other_pid;
-static void
-inf_ptrace_resume (ptid_t ptid, int step, enum target_signal signal)
-{
- int request = PT_CONTINUE;
- int pid = PIDGET (ptid);
+ if (follow_child)
+ {
+ struct inferior *parent_inf, *child_inf;
+ struct thread_info *tp;
- if (pid == -1)
- /* Resume all threads. */
- /* I think this only gets used in the non-threaded case, where
- "resume all threads" and "resume inferior_ptid" are the
- same. */
- pid = PIDGET (inferior_ptid);
+ parent_inf = find_inferior_pid (pid);
- if (step)
+ /* Add the child. */
+ child_inf = add_inferior (fpid);
+ child_inf->attach_flag = parent_inf->attach_flag;
+ copy_terminal_info (child_inf, parent_inf);
+ child_inf->pspace = parent_inf->pspace;
+ child_inf->aspace = parent_inf->aspace;
+
+ /* Before detaching from the parent, remove all breakpoints from
+ it. */
+ remove_breakpoints ();
+
+ if (ptrace (PT_DETACH, pid, (PTRACE_TYPE_ARG3)1, 0) == -1)
+ perror_with_name (("ptrace"));
+
+ /* Switch inferior_ptid out of the parent's way. */
+ inferior_ptid = pid_to_ptid (fpid);
+
+ /* Delete the parent. */
+ detach_inferior (pid);
+
+ add_thread_silent (inferior_ptid);
+ }
+ else
{
- /* If this system does not support PT_STEP, a higher level
- function will have called single_step() to transmute the step
- request into a continue request (by setting breakpoints on
- all possible successor instructions), so we don't have to
- worry about that here. */
- request = PT_STEP;
+ /* Breakpoints have already been detached from the child by
+ infrun.c. */
+
+ if (ptrace (PT_DETACH, fpid, (PTRACE_TYPE_ARG3)1, 0) == -1)
+ perror_with_name (("ptrace"));
}
- /* An address of (PTRACE_TYPE_ARG3)1 tells ptrace to continue from
- where it was. If GDB wanted it to start some other way, we have
- already written a new PC value to the child. */
- errno = 0;
- ptrace (request, pid, (PTRACE_TYPE_ARG3) 1, target_signal_to_host (signal));
- if (errno != 0)
- perror_with_name (("ptrace"));
+ return 0;
}
-/* Wait for child to do something. Return pid of child, or -1 in case
- of error; store status through argument pointer OURSTATUS. */
+#endif /* PT_GET_PROCESS_STATE */
+
+
+/* Prepare to be traced. */
-static ptid_t
-inf_ptrace_wait (ptid_t ptid, struct target_waitstatus *ourstatus)
+static void
+inf_ptrace_me (void)
{
- int save_errno;
- int status;
- char *execd_pathname = NULL;
- int exit_status;
- int related_pid;
- int syscall_id;
- enum target_waitkind kind;
- int pid;
+ /* "Trace me, Dr. Memory!" */
+ ptrace (PT_TRACE_ME, 0, (PTRACE_TYPE_ARG3)0, 0);
+}
- do
- {
- set_sigint_trap (); /* Causes SIGINT to be passed on to the
- attached process. */
- set_sigio_trap ();
+/* Start a new inferior Unix child process. EXEC_FILE is the file to
+ run, ALLARGS is a string containing the arguments to the program.
+ ENV is the environment vector to pass. If FROM_TTY is non-zero, be
+ chatty about it. */
- pid = wait (&status);
+static void
+inf_ptrace_create_inferior (struct target_ops *ops,
+ char *exec_file, char *allargs, char **env,
+ int from_tty)
+{
+ int pid;
- save_errno = errno;
+ /* Do not change either targets above or the same target if already present.
+ The reason is the target stack is shared across multiple inferiors. */
+ int ops_already_pushed = target_is_pushed (ops);
+ struct cleanup *back_to = NULL;
- clear_sigio_trap ();
+ if (! ops_already_pushed)
+ {
+ /* Clear possible core file with its process_stratum. */
+ push_target (ops);
+ back_to = make_cleanup_unpush_target (ops);
+ }
- clear_sigint_trap ();
+ pid = fork_inferior (exec_file, allargs, env, inf_ptrace_me, NULL,
+ NULL, NULL, NULL);
- if (pid == -1)
- {
- if (save_errno == EINTR)
- continue;
+ if (! ops_already_pushed)
+ discard_cleanups (back_to);
- fprintf_unfiltered (gdb_stderr,
- "Child process unexpectedly missing: %s.\n",
- safe_strerror (save_errno));
+ /* START_INFERIOR_TRAPS_EXPECTED is defined in inferior.h, and will
+ be 1 or 2 depending on whether we're starting without or with a
+ shell. */
+ startup_inferior (START_INFERIOR_TRAPS_EXPECTED);
- /* Claim it exited with unknown signal. */
- ourstatus->kind = TARGET_WAITKIND_SIGNALLED;
- ourstatus->value.sig = TARGET_SIGNAL_UNKNOWN;
- return pid_to_ptid (-1);
- }
+ /* On some targets, there must be some explicit actions taken after
+ the inferior has been started up. */
+ target_post_startup_inferior (pid_to_ptid (pid));
+}
- /* Did it exit? */
- if (target_has_exited (pid, status, &exit_status))
- {
- /* ??rehrauer: For now, ignore this. */
- continue;
- }
+#ifdef PT_GET_PROCESS_STATE
- if (!target_thread_alive (pid_to_ptid (pid)))
- {
- ourstatus->kind = TARGET_WAITKIND_SPURIOUS;
- return pid_to_ptid (pid);
- }
- }
- while (pid != PIDGET (inferior_ptid)); /* Some other child died or
- stopped. */
+static void
+inf_ptrace_post_startup_inferior (ptid_t pid)
+{
+ ptrace_event_t pe;
- store_waitstatus (ourstatus, status);
- return pid_to_ptid (pid);
+ /* Set the initial event mask. */
+ memset (&pe, 0, sizeof pe);
+ pe.pe_set_event |= PTRACE_FORK;
+ if (ptrace (PT_SET_EVENT_MASK, ptid_get_pid (pid),
+ (PTRACE_TYPE_ARG3)&pe, sizeof pe) == -1)
+ perror_with_name (("ptrace"));
}
-/* Check to see if the given thread is alive.
+#endif
- FIXME: Is kill() ever the right way to do this? I doubt it, but
- for now we're going to try and be compatable with the old thread
- code. */
+/* Clean up a rotting corpse of an inferior after it died. */
-static int
-inf_ptrace_thread_alive (ptid_t ptid)
+static void
+inf_ptrace_mourn_inferior (struct target_ops *ops)
{
- pid_t pid = PIDGET (ptid);
+ int status;
+
+ /* Wait just one more time to collect the inferior's exit status.
+ Do not check whether this succeeds though, since we may be
+ dealing with a process that we attached to. Such a process will
+ only report its exit status to its original parent. */
+ waitpid (ptid_get_pid (inferior_ptid), &status, 0);
+
+ generic_mourn_inferior ();
- return (kill (pid, 0) != -1);
+ if (!have_inferiors ())
+ unpush_target (ops);
}
-/* Attach to process PID, then initialize for debugging it. */
+/* Attach to the process specified by ARGS. If FROM_TTY is non-zero,
+ be chatty about it. */
static void
-inf_ptrace_attach (char *args, int from_tty)
+inf_ptrace_attach (struct target_ops *ops, char *args, int from_tty)
{
char *exec_file;
- int pid;
- char *dummy;
+ pid_t pid;
+ struct inferior *inf;
- if (!args)
- error_no_arg (_("process-id to attach"));
+ /* Do not change either targets above or the same target if already present.
+ The reason is the target stack is shared across multiple inferiors. */
+ int ops_already_pushed = target_is_pushed (ops);
+ struct cleanup *back_to = NULL;
- dummy = args;
- pid = strtol (args, &dummy, 0);
- /* Some targets don't set errno on errors, grrr! */
- if (pid == 0 && args == dummy)
- error (_("Illegal process-id: %s."), args);
+ pid = parse_pid_to_attach (args);
if (pid == getpid ()) /* Trying to masturbate? */
error (_("I refuse to debug myself!"));
+ if (! ops_already_pushed)
+ {
+ /* target_pid_to_str already uses the target. Also clear possible core
+ file with its process_stratum. */
+ push_target (ops);
+ back_to = make_cleanup_unpush_target (ops);
+ }
+
if (from_tty)
{
- exec_file = (char *) get_exec_file (0);
+ exec_file = get_exec_file (0);
if (exec_file)
- printf_unfiltered ("Attaching to program: %s, %s\n", exec_file,
+ printf_unfiltered (_("Attaching to program: %s, %s\n"), exec_file,
target_pid_to_str (pid_to_ptid (pid)));
else
- printf_unfiltered ("Attaching to %s\n",
+ printf_unfiltered (_("Attaching to %s\n"),
target_pid_to_str (pid_to_ptid (pid)));
gdb_flush (gdb_stdout);
@@ -213,48 +228,58 @@ inf_ptrace_attach (char *args, int from_tty)
#ifdef PT_ATTACH
errno = 0;
- ptrace (PT_ATTACH, pid, (PTRACE_TYPE_ARG3) 0, 0);
+ ptrace (PT_ATTACH, pid, (PTRACE_TYPE_ARG3)0, 0);
if (errno != 0)
perror_with_name (("ptrace"));
- attach_flag = 1;
#else
error (_("This system does not support attaching to a process"));
#endif
+ inf = current_inferior ();
+ inferior_appeared (inf, pid);
+ inf->attach_flag = 1;
inferior_ptid = pid_to_ptid (pid);
- push_target (ptrace_ops_hack);
- /* Do this first, before anything has had a chance to query the
- inferior's symbol table or similar. */
- observer_notify_inferior_created (¤t_target, from_tty);
+ /* Always add a main thread. If some target extends the ptrace
+ target, it should decorate the ptid later with more info. */
+ add_thread_silent (inferior_ptid);
+
+ if (! ops_already_pushed)
+ discard_cleanups (back_to);
}
+#ifdef PT_GET_PROCESS_STATE
+
static void
inf_ptrace_post_attach (int pid)
{
- /* This version of Unix doesn't require a meaningful "post attach"
- operation by a debugger. */
+ ptrace_event_t pe;
+
+ /* Set the initial event mask. */
+ memset (&pe, 0, sizeof pe);
+ pe.pe_set_event |= PTRACE_FORK;
+ if (ptrace (PT_SET_EVENT_MASK, pid,
+ (PTRACE_TYPE_ARG3)&pe, sizeof pe) == -1)
+ perror_with_name (("ptrace"));
}
-/* Take a program previously attached to and detaches it. The program
- resumes execution and will no longer stop on signals, etc. We'd
- better not have left any breakpoints in the program or it'll die
- when it hits one. For this to work, it may be necessary for the
- process to have been previously attached. It *might* work if the
- program was started via the normal ptrace (PTRACE_TRACEME). */
+#endif
+
+/* Detach from the inferior, optionally passing it the signal
+ specified by ARGS. If FROM_TTY is non-zero, be chatty about it. */
static void
-inf_ptrace_detach (char *args, int from_tty)
+inf_ptrace_detach (struct target_ops *ops, char *args, int from_tty)
{
+ pid_t pid = ptid_get_pid (inferior_ptid);
int sig = 0;
- int pid = PIDGET (inferior_ptid);
if (from_tty)
{
char *exec_file = get_exec_file (0);
if (exec_file == 0)
exec_file = "";
- printf_unfiltered ("Detaching from program: %s, %s\n", exec_file,
+ printf_unfiltered (_("Detaching from program: %s, %s\n"), exec_file,
target_pid_to_str (pid_to_ptid (pid)));
gdb_flush (gdb_stdout);
}
@@ -262,147 +287,191 @@ inf_ptrace_detach (char *args, int from_tty)
sig = atoi (args);
#ifdef PT_DETACH
+ /* We'd better not have left any breakpoints in the program or it'll
+ die when it hits one. Also note that this may only work if we
+ previously attached to the inferior. It *might* work if we
+ started the process ourselves. */
errno = 0;
- ptrace (PT_DETACH, pid, (PTRACE_TYPE_ARG3) 1, sig);
+ ptrace (PT_DETACH, pid, (PTRACE_TYPE_ARG3)1, sig);
if (errno != 0)
perror_with_name (("ptrace"));
- attach_flag = 0;
#else
error (_("This system does not support detaching from a process"));
#endif
inferior_ptid = null_ptid;
- unpush_target (ptrace_ops_hack);
+ detach_inferior (pid);
+
+ if (!have_inferiors ())
+ unpush_target (ops);
}
-/* Print status information about what we're accessing. */
+/* Kill the inferior. */
static void
-inf_ptrace_files_info (struct target_ops *ignore)
+inf_ptrace_kill (struct target_ops *ops)
{
- printf_unfiltered ("\tUsing the running image of %s %s.\n",
- attach_flag ? "attached" : "child",
- target_pid_to_str (inferior_ptid));
-}
+ pid_t pid = ptid_get_pid (inferior_ptid);
+ int status;
-static void
-inf_ptrace_open (char *arg, int from_tty)
-{
- error (_("Use the \"run\" command to start a Unix child process."));
+ if (pid == 0)
+ return;
+
+ ptrace (PT_KILL, pid, (PTRACE_TYPE_ARG3)0, 0);
+ waitpid (pid, &status, 0);
+
+ target_mourn_inferior ();
}
-/* Stub function which causes the inferior that runs it, to be ptrace-able
- by its parent process. */
+/* Stop the inferior. */
static void
-inf_ptrace_me (void)
+inf_ptrace_stop (ptid_t ptid)
{
- /* "Trace me, Dr. Memory!" */
- ptrace (0, 0, (PTRACE_TYPE_ARG3) 0, 0);
+ /* Send a SIGINT to the process group. This acts just like the user
+ typed a ^C on the controlling terminal. Note that using a
+ negative process number in kill() is a System V-ism. The proper
+ BSD interface is killpg(). However, all modern BSDs support the
+ System V interface too. */
+ kill (-inferior_process_group (), SIGINT);
}
-/* Stub function which causes the GDB that runs it, to start ptrace-ing
- the child process. */
+/* Resume execution of thread PTID, or all threads if PTID is -1. If
+ STEP is nonzero, single-step it. If SIGNAL is nonzero, give it
+ that signal. */
static void
-inf_ptrace_him (int pid)
+inf_ptrace_resume (struct target_ops *ops,
+ ptid_t ptid, int step, enum target_signal signal)
{
- push_target (ptrace_ops_hack);
+ pid_t pid = ptid_get_pid (ptid);
+ int request;
- /* On some targets, there must be some explicit synchronization
- between the parent and child processes after the debugger
- forks, and before the child execs the debuggee program. This
- call basically gives permission for the child to exec. */
+ if (pid == -1)
+ /* Resume all threads. Traditionally ptrace() only supports
+ single-threaded processes, so simply resume the inferior. */
+ pid = ptid_get_pid (inferior_ptid);
- target_acknowledge_created_inferior (pid);
+ if (catch_syscall_enabled () > 0)
+ request = PT_SYSCALL;
+ else
+ request = PT_CONTINUE;
- /* START_INFERIOR_TRAPS_EXPECTED is defined in inferior.h, and will
- be 1 or 2 depending on whether we're starting without or with a
- shell. */
- startup_inferior (START_INFERIOR_TRAPS_EXPECTED);
+ if (step)
+ {
+ /* If this system does not support PT_STEP, a higher level
+ function will have called single_step() to transmute the step
+ request into a continue request (by setting breakpoints on
+ all possible successor instructions), so we don't have to
+ worry about that here. */
+ request = PT_STEP;
+ }
- /* On some targets, there must be some explicit actions taken after
- the inferior has been started up. */
- target_post_startup_inferior (pid_to_ptid (pid));
+ /* An address of (PTRACE_TYPE_ARG3)1 tells ptrace to continue from
+ where it was. If GDB wanted it to start some other way, we have
+ already written a new program counter value to the child. */
+ errno = 0;
+ ptrace (request, pid, (PTRACE_TYPE_ARG3)1, target_signal_to_host (signal));
+ if (errno != 0)
+ perror_with_name (("ptrace"));
}
-/* Start an inferior Unix child process and sets inferior_ptid to its
- pid. EXEC_FILE is the file to run. ALLARGS is a string containing
- the arguments to the program. ENV is the environment vector to
- pass. Errors reported with error(). */
-
-static void
-inf_ptrace_create_inferior (char *exec_file, char *allargs, char **env,
- int from_tty)
-{
- fork_inferior (exec_file, allargs, env, inf_ptrace_me, inf_ptrace_him,
- NULL, NULL);
- /* We are at the first instruction we care about. */
- observer_notify_inferior_created (¤t_target, from_tty);
- /* Pedal to the metal... */
- proceed ((CORE_ADDR) -1, TARGET_SIGNAL_0, 0);
-}
+/* Wait for the child specified by PTID to do something. Return the
+ process ID of the child, or MINUS_ONE_PTID in case of error; store
+ the status in *OURSTATUS. */
-static int
-inf_ptrace_reported_exec_events_per_exec_call (void)
+static ptid_t
+inf_ptrace_wait (struct target_ops *ops,
+ ptid_t ptid, struct target_waitstatus *ourstatus, int options)
{
- /* Typically, we get a single SIGTRAP per exec. */
- return 1;
-}
+ pid_t pid;
+ int status, save_errno;
-static int
-inf_ptrace_has_exited (int pid, int wait_status, int *exit_status)
-{
- if (WIFEXITED (wait_status))
+ do
{
- *exit_status = WEXITSTATUS (wait_status);
- return 1;
- }
+ set_sigint_trap ();
- if (WIFSIGNALED (wait_status))
- {
- *exit_status = 0; /* ?? Don't know what else to say here. */
- return 1;
- }
+ do
+ {
+ pid = waitpid (ptid_get_pid (ptid), &status, 0);
+ save_errno = errno;
+ }
+ while (pid == -1 && errno == EINTR);
- /* ??? Do we really need to consult the event state, too?
- Assume the wait_state alone suffices. */
- return 0;
-}
+ clear_sigint_trap ();
-static void
-inf_ptrace_mourn_inferior (void)
-{
- unpush_target (ptrace_ops_hack);
- generic_mourn_inferior ();
-}
+ if (pid == -1)
+ {
+ fprintf_unfiltered (gdb_stderr,
+ _("Child process unexpectedly missing: %s.\n"),
+ safe_strerror (save_errno));
-static int
-inf_ptrace_can_run (void)
-{
- return 1;
-}
+ /* Claim it exited with unknown signal. */
+ ourstatus->kind = TARGET_WAITKIND_SIGNALLED;
+ ourstatus->value.sig = TARGET_SIGNAL_UNKNOWN;
+ return inferior_ptid;
+ }
-/* Send a SIGINT to the process group. This acts just like the user
- typed a ^C on the controlling terminal.
+ /* Ignore terminated detached child processes. */
+ if (!WIFSTOPPED (status) && pid != ptid_get_pid (inferior_ptid))
+ pid = -1;
+ }
+ while (pid == -1);
- FIXME: This may not be correct for all systems. Some may want to
- use killpg() instead of kill (-pgrp). */
+#ifdef PT_GET_PROCESS_STATE
+ if (WIFSTOPPED (status))
+ {
+ ptrace_state_t pe;
+ pid_t fpid;
-static void
-inf_ptrace_stop (void)
-{
- kill (-inferior_process_group, SIGINT);
+ if (ptrace (PT_GET_PROCESS_STATE, pid,
+ (PTRACE_TYPE_ARG3)&pe, sizeof pe) == -1)
+ perror_with_name (("ptrace"));
+
+ switch (pe.pe_report_event)
+ {
+ case PTRACE_FORK:
+ ourstatus->kind = TARGET_WAITKIND_FORKED;
+ ourstatus->value.related_pid = pid_to_ptid (pe.pe_other_pid);
+
+ /* Make sure the other end of the fork is stopped too. */
+ fpid = waitpid (pe.pe_other_pid, &status, 0);
+ if (fpid == -1)
+ perror_with_name (("waitpid"));
+
+ if (ptrace (PT_GET_PROCESS_STATE, fpid,
+ (PTRACE_TYPE_ARG3)&pe, sizeof pe) == -1)
+ perror_with_name (("ptrace"));
+
+ gdb_assert (pe.pe_report_event == PTRACE_FORK);
+ gdb_assert (pe.pe_other_pid == pid);
+ if (fpid == ptid_get_pid (inferior_ptid))
+ {
+ ourstatus->value.related_pid = pid_to_ptid (pe.pe_other_pid);
+ return pid_to_ptid (fpid);
+ }
+
+ return pid_to_ptid (pid);
+ }
+ }
+#endif
+
+ store_waitstatus (ourstatus, status);
+ return pid_to_ptid (pid);
}
-/* Perform a partial transfer to/from the specified object. For
- memory transfers, fall back to the old memory xfer functions. */
+/* Attempt a transfer all LEN bytes starting at OFFSET between the
+ inferior's OBJECT:ANNEX space and GDB's READBUF/WRITEBUF buffer.
+ Return the number of bytes actually transferred. */
static LONGEST
inf_ptrace_xfer_partial (struct target_ops *ops, enum target_object object,
- const char *annex, void *readbuf,
- const void *writebuf, ULONGEST offset, LONGEST len)
+ const char *annex, gdb_byte *readbuf,
+ const gdb_byte *writebuf,
+ ULONGEST offset, LONGEST len)
{
+ pid_t pid = ptid_get_pid (inferior_ptid);
+
switch (object)
{
case TARGET_OBJECT_MEMORY:
@@ -412,16 +481,20 @@ inf_ptrace_xfer_partial (struct target_ops *ops, enum target_object object,
and writing data in the traced process's address space. */
{
struct ptrace_io_desc piod;
-
+
/* NOTE: We assume that there are no distinct address spaces
- for instruction and data. */
- piod.piod_op = writebuf ? PIOD_WRITE_D : PIOD_READ_D;
+ for instruction and data. However, on OpenBSD 3.9 and
+ later, PIOD_WRITE_D doesn't allow changing memory that's
+ mapped read-only. Since most code segments will be
+ read-only, using PIOD_WRITE_D will prevent us from
+ inserting breakpoints, so we use PIOD_WRITE_I instead. */
+ piod.piod_op = writebuf ? PIOD_WRITE_I : PIOD_READ_D;
piod.piod_addr = writebuf ? (void *) writebuf : readbuf;
piod.piod_offs = (void *) (long) offset;
piod.piod_len = len;
errno = 0;
- if (ptrace (PT_IO, PIDGET (inferior_ptid), (caddr_t) &piod, 0) == 0)
+ if (ptrace (PT_IO, pid, (caddr_t)&piod, 0) == 0)
/* Return the actual number of bytes read or written. */
return piod.piod_len;
/* If the PT_IO request is somehow not supported, fallback on
@@ -435,15 +508,15 @@ inf_ptrace_xfer_partial (struct target_ops *ops, enum target_object object,
union
{
PTRACE_TYPE_RET word;
- unsigned char byte[sizeof (PTRACE_TYPE_RET)];
+ gdb_byte byte[sizeof (PTRACE_TYPE_RET)];
} buffer;
ULONGEST rounded_offset;
LONGEST partial_len;
-
+
/* Round the start offset down to the next long word
boundary. */
rounded_offset = offset & -(ULONGEST) sizeof (PTRACE_TYPE_RET);
-
+
/* Since ptrace will transfer a single word starting at that
rounded_offset the partial_len needs to be adjusted down to
that (remember this function only does a single transfer).
@@ -452,7 +525,7 @@ inf_ptrace_xfer_partial (struct target_ops *ops, enum target_object object,
partial_len = (rounded_offset + sizeof (PTRACE_TYPE_RET)) - offset;
if (partial_len > len)
partial_len = len;
-
+
if (writebuf)
{
/* If OFFSET:PARTIAL_LEN is smaller than
@@ -462,42 +535,45 @@ inf_ptrace_xfer_partial (struct target_ops *ops, enum target_object object,
|| (offset + partial_len
< rounded_offset + sizeof (PTRACE_TYPE_RET)))
/* Need part of initial word -- fetch it. */
- buffer.word = ptrace (PT_READ_I, PIDGET (inferior_ptid),
- (PTRACE_TYPE_ARG3) (long) rounded_offset,
- 0);
-
+ buffer.word = ptrace (PT_READ_I, pid,
+ (PTRACE_TYPE_ARG3)(uintptr_t)
+ rounded_offset, 0);
+
/* Copy data to be written over corresponding part of
buffer. */
memcpy (buffer.byte + (offset - rounded_offset),
writebuf, partial_len);
-
+
errno = 0;
- ptrace (PT_WRITE_D, PIDGET (inferior_ptid),
- (PTRACE_TYPE_ARG3) (long) rounded_offset,
+ ptrace (PT_WRITE_D, pid,
+ (PTRACE_TYPE_ARG3)(uintptr_t)rounded_offset,
buffer.word);
if (errno)
{
/* Using the appropriate one (I or D) is necessary for
Gould NP1, at least. */
errno = 0;
- ptrace (PT_WRITE_I, PIDGET (inferior_ptid),
- (PTRACE_TYPE_ARG3) (long) rounded_offset,
+ ptrace (PT_WRITE_I, pid,
+ (PTRACE_TYPE_ARG3)(uintptr_t)rounded_offset,
buffer.word);
if (errno)
return 0;
}
}
+
if (readbuf)
{
errno = 0;
- buffer.word = ptrace (PT_READ_I, PIDGET (inferior_ptid),
- (PTRACE_TYPE_ARG3) (long) rounded_offset, 0);
+ buffer.word = ptrace (PT_READ_I, pid,
+ (PTRACE_TYPE_ARG3)(uintptr_t)rounded_offset,
+ 0);
if (errno)
return 0;
/* Copy appropriate bytes out of the buffer. */
memcpy (readbuf, buffer.byte + (offset - rounded_offset),
partial_len);
}
+
return partial_len;
}
@@ -505,6 +581,26 @@ inf_ptrace_xfer_partial (struct target_ops *ops, enum target_object object,
return -1;
case TARGET_OBJECT_AUXV:
+#if defined (PT_IO) && defined (PIOD_READ_AUXV)
+ /* OpenBSD 4.5 has a new PIOD_READ_AUXV operation for the PT_IO
+ request that allows us to read the auxilliary vector. Other
+ BSD's may follow if they feel the need to support PIE. */
+ {
+ struct ptrace_io_desc piod;
+
+ if (writebuf)
+ return -1;
+ piod.piod_op = PIOD_READ_AUXV;
+ piod.piod_addr = readbuf;
+ piod.piod_offs = (void *) (long) offset;
+ piod.piod_len = len;
+
+ errno = 0;
+ if (ptrace (PT_IO, pid, (caddr_t)&piod, 0) == 0)
+ /* Return the actual number of bytes read or written. */
+ return piod.piod_len;
+ }
+#endif
return -1;
case TARGET_OBJECT_WCOOKIE:
@@ -515,12 +611,68 @@ inf_ptrace_xfer_partial (struct target_ops *ops, enum target_object object,
}
}
+/* Return non-zero if the thread specified by PTID is alive. */
+
+static int
+inf_ptrace_thread_alive (struct target_ops *ops, ptid_t ptid)
+{
+ /* ??? Is kill the right way to do this? */
+ return (kill (ptid_get_pid (ptid), 0) != -1);
+}
+
+/* Print status information about what we're accessing. */
+
+static void
+inf_ptrace_files_info (struct target_ops *ignore)
+{
+ struct inferior *inf = current_inferior ();
+
+ printf_filtered (_("\tUsing the running image of %s %s.\n"),
+ inf->attach_flag ? "attached" : "child",
+ target_pid_to_str (inferior_ptid));
+}
+
static char *
-inf_ptrace_pid_to_str (ptid_t ptid)
+inf_ptrace_pid_to_str (struct target_ops *ops, ptid_t ptid)
{
return normal_pid_to_str (ptid);
}
+#if defined (PT_IO) && defined (PIOD_READ_AUXV)
+
+/* Read one auxv entry from *READPTR, not reading locations >= ENDPTR.
+ Return 0 if *READPTR is already at the end of the buffer.
+ Return -1 if there is insufficient buffer for a whole entry.
+ Return 1 if an entry was read into *TYPEP and *VALP. */
+
+static int
+inf_ptrace_auxv_parse (struct target_ops *ops, gdb_byte **readptr,
+ gdb_byte *endptr, CORE_ADDR *typep, CORE_ADDR *valp)
+{
+ struct type *int_type = builtin_type (target_gdbarch)->builtin_int;
+ struct type *ptr_type = builtin_type (target_gdbarch)->builtin_data_ptr;
+ const int sizeof_auxv_type = TYPE_LENGTH (int_type);
+ const int sizeof_auxv_val = TYPE_LENGTH (ptr_type);
+ enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch);
+ gdb_byte *ptr = *readptr;
+
+ if (endptr == ptr)
+ return 0;
+
+ if (endptr - ptr < 2 * sizeof_auxv_val)
+ return -1;
+
+ *typep = extract_unsigned_integer (ptr, sizeof_auxv_type, byte_order);
+ ptr += sizeof_auxv_val; /* Alignment. */
+ *valp = extract_unsigned_integer (ptr, sizeof_auxv_val, byte_order);
+ ptr += sizeof_auxv_val;
+
+ *readptr = ptr;
+ return 1;
+}
+
+#endif
+
/* Create a prototype ptrace target. The client can override it with
local methods. */
@@ -529,122 +681,132 @@ inf_ptrace_target (void)
{
struct target_ops *t = inf_child_target ();
- t->to_open = inf_ptrace_open;
t->to_attach = inf_ptrace_attach;
- t->to_post_attach = inf_ptrace_post_attach;
t->to_detach = inf_ptrace_detach;
t->to_resume = inf_ptrace_resume;
t->to_wait = inf_ptrace_wait;
- t->to_xfer_partial = inf_ptrace_xfer_partial;
t->to_files_info = inf_ptrace_files_info;
- t->to_kill = inf_ptrace_kill_inferior;
+ t->to_kill = inf_ptrace_kill;
t->to_create_inferior = inf_ptrace_create_inferior;
- t->to_reported_exec_events_per_exec_call =
- inf_ptrace_reported_exec_events_per_exec_call;
- t->to_has_exited = inf_ptrace_has_exited;
+#ifdef PT_GET_PROCESS_STATE
+ t->to_follow_fork = inf_ptrace_follow_fork;
+ t->to_post_startup_inferior = inf_ptrace_post_startup_inferior;
+ t->to_post_attach = inf_ptrace_post_attach;
+#endif
t->to_mourn_inferior = inf_ptrace_mourn_inferior;
- t->to_can_run = inf_ptrace_can_run;
t->to_thread_alive = inf_ptrace_thread_alive;
t->to_pid_to_str = inf_ptrace_pid_to_str;
t->to_stop = inf_ptrace_stop;
- t->to_stratum = process_stratum;
- t->to_has_all_memory = 1;
- t->to_has_memory = 1;
- t->to_has_stack = 1;
- t->to_has_registers = 1;
- t->to_has_execution = 1;
- t->to_magic = OPS_MAGIC;
- ptrace_ops_hack = t;
+ t->to_xfer_partial = inf_ptrace_xfer_partial;
+#if defined (PT_IO) && defined (PIOD_READ_AUXV)
+ t->to_auxv_parse = inf_ptrace_auxv_parse;
+#endif
return t;
}
-/* Pointer to a function that returns the oggset within the user area
+/* Pointer to a function that returns the offset within the user area
where a particular register is stored. */
-static CORE_ADDR (*inf_ptrace_register_u_offset)(int);
+static CORE_ADDR (*inf_ptrace_register_u_offset)(struct gdbarch *, int, int);
/* Fetch register REGNUM from the inferior. */
static void
-inf_ptrace_fetch_register (int regnum)
+inf_ptrace_fetch_register (struct regcache *regcache, int regnum)
{
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
CORE_ADDR addr;
size_t size;
PTRACE_TYPE_RET *buf;
int pid, i;
+ /* This isn't really an address, but ptrace thinks of it as one. */
+ addr = inf_ptrace_register_u_offset (gdbarch, regnum, 0);
+ if (addr == (CORE_ADDR)-1
+ || gdbarch_cannot_fetch_register (gdbarch, regnum))
+ {
+ regcache_raw_supply (regcache, regnum, NULL);
+ return;
+ }
+
/* Cater for systems like GNU/Linux, that implement threads as
- seperate processes. */
+ separate processes. */
pid = ptid_get_lwp (inferior_ptid);
if (pid == 0)
pid = ptid_get_pid (inferior_ptid);
- /* This isn't really an address, but ptrace thinks of it as one. */
- addr = inf_ptrace_register_u_offset (regnum);
- size = register_size (current_gdbarch, regnum);
-
+ size = register_size (gdbarch, regnum);
gdb_assert ((size % sizeof (PTRACE_TYPE_RET)) == 0);
buf = alloca (size);
- /* Read the register contents from the inferior a chuck at the time. */
+ /* Read the register contents from the inferior a chunk at a time. */
for (i = 0; i < size / sizeof (PTRACE_TYPE_RET); i++)
{
errno = 0;
- buf[i] = ptrace (PT_READ_U, pid, (PTRACE_TYPE_ARG3) addr, 0);
+ buf[i] = ptrace (PT_READ_U, pid, (PTRACE_TYPE_ARG3)(uintptr_t)addr, 0);
if (errno != 0)
- error (_("Couldn't read register %s (#%d): %s."), REGISTER_NAME (regnum),
+ error (_("Couldn't read register %s (#%d): %s."),
+ gdbarch_register_name (gdbarch, regnum),
regnum, safe_strerror (errno));
addr += sizeof (PTRACE_TYPE_RET);
}
- regcache_raw_supply (current_regcache, regnum, buf);
+ regcache_raw_supply (regcache, regnum, buf);
}
/* Fetch register REGNUM from the inferior. If REGNUM is -1, do this
for all registers. */
static void
-inf_ptrace_fetch_registers (int regnum)
+inf_ptrace_fetch_registers (struct target_ops *ops,
+ struct regcache *regcache, int regnum)
{
if (regnum == -1)
- for (regnum = 0; regnum < NUM_REGS; regnum++)
- inf_ptrace_fetch_register (regnum);
+ for (regnum = 0;
+ regnum < gdbarch_num_regs (get_regcache_arch (regcache));
+ regnum++)
+ inf_ptrace_fetch_register (regcache, regnum);
else
- inf_ptrace_fetch_register (regnum);
+ inf_ptrace_fetch_register (regcache, regnum);
}
/* Store register REGNUM into the inferior. */
static void
-inf_ptrace_store_register (int regnum)
+inf_ptrace_store_register (const struct regcache *regcache, int regnum)
{
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
CORE_ADDR addr;
size_t size;
PTRACE_TYPE_RET *buf;
int pid, i;
+ /* This isn't really an address, but ptrace thinks of it as one. */
+ addr = inf_ptrace_register_u_offset (gdbarch, regnum, 1);
+ if (addr == (CORE_ADDR)-1
+ || gdbarch_cannot_store_register (gdbarch, regnum))
+ return;
+
/* Cater for systems like GNU/Linux, that implement threads as
- seperate processes. */
+ separate processes. */
pid = ptid_get_lwp (inferior_ptid);
if (pid == 0)
pid = ptid_get_pid (inferior_ptid);
- /* This isn't really an address, but ptrace thinks of it as one. */
- addr = inf_ptrace_register_u_offset (regnum);
- size = register_size (current_gdbarch, regnum);
-
+ size = register_size (gdbarch, regnum);
gdb_assert ((size % sizeof (PTRACE_TYPE_RET)) == 0);
buf = alloca (size);
- /* Write the register contents into the inferior a chunk at the time. */
- regcache_raw_collect (current_regcache, regnum, buf);
+ /* Write the register contents into the inferior a chunk at a time. */
+ regcache_raw_collect (regcache, regnum, buf);
for (i = 0; i < size / sizeof (PTRACE_TYPE_RET); i++)
{
errno = 0;
- ptrace (PT_WRITE_U, pid, (PTRACE_TYPE_ARG3) addr, buf[i]);
+ ptrace (PT_WRITE_U, pid, (PTRACE_TYPE_ARG3)(uintptr_t)addr, buf[i]);
if (errno != 0)
- error (_("Couldn't write register %s (#%d): %s."), REGISTER_NAME (regnum),
+ error (_("Couldn't write register %s (#%d): %s."),
+ gdbarch_register_name (gdbarch, regnum),
regnum, safe_strerror (errno));
addr += sizeof (PTRACE_TYPE_RET);
@@ -654,14 +816,17 @@ inf_ptrace_store_register (int regnum)
/* Store register REGNUM back into the inferior. If REGNUM is -1, do
this for all registers. */
-void
-inf_ptrace_store_registers (int regnum)
+static void
+inf_ptrace_store_registers (struct target_ops *ops,
+ struct regcache *regcache, int regnum)
{
if (regnum == -1)
- for (regnum = 0; regnum < NUM_REGS; regnum++)
- inf_ptrace_store_register (regnum);
+ for (regnum = 0;
+ regnum < gdbarch_num_regs (get_regcache_arch (regcache));
+ regnum++)
+ inf_ptrace_store_register (regcache, regnum);
else
- inf_ptrace_store_register (regnum);
+ inf_ptrace_store_register (regcache, regnum);
}
/* Create a "traditional" ptrace target. REGISTER_U_OFFSET should be
@@ -669,7 +834,8 @@ inf_ptrace_store_registers (int regnum)
particular register is stored. */
struct target_ops *
-inf_ptrace_trad_target (CORE_ADDR (*register_u_offset)(int))
+inf_ptrace_trad_target (CORE_ADDR (*register_u_offset)
+ (struct gdbarch *, int, int))
{
struct target_ops *t = inf_ptrace_target();