}
#endif
+#ifdef KERN_PROC_AUXV
+static enum target_xfer_status (*super_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);
+
+/* Implement the "to_xfer_partial target_ops" method. */
+
+static enum target_xfer_status
+fbsd_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)
+{
+ pid_t pid = ptid_get_pid (inferior_ptid);
+
+ switch (object)
+ {
+ case TARGET_OBJECT_AUXV:
+ {
+ struct cleanup *cleanup = make_cleanup (null_cleanup, NULL);
+ unsigned char *buf;
+ size_t buflen;
+ int mib[4];
+
+ if (writebuf != NULL)
+ return TARGET_XFER_E_IO;
+ mib[0] = CTL_KERN;
+ mib[1] = KERN_PROC;
+ mib[2] = KERN_PROC_AUXV;
+ mib[3] = pid;
+ if (offset == 0)
+ {
+ buf = readbuf;
+ buflen = len;
+ }
+ else
+ {
+ buflen = offset + len;
+ buf = XCNEWVEC (unsigned char, buflen);
+ cleanup = make_cleanup (xfree, buf);
+ }
+ if (sysctl (mib, 4, buf, &buflen, NULL, 0) == 0)
+ {
+ if (offset != 0)
+ {
+ if (buflen > offset)
+ {
+ buflen -= offset;
+ memcpy (readbuf, buf + offset, buflen);
+ }
+ else
+ buflen = 0;
+ }
+ do_cleanups (cleanup);
+ *xfered_len = buflen;
+ return (buflen == 0) ? TARGET_XFER_EOF : TARGET_XFER_OK;
+ }
+ do_cleanups (cleanup);
+ return TARGET_XFER_E_IO;
+ }
+ default:
+ return super_xfer_partial (ops, object, annex, readbuf, writebuf, offset,
+ len, xfered_len);
+ }
+}
+#endif
+
#ifdef PT_LWPINFO
static int debug_fbsd_lwp;
+static void (*super_resume) (struct target_ops *,
+ ptid_t,
+ int,
+ enum gdb_signal);
static ptid_t (*super_wait) (struct target_ops *,
ptid_t,
struct target_waitstatus *,
#endif
}
-static void (*super_resume) (struct target_ops *,
- ptid_t,
- int,
- enum gdb_signal);
-
-static int
-resume_one_thread_cb (struct thread_info *tp, void *data)
-{
- ptid_t *ptid = (ptid_t *) data;
- int request;
-
- if (ptid_get_pid (tp->ptid) != ptid_get_pid (*ptid))
- return 0;
-
- if (ptid_get_lwp (tp->ptid) == ptid_get_lwp (*ptid))
- request = PT_RESUME;
- else
- request = PT_SUSPEND;
-
- if (ptrace (request, ptid_get_lwp (tp->ptid), NULL, 0) == -1)
- perror_with_name (("ptrace"));
- return 0;
-}
-
-static int
-resume_all_threads_cb (struct thread_info *tp, void *data)
-{
- ptid_t *filter = (ptid_t *) data;
-
- if (!ptid_match (tp->ptid, *filter))
- return 0;
-
- if (ptrace (PT_RESUME, ptid_get_lwp (tp->ptid), NULL, 0) == -1)
- perror_with_name (("ptrace"));
- return 0;
-}
-
-/* Implement the "to_resume" target_ops method. */
-
-static void
-fbsd_resume (struct target_ops *ops,
- ptid_t ptid, int step, enum gdb_signal signo)
-{
-
- if (debug_fbsd_lwp)
- fprintf_unfiltered (gdb_stdlog,
- "FLWP: fbsd_resume for ptid (%d, %ld, %ld)\n",
- ptid_get_pid (ptid), ptid_get_lwp (ptid),
- ptid_get_tid (ptid));
- if (ptid_lwp_p (ptid))
- {
- /* If ptid is a specific LWP, suspend all other LWPs in the process. */
- iterate_over_threads (resume_one_thread_cb, &ptid);
- }
- else
- {
- /* If ptid is a wildcard, resume all matching threads (they won't run
- until the process is continued however). */
- iterate_over_threads (resume_all_threads_cb, &ptid);
- ptid = inferior_ptid;
- }
- super_resume (ops, ptid, step, signo);
-}
-
#ifdef TDP_RFPPWAIT
/*
To catch fork events, PT_FOLLOW_FORK is set on every traced process
sake. FreeBSD versions newer than 9.1 contain both fixes.
*/
-struct fbsd_fork_child_info
+struct fbsd_fork_info
{
- struct fbsd_fork_child_info *next;
- ptid_t child; /* Pid of new child. */
+ struct fbsd_fork_info *next;
+ ptid_t ptid;
};
-static struct fbsd_fork_child_info *fbsd_pending_children;
+static struct fbsd_fork_info *fbsd_pending_children;
/* Record a new child process event that is reported before the
corresponding fork event in the parent. */
static void
fbsd_remember_child (ptid_t pid)
{
- struct fbsd_fork_child_info *info = XCNEW (struct fbsd_fork_child_info);
+ struct fbsd_fork_info *info = XCNEW (struct fbsd_fork_info);
- info->child = pid;
+ info->ptid = pid;
info->next = fbsd_pending_children;
fbsd_pending_children = info;
}
static ptid_t
fbsd_is_child_pending (pid_t pid)
{
- struct fbsd_fork_child_info *info, *prev;
+ struct fbsd_fork_info *info, *prev;
ptid_t ptid;
prev = NULL;
for (info = fbsd_pending_children; info; prev = info, info = info->next)
{
- if (ptid_get_pid (info->child) == pid)
+ if (ptid_get_pid (info->ptid) == pid)
{
if (prev == NULL)
fbsd_pending_children = info->next;
else
prev->next = info->next;
- ptid = info->child;
+ ptid = info->ptid;
xfree (info);
return ptid;
}
}
return null_ptid;
}
+
+static struct fbsd_fork_info *fbsd_pending_vfork_done;
+
+/* Record a pending vfork done event. */
+
+static void
+fbsd_add_vfork_done (ptid_t pid)
+{
+ struct fbsd_fork_info *info = XCNEW (struct fbsd_fork_info);
+
+ info->ptid = pid;
+ info->next = fbsd_pending_vfork_done;
+ fbsd_pending_vfork_done = info;
+}
+
+/* Check for a pending vfork done event for a specific PID. */
+
+static int
+fbsd_is_vfork_done_pending (pid_t pid)
+{
+ struct fbsd_fork_info *info;
+
+ for (info = fbsd_pending_vfork_done; info != NULL; info = info->next)
+ {
+ if (ptid_get_pid (info->ptid) == pid)
+ return 1;
+ }
+ return 0;
+}
+
+/* Check for a pending vfork done event. If one is found, remove it
+ from the list and return the PTID. */
+
+static ptid_t
+fbsd_next_vfork_done (void)
+{
+ struct fbsd_fork_info *info;
+ ptid_t ptid;
+
+ if (fbsd_pending_vfork_done != NULL)
+ {
+ info = fbsd_pending_vfork_done;
+ fbsd_pending_vfork_done = info->next;
+ ptid = info->ptid;
+ xfree (info);
+ return ptid;
+ }
+ return null_ptid;
+}
+#endif
+
+static int
+resume_one_thread_cb (struct thread_info *tp, void *data)
+{
+ ptid_t *ptid = (ptid_t *) data;
+ int request;
+
+ if (ptid_get_pid (tp->ptid) != ptid_get_pid (*ptid))
+ return 0;
+
+ if (ptid_get_lwp (tp->ptid) == ptid_get_lwp (*ptid))
+ request = PT_RESUME;
+ else
+ request = PT_SUSPEND;
+
+ if (ptrace (request, ptid_get_lwp (tp->ptid), NULL, 0) == -1)
+ perror_with_name (("ptrace"));
+ return 0;
+}
+
+static int
+resume_all_threads_cb (struct thread_info *tp, void *data)
+{
+ ptid_t *filter = (ptid_t *) data;
+
+ if (!ptid_match (tp->ptid, *filter))
+ return 0;
+
+ if (ptrace (PT_RESUME, ptid_get_lwp (tp->ptid), NULL, 0) == -1)
+ perror_with_name (("ptrace"));
+ return 0;
+}
+
+/* Implement the "to_resume" target_ops method. */
+
+static void
+fbsd_resume (struct target_ops *ops,
+ ptid_t ptid, int step, enum gdb_signal signo)
+{
+#ifdef TDP_RFPPWAIT
+ pid_t pid;
+
+ /* Don't PT_CONTINUE a process which has a pending vfork done event. */
+ if (ptid_equal (minus_one_ptid, ptid))
+ pid = ptid_get_pid (inferior_ptid);
+ else
+ pid = ptid_get_pid (ptid);
+ if (fbsd_is_vfork_done_pending (pid))
+ return;
#endif
+ if (debug_fbsd_lwp)
+ fprintf_unfiltered (gdb_stdlog,
+ "FLWP: fbsd_resume for ptid (%d, %ld, %ld)\n",
+ ptid_get_pid (ptid), ptid_get_lwp (ptid),
+ ptid_get_tid (ptid));
+ if (ptid_lwp_p (ptid))
+ {
+ /* If ptid is a specific LWP, suspend all other LWPs in the process. */
+ iterate_over_threads (resume_one_thread_cb, &ptid);
+ }
+ else
+ {
+ /* If ptid is a wildcard, resume all matching threads (they won't run
+ until the process is continued however). */
+ iterate_over_threads (resume_all_threads_cb, &ptid);
+ ptid = inferior_ptid;
+ }
+ super_resume (ops, ptid, step, signo);
+}
+
/* 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. */
while (1)
{
+ wptid = fbsd_next_vfork_done ();
+ if (!ptid_equal (wptid, null_ptid))
+ {
+ ourstatus->kind = TARGET_WAITKIND_VFORK_DONE;
+ return wptid;
+ }
wptid = super_wait (ops, ptid, ourstatus, target_options);
if (ourstatus->kind == TARGET_WAITKIND_STOPPED)
{
return wptid;
}
#endif
+
+ /* Note that PL_FLAG_SCE is set for any event reported while
+ a thread is executing a system call in the kernel. In
+ particular, signals that interrupt a sleep in a system
+ call will report this flag as part of their event. Stops
+ explicitly for system call entry and exit always use
+ SIGTRAP, so only treat SIGTRAP events as system call
+ entry/exit events. */
+ if (pl.pl_flags & (PL_FLAG_SCE | PL_FLAG_SCX)
+ && ourstatus->value.sig == SIGTRAP)
+ {
+#ifdef HAVE_STRUCT_PTRACE_LWPINFO_PL_SYSCALL_CODE
+ if (catch_syscall_enabled ())
+ {
+ if (catching_syscall_number (pl.pl_syscall_code))
+ {
+ if (pl.pl_flags & PL_FLAG_SCE)
+ ourstatus->kind = TARGET_WAITKIND_SYSCALL_ENTRY;
+ else
+ ourstatus->kind = TARGET_WAITKIND_SYSCALL_RETURN;
+ ourstatus->value.syscall_number = pl.pl_syscall_code;
+ return wptid;
+ }
+ }
+#endif
+ /* If the core isn't interested in this event, just
+ continue the process explicitly and wait for another
+ event. Note that PT_SYSCALL is "sticky" on FreeBSD
+ and once system call stops are enabled on a process
+ it stops for all system call entries and exits. */
+ if (ptrace (PT_CONTINUE, pid, (caddr_t) 1, 0) == -1)
+ perror_with_name (("ptrace"));
+ continue;
+ }
}
return wptid;
}
fbsd_follow_fork (struct target_ops *ops, int follow_child,
int detach_fork)
{
- if (!follow_child)
+ if (!follow_child && detach_fork)
{
struct thread_info *tp = inferior_thread ();
+ int has_vforked = tp->pending_follow.kind == TARGET_WAITKIND_VFORKED;
pid_t child_pid = ptid_get_pid (tp->pending_follow.value.related_pid);
/* Breakpoints have already been detached from the child by
if (ptrace (PT_DETACH, child_pid, (PTRACE_TYPE_ARG3)1, 0) == -1)
perror_with_name (("ptrace"));
+
+ if (has_vforked)
+ {
+ /* We can't insert breakpoints until the child process has
+ finished with the shared memory region. The parent
+ process doesn't wait for the child process to exit or
+ exec until after it has been resumed from the ptrace stop
+ to report the fork. Once it has been resumed it doesn't
+ stop again before returning to userland, so there is no
+ reliable way to wait on the parent.
+
+ We can't stay attached to the child to wait for an exec
+ or exit because it may invoke ptrace(PT_TRACE_ME)
+ (e.g. if the parent process is a debugger forking a new
+ child process).
+
+ In the end, the best we can do is to make sure it runs
+ for a little while. Hopefully it will be out of range of
+ any breakpoints we reinsert. Usually this is only the
+ single-step breakpoint at vfork's return point. */
+
+ usleep (10000);
+
+ /* Schedule a fake VFORK_DONE event to report on the next
+ wait. */
+ fbsd_add_vfork_done (inferior_ptid);
+ }
}
return 0;
return 0;
}
#endif
+
+#ifdef HAVE_STRUCT_PTRACE_LWPINFO_PL_SYSCALL_CODE
+static int
+fbsd_set_syscall_catchpoint (struct target_ops *self, int pid, int needed,
+ int any_count, int table_size, int *table)
+{
+
+ /* Ignore the arguments. inf-ptrace.c will use PT_SYSCALL which
+ will catch all system call entries and exits. The system calls
+ are filtered by GDB rather than the kernel. */
+ return 0;
+}
+#endif
#endif
void
{
t->to_pid_to_exec_file = fbsd_pid_to_exec_file;
t->to_find_memory_regions = fbsd_find_memory_regions;
+#ifdef KERN_PROC_AUXV
+ super_xfer_partial = t->to_xfer_partial;
+ t->to_xfer_partial = fbsd_xfer_partial;
+#endif
#ifdef PT_LWPINFO
t->to_thread_alive = fbsd_thread_alive;
t->to_pid_to_str = fbsd_pid_to_str;
t->to_insert_exec_catchpoint = fbsd_insert_exec_catchpoint;
t->to_remove_exec_catchpoint = fbsd_remove_exec_catchpoint;
#endif
+#ifdef HAVE_STRUCT_PTRACE_LWPINFO_PL_SYSCALL_CODE
+ t->to_set_syscall_catchpoint = fbsd_set_syscall_catchpoint;
+#endif
#endif
add_target (t);
}
projects / deliverable / binutils-gdb.git / blobdiff