X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fdarwin-nat.c;h=be80163d22e13ad2be4ee5731ee370ee9cdc7547;hb=7a6dbc2fdb2323c35e981f93236f323e9d7c0b24;hp=082a056ec11cb63545696e29d99771ee544f2d03;hpb=618f726fcb851883a0094aa7fa17003889b7189f;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/darwin-nat.c b/gdb/darwin-nat.c index 082a056ec1..be80163d22 100644 --- a/gdb/darwin-nat.c +++ b/gdb/darwin-nat.c @@ -1,5 +1,5 @@ /* Darwin support for GDB, the GNU debugger. - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2018 Free Software Foundation, Inc. Contributed by AdaCore. @@ -25,7 +25,6 @@ #include "symfile.h" #include "symtab.h" #include "objfiles.h" -#include "gdb.h" #include "gdbcmd.h" #include "gdbcore.h" #include "gdbthread.h" @@ -63,6 +62,7 @@ #include "darwin-nat.h" #include "common/filestuff.h" +#include "nat/fork-inferior.h" /* Quick overview. Darwin kernel is Mach + BSD derived kernel. Note that they share the @@ -83,39 +83,19 @@ #define PTRACE(CMD, PID, ADDR, SIG) \ darwin_ptrace(#CMD, CMD, (PID), (ADDR), (SIG)) -static void darwin_interrupt (struct target_ops *self, ptid_t); - -static void darwin_resume_to (struct target_ops *ops, ptid_t ptid, int step, - enum gdb_signal signal); -static void darwin_resume (ptid_t ptid, int step, - enum gdb_signal signal); - -static ptid_t darwin_wait_to (struct target_ops *ops, ptid_t ptid, - struct target_waitstatus *status, int options); static ptid_t darwin_wait (ptid_t ptid, struct target_waitstatus *status); -static void darwin_mourn_inferior (struct target_ops *ops); - -static void darwin_kill_inferior (struct target_ops *ops); - static void darwin_ptrace_me (void); static void darwin_ptrace_him (int pid); -static void darwin_create_inferior (struct target_ops *ops, char *exec_file, - char *allargs, char **env, int from_tty); - -static void darwin_files_info (struct target_ops *ops); - -static char *darwin_pid_to_str (struct target_ops *ops, ptid_t tpid); - -static int darwin_thread_alive (struct target_ops *ops, ptid_t tpid); - static void darwin_encode_reply (mig_reply_error_t *reply, mach_msg_header_t *hdr, integer_t code); -/* Target operations for Darwin. */ -static struct target_ops *darwin_ops; +static void darwin_setup_request_notification (struct inferior *inf); +static void darwin_deallocate_exception_ports (darwin_inferior *inf); +static void darwin_setup_exceptions (struct inferior *inf); +static void darwin_deallocate_threads (struct inferior *inf); /* Task identifier of gdb. */ static task_t gdb_task; @@ -272,13 +252,15 @@ static void darwin_check_new_threads (struct inferior *inf) { kern_return_t kret; - unsigned int i; thread_array_t thread_list; unsigned int new_nbr; unsigned int old_nbr; unsigned int new_ix, old_ix; - darwin_inferior *darwin_inf = inf->priv; - VEC (darwin_thread_t) *thread_vec; + darwin_inferior *darwin_inf = get_darwin_inferior (inf); + std::vector new_thread_vec; + + if (darwin_inf == nullptr) + return; /* Get list of threads. */ kret = task_threads (darwin_inf->task, &thread_list, &new_nbr); @@ -290,17 +272,15 @@ darwin_check_new_threads (struct inferior *inf) if (new_nbr > 1) qsort (thread_list, new_nbr, sizeof (thread_t), cmp_thread_t); - if (darwin_inf->threads) - old_nbr = VEC_length (darwin_thread_t, darwin_inf->threads); - else - old_nbr = 0; + old_nbr = darwin_inf->threads.size (); /* Quick check for no changes. */ if (old_nbr == new_nbr) { + size_t i; + for (i = 0; i < new_nbr; i++) - if (thread_list[i] - != VEC_index (darwin_thread_t, darwin_inf->threads, i)->gdb_port) + if (thread_list[i] != darwin_inf->threads[i]->gdb_port) break; if (i == new_nbr) { @@ -320,15 +300,16 @@ darwin_check_new_threads (struct inferior *inf) } } - thread_vec = VEC_alloc (darwin_thread_t, new_nbr); + /* Full handling: detect new threads, remove dead threads. */ + + new_thread_vec.reserve (new_nbr); for (new_ix = 0, old_ix = 0; new_ix < new_nbr || old_ix < old_nbr;) { - thread_t new_id = (new_ix < new_nbr) ? - thread_list[new_ix] : THREAD_NULL; - darwin_thread_t *old = (old_ix < old_nbr) ? - VEC_index (darwin_thread_t, darwin_inf->threads, old_ix) : NULL; - thread_t old_id = old ? old->gdb_port : THREAD_NULL; + thread_t new_id = (new_ix < new_nbr) ? thread_list[new_ix] : THREAD_NULL; + darwin_thread_t *old + = (old_ix < old_nbr) ? darwin_inf->threads[old_ix] : NULL; + thread_t old_id = old != NULL ? old->gdb_port : THREAD_NULL; inferior_debug (12, _(" new_ix:%d/%d, old_ix:%d/%d, new_id:0x%x old_id:0x%x\n"), @@ -337,7 +318,7 @@ darwin_check_new_threads (struct inferior *inf) if (old_id == new_id) { /* Thread still exist. */ - VEC_safe_push (darwin_thread_t, thread_vec, old); + new_thread_vec.push_back (old); new_ix++; old_ix++; @@ -358,30 +339,23 @@ darwin_check_new_threads (struct inferior *inf) if (new_ix < new_nbr && (old_ix == old_nbr || new_id < old_id)) { /* A thread was created. */ - struct thread_info *tp; - struct private_thread_info *pti; + darwin_thread_info *pti = new darwin_thread_info; - pti = XCNEW (struct private_thread_info); pti->gdb_port = new_id; pti->msg_state = DARWIN_RUNNING; - /* Add a new thread unless this is the first one ever met. */ - if (!(old_nbr == 0 && new_ix == 0)) - tp = add_thread_with_info (ptid_build (inf->pid, 0, new_id), pti); - else - { - tp = find_thread_ptid (ptid_build (inf->pid, 0, 0)); - gdb_assert (tp); - tp->priv = pti; - } - VEC_safe_push (darwin_thread_t, thread_vec, pti); + /* Add the new thread. */ + add_thread_with_info (ptid_t (inf->pid, 0, new_id), pti); + new_thread_vec.push_back (pti); new_ix++; continue; } if (old_ix < old_nbr && (new_ix == new_nbr || new_id > old_id)) { /* A thread was removed. */ - delete_thread (ptid_build (inf->pid, 0, old_id)); + struct thread_info *thr + = find_thread_ptid (ptid_t (inf->pid, 0, old_id)); + delete_thread (thr); kret = mach_port_deallocate (gdb_task, old_id); MACH_CHECK_ERROR (kret); old_ix++; @@ -390,9 +364,7 @@ darwin_check_new_threads (struct inferior *inf) gdb_assert_not_reached ("unexpected thread case"); } - if (darwin_inf->threads) - VEC_free (darwin_thread_t, darwin_inf->threads); - darwin_inf->threads = thread_vec; + darwin_inf->threads = std::move (new_thread_vec); /* Deallocate the buffer. */ kret = vm_deallocate (gdb_task, (vm_address_t) thread_list, @@ -403,13 +375,15 @@ darwin_check_new_threads (struct inferior *inf) static int find_inferior_task_it (struct inferior *inf, void *port_ptr) { - return inf->priv->task == *(task_t*)port_ptr; + darwin_inferior *priv = get_darwin_inferior (inf); + + return priv != nullptr && priv->task == *(task_t *)port_ptr; } static int -find_inferior_notify_it (struct inferior *inf, void *port_ptr) +find_inferior_pid_it (struct inferior *inf, void *pid_ptr) { - return inf->priv->notify_port == *(task_t*)port_ptr; + return inf->pid == *(int *)pid_ptr; } /* Return an inferior by task port. */ @@ -419,25 +393,26 @@ darwin_find_inferior_by_task (task_t port) return iterate_over_inferiors (&find_inferior_task_it, &port); } -/* Return an inferior by notification port. */ +/* Return an inferior by pid port. */ static struct inferior * -darwin_find_inferior_by_notify (mach_port_t port) +darwin_find_inferior_by_pid (int pid) { - return iterate_over_inferiors (&find_inferior_notify_it, &port); + return iterate_over_inferiors (&find_inferior_pid_it, &pid); } /* Return a thread by port. */ static darwin_thread_t * darwin_find_thread (struct inferior *inf, thread_t thread) { - darwin_thread_t *t; - int k; + darwin_inferior *priv = get_darwin_inferior (inf); + + if (priv != nullptr) + for (darwin_thread_t *t : priv->threads) + { + if (t->gdb_port == thread) + return t; + } - for (k = 0; - VEC_iterate (darwin_thread_t, inf->priv->threads, k, t); - k++) - if (t->gdb_port == thread) - return t; return NULL; } @@ -446,14 +421,16 @@ darwin_find_thread (struct inferior *inf, thread_t thread) static void darwin_suspend_inferior (struct inferior *inf) { - if (!inf->priv->suspended) + darwin_inferior *priv = get_darwin_inferior (inf); + + if (priv != nullptr && !priv->suspended) { kern_return_t kret; - kret = task_suspend (inf->priv->task); + kret = task_suspend (priv->task); MACH_CHECK_ERROR (kret); - inf->priv->suspended = 1; + priv->suspended = 1; } } @@ -462,14 +439,16 @@ darwin_suspend_inferior (struct inferior *inf) static void darwin_resume_inferior (struct inferior *inf) { - if (inf->priv->suspended) + darwin_inferior *priv = get_darwin_inferior (inf); + + if (priv != nullptr && priv->suspended) { kern_return_t kret; - kret = task_resume (inf->priv->task); + kret = task_resume (priv->task); MACH_CHECK_ERROR (kret); - inf->priv->suspended = 0; + priv->suspended = 0; } } @@ -557,6 +536,71 @@ darwin_dump_message (mach_msg_header_t *hdr, int disp_body) } } +/* Adjust inferior data when a new task was created. */ + +static struct inferior * +darwin_find_new_inferior (task_t task_port, thread_t thread_port) +{ + int task_pid; + struct inferior *inf; + kern_return_t kret; + mach_port_t prev; + + /* Find the corresponding pid. */ + kret = pid_for_task (task_port, &task_pid); + if (kret != KERN_SUCCESS) + { + MACH_CHECK_ERROR (kret); + return NULL; + } + + /* Find the inferior for this pid. */ + inf = darwin_find_inferior_by_pid (task_pid); + if (inf == NULL) + return NULL; + + darwin_inferior *priv = get_darwin_inferior (inf); + + /* Deallocate saved exception ports. */ + darwin_deallocate_exception_ports (priv); + + /* No need to remove dead_name notification, but still... */ + kret = mach_port_request_notification (gdb_task, priv->task, + MACH_NOTIFY_DEAD_NAME, 0, + MACH_PORT_NULL, + MACH_MSG_TYPE_MAKE_SEND_ONCE, + &prev); + if (kret != KERN_INVALID_ARGUMENT) + MACH_CHECK_ERROR (kret); + + /* Replace old task port. */ + kret = mach_port_deallocate (gdb_task, priv->task); + MACH_CHECK_ERROR (kret); + priv->task = task_port; + + darwin_setup_request_notification (inf); + darwin_setup_exceptions (inf); + + return inf; +} + +/* Check data representation. */ + +static int +darwin_check_message_ndr (NDR_record_t *ndr) +{ + if (ndr->mig_vers != NDR_PROTOCOL_2_0 + || ndr->if_vers != NDR_PROTOCOL_2_0 + || ndr->mig_encoding != NDR_record.mig_encoding + || ndr->int_rep != NDR_record.int_rep + || ndr->char_rep != NDR_record.char_rep + || ndr->float_rep != NDR_record.float_rep) + return -1; + return 0; +} + +/* Decode an exception message. */ + static int darwin_decode_exception_message (mach_msg_header_t *hdr, struct inferior **pinf, @@ -593,12 +637,7 @@ darwin_decode_exception_message (mach_msg_header_t *hdr, /* Check data representation. */ ndr = (NDR_record_t *)(desc + 2); - if (ndr->mig_vers != NDR_PROTOCOL_2_0 - || ndr->if_vers != NDR_PROTOCOL_2_0 - || ndr->mig_encoding != NDR_record.mig_encoding - || ndr->int_rep != NDR_record.int_rep - || ndr->char_rep != NDR_record.char_rep - || ndr->float_rep != NDR_record.float_rep) + if (darwin_check_message_ndr (ndr) != 0) return -1; /* Ok, the hard work. */ @@ -607,14 +646,33 @@ darwin_decode_exception_message (mach_msg_header_t *hdr, task_port = desc[1].name; thread_port = desc[0].name; - /* We got new rights to the task, get rid of it. Do not get rid of thread - right, as we will need it to find the thread. */ - kret = mach_port_deallocate (mach_task_self (), task_port); - MACH_CHECK_ERROR (kret); - /* Find process by port. */ inf = darwin_find_inferior_by_task (task_port); *pinf = inf; + + if (inf == NULL && data[0] == EXC_SOFTWARE && data[1] == 2 + && data[2] == EXC_SOFT_SIGNAL && data[3] == SIGTRAP) + { + /* Not a known inferior, but a sigtrap. This happens on darwin 16.1.0, + as a new Mach task is created when a process exec. */ + inf = darwin_find_new_inferior (task_port, thread_port); + *pinf = inf; + + if (inf == NULL) + { + /* Deallocate task_port, unless it was saved. */ + kret = mach_port_deallocate (mach_task_self (), task_port); + MACH_CHECK_ERROR (kret); + } + } + else + { + /* We got new rights to the task, get rid of it. Do not get rid of + thread right, as we will need it to find the thread. */ + kret = mach_port_deallocate (mach_task_self (), task_port); + MACH_CHECK_ERROR (kret); + } + if (inf == NULL) { /* Not a known inferior. This could happen if the child fork, as @@ -623,6 +681,10 @@ darwin_decode_exception_message (mach_msg_header_t *hdr, kern_return_t kret; mig_reply_error_t reply; + inferior_debug + (4, _("darwin_decode_exception_message: unknown task 0x%x\n"), + task_port); + /* Free thread port (we don't know it). */ kret = mach_port_deallocate (mach_task_self (), thread_port); MACH_CHECK_ERROR (kret); @@ -676,6 +738,49 @@ darwin_decode_exception_message (mach_msg_header_t *hdr, return 0; } +/* Decode dead_name notify message. */ + +static int +darwin_decode_notify_message (mach_msg_header_t *hdr, struct inferior **pinf) +{ + NDR_record_t *ndr = (NDR_record_t *)(hdr + 1); + integer_t *data = (integer_t *)(ndr + 1); + struct inferior *inf; + darwin_thread_t *thread; + task_t task_port; + thread_t thread_port; + kern_return_t kret; + int i; + + /* Check message header. */ + if (hdr->msgh_bits & MACH_MSGH_BITS_COMPLEX) + return -1; + + /* Check descriptors. */ + if (hdr->msgh_size < (sizeof (*hdr) + sizeof (*ndr) + sizeof (integer_t))) + return -2; + + /* Check data representation. */ + if (darwin_check_message_ndr (ndr) != 0) + return -3; + + task_port = data[0]; + + /* Find process by port. */ + inf = darwin_find_inferior_by_task (task_port); + *pinf = inf; + + /* Check message destination. */ + if (inf != NULL) + { + darwin_inferior *priv = get_darwin_inferior (inf); + if (hdr->msgh_local_port != priv->notify_port) + return -4; + } + + return 0; +} + static void darwin_encode_reply (mig_reply_error_t *reply, mach_msg_header_t *hdr, integer_t code) @@ -697,6 +802,7 @@ darwin_send_reply (struct inferior *inf, darwin_thread_t *thread) { kern_return_t kret; mig_reply_error_t reply; + darwin_inferior *priv = get_darwin_inferior (inf); darwin_encode_reply (&reply, &thread->event.header, KERN_SUCCESS); @@ -706,16 +812,27 @@ darwin_send_reply (struct inferior *inf, darwin_thread_t *thread) MACH_PORT_NULL); MACH_CHECK_ERROR (kret); - inf->priv->pending_messages--; + priv->pending_messages--; +} + +/* Wrapper around the __pthread_kill syscall. We use this instead of the + pthread_kill function to be able to send a signal to any kind of thread, + including GCD threads. */ + +static int +darwin_pthread_kill (darwin_thread_t *thread, int nsignal) +{ + DIAGNOSTIC_PUSH; + DIAGNOSTIC_IGNORE_DEPRECATED_DECLARATIONS; + int res = syscall (SYS___pthread_kill, thread->gdb_port, nsignal); + DIAGNOSTIC_POP; + return res; } static void darwin_resume_thread (struct inferior *inf, darwin_thread_t *thread, int step, int nsignal) { - kern_return_t kret; - int res; - inferior_debug (3, _("darwin_resume_thread: state=%d, thread=0x%x, step=%d nsignal=%d\n"), thread->msg_state, thread->gdb_port, step, nsignal); @@ -727,8 +844,8 @@ darwin_resume_thread (struct inferior *inf, darwin_thread_t *thread, && thread->event.ex_data[0] == EXC_SOFT_SIGNAL) { /* Either deliver a new signal or cancel the signal received. */ - res = PTRACE (PT_THUPDATE, inf->pid, - (caddr_t)thread->gdb_port, nsignal); + int res = PTRACE (PT_THUPDATE, inf->pid, + (caddr_t) (uintptr_t) thread->gdb_port, nsignal); if (res < 0) inferior_debug (1, _("ptrace THUP: res=%d\n"), res); } @@ -736,7 +853,7 @@ darwin_resume_thread (struct inferior *inf, darwin_thread_t *thread, { /* Note: ptrace is allowed only if the process is stopped. Directly send the signal to the thread. */ - res = syscall (SYS___pthread_kill, thread->gdb_port, nsignal); + int res = darwin_pthread_kill (thread, nsignal); inferior_debug (4, _("darwin_resume_thread: kill 0x%x %d: %d\n"), thread->gdb_port, nsignal, res); thread->signaled = 1; @@ -756,7 +873,7 @@ darwin_resume_thread (struct inferior *inf, darwin_thread_t *thread, break; case DARWIN_STOPPED: - kret = thread_resume (thread->gdb_port); + kern_return_t kret = thread_resume (thread->gdb_port); MACH_CHECK_ERROR (kret); thread->msg_state = DARWIN_RUNNING; @@ -769,13 +886,11 @@ darwin_resume_thread (struct inferior *inf, darwin_thread_t *thread, static void darwin_resume_inferior_threads (struct inferior *inf, int step, int nsignal) { - darwin_thread_t *thread; - int k; + darwin_inferior *priv = get_darwin_inferior (inf); - for (k = 0; - VEC_iterate (darwin_thread_t, inf->priv->threads, k, thread); - k++) - darwin_resume_thread (inf, thread, step, nsignal); + if (priv != nullptr) + for (darwin_thread_t *thread : priv->threads) + darwin_resume_thread (inf, thread, step, nsignal); } struct resume_inferior_threads_param @@ -800,28 +915,28 @@ darwin_resume_inferior_threads_it (struct inferior *inf, void *param) static void darwin_suspend_inferior_threads (struct inferior *inf) { - darwin_thread_t *thread; - kern_return_t kret; - int k; + darwin_inferior *priv = get_darwin_inferior (inf); - for (k = 0; - VEC_iterate (darwin_thread_t, inf->priv->threads, k, thread); - k++) - switch (thread->msg_state) - { - case DARWIN_STOPPED: - case DARWIN_MESSAGE: - break; - case DARWIN_RUNNING: - kret = thread_suspend (thread->gdb_port); - MACH_CHECK_ERROR (kret); - thread->msg_state = DARWIN_STOPPED; - break; - } + for (darwin_thread_t *thread : priv->threads) + { + switch (thread->msg_state) + { + case DARWIN_STOPPED: + case DARWIN_MESSAGE: + break; + case DARWIN_RUNNING: + { + kern_return_t kret = thread_suspend (thread->gdb_port); + MACH_CHECK_ERROR (kret); + thread->msg_state = DARWIN_STOPPED; + break; + } + } + } } -static void -darwin_resume (ptid_t ptid, int step, enum gdb_signal signal) +void +darwin_nat_target::resume (ptid_t ptid, int step, enum gdb_signal signal) { struct target_waitstatus status; int pid; @@ -833,7 +948,7 @@ darwin_resume (ptid_t ptid, int step, enum gdb_signal signal) inferior_debug (2, _("darwin_resume: pid=%d, tid=0x%lx, step=%d, signal=%d\n"), - ptid_get_pid (ptid), ptid_get_tid (ptid), step, signal); + ptid.pid (), ptid.tid (), step, signal); if (signal == GDB_SIGNAL_0) nsignal = 0; @@ -845,7 +960,7 @@ darwin_resume (ptid_t ptid, int step, enum gdb_signal signal) ptid = inferior_ptid; /* minus_one_ptid is RESUME_ALL. */ - if (ptid_equal (ptid, minus_one_ptid)) + if (ptid == minus_one_ptid) { struct resume_inferior_threads_param param; @@ -860,7 +975,7 @@ darwin_resume (ptid_t ptid, int step, enum gdb_signal signal) else { struct inferior *inf = find_inferior_ptid (ptid); - long tid = ptid_get_tid (ptid); + long tid = ptid.tid (); /* Stop the inferior (should be useless). */ darwin_suspend_inferior (inf); @@ -885,13 +1000,6 @@ darwin_resume (ptid_t ptid, int step, enum gdb_signal signal) } } -static void -darwin_resume_to (struct target_ops *ops, ptid_t ptid, int step, - enum gdb_signal signal) -{ - return darwin_resume (ptid, step, signal); -} - static ptid_t darwin_decode_message (mach_msg_header_t *hdr, darwin_thread_t **pthread, @@ -925,7 +1033,10 @@ darwin_decode_message (mach_msg_header_t *hdr, } *pinf = inf; *pthread = thread; - inf->priv->pending_messages++; + + darwin_inferior *priv = get_darwin_inferior (inf); + + priv->pending_messages++; status->kind = TARGET_WAITKIND_STOPPED; thread->msg_state = DARWIN_MESSAGE; @@ -981,18 +1092,37 @@ darwin_decode_message (mach_msg_header_t *hdr, break; } - return ptid_build (inf->pid, 0, thread->gdb_port); + return ptid_t (inf->pid, 0, thread->gdb_port); } else if (hdr->msgh_id == 0x48) { /* MACH_NOTIFY_DEAD_NAME: notification for exit. */ + int res; + + res = darwin_decode_notify_message (hdr, &inf); + + if (res < 0) + { + /* Should not happen... */ + printf_unfiltered + (_("darwin_wait: ill-formatted message (id=0x%x, res=%d)\n"), + hdr->msgh_id, res); + } + *pinf = NULL; *pthread = NULL; - inf = darwin_find_inferior_by_notify (hdr->msgh_local_port); + if (res < 0 || inf == NULL) + { + status->kind = TARGET_WAITKIND_IGNORE; + return minus_one_ptid; + } + if (inf != NULL) { - if (!inf->priv->no_ptrace) + darwin_inferior *priv = get_darwin_inferior (inf); + + if (!priv->no_ptrace) { pid_t res; int wstatus; @@ -1013,7 +1143,7 @@ darwin_decode_message (mach_msg_header_t *hdr, else { status->kind = TARGET_WAITKIND_SIGNALLED; - status->value.sig = WTERMSIG (wstatus); + status->value.sig = gdb_signal_from_host (WTERMSIG (wstatus)); } inferior_debug (4, _("darwin_wait: pid=%d exit, status=0x%x\n"), @@ -1022,14 +1152,15 @@ darwin_decode_message (mach_msg_header_t *hdr, /* Looks necessary on Leopard and harmless... */ wait4 (inf->pid, &wstatus, 0, NULL); - return ptid_build (inf->pid, 0, 0); + inferior_ptid = ptid_t (inf->pid, 0, 0); + return inferior_ptid; } else { inferior_debug (4, _("darwin_wait: pid=%d\n"), inf->pid); status->kind = TARGET_WAITKIND_EXITED; status->value.integer = 0; /* Don't know. */ - return ptid_build (inf->pid, 0, 0); + return ptid_t (inf->pid, 0, 0); } } } @@ -1052,14 +1183,14 @@ cancel_breakpoint (ptid_t ptid) tripped on it. */ struct regcache *regcache = get_thread_regcache (ptid); - struct gdbarch *gdbarch = get_regcache_arch (regcache); + struct gdbarch *gdbarch = regcache->arch (); CORE_ADDR pc; pc = regcache_read_pc (regcache) - gdbarch_decr_pc_after_break (gdbarch); - if (breakpoint_inserted_here_p (get_regcache_aspace (regcache), pc)) + if (breakpoint_inserted_here_p (regcache->aspace (), pc)) { inferior_debug (4, "cancel_breakpoint for thread 0x%lx\n", - (unsigned long) ptid_get_tid (ptid)); + (unsigned long) ptid.tid ()); /* Back up the PC if necessary. */ if (gdbarch_decr_pc_after_break (gdbarch)) @@ -1086,7 +1217,7 @@ darwin_wait (ptid_t ptid, struct target_waitstatus *status) inferior_debug (2, _("darwin_wait: waiting for a message pid=%d thread=%lx\n"), - ptid_get_pid (ptid), ptid_get_tid (ptid)); + ptid.pid (), ptid.tid ()); /* Handle fake stop events at first. */ if (darwin_inf_fake_stop != NULL) @@ -1094,11 +1225,13 @@ darwin_wait (ptid_t ptid, struct target_waitstatus *status) inf = darwin_inf_fake_stop; darwin_inf_fake_stop = NULL; + darwin_inferior *priv = get_darwin_inferior (inf); + status->kind = TARGET_WAITKIND_STOPPED; status->value.sig = GDB_SIGNAL_TRAP; - thread = VEC_index (darwin_thread_t, inf->priv->threads, 0); + thread = priv->threads[0]; thread->msg_state = DARWIN_STOPPED; - return ptid_build (inf->pid, 0, thread->gdb_port); + return ptid_t (inf->pid, 0, thread->gdb_port); } do @@ -1129,7 +1262,7 @@ darwin_wait (ptid_t ptid, struct target_waitstatus *status) darwin_dump_message (hdr, darwin_debug_flag > 11); res = darwin_decode_message (hdr, &thread, &inf, status); - if (ptid_equal (res, minus_one_ptid)) + if (res == minus_one_ptid) continue; /* Early return in case an inferior has exited. */ @@ -1170,7 +1303,7 @@ darwin_wait (ptid_t ptid, struct target_waitstatus *status) && thread->event.ex_type == EXC_BREAKPOINT) { if (thread->single_step - || cancel_breakpoint (ptid_build (inf->pid, 0, thread->gdb_port))) + || cancel_breakpoint (ptid_t (inf->pid, 0, thread->gdb_port))) { gdb_assert (thread->msg_state == DARWIN_MESSAGE); darwin_send_reply (inf, thread); @@ -1187,59 +1320,66 @@ darwin_wait (ptid_t ptid, struct target_waitstatus *status) return res; } -static ptid_t -darwin_wait_to (struct target_ops *ops, - ptid_t ptid, struct target_waitstatus *status, int options) +ptid_t +darwin_nat_target::wait (ptid_t ptid, struct target_waitstatus *status, + int options) { return darwin_wait (ptid, status); } -static void -darwin_interrupt (struct target_ops *self, ptid_t t) +void +darwin_nat_target::interrupt () { struct inferior *inf = current_inferior (); + darwin_inferior *priv = get_darwin_inferior (inf); /* FIXME: handle in no_ptrace mode. */ - gdb_assert (!inf->priv->no_ptrace); - kill (inf->pid, SIGINT); + gdb_assert (!priv->no_ptrace); + ::kill (inf->pid, SIGINT); } +/* Deallocate threads port and vector. */ + static void -darwin_mourn_inferior (struct target_ops *ops) +darwin_deallocate_threads (struct inferior *inf) +{ + darwin_inferior *priv = get_darwin_inferior (inf); + + for (darwin_thread_t *t : priv->threads) + { + kern_return_t kret = mach_port_deallocate (gdb_task, t->gdb_port); + MACH_CHECK_ERROR (kret); + } + + priv->threads.clear (); +} + +void +darwin_nat_target::mourn_inferior () { struct inferior *inf = current_inferior (); + darwin_inferior *priv = get_darwin_inferior (inf); kern_return_t kret; mach_port_t prev; int i; /* Deallocate threads. */ - if (inf->priv->threads) - { - int k; - darwin_thread_t *t; - for (k = 0; - VEC_iterate (darwin_thread_t, inf->priv->threads, k, t); - k++) - { - kret = mach_port_deallocate (gdb_task, t->gdb_port); - MACH_CHECK_ERROR (kret); - } - VEC_free (darwin_thread_t, inf->priv->threads); - inf->priv->threads = NULL; - } + darwin_deallocate_threads (inf); + /* Remove notify_port from darwin_port_set. */ kret = mach_port_move_member (gdb_task, - inf->priv->notify_port, MACH_PORT_NULL); + priv->notify_port, MACH_PORT_NULL); MACH_CHECK_ERROR (kret); - kret = mach_port_request_notification (gdb_task, inf->priv->task, + /* Remove task port dead_name notification. */ + kret = mach_port_request_notification (gdb_task, priv->task, MACH_NOTIFY_DEAD_NAME, 0, MACH_PORT_NULL, MACH_MSG_TYPE_MAKE_SEND_ONCE, &prev); /* This can fail if the task is dead. */ inferior_debug (4, "task=0x%x, prev=0x%x, notify_port=0x%x\n", - inf->priv->task, prev, inf->priv->notify_port); + priv->task, prev, priv->notify_port); if (kret == KERN_SUCCESS) { @@ -1247,37 +1387,28 @@ darwin_mourn_inferior (struct target_ops *ops) MACH_CHECK_ERROR (kret); } - kret = mach_port_destroy (gdb_task, inf->priv->notify_port); + /* Destroy notify_port. */ + kret = mach_port_destroy (gdb_task, priv->notify_port); MACH_CHECK_ERROR (kret); - /* Deallocate saved exception ports. */ - for (i = 0; i < inf->priv->exception_info.count; i++) - { - kret = mach_port_deallocate - (gdb_task, inf->priv->exception_info.ports[i]); - MACH_CHECK_ERROR (kret); - } - inf->priv->exception_info.count = 0; + darwin_deallocate_exception_ports (priv); - kret = mach_port_deallocate (gdb_task, inf->priv->task); + /* Deallocate task port. */ + kret = mach_port_deallocate (gdb_task, priv->task); MACH_CHECK_ERROR (kret); - xfree (inf->priv); inf->priv = NULL; - inf_child_mourn_inferior (ops); + inf_child_target::mourn_inferior (); } static void darwin_reply_to_all_pending_messages (struct inferior *inf) { - int k; - darwin_thread_t *t; + darwin_inferior *priv = get_darwin_inferior (inf); - for (k = 0; - VEC_iterate (darwin_thread_t, inf->priv->threads, k, t); - k++) + for (darwin_thread_t *t : priv->threads) { if (t->msg_state == DARWIN_MESSAGE) darwin_resume_thread (inf, t, 0, 0); @@ -1292,6 +1423,7 @@ darwin_stop_inferior (struct inferior *inf) kern_return_t kret; int status; int res; + darwin_inferior *priv = get_darwin_inferior (inf); gdb_assert (inf != NULL); @@ -1299,7 +1431,7 @@ darwin_stop_inferior (struct inferior *inf) darwin_reply_to_all_pending_messages (inf); - if (inf->priv->no_ptrace) + if (priv->no_ptrace) return; res = kill (inf->pid, SIGSTOP); @@ -1349,30 +1481,92 @@ darwin_restore_exception_ports (darwin_inferior *inf) return KERN_SUCCESS; } +/* Deallocate saved exception ports. */ + static void -darwin_kill_inferior (struct target_ops *ops) +darwin_deallocate_exception_ports (darwin_inferior *inf) +{ + int i; + kern_return_t kret; + + for (i = 0; i < inf->exception_info.count; i++) + { + kret = mach_port_deallocate (gdb_task, inf->exception_info.ports[i]); + MACH_CHECK_ERROR (kret); + } + inf->exception_info.count = 0; +} + +static void +darwin_setup_exceptions (struct inferior *inf) +{ + darwin_inferior *priv = get_darwin_inferior (inf); + kern_return_t kret; + int traps_expected; + exception_mask_t mask; + + kret = darwin_save_exception_ports (priv); + if (kret != KERN_SUCCESS) + error (_("Unable to save exception ports, task_get_exception_ports" + "returned: %d"), + kret); + + /* Set exception port. */ + if (enable_mach_exceptions) + mask = EXC_MASK_ALL; + else + mask = EXC_MASK_SOFTWARE | EXC_MASK_BREAKPOINT; + kret = task_set_exception_ports (priv->task, mask, darwin_ex_port, + EXCEPTION_DEFAULT, THREAD_STATE_NONE); + if (kret != KERN_SUCCESS) + error (_("Unable to set exception ports, task_set_exception_ports" + "returned: %d"), + kret); +} + +void +darwin_nat_target::kill () { struct inferior *inf = current_inferior (); + darwin_inferior *priv = get_darwin_inferior (inf); struct target_waitstatus wstatus; ptid_t ptid; kern_return_t kret; int status; int res; - if (ptid_equal (inferior_ptid, null_ptid)) + if (inferior_ptid == null_ptid) return; gdb_assert (inf != NULL); - kret = darwin_restore_exception_ports (inf->priv); + kret = darwin_restore_exception_ports (priv); MACH_CHECK_ERROR (kret); darwin_reply_to_all_pending_messages (inf); - res = kill (inf->pid, 9); + res = ::kill (inf->pid, 9); if (res == 0) { + /* On MacOS version Sierra, the darwin_restore_exception_ports call + does not work as expected. + When the kill function is called, the SIGKILL signal is received + by gdb whereas it should have been received by the kernel since + the exception ports have been restored. + This behavior is not the expected one thus gdb does not reply to + the received SIGKILL message. This situation leads to a "busy" + resource from the kernel point of view and the inferior is never + released, causing it to remain as a zombie process, even after + GDB exits. + To work around this, we mark all the threads of the inferior as + signaled thus darwin_decode_message function knows that the kill + signal was sent by gdb and will take the appropriate action + (cancel signal and reply to the signal message). */ + darwin_inferior *priv = get_darwin_inferior (inf); + for (darwin_thread_t *thread : priv->threads) + thread->signaled = 1; + darwin_resume_inferior (inf); ptid = darwin_wait (inferior_ptid, &wstatus); @@ -1381,7 +1575,36 @@ darwin_kill_inferior (struct target_ops *ops) warning (_("Failed to kill inferior: kill (%d, 9) returned [%s]"), inf->pid, safe_strerror (errno)); - target_mourn_inferior (); + target_mourn_inferior (inferior_ptid); +} + +static void +darwin_setup_request_notification (struct inferior *inf) +{ + darwin_inferior *priv = get_darwin_inferior (inf); + kern_return_t kret; + mach_port_t prev_not; + + kret = mach_port_request_notification (gdb_task, priv->task, + MACH_NOTIFY_DEAD_NAME, 0, + priv->notify_port, + MACH_MSG_TYPE_MAKE_SEND_ONCE, + &prev_not); + if (kret != KERN_SUCCESS) + error (_("Termination notification request failed, " + "mach_port_request_notification\n" + "returned: %d"), + kret); + if (prev_not != MACH_PORT_NULL) + { + /* This is unexpected, as there should not be any previously + registered notification request. But this is not a fatal + issue, so just emit a warning. */ + warning (_("\ +A task termination request was registered before the debugger registered\n\ +its own. This is unexpected, but should otherwise not have any actual\n\ +impact on the debugging session.")); + } } static void @@ -1393,136 +1616,134 @@ darwin_attach_pid (struct inferior *inf) mach_port_t prev_not; exception_mask_t mask; - inf->priv = XCNEW (darwin_inferior); + darwin_inferior *priv = new darwin_inferior; + inf->priv.reset (priv); - kret = task_for_pid (gdb_task, inf->pid, &inf->priv->task); - if (kret != KERN_SUCCESS) + TRY { - int status; - - if (!inf->attach_flag) + kret = task_for_pid (gdb_task, inf->pid, &priv->task); + if (kret != KERN_SUCCESS) { - kill (inf->pid, 9); - waitpid (inf->pid, &status, 0); - } + int status; + + if (!inf->attach_flag) + { + kill (inf->pid, 9); + waitpid (inf->pid, &status, 0); + } - error (_("Unable to find Mach task port for process-id %d: %s (0x%lx).\n" + error + (_("Unable to find Mach task port for process-id %d: %s (0x%lx).\n" " (please check gdb is codesigned - see taskgated(8))"), - inf->pid, mach_error_string (kret), (unsigned long) kret); - } + inf->pid, mach_error_string (kret), (unsigned long) kret); + } - inferior_debug (2, _("inferior task: 0x%x, pid: %d\n"), - inf->priv->task, inf->pid); + inferior_debug (2, _("inferior task: 0x%x, pid: %d\n"), + priv->task, inf->pid); - if (darwin_ex_port == MACH_PORT_NULL) - { - /* Create a port to get exceptions. */ - kret = mach_port_allocate (gdb_task, MACH_PORT_RIGHT_RECEIVE, - &darwin_ex_port); - if (kret != KERN_SUCCESS) - error (_("Unable to create exception port, mach_port_allocate " - "returned: %d"), - kret); + if (darwin_ex_port == MACH_PORT_NULL) + { + /* Create a port to get exceptions. */ + kret = mach_port_allocate (gdb_task, MACH_PORT_RIGHT_RECEIVE, + &darwin_ex_port); + if (kret != KERN_SUCCESS) + error (_("Unable to create exception port, mach_port_allocate " + "returned: %d"), + kret); - kret = mach_port_insert_right (gdb_task, darwin_ex_port, darwin_ex_port, - MACH_MSG_TYPE_MAKE_SEND); - if (kret != KERN_SUCCESS) - error (_("Unable to create exception port, mach_port_insert_right " - "returned: %d"), - kret); + kret = mach_port_insert_right (gdb_task, darwin_ex_port, + darwin_ex_port, + MACH_MSG_TYPE_MAKE_SEND); + if (kret != KERN_SUCCESS) + error (_("Unable to create exception port, mach_port_insert_right " + "returned: %d"), + kret); + + /* Create a port set and put ex_port in it. */ + kret = mach_port_allocate (gdb_task, MACH_PORT_RIGHT_PORT_SET, + &darwin_port_set); + if (kret != KERN_SUCCESS) + error (_("Unable to create port set, mach_port_allocate " + "returned: %d"), + kret); - /* Create a port set and put ex_port in it. */ - kret = mach_port_allocate (gdb_task, MACH_PORT_RIGHT_PORT_SET, - &darwin_port_set); + kret = mach_port_move_member (gdb_task, darwin_ex_port, + darwin_port_set); + if (kret != KERN_SUCCESS) + error (_("Unable to move exception port into new port set, " + "mach_port_move_member\n" + "returned: %d"), + kret); + } + + /* Create a port to be notified when the child task terminates. */ + kret = mach_port_allocate (gdb_task, MACH_PORT_RIGHT_RECEIVE, + &priv->notify_port); if (kret != KERN_SUCCESS) - error (_("Unable to create port set, mach_port_allocate " + error (_("Unable to create notification port, mach_port_allocate " "returned: %d"), kret); - kret = mach_port_move_member (gdb_task, darwin_ex_port, darwin_port_set); + kret = mach_port_move_member (gdb_task, + priv->notify_port, darwin_port_set); if (kret != KERN_SUCCESS) - error (_("Unable to move exception port into new port set, " + error (_("Unable to move notification port into new port set, " "mach_port_move_member\n" "returned: %d"), kret); + + darwin_setup_request_notification (inf); + + darwin_setup_exceptions (inf); + } + CATCH (ex, RETURN_MASK_ALL) + { + exit_inferior (inf); + inferior_ptid = null_ptid; + + throw_exception (ex); } + END_CATCH - /* Create a port to be notified when the child task terminates. */ - kret = mach_port_allocate (gdb_task, MACH_PORT_RIGHT_RECEIVE, - &inf->priv->notify_port); - if (kret != KERN_SUCCESS) - error (_("Unable to create notification port, mach_port_allocate " - "returned: %d"), - kret); + target_ops *darwin_ops = get_native_target (); + if (!target_is_pushed (darwin_ops)) + push_target (darwin_ops); +} - kret = mach_port_move_member (gdb_task, - inf->priv->notify_port, darwin_port_set); - if (kret != KERN_SUCCESS) - error (_("Unable to move notification port into new port set, " - "mach_port_move_member\n" - "returned: %d"), - kret); +/* Get the thread_info object corresponding to this darwin_thread_info. */ - kret = mach_port_request_notification (gdb_task, inf->priv->task, - MACH_NOTIFY_DEAD_NAME, 0, - inf->priv->notify_port, - MACH_MSG_TYPE_MAKE_SEND_ONCE, - &prev_not); - if (kret != KERN_SUCCESS) - error (_("Termination notification request failed, " - "mach_port_request_notification\n" - "returned: %d"), - kret); - if (prev_not != MACH_PORT_NULL) +static struct thread_info * +thread_info_from_private_thread_info (darwin_thread_info *pti) +{ + struct thread_info *it; + + ALL_THREADS (it) { - /* This is unexpected, as there should not be any previously - registered notification request. But this is not a fatal - issue, so just emit a warning. */ - warning (_("\ -A task termination request was registered before the debugger registered\n\ -its own. This is unexpected, but should otherwise not have any actual\n\ -impact on the debugging session.")); - } + darwin_thread_info *iter_pti = get_darwin_thread_info (it); - kret = darwin_save_exception_ports (inf->priv); - if (kret != KERN_SUCCESS) - error (_("Unable to save exception ports, task_get_exception_ports" - "returned: %d"), - kret); + if (iter_pti->gdb_port == pti->gdb_port) + break; + } - /* Set exception port. */ - if (enable_mach_exceptions) - mask = EXC_MASK_ALL; - else - mask = EXC_MASK_SOFTWARE | EXC_MASK_BREAKPOINT; - kret = task_set_exception_ports (inf->priv->task, mask, darwin_ex_port, - EXCEPTION_DEFAULT, THREAD_STATE_NONE); - if (kret != KERN_SUCCESS) - error (_("Unable to set exception ports, task_set_exception_ports" - "returned: %d"), - kret); + gdb_assert (it != NULL); - if (!target_is_pushed (darwin_ops)) - push_target (darwin_ops); + return it; } static void darwin_init_thread_list (struct inferior *inf) { - darwin_thread_t *thread; - ptid_t new_ptid; - darwin_check_new_threads (inf); - gdb_assert (inf->priv->threads - && VEC_length (darwin_thread_t, inf->priv->threads) > 0); - thread = VEC_index (darwin_thread_t, inf->priv->threads, 0); + darwin_inferior *priv = get_darwin_inferior (inf); + + gdb_assert (!priv->threads.empty ()); - /* Note: fork_inferior automatically add a thead but it uses a wrong ptid. - Fix up. */ - new_ptid = ptid_build (inf->pid, 0, thread->gdb_port); - thread_change_ptid (inferior_ptid, new_ptid); - inferior_ptid = new_ptid; + darwin_thread_info *first_pti = priv->threads.front (); + struct thread_info *first_thread + = thread_info_from_private_thread_info (first_pti); + + inferior_ptid = first_thread->ptid; } /* The child must synchronize with gdb: gdb must set the exception port @@ -1537,22 +1758,28 @@ darwin_ptrace_me (void) char c; /* Close write end point. */ - close (ptrace_fds[1]); + if (close (ptrace_fds[1]) < 0) + trace_start_error_with_name ("close"); /* Wait until gdb is ready. */ res = read (ptrace_fds[0], &c, 1); if (res != 0) - error (_("unable to read from pipe, read returned: %d"), res); - close (ptrace_fds[0]); + trace_start_error (_("unable to read from pipe, read returned: %d"), res); + + if (close (ptrace_fds[0]) < 0) + trace_start_error_with_name ("close"); /* Get rid of privileges. */ - setegid (getgid ()); + if (setegid (getgid ()) < 0) + trace_start_error_with_name ("setegid"); /* Set TRACEME. */ - PTRACE (PT_TRACE_ME, 0, 0, 0); + if (PTRACE (PT_TRACE_ME, 0, 0, 0) < 0) + trace_start_error_with_name ("PTRACE"); /* Redirect signals to exception port. */ - PTRACE (PT_SIGEXC, 0, 0, 0); + if (PTRACE (PT_SIGEXC, 0, 0, 0) < 0) + trace_start_error_with_name ("PTRACE"); } /* Dummy function to be sure fork_inferior uses fork(2) and not vfork(2). */ @@ -1590,7 +1817,7 @@ darwin_ptrace_him (int pid) darwin_init_thread_list (inf); - startup_inferior (START_INFERIOR_TRAPS_EXPECTED); + gdb_startup_inferior (pid, START_INFERIOR_TRAPS_EXPECTED); } static void @@ -1627,17 +1854,15 @@ darwin_execvp (const char *file, char * const argv[], char * const env[]) posix_spawnp (NULL, argv[0], NULL, &attr, argv, env); } -static void -darwin_create_inferior (struct target_ops *ops, char *exec_file, - char *allargs, char **env, int from_tty) +void +darwin_nat_target::create_inferior (const char *exec_file, + const std::string &allargs, + char **env, int from_tty) { /* Do the hard work. */ - fork_inferior (exec_file, allargs, env, darwin_ptrace_me, darwin_ptrace_him, - darwin_pre_ptrace, NULL, darwin_execvp); - - /* Return now in case of error. */ - if (ptid_equal (inferior_ptid, null_ptid)) - return; + fork_inferior (exec_file, allargs, env, darwin_ptrace_me, + darwin_ptrace_him, darwin_pre_ptrace, NULL, + darwin_execvp); } @@ -1650,6 +1875,7 @@ darwin_create_inferior (struct target_ops *ops, char *exec_file, static void darwin_setup_fake_stop_event (struct inferior *inf) { + darwin_inferior *priv = get_darwin_inferior (inf); darwin_thread_t *thread; kern_return_t kret; @@ -1662,15 +1888,15 @@ darwin_setup_fake_stop_event (struct inferior *inf) as well. Otherwise, we'll try resuming it when resuming the inferior, and get a warning because the thread's suspend count is already zero, making the resume request useless. */ - thread = VEC_index (darwin_thread_t, inf->priv->threads, 0); + thread = priv->threads[0]; kret = thread_suspend (thread->gdb_port); MACH_CHECK_ERROR (kret); } /* Attach to process PID, then initialize for debugging it and wait for the trace-trap that results from attaching. */ -static void -darwin_attach (struct target_ops *ops, const char *args, int from_tty) +void +darwin_nat_target::attach (const char *args, int from_tty) { pid_t pid; pid_t pid2; @@ -1690,37 +1916,36 @@ darwin_attach (struct target_ops *ops, const char *args, int from_tty) if (exec_file) printf_unfiltered (_("Attaching to program: %s, %s\n"), exec_file, - target_pid_to_str (pid_to_ptid (pid))); + target_pid_to_str (ptid_t (pid))); else printf_unfiltered (_("Attaching to %s\n"), - target_pid_to_str (pid_to_ptid (pid))); + target_pid_to_str (ptid_t (pid))); gdb_flush (gdb_stdout); } - if (pid == 0 || kill (pid, 0) < 0) + if (pid == 0 || ::kill (pid, 0) < 0) error (_("Can't attach to process %d: %s (%d)"), pid, safe_strerror (errno), errno); - inferior_ptid = pid_to_ptid (pid); + inferior_ptid = ptid_t (pid); inf = current_inferior (); inferior_appeared (inf, pid); inf->attach_flag = 1; - /* Always add a main thread. */ - add_thread_silent (inferior_ptid); - darwin_attach_pid (inf); darwin_suspend_inferior (inf); darwin_init_thread_list (inf); - darwin_check_osabi (inf->priv, ptid_get_tid (inferior_ptid)); + darwin_inferior *priv = get_darwin_inferior (inf); + + darwin_check_osabi (priv, inferior_ptid.tid ()); darwin_setup_fake_stop_event (inf); - inf->priv->no_ptrace = 1; + priv->no_ptrace = 1; } /* Take a program previously attached to and detaches it. @@ -1730,33 +1955,26 @@ darwin_attach (struct target_ops *ops, const char *args, int from_tty) to work, it may be necessary for the process to have been previously attached. It *might* work if the program was started via fork. */ -static void -darwin_detach (struct target_ops *ops, const char *args, int from_tty) + +void +darwin_nat_target::detach (inferior *inf, int from_tty) { - pid_t pid = ptid_get_pid (inferior_ptid); - struct inferior *inf = current_inferior (); + pid_t pid = inferior_ptid.pid (); + darwin_inferior *priv = get_darwin_inferior (inf); kern_return_t kret; int res; /* Display message. */ - 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, - target_pid_to_str (pid_to_ptid (pid))); - gdb_flush (gdb_stdout); - } + target_announce_detach (from_tty); /* If ptrace() is in use, stop the process. */ - if (!inf->priv->no_ptrace) + if (!priv->no_ptrace) darwin_stop_inferior (inf); - kret = darwin_restore_exception_ports (inf->priv); + kret = darwin_restore_exception_ports (priv); MACH_CHECK_ERROR (kret); - if (!inf->priv->no_ptrace) + if (!priv->no_ptrace) { res = PTRACE (PT_DETACH, inf->pid, 0, 0); if (res != 0) @@ -1769,37 +1987,32 @@ darwin_detach (struct target_ops *ops, const char *args, int from_tty) /* When using ptrace, we have just performed a PT_DETACH, which resumes the inferior. On the other hand, when we are not using ptrace, we need to resume its execution ourselves. */ - if (inf->priv->no_ptrace) + if (priv->no_ptrace) darwin_resume_inferior (inf); - darwin_mourn_inferior (ops); -} - -static void -darwin_files_info (struct target_ops *ops) -{ + mourn_inferior (); } -static char * -darwin_pid_to_str (struct target_ops *ops, ptid_t ptid) +const char * +darwin_nat_target::pid_to_str (ptid_t ptid) { static char buf[80]; - long tid = ptid_get_tid (ptid); + long tid = ptid.tid (); if (tid != 0) { snprintf (buf, sizeof (buf), _("Thread 0x%lx of process %u"), - tid, ptid_get_pid (ptid)); + tid, ptid.pid ()); return buf; } return normal_pid_to_str (ptid); } -static int -darwin_thread_alive (struct target_ops *ops, ptid_t ptid) +bool +darwin_nat_target::thread_alive (ptid_t ptid) { - return 1; + return true; } /* If RDADDR is not NULL, read inferior task's LEN bytes from ADDR and @@ -1994,13 +2207,14 @@ darwin_read_dyld_info (task_t task, CORE_ADDR addr, gdb_byte *rdaddr, -static enum target_xfer_status -darwin_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) +enum target_xfer_status +darwin_nat_target::xfer_partial (enum target_object object, const char *annex, + gdb_byte *readbuf, const gdb_byte *writebuf, + ULONGEST offset, ULONGEST len, + ULONGEST *xfered_len) { struct inferior *inf = current_inferior (); + darwin_inferior *priv = get_darwin_inferior (inf); inferior_debug (8, _("darwin_xfer_partial(%s, %s, rbuf=%s, wbuf=%s) pid=%u\n"), @@ -2012,7 +2226,7 @@ darwin_xfer_partial (struct target_ops *ops, { case TARGET_OBJECT_MEMORY: { - int l = darwin_read_write_inferior (inf->priv->task, offset, + int l = darwin_read_write_inferior (priv->task, offset, readbuf, writebuf, len); if (l == 0) @@ -2031,7 +2245,7 @@ darwin_xfer_partial (struct target_ops *ops, /* Support only read. */ return TARGET_XFER_E_IO; } - return darwin_read_dyld_info (inf->priv->task, offset, readbuf, len, + return darwin_read_dyld_info (priv->task, offset, readbuf, len, xfered_len); #endif default: @@ -2041,12 +2255,13 @@ darwin_xfer_partial (struct target_ops *ops, } static void -set_enable_mach_exceptions (char *args, int from_tty, +set_enable_mach_exceptions (const char *args, int from_tty, struct cmd_list_element *c) { - if (!ptid_equal (inferior_ptid, null_ptid)) + if (inferior_ptid != null_ptid) { struct inferior *inf = current_inferior (); + darwin_inferior *priv = get_darwin_inferior (inf); exception_mask_t mask; kern_return_t kret; @@ -2054,17 +2269,17 @@ set_enable_mach_exceptions (char *args, int from_tty, mask = EXC_MASK_ALL; else { - darwin_restore_exception_ports (inf->priv); + darwin_restore_exception_ports (priv); mask = EXC_MASK_SOFTWARE | EXC_MASK_BREAKPOINT; } - kret = task_set_exception_ports (inf->priv->task, mask, darwin_ex_port, + kret = task_set_exception_ports (priv->task, mask, darwin_ex_port, EXCEPTION_DEFAULT, THREAD_STATE_NONE); MACH_CHECK_ERROR (kret); } } -static char * -darwin_pid_to_exec_file (struct target_ops *self, int pid) +char * +darwin_nat_target::pid_to_exec_file (int pid) { static char path[PATH_MAX]; int res; @@ -2076,13 +2291,11 @@ darwin_pid_to_exec_file (struct target_ops *self, int pid) return NULL; } -static ptid_t -darwin_get_ada_task_ptid (struct target_ops *self, long lwp, long thread) +ptid_t +darwin_nat_target::get_ada_task_ptid (long lwp, long thread) { - int i; - darwin_thread_t *t; - int k; struct inferior *inf = current_inferior (); + darwin_inferior *priv = get_darwin_inferior (inf); kern_return_t kret; mach_port_name_array_t names; mach_msg_type_number_t names_count; @@ -2091,16 +2304,16 @@ darwin_get_ada_task_ptid (struct target_ops *self, long lwp, long thread) long res = 0; /* First linear search. */ - for (k = 0; - VEC_iterate (darwin_thread_t, inf->priv->threads, k, t); - k++) - if (t->inf_port == lwp) - return ptid_build (ptid_get_pid (inferior_ptid), 0, t->gdb_port); + for (darwin_thread_t *t : priv->threads) + { + if (t->inf_port == lwp) + return ptid_t (inferior_ptid.pid (), 0, t->gdb_port); + } /* Maybe the port was never extract. Do it now. */ /* First get inferior port names. */ - kret = mach_port_names (inf->priv->task, &names, &names_count, &types, + kret = mach_port_names (priv->task, &names, &names_count, &types, &types_count); MACH_CHECK_ERROR (kret); if (kret != KERN_SUCCESS) @@ -2109,51 +2322,48 @@ darwin_get_ada_task_ptid (struct target_ops *self, long lwp, long thread) /* For each name, copy the right in the gdb space and then compare with our view of the inferior threads. We don't forget to deallocate the right. */ - for (i = 0; i < names_count; i++) + for (int i = 0; i < names_count; i++) { mach_port_t local_name; mach_msg_type_name_t local_type; /* We just need to know the corresponding name in gdb name space. So extract and deallocate the right. */ - kret = mach_port_extract_right (inf->priv->task, names[i], + kret = mach_port_extract_right (priv->task, names[i], MACH_MSG_TYPE_COPY_SEND, &local_name, &local_type); if (kret != KERN_SUCCESS) continue; mach_port_deallocate (gdb_task, local_name); - for (k = 0; - VEC_iterate (darwin_thread_t, inf->priv->threads, k, t); - k++) - if (t->gdb_port == local_name) - { - t->inf_port = names[i]; - if (names[i] == lwp) - res = t->gdb_port; - } + for (darwin_thread_t *t : priv->threads) + { + if (t->gdb_port == local_name) + { + t->inf_port = names[i]; + if (names[i] == lwp) + res = t->gdb_port; + } + } } vm_deallocate (gdb_task, (vm_address_t) names, names_count * sizeof (mach_port_t)); if (res) - return ptid_build (ptid_get_pid (inferior_ptid), 0, res); + return ptid_t (inferior_ptid.pid (), 0, res); else return null_ptid; } -static int -darwin_supports_multi_process (struct target_ops *self) +bool +darwin_nat_target::supports_multi_process () { - return 1; + return true; } -/* -Wmissing-prototypes */ -extern initialize_file_ftype _initialize_darwin_inferior; - void -_initialize_darwin_inferior (void) +_initialize_darwin_nat () { kern_return_t kret; @@ -2168,30 +2378,6 @@ _initialize_darwin_inferior (void) MACH_CHECK_ERROR (kret); } - darwin_ops = inf_child_target (); - - darwin_ops->to_create_inferior = darwin_create_inferior; - darwin_ops->to_attach = darwin_attach; - darwin_ops->to_attach_no_wait = 0; - darwin_ops->to_detach = darwin_detach; - darwin_ops->to_files_info = darwin_files_info; - darwin_ops->to_wait = darwin_wait_to; - darwin_ops->to_mourn_inferior = darwin_mourn_inferior; - darwin_ops->to_kill = darwin_kill_inferior; - darwin_ops->to_interrupt = darwin_interrupt; - darwin_ops->to_resume = darwin_resume_to; - darwin_ops->to_thread_alive = darwin_thread_alive; - darwin_ops->to_pid_to_str = darwin_pid_to_str; - darwin_ops->to_pid_to_exec_file = darwin_pid_to_exec_file; - darwin_ops->to_load = NULL; - darwin_ops->to_xfer_partial = darwin_xfer_partial; - darwin_ops->to_supports_multi_process = darwin_supports_multi_process; - darwin_ops->to_get_ada_task_ptid = darwin_get_ada_task_ptid; - - darwin_complete_target (darwin_ops); - - add_target (darwin_ops); - inferior_debug (2, _("GDB task: 0x%lx, pid: %d\n"), (unsigned long) mach_task_self (), getpid ());