binutils-gdb/gdb/darwin-nat.h

169 lines
4.7 KiB
C
Raw Normal View History

/* Common things used by the various darwin files
Copyright (C) 1995-2017 Free Software Foundation, Inc.
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 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
Fix formating in copyright headers. File list found with: $ grep "along with this program" * -A 1 -rn \ | grep "*/" \ | grep -v "along with this program" \ | sed 's,-[0-9]\+-.*,,g' Tested on x86_64 Fedora 17. gdb/ 2013-06-07 Pedro Alves <palves@redhat.com> * darwin-nat.c: Fix formating in copyright header. * darwin-nat.h: Likewise. * gnu-nat.c: Likewise. * machoread.c: Likewise. gdb/testsuite/ 2013-06-07 Pedro Alves <palves@redhat.com> * gdb.ada/info_types.c: Fix formating in copyright header. * gdb.base/break-on-linker-gcd-function.cc: Likewise. * gdb.base/float.c: Likewise. * gdb.base/inferior-died.c: Likewise. * gdb.base/interp.c: Likewise. * gdb.base/jit-main.c: Likewise. * gdb.base/jit-solib.c: Likewise. * gdb.base/long_long.c: Likewise. * gdb.base/longjmp.c: Likewise. * gdb.base/nextoverexit.c: Likewise. * gdb.base/pr11022.c: Likewise. * gdb.base/prelink-lib.c: Likewise. * gdb.base/prelink.c: Likewise. * gdb.base/prologue.c: Likewise. * gdb.base/restore.c: Likewise. * gdb.base/sigchld.c: Likewise. * gdb.base/solib-search-lib1.c: Likewise. * gdb.base/solib-search-lib2.c: Likewise. * gdb.base/solib-search.c: Likewise. * gdb.base/solib-search.h: Likewise. * gdb.base/whatis.c: Likewise. * gdb.cp/abstract-origin.cc: Likewise. * gdb.cp/anon-struct.cc: Likewise. * gdb.cp/baseenum.cc: Likewise. * gdb.cp/bs15503.cc: Likewise. * gdb.cp/call-c-1.c: Likewise. * gdb.cp/call-c.cc: Likewise. * gdb.cp/class2.cc: Likewise. * gdb.cp/classes.cc: Likewise. * gdb.cp/cttiadd.cc: Likewise. * gdb.cp/cttiadd1.cc: Likewise. * gdb.cp/cttiadd2.cc: Likewise. * gdb.cp/cttiadd3.cc: Likewise. * gdb.cp/derivation.cc: Likewise. * gdb.cp/derivation2.cc: Likewise. * gdb.cp/dispcxx.cc: Likewise. * gdb.cp/exception.cc: Likewise. * gdb.cp/gdb2384-base.cc: Likewise. * gdb.cp/gdb2384-base.h: Likewise. * gdb.cp/gdb2384.cc: Likewise. * gdb.cp/gdb2495.cc: Likewise. * gdb.cp/mb-inline.h: Likewise. * gdb.cp/mb-inline1.cc: Likewise. * gdb.cp/mb-inline2.cc: Likewise. * gdb.cp/member-name.cc: Likewise. * gdb.cp/member-ptr.cc: Likewise. * gdb.cp/misc.cc: Likewise. * gdb.cp/namespace1.cc: Likewise. * gdb.cp/nextoverthrow.cc: Likewise. * gdb.cp/pr-574.cc: Likewise. * gdb.cp/pr9631.cc: Likewise. * gdb.cp/printmethod.cc: Likewise. * gdb.cp/psmang1.cc: Likewise. * gdb.cp/psmang2.cc: Likewise. * gdb.cp/psymtab-parameter.cc: Likewise. * gdb.cp/ptype-flags.cc: Likewise. * gdb.cp/ref-params.cc: Likewise. * gdb.cp/ref-types.cc: Likewise. * gdb.cp/smartp.cc: Likewise. * gdb.cp/try_catch.cc: Likewise. * gdb.cp/userdef.cc: Likewise. * gdb.cp/using-crash.cc: Likewise. * gdb.cp/virtfunc.cc: Likewise. * gdb.cp/virtfunc2.cc: Likewise. * gdb.dwarf2/callframecfa.S: Likewise. * gdb.dwarf2/dw2-ranges.c: Likewise. * gdb.dwarf2/dw2-ranges2.c: Likewise. * gdb.dwarf2/dw2-ranges3.c: Likewise. * gdb.dwarf2/dw2-restore.S: Likewise. * gdb.dwarf2/pieces.S: Likewise. * gdb.dwarf2/valop.S: Likewise. * gdb.java/jnpe.java: Likewise. * gdb.mi/mi-stepn.c: Likewise. * gdb.mi/mi-var-cp.cc: Likewise. * gdb.mi/mi-var-rtti.cc: Likewise. * gdb.mi/ns-stale-regcache.c: Likewise. * gdb.mi/pr11022.c: Likewise. * gdb.mi/solib-lib.c: Likewise. * gdb.mi/solib-main.c: Likewise. * gdb.python/py-arch.c: Likewise. * gdb.python/py-block.c: Likewise. * gdb.python/py-breakpoint.c: Likewise. * gdb.python/py-events.c: Likewise. * gdb.python/py-evthreads.c: Likewise. * gdb.python/py-explore.c: Likewise. * gdb.python/py-explore.cc: Likewise. * gdb.python/py-finish-breakpoint.c: Likewise. * gdb.python/py-finish-breakpoint2.cc: Likewise. * gdb.python/py-symbol.c: Likewise. * gdb.threads/execl.c: Likewise. * gdb.threads/execl1.c: Likewise.
2013-06-07 16:39:33 +02:00
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#ifndef __DARWIN_NAT_H__
#define __DARWIN_NAT_H__
#include <mach/mach.h>
Create private_thread_info hierarchy There are multiple definitions of the private_thread_info structure compiled in the same GDB build. Because of the one definition rule, we need to change this if we want to be able to make them non-POD (e.g. use std::vector fields). This patch creates a class hierarchy, with private_thread_info being an abstract base class, and all the specific implementations inheriting from it. In order to poison XNEW/xfree for non-POD types, it is also needed to get rid of the xfree in thread_info::~thread_info, which operates on an opaque type. This is replaced by thread_info::priv now being a unique_ptr, which calls the destructor of the private_thread_info subclass when the thread is being destroyed. Including gdbthread.h from darwin-nat.h gave these errors: /Users/simark/src/binutils-gdb/gdb/gdbthread.h:609:3: error: must use 'class' tag to refer to type 'thread_info' in this scope thread_info *m_thread; ^ class /usr/include/mach/thread_act.h:240:15: note: class 'thread_info' is hidden by a non-type declaration of 'thread_info' here kern_return_t thread_info ^ It turns out that there is a thread_info function in the Darwin/XNU/mach API: http://web.mit.edu/darwin/src/modules/xnu/osfmk/man/thread_info.html Therefore, I had to add the class keyword at a couple of places in gdbthread.h, I don't really see a way around it. gdb/ChangeLog: * gdbthread.h (private_thread_info): Define structure type, add virtual pure destructor. (thread_info) <priv>: Change type to unique_ptr. <private_dtor>: Remove. * thread.c (add_thread_with_info): Adjust to use of unique_ptr. (private_thread_info::~private_thread_info): Provide default implementation. (thread_info::~thread_info): Don't call private_dtor nor manually free priv. * aix-thread.c (private_thread_info): Rename to ... (aix_thread_info): ... this. (get_aix_thread_info): New. (sync_threadlists): Adjust. (iter_tid): Adjust. (aix_thread_resume): Adjust. (aix_thread_fetch_registers): Adjust. (aix_thread_store_registers): Adjust. (aix_thread_extra_thread_info): Adjust. * darwin-nat.h (private_thread_info): Rename to ... (darwin_thread_info): ... this. (get_darwin_thread_info): New. * darwin-nat.c (darwin_init_thread_list): Adjust. (darwin_check_new_threads): Adjust. (thread_info_from_private_thread_info): Adjust. * linux-thread-db.c (private_thread_info): Rename to ... (thread_db_thread_info): ... this, initialize fields. (get_thread_db_thread_info): New. <dying>: Change type to bool. (update_thread_state): Adjust to type rename. (record_thread): Adjust to type rename an use of unique_ptr. (thread_db_pid_to_str): Likewise. (thread_db_extra_thread_info): Likewise. (thread_db_thread_handle_to_thread_info): Likewise. (thread_db_get_thread_local_address): Likewise. * nto-tdep.h (private_thread_info): Rename to ... (nto_thread_info): ... this, initialize fields. (get_nto_thread_info): New. <name>: Change type to std::string. * nto-tdep.c (nto_extra_thread_info): Adjust to type rename and use of unique_ptr. * nto-procfs.c (update_thread_private_data_name): Adjust to std::string change, allocate nto_private_thread_info with new. (update_thread_private_data): Adjust to unique_ptr. * remote.c (private_thread_info): Rename to ... (remote_thread_info): ... this, initialize data members with default values. <extra, name>: Change type to std::string. <thread_handle>: Change type to non-pointer. (free_private_thread_info): Remove. (get_private_info_thread): Rename to... (get_remote_thread_info): ... this, change return type, adjust to use of unique_ptr, use remote_thread_info constructor. (remote_add_thread): Adjust. (get_private_info_ptid): Rename to... (get_remote_thread_info): ...this, change return type. (remote_thread_name): Use get_remote_thread_info, adjust to change to std::string. (struct thread_item) <~thread_item>: Remove. <thread_handle>: Make non pointer. (start_thread): Adjust to thread_item::thread_handle type change. (remote_update_thread_list): Adjust to type name change, move strings from temporary to long-lived object instead of duplicating. (remote_threads_extra_info): Use get_remote_thread_info. (process_initial_stop_replies): Likewise. (resume_clear_thread_private_info): Likewise. (remote_resume): Adjust to type name change. (remote_commit_resume): Use get_remote_thread_info. (process_stop_reply): Adjust to type name change. (remote_stopped_by_sw_breakpoint): Use get_remote_thread_info. (remote_stopped_by_hw_breakpoint): Likewise. (remote_stopped_by_watchpoint): Likewise. (remote_stopped_data_address): Likewise. (remote_core_of_thread): Likewise. (remote_thread_handle_to_thread_info): Use get_private_info_thread, adjust to thread_handle field type change.
2017-11-24 16:40:31 +01:00
#include "gdbthread.h"
/* Describe the mach exception handling state for a task. This state is saved
before being changed and restored when a process is detached.
For more information on these fields see task_get_exception_ports manual
page. */
struct darwin_exception_info
{
/* Exceptions handled by the port. */
Create private_inferior class hierarchy There are currently multiple definitions of private_inferior, defined in remote.c and darwin-nat.h. The patch that poisons XNEW and friends for non-POD types trips on that, because private_inferior is freed in ~inferior(), where it is an opaque type. Since the compiler can't tell whether the type is POD, it gives an error. Also, we can't start using C++ features in these structures (make them non-POD) as long as there are multiple definitions with the same name. For these reasons, this patch makes a class hierarchy, with private_inferior being the abstract base class, and darwin_inferior & remote_inferior inheriting from it. Destruction is done through the virtual destructor. I stumbled on some suspicious code in the darwin implementation though. darwin_check_new_threads does an XCNEW(darwin_thread_t) when it finds a new thread, allocating a new structure for it (darwin_thread_t is a typedef for private_thread_info). It then VEC_safe_pushes it in a vector defined as DEF_VEC_O (a vector of objects). This means that the structure content gets copied in the vector. The thread_info object is created with the XCNEW'ed structure as the private thread info, while the rest of the code works with the instance in the vector. We have therefore two distinct instances of darwin_thread_t/private_thread_info for each thread. This is not really a problem in practice, because thread_info::priv is not used in the darwin code. I still find it weird and far from ideal, so I tried to fix it by changing the vector to be a vector of pointers. There should now be a single instance of the structure for each thread. The deallocation of the darwin_thread_t/private_thread_info structure is done by the thread_info destructor. I am able to build on macOS, but not really test, since the port seems a bit broken. I am not able to debug reliably on the machine I have access to, which runs macOS 10.12.6. gdb/ChangeLog: * inferior.h (private_inferior): Define structure type, add virtual pure destructor. (inferior) <priv>: Change type to unique_ptr. * inferior.c (private_inferior::~private_inferior): Provide default implementation. (inferior::~inferior): Don't free priv field. (exit_inferior_1): Likewise. * darwin-nat.h (struct darwin_exception_info): Initialize fields. (darwin_exception_info): Remove typedef. (DEF_VEC_O (darwin_thread_t)); Remove. (private_inferior): Rename to ... (darwin_private_inferior): ... this, extend private_inferior. (get_darwin_inferior): New. <threads>: Change type to std::vector of darwin_thread_t pointers. * darwin-nat.c (darwin_check_new_threads): Adjust. (find_inferior_task_it): Adjust. (darwin_find_thread); Adjust. (darwin_suspend_inferior): Adjust. (darwin_resume_inferior): Adjust. (darwin_find_new_inferior): Adjust. (darwin_decode_notify_message): Adjust. (darwin_send_reply): Adjust. (darwin_resume_inferior_threads): Adjust. (darwin_suspend_inferior_threads): Adjust. (darwin_decode_message): Adjust. (darwin_wait): Adjust. (darwin_interrupt): Adjust. (darwin_deallocate_threads): Adjust. (darwin_mourn_inferior): Adjust, don't free private data. (darwin_reply_to_all_pending_messages): Adjust. (darwin_stop_inferior): Adjust. (darwin_setup_exceptions): Adjust. (darwin_kill_inferior): Adjust. (darwin_setup_request_notification): Adjust. (darwin_attach_pid): Adjust. (darwin_init_thread_list): Adjust. (darwin_setup_fake_stop_event): Adjust. (darwin_attach): Adjust. (darwin_detach): Adjust. (darwin_xfer_partial): Adjust. (set_enable_mach_exceptions): Adjust. (darwin_pid_to_exec_file): Adjust. (darwin_get_ada_task_ptid): Adjust. * darwin-nat-info.c (get_task_from_args): Adjust. (info_mach_ports_command): Adjust. (info_mach_region_command): Adjust. (info_mach_exceptions_command): Adjust. * remote.c (private_inferior): Rename to ... (remote_private_inferior): ... this, initialize fields. (get_remote_inferior); New. (remote_commit_resume): Use get_remote_inferior. (check_pending_event_prevents_wildcard_vcont_callback): Likewise.
2017-11-24 16:39:30 +01:00
exception_mask_t masks[EXC_TYPES_COUNT] {};
/* Ports receiving exception messages. */
Create private_inferior class hierarchy There are currently multiple definitions of private_inferior, defined in remote.c and darwin-nat.h. The patch that poisons XNEW and friends for non-POD types trips on that, because private_inferior is freed in ~inferior(), where it is an opaque type. Since the compiler can't tell whether the type is POD, it gives an error. Also, we can't start using C++ features in these structures (make them non-POD) as long as there are multiple definitions with the same name. For these reasons, this patch makes a class hierarchy, with private_inferior being the abstract base class, and darwin_inferior & remote_inferior inheriting from it. Destruction is done through the virtual destructor. I stumbled on some suspicious code in the darwin implementation though. darwin_check_new_threads does an XCNEW(darwin_thread_t) when it finds a new thread, allocating a new structure for it (darwin_thread_t is a typedef for private_thread_info). It then VEC_safe_pushes it in a vector defined as DEF_VEC_O (a vector of objects). This means that the structure content gets copied in the vector. The thread_info object is created with the XCNEW'ed structure as the private thread info, while the rest of the code works with the instance in the vector. We have therefore two distinct instances of darwin_thread_t/private_thread_info for each thread. This is not really a problem in practice, because thread_info::priv is not used in the darwin code. I still find it weird and far from ideal, so I tried to fix it by changing the vector to be a vector of pointers. There should now be a single instance of the structure for each thread. The deallocation of the darwin_thread_t/private_thread_info structure is done by the thread_info destructor. I am able to build on macOS, but not really test, since the port seems a bit broken. I am not able to debug reliably on the machine I have access to, which runs macOS 10.12.6. gdb/ChangeLog: * inferior.h (private_inferior): Define structure type, add virtual pure destructor. (inferior) <priv>: Change type to unique_ptr. * inferior.c (private_inferior::~private_inferior): Provide default implementation. (inferior::~inferior): Don't free priv field. (exit_inferior_1): Likewise. * darwin-nat.h (struct darwin_exception_info): Initialize fields. (darwin_exception_info): Remove typedef. (DEF_VEC_O (darwin_thread_t)); Remove. (private_inferior): Rename to ... (darwin_private_inferior): ... this, extend private_inferior. (get_darwin_inferior): New. <threads>: Change type to std::vector of darwin_thread_t pointers. * darwin-nat.c (darwin_check_new_threads): Adjust. (find_inferior_task_it): Adjust. (darwin_find_thread); Adjust. (darwin_suspend_inferior): Adjust. (darwin_resume_inferior): Adjust. (darwin_find_new_inferior): Adjust. (darwin_decode_notify_message): Adjust. (darwin_send_reply): Adjust. (darwin_resume_inferior_threads): Adjust. (darwin_suspend_inferior_threads): Adjust. (darwin_decode_message): Adjust. (darwin_wait): Adjust. (darwin_interrupt): Adjust. (darwin_deallocate_threads): Adjust. (darwin_mourn_inferior): Adjust, don't free private data. (darwin_reply_to_all_pending_messages): Adjust. (darwin_stop_inferior): Adjust. (darwin_setup_exceptions): Adjust. (darwin_kill_inferior): Adjust. (darwin_setup_request_notification): Adjust. (darwin_attach_pid): Adjust. (darwin_init_thread_list): Adjust. (darwin_setup_fake_stop_event): Adjust. (darwin_attach): Adjust. (darwin_detach): Adjust. (darwin_xfer_partial): Adjust. (set_enable_mach_exceptions): Adjust. (darwin_pid_to_exec_file): Adjust. (darwin_get_ada_task_ptid): Adjust. * darwin-nat-info.c (get_task_from_args): Adjust. (info_mach_ports_command): Adjust. (info_mach_region_command): Adjust. (info_mach_exceptions_command): Adjust. * remote.c (private_inferior): Rename to ... (remote_private_inferior): ... this, initialize fields. (get_remote_inferior); New. (remote_commit_resume): Use get_remote_inferior. (check_pending_event_prevents_wildcard_vcont_callback): Likewise.
2017-11-24 16:39:30 +01:00
mach_port_t ports[EXC_TYPES_COUNT] {};
/* Type of messages sent. */
Create private_inferior class hierarchy There are currently multiple definitions of private_inferior, defined in remote.c and darwin-nat.h. The patch that poisons XNEW and friends for non-POD types trips on that, because private_inferior is freed in ~inferior(), where it is an opaque type. Since the compiler can't tell whether the type is POD, it gives an error. Also, we can't start using C++ features in these structures (make them non-POD) as long as there are multiple definitions with the same name. For these reasons, this patch makes a class hierarchy, with private_inferior being the abstract base class, and darwin_inferior & remote_inferior inheriting from it. Destruction is done through the virtual destructor. I stumbled on some suspicious code in the darwin implementation though. darwin_check_new_threads does an XCNEW(darwin_thread_t) when it finds a new thread, allocating a new structure for it (darwin_thread_t is a typedef for private_thread_info). It then VEC_safe_pushes it in a vector defined as DEF_VEC_O (a vector of objects). This means that the structure content gets copied in the vector. The thread_info object is created with the XCNEW'ed structure as the private thread info, while the rest of the code works with the instance in the vector. We have therefore two distinct instances of darwin_thread_t/private_thread_info for each thread. This is not really a problem in practice, because thread_info::priv is not used in the darwin code. I still find it weird and far from ideal, so I tried to fix it by changing the vector to be a vector of pointers. There should now be a single instance of the structure for each thread. The deallocation of the darwin_thread_t/private_thread_info structure is done by the thread_info destructor. I am able to build on macOS, but not really test, since the port seems a bit broken. I am not able to debug reliably on the machine I have access to, which runs macOS 10.12.6. gdb/ChangeLog: * inferior.h (private_inferior): Define structure type, add virtual pure destructor. (inferior) <priv>: Change type to unique_ptr. * inferior.c (private_inferior::~private_inferior): Provide default implementation. (inferior::~inferior): Don't free priv field. (exit_inferior_1): Likewise. * darwin-nat.h (struct darwin_exception_info): Initialize fields. (darwin_exception_info): Remove typedef. (DEF_VEC_O (darwin_thread_t)); Remove. (private_inferior): Rename to ... (darwin_private_inferior): ... this, extend private_inferior. (get_darwin_inferior): New. <threads>: Change type to std::vector of darwin_thread_t pointers. * darwin-nat.c (darwin_check_new_threads): Adjust. (find_inferior_task_it): Adjust. (darwin_find_thread); Adjust. (darwin_suspend_inferior): Adjust. (darwin_resume_inferior): Adjust. (darwin_find_new_inferior): Adjust. (darwin_decode_notify_message): Adjust. (darwin_send_reply): Adjust. (darwin_resume_inferior_threads): Adjust. (darwin_suspend_inferior_threads): Adjust. (darwin_decode_message): Adjust. (darwin_wait): Adjust. (darwin_interrupt): Adjust. (darwin_deallocate_threads): Adjust. (darwin_mourn_inferior): Adjust, don't free private data. (darwin_reply_to_all_pending_messages): Adjust. (darwin_stop_inferior): Adjust. (darwin_setup_exceptions): Adjust. (darwin_kill_inferior): Adjust. (darwin_setup_request_notification): Adjust. (darwin_attach_pid): Adjust. (darwin_init_thread_list): Adjust. (darwin_setup_fake_stop_event): Adjust. (darwin_attach): Adjust. (darwin_detach): Adjust. (darwin_xfer_partial): Adjust. (set_enable_mach_exceptions): Adjust. (darwin_pid_to_exec_file): Adjust. (darwin_get_ada_task_ptid): Adjust. * darwin-nat-info.c (get_task_from_args): Adjust. (info_mach_ports_command): Adjust. (info_mach_region_command): Adjust. (info_mach_exceptions_command): Adjust. * remote.c (private_inferior): Rename to ... (remote_private_inferior): ... this, initialize fields. (get_remote_inferior); New. (remote_commit_resume): Use get_remote_inferior. (check_pending_event_prevents_wildcard_vcont_callback): Likewise.
2017-11-24 16:39:30 +01:00
exception_behavior_t behaviors[EXC_TYPES_COUNT] {};
/* Type of state to be sent. */
Create private_inferior class hierarchy There are currently multiple definitions of private_inferior, defined in remote.c and darwin-nat.h. The patch that poisons XNEW and friends for non-POD types trips on that, because private_inferior is freed in ~inferior(), where it is an opaque type. Since the compiler can't tell whether the type is POD, it gives an error. Also, we can't start using C++ features in these structures (make them non-POD) as long as there are multiple definitions with the same name. For these reasons, this patch makes a class hierarchy, with private_inferior being the abstract base class, and darwin_inferior & remote_inferior inheriting from it. Destruction is done through the virtual destructor. I stumbled on some suspicious code in the darwin implementation though. darwin_check_new_threads does an XCNEW(darwin_thread_t) when it finds a new thread, allocating a new structure for it (darwin_thread_t is a typedef for private_thread_info). It then VEC_safe_pushes it in a vector defined as DEF_VEC_O (a vector of objects). This means that the structure content gets copied in the vector. The thread_info object is created with the XCNEW'ed structure as the private thread info, while the rest of the code works with the instance in the vector. We have therefore two distinct instances of darwin_thread_t/private_thread_info for each thread. This is not really a problem in practice, because thread_info::priv is not used in the darwin code. I still find it weird and far from ideal, so I tried to fix it by changing the vector to be a vector of pointers. There should now be a single instance of the structure for each thread. The deallocation of the darwin_thread_t/private_thread_info structure is done by the thread_info destructor. I am able to build on macOS, but not really test, since the port seems a bit broken. I am not able to debug reliably on the machine I have access to, which runs macOS 10.12.6. gdb/ChangeLog: * inferior.h (private_inferior): Define structure type, add virtual pure destructor. (inferior) <priv>: Change type to unique_ptr. * inferior.c (private_inferior::~private_inferior): Provide default implementation. (inferior::~inferior): Don't free priv field. (exit_inferior_1): Likewise. * darwin-nat.h (struct darwin_exception_info): Initialize fields. (darwin_exception_info): Remove typedef. (DEF_VEC_O (darwin_thread_t)); Remove. (private_inferior): Rename to ... (darwin_private_inferior): ... this, extend private_inferior. (get_darwin_inferior): New. <threads>: Change type to std::vector of darwin_thread_t pointers. * darwin-nat.c (darwin_check_new_threads): Adjust. (find_inferior_task_it): Adjust. (darwin_find_thread); Adjust. (darwin_suspend_inferior): Adjust. (darwin_resume_inferior): Adjust. (darwin_find_new_inferior): Adjust. (darwin_decode_notify_message): Adjust. (darwin_send_reply): Adjust. (darwin_resume_inferior_threads): Adjust. (darwin_suspend_inferior_threads): Adjust. (darwin_decode_message): Adjust. (darwin_wait): Adjust. (darwin_interrupt): Adjust. (darwin_deallocate_threads): Adjust. (darwin_mourn_inferior): Adjust, don't free private data. (darwin_reply_to_all_pending_messages): Adjust. (darwin_stop_inferior): Adjust. (darwin_setup_exceptions): Adjust. (darwin_kill_inferior): Adjust. (darwin_setup_request_notification): Adjust. (darwin_attach_pid): Adjust. (darwin_init_thread_list): Adjust. (darwin_setup_fake_stop_event): Adjust. (darwin_attach): Adjust. (darwin_detach): Adjust. (darwin_xfer_partial): Adjust. (set_enable_mach_exceptions): Adjust. (darwin_pid_to_exec_file): Adjust. (darwin_get_ada_task_ptid): Adjust. * darwin-nat-info.c (get_task_from_args): Adjust. (info_mach_ports_command): Adjust. (info_mach_region_command): Adjust. (info_mach_exceptions_command): Adjust. * remote.c (private_inferior): Rename to ... (remote_private_inferior): ... this, initialize fields. (get_remote_inferior); New. (remote_commit_resume): Use get_remote_inferior. (check_pending_event_prevents_wildcard_vcont_callback): Likewise.
2017-11-24 16:39:30 +01:00
thread_state_flavor_t flavors[EXC_TYPES_COUNT] {};
/* Number of elements set. */
Create private_inferior class hierarchy There are currently multiple definitions of private_inferior, defined in remote.c and darwin-nat.h. The patch that poisons XNEW and friends for non-POD types trips on that, because private_inferior is freed in ~inferior(), where it is an opaque type. Since the compiler can't tell whether the type is POD, it gives an error. Also, we can't start using C++ features in these structures (make them non-POD) as long as there are multiple definitions with the same name. For these reasons, this patch makes a class hierarchy, with private_inferior being the abstract base class, and darwin_inferior & remote_inferior inheriting from it. Destruction is done through the virtual destructor. I stumbled on some suspicious code in the darwin implementation though. darwin_check_new_threads does an XCNEW(darwin_thread_t) when it finds a new thread, allocating a new structure for it (darwin_thread_t is a typedef for private_thread_info). It then VEC_safe_pushes it in a vector defined as DEF_VEC_O (a vector of objects). This means that the structure content gets copied in the vector. The thread_info object is created with the XCNEW'ed structure as the private thread info, while the rest of the code works with the instance in the vector. We have therefore two distinct instances of darwin_thread_t/private_thread_info for each thread. This is not really a problem in practice, because thread_info::priv is not used in the darwin code. I still find it weird and far from ideal, so I tried to fix it by changing the vector to be a vector of pointers. There should now be a single instance of the structure for each thread. The deallocation of the darwin_thread_t/private_thread_info structure is done by the thread_info destructor. I am able to build on macOS, but not really test, since the port seems a bit broken. I am not able to debug reliably on the machine I have access to, which runs macOS 10.12.6. gdb/ChangeLog: * inferior.h (private_inferior): Define structure type, add virtual pure destructor. (inferior) <priv>: Change type to unique_ptr. * inferior.c (private_inferior::~private_inferior): Provide default implementation. (inferior::~inferior): Don't free priv field. (exit_inferior_1): Likewise. * darwin-nat.h (struct darwin_exception_info): Initialize fields. (darwin_exception_info): Remove typedef. (DEF_VEC_O (darwin_thread_t)); Remove. (private_inferior): Rename to ... (darwin_private_inferior): ... this, extend private_inferior. (get_darwin_inferior): New. <threads>: Change type to std::vector of darwin_thread_t pointers. * darwin-nat.c (darwin_check_new_threads): Adjust. (find_inferior_task_it): Adjust. (darwin_find_thread); Adjust. (darwin_suspend_inferior): Adjust. (darwin_resume_inferior): Adjust. (darwin_find_new_inferior): Adjust. (darwin_decode_notify_message): Adjust. (darwin_send_reply): Adjust. (darwin_resume_inferior_threads): Adjust. (darwin_suspend_inferior_threads): Adjust. (darwin_decode_message): Adjust. (darwin_wait): Adjust. (darwin_interrupt): Adjust. (darwin_deallocate_threads): Adjust. (darwin_mourn_inferior): Adjust, don't free private data. (darwin_reply_to_all_pending_messages): Adjust. (darwin_stop_inferior): Adjust. (darwin_setup_exceptions): Adjust. (darwin_kill_inferior): Adjust. (darwin_setup_request_notification): Adjust. (darwin_attach_pid): Adjust. (darwin_init_thread_list): Adjust. (darwin_setup_fake_stop_event): Adjust. (darwin_attach): Adjust. (darwin_detach): Adjust. (darwin_xfer_partial): Adjust. (set_enable_mach_exceptions): Adjust. (darwin_pid_to_exec_file): Adjust. (darwin_get_ada_task_ptid): Adjust. * darwin-nat-info.c (get_task_from_args): Adjust. (info_mach_ports_command): Adjust. (info_mach_region_command): Adjust. (info_mach_exceptions_command): Adjust. * remote.c (private_inferior): Rename to ... (remote_private_inferior): ... this, initialize fields. (get_remote_inferior); New. (remote_commit_resume): Use get_remote_inferior. (check_pending_event_prevents_wildcard_vcont_callback): Likewise.
2017-11-24 16:39:30 +01:00
mach_msg_type_number_t count = 0;
};
2009-06-19 Tristan Gingold <gingold@adacore.com> * machoread.c (macho_symtab_read): Adjust for bfd changes. * darwin-nat.h (struct darwin_exception_msg): New type to describe a mach exception. (struct private_thread_info): New type to describe the state of the thread. (DEF_VEC_I thread_t): Removed, replaced by ... (DEF_VEC_O darwin_thread_t): ... this new type. (struct darwin_inferior): Renamed to ... (struct private_inferior): ... this type. Fields added. (darwin_not_port): Moved into the private inferior structure. * darwin-nat.c: Add includes, improve comments. Rewrite to handle multiple threads and processes. (darwin_resume_to): New function and protype. (darwin_resume, darwin_wait_to, darwin_wait): Ditto. (darwin_kill_inferior): Add ops argument. (darwin_pid_to_str): New function. (darwin_thread_alive): Ditto. (darwin_inf, darwin_not_port): Removed. (darwin_inf_fake_stop): New variable. (msgin, msgout, msg_state, exc_msg): Removed. (mach_check_error): Use warning instead of error. (darwin_ptrace): Adjust debug level. (cmp_thread_t): Fix names (typo). (darwin_check_new_threads): Argument is now an inferior, adjust for new structures, add no change check, ignore dead ports, handle first thread case. (find_inferior_task_it): New function. (find_inferior_notify_it): Ditto. (darwin_find_inferior_by_task): Ditto. (darwin_find_inferior_by_notify): Ditto. (darwin_find_thread): Ditto. (darwin_suspend_inferior): Ditto. (darwin_resume_inferior): Ditto. (catch_exception_raise_state): Removed. (catch_exception_raise_state_identity): Removed. (darwin_suspend_inferior_it): New function. (darwin_resume_inferior_it): Ditto. (darwin_dump_message): New function, extracted from darwin_wait. (darwin_decode_exception_message): New function. (darwin_encode_reply): New function. (catch_exception_raise): Removed. (darwin_send_reply): New function, extracted from darwin_resume. (darwin_resume_thread): New function, extracted from darwin_resume. (struct resume_inferior_threads_param): New type. (darwin_resume_inferior_threads_it): New function. (darwin_resume_inferior_threads): New function. (darwin_suspend_inferior_threads): New function. (darwin_resume): Mostly rewritten to handle multiple threads and some corner cases. (darwin_decode_message): New function extracted from darwin_wait. (cancel_breakpoint): New function. (darwin_wait): Mostly rewritten. Handle multiple threads. (darwin_mourn_inferior): Adjust for per process structures. (darwin_reply_to_all_pending_messages): New function. (darwin_stop_inferior): Adjust for per inferior structures. (darwin_attach_pid): Ditto. (darwin_init_thread_list): Ditto. (darwin_attach): Ditto. (darwin_detach): Ditto. (darwin_files_info): Now empty. (darwin_pid_to_str): Adjust returns string to match one expected by the testsuite. (darwin_read_write_inferior): Rename err variable to match other uses. Adjust debug message. Handle submaps. (darwin_xfer_memory): Adjust for per inferior structures. (set_enable_mach_exceptions): Ditto. (darwin_pid_to_exec_file): New function. (darwin_get_ada_task_ptid): Ditto. (darwin_supports_multi_process): Ditto. (_initialize_darwin_inferior): Remove useless assertion, adjust for per inferior structures. Add new target operations.
2009-06-19 16:30:30 +02:00
struct darwin_exception_msg
{
2009-06-19 Tristan Gingold <gingold@adacore.com> * machoread.c (macho_symtab_read): Adjust for bfd changes. * darwin-nat.h (struct darwin_exception_msg): New type to describe a mach exception. (struct private_thread_info): New type to describe the state of the thread. (DEF_VEC_I thread_t): Removed, replaced by ... (DEF_VEC_O darwin_thread_t): ... this new type. (struct darwin_inferior): Renamed to ... (struct private_inferior): ... this type. Fields added. (darwin_not_port): Moved into the private inferior structure. * darwin-nat.c: Add includes, improve comments. Rewrite to handle multiple threads and processes. (darwin_resume_to): New function and protype. (darwin_resume, darwin_wait_to, darwin_wait): Ditto. (darwin_kill_inferior): Add ops argument. (darwin_pid_to_str): New function. (darwin_thread_alive): Ditto. (darwin_inf, darwin_not_port): Removed. (darwin_inf_fake_stop): New variable. (msgin, msgout, msg_state, exc_msg): Removed. (mach_check_error): Use warning instead of error. (darwin_ptrace): Adjust debug level. (cmp_thread_t): Fix names (typo). (darwin_check_new_threads): Argument is now an inferior, adjust for new structures, add no change check, ignore dead ports, handle first thread case. (find_inferior_task_it): New function. (find_inferior_notify_it): Ditto. (darwin_find_inferior_by_task): Ditto. (darwin_find_inferior_by_notify): Ditto. (darwin_find_thread): Ditto. (darwin_suspend_inferior): Ditto. (darwin_resume_inferior): Ditto. (catch_exception_raise_state): Removed. (catch_exception_raise_state_identity): Removed. (darwin_suspend_inferior_it): New function. (darwin_resume_inferior_it): Ditto. (darwin_dump_message): New function, extracted from darwin_wait. (darwin_decode_exception_message): New function. (darwin_encode_reply): New function. (catch_exception_raise): Removed. (darwin_send_reply): New function, extracted from darwin_resume. (darwin_resume_thread): New function, extracted from darwin_resume. (struct resume_inferior_threads_param): New type. (darwin_resume_inferior_threads_it): New function. (darwin_resume_inferior_threads): New function. (darwin_suspend_inferior_threads): New function. (darwin_resume): Mostly rewritten to handle multiple threads and some corner cases. (darwin_decode_message): New function extracted from darwin_wait. (cancel_breakpoint): New function. (darwin_wait): Mostly rewritten. Handle multiple threads. (darwin_mourn_inferior): Adjust for per process structures. (darwin_reply_to_all_pending_messages): New function. (darwin_stop_inferior): Adjust for per inferior structures. (darwin_attach_pid): Ditto. (darwin_init_thread_list): Ditto. (darwin_attach): Ditto. (darwin_detach): Ditto. (darwin_files_info): Now empty. (darwin_pid_to_str): Adjust returns string to match one expected by the testsuite. (darwin_read_write_inferior): Rename err variable to match other uses. Adjust debug message. Handle submaps. (darwin_xfer_memory): Adjust for per inferior structures. (set_enable_mach_exceptions): Ditto. (darwin_pid_to_exec_file): New function. (darwin_get_ada_task_ptid): Ditto. (darwin_supports_multi_process): Ditto. (_initialize_darwin_inferior): Remove useless assertion, adjust for per inferior structures. Add new target operations.
2009-06-19 16:30:30 +02:00
mach_msg_header_t header;
/* Thread and task taking the exception. */
mach_port_t thread_port;
mach_port_t task_port;
/* Type of the exception. */
exception_type_t ex_type;
/* Machine dependent details. */
mach_msg_type_number_t data_count;
integer_t ex_data[2];
};
enum darwin_msg_state
{
/* The thread is running. */
DARWIN_RUNNING,
/* The thread is stopped. */
DARWIN_STOPPED,
/* The thread has sent a message and waits for a reply. */
DARWIN_MESSAGE
};
2009-06-19 Tristan Gingold <gingold@adacore.com> * machoread.c (macho_symtab_read): Adjust for bfd changes. * darwin-nat.h (struct darwin_exception_msg): New type to describe a mach exception. (struct private_thread_info): New type to describe the state of the thread. (DEF_VEC_I thread_t): Removed, replaced by ... (DEF_VEC_O darwin_thread_t): ... this new type. (struct darwin_inferior): Renamed to ... (struct private_inferior): ... this type. Fields added. (darwin_not_port): Moved into the private inferior structure. * darwin-nat.c: Add includes, improve comments. Rewrite to handle multiple threads and processes. (darwin_resume_to): New function and protype. (darwin_resume, darwin_wait_to, darwin_wait): Ditto. (darwin_kill_inferior): Add ops argument. (darwin_pid_to_str): New function. (darwin_thread_alive): Ditto. (darwin_inf, darwin_not_port): Removed. (darwin_inf_fake_stop): New variable. (msgin, msgout, msg_state, exc_msg): Removed. (mach_check_error): Use warning instead of error. (darwin_ptrace): Adjust debug level. (cmp_thread_t): Fix names (typo). (darwin_check_new_threads): Argument is now an inferior, adjust for new structures, add no change check, ignore dead ports, handle first thread case. (find_inferior_task_it): New function. (find_inferior_notify_it): Ditto. (darwin_find_inferior_by_task): Ditto. (darwin_find_inferior_by_notify): Ditto. (darwin_find_thread): Ditto. (darwin_suspend_inferior): Ditto. (darwin_resume_inferior): Ditto. (catch_exception_raise_state): Removed. (catch_exception_raise_state_identity): Removed. (darwin_suspend_inferior_it): New function. (darwin_resume_inferior_it): Ditto. (darwin_dump_message): New function, extracted from darwin_wait. (darwin_decode_exception_message): New function. (darwin_encode_reply): New function. (catch_exception_raise): Removed. (darwin_send_reply): New function, extracted from darwin_resume. (darwin_resume_thread): New function, extracted from darwin_resume. (struct resume_inferior_threads_param): New type. (darwin_resume_inferior_threads_it): New function. (darwin_resume_inferior_threads): New function. (darwin_suspend_inferior_threads): New function. (darwin_resume): Mostly rewritten to handle multiple threads and some corner cases. (darwin_decode_message): New function extracted from darwin_wait. (cancel_breakpoint): New function. (darwin_wait): Mostly rewritten. Handle multiple threads. (darwin_mourn_inferior): Adjust for per process structures. (darwin_reply_to_all_pending_messages): New function. (darwin_stop_inferior): Adjust for per inferior structures. (darwin_attach_pid): Ditto. (darwin_init_thread_list): Ditto. (darwin_attach): Ditto. (darwin_detach): Ditto. (darwin_files_info): Now empty. (darwin_pid_to_str): Adjust returns string to match one expected by the testsuite. (darwin_read_write_inferior): Rename err variable to match other uses. Adjust debug message. Handle submaps. (darwin_xfer_memory): Adjust for per inferior structures. (set_enable_mach_exceptions): Ditto. (darwin_pid_to_exec_file): New function. (darwin_get_ada_task_ptid): Ditto. (darwin_supports_multi_process): Ditto. (_initialize_darwin_inferior): Remove useless assertion, adjust for per inferior structures. Add new target operations.
2009-06-19 16:30:30 +02:00
Create private_thread_info hierarchy There are multiple definitions of the private_thread_info structure compiled in the same GDB build. Because of the one definition rule, we need to change this if we want to be able to make them non-POD (e.g. use std::vector fields). This patch creates a class hierarchy, with private_thread_info being an abstract base class, and all the specific implementations inheriting from it. In order to poison XNEW/xfree for non-POD types, it is also needed to get rid of the xfree in thread_info::~thread_info, which operates on an opaque type. This is replaced by thread_info::priv now being a unique_ptr, which calls the destructor of the private_thread_info subclass when the thread is being destroyed. Including gdbthread.h from darwin-nat.h gave these errors: /Users/simark/src/binutils-gdb/gdb/gdbthread.h:609:3: error: must use 'class' tag to refer to type 'thread_info' in this scope thread_info *m_thread; ^ class /usr/include/mach/thread_act.h:240:15: note: class 'thread_info' is hidden by a non-type declaration of 'thread_info' here kern_return_t thread_info ^ It turns out that there is a thread_info function in the Darwin/XNU/mach API: http://web.mit.edu/darwin/src/modules/xnu/osfmk/man/thread_info.html Therefore, I had to add the class keyword at a couple of places in gdbthread.h, I don't really see a way around it. gdb/ChangeLog: * gdbthread.h (private_thread_info): Define structure type, add virtual pure destructor. (thread_info) <priv>: Change type to unique_ptr. <private_dtor>: Remove. * thread.c (add_thread_with_info): Adjust to use of unique_ptr. (private_thread_info::~private_thread_info): Provide default implementation. (thread_info::~thread_info): Don't call private_dtor nor manually free priv. * aix-thread.c (private_thread_info): Rename to ... (aix_thread_info): ... this. (get_aix_thread_info): New. (sync_threadlists): Adjust. (iter_tid): Adjust. (aix_thread_resume): Adjust. (aix_thread_fetch_registers): Adjust. (aix_thread_store_registers): Adjust. (aix_thread_extra_thread_info): Adjust. * darwin-nat.h (private_thread_info): Rename to ... (darwin_thread_info): ... this. (get_darwin_thread_info): New. * darwin-nat.c (darwin_init_thread_list): Adjust. (darwin_check_new_threads): Adjust. (thread_info_from_private_thread_info): Adjust. * linux-thread-db.c (private_thread_info): Rename to ... (thread_db_thread_info): ... this, initialize fields. (get_thread_db_thread_info): New. <dying>: Change type to bool. (update_thread_state): Adjust to type rename. (record_thread): Adjust to type rename an use of unique_ptr. (thread_db_pid_to_str): Likewise. (thread_db_extra_thread_info): Likewise. (thread_db_thread_handle_to_thread_info): Likewise. (thread_db_get_thread_local_address): Likewise. * nto-tdep.h (private_thread_info): Rename to ... (nto_thread_info): ... this, initialize fields. (get_nto_thread_info): New. <name>: Change type to std::string. * nto-tdep.c (nto_extra_thread_info): Adjust to type rename and use of unique_ptr. * nto-procfs.c (update_thread_private_data_name): Adjust to std::string change, allocate nto_private_thread_info with new. (update_thread_private_data): Adjust to unique_ptr. * remote.c (private_thread_info): Rename to ... (remote_thread_info): ... this, initialize data members with default values. <extra, name>: Change type to std::string. <thread_handle>: Change type to non-pointer. (free_private_thread_info): Remove. (get_private_info_thread): Rename to... (get_remote_thread_info): ... this, change return type, adjust to use of unique_ptr, use remote_thread_info constructor. (remote_add_thread): Adjust. (get_private_info_ptid): Rename to... (get_remote_thread_info): ...this, change return type. (remote_thread_name): Use get_remote_thread_info, adjust to change to std::string. (struct thread_item) <~thread_item>: Remove. <thread_handle>: Make non pointer. (start_thread): Adjust to thread_item::thread_handle type change. (remote_update_thread_list): Adjust to type name change, move strings from temporary to long-lived object instead of duplicating. (remote_threads_extra_info): Use get_remote_thread_info. (process_initial_stop_replies): Likewise. (resume_clear_thread_private_info): Likewise. (remote_resume): Adjust to type name change. (remote_commit_resume): Use get_remote_thread_info. (process_stop_reply): Adjust to type name change. (remote_stopped_by_sw_breakpoint): Use get_remote_thread_info. (remote_stopped_by_hw_breakpoint): Likewise. (remote_stopped_by_watchpoint): Likewise. (remote_stopped_data_address): Likewise. (remote_core_of_thread): Likewise. (remote_thread_handle_to_thread_info): Use get_private_info_thread, adjust to thread_handle field type change.
2017-11-24 16:40:31 +01:00
struct darwin_thread_info : public private_thread_info
2009-06-19 Tristan Gingold <gingold@adacore.com> * machoread.c (macho_symtab_read): Adjust for bfd changes. * darwin-nat.h (struct darwin_exception_msg): New type to describe a mach exception. (struct private_thread_info): New type to describe the state of the thread. (DEF_VEC_I thread_t): Removed, replaced by ... (DEF_VEC_O darwin_thread_t): ... this new type. (struct darwin_inferior): Renamed to ... (struct private_inferior): ... this type. Fields added. (darwin_not_port): Moved into the private inferior structure. * darwin-nat.c: Add includes, improve comments. Rewrite to handle multiple threads and processes. (darwin_resume_to): New function and protype. (darwin_resume, darwin_wait_to, darwin_wait): Ditto. (darwin_kill_inferior): Add ops argument. (darwin_pid_to_str): New function. (darwin_thread_alive): Ditto. (darwin_inf, darwin_not_port): Removed. (darwin_inf_fake_stop): New variable. (msgin, msgout, msg_state, exc_msg): Removed. (mach_check_error): Use warning instead of error. (darwin_ptrace): Adjust debug level. (cmp_thread_t): Fix names (typo). (darwin_check_new_threads): Argument is now an inferior, adjust for new structures, add no change check, ignore dead ports, handle first thread case. (find_inferior_task_it): New function. (find_inferior_notify_it): Ditto. (darwin_find_inferior_by_task): Ditto. (darwin_find_inferior_by_notify): Ditto. (darwin_find_thread): Ditto. (darwin_suspend_inferior): Ditto. (darwin_resume_inferior): Ditto. (catch_exception_raise_state): Removed. (catch_exception_raise_state_identity): Removed. (darwin_suspend_inferior_it): New function. (darwin_resume_inferior_it): Ditto. (darwin_dump_message): New function, extracted from darwin_wait. (darwin_decode_exception_message): New function. (darwin_encode_reply): New function. (catch_exception_raise): Removed. (darwin_send_reply): New function, extracted from darwin_resume. (darwin_resume_thread): New function, extracted from darwin_resume. (struct resume_inferior_threads_param): New type. (darwin_resume_inferior_threads_it): New function. (darwin_resume_inferior_threads): New function. (darwin_suspend_inferior_threads): New function. (darwin_resume): Mostly rewritten to handle multiple threads and some corner cases. (darwin_decode_message): New function extracted from darwin_wait. (cancel_breakpoint): New function. (darwin_wait): Mostly rewritten. Handle multiple threads. (darwin_mourn_inferior): Adjust for per process structures. (darwin_reply_to_all_pending_messages): New function. (darwin_stop_inferior): Adjust for per inferior structures. (darwin_attach_pid): Ditto. (darwin_init_thread_list): Ditto. (darwin_attach): Ditto. (darwin_detach): Ditto. (darwin_files_info): Now empty. (darwin_pid_to_str): Adjust returns string to match one expected by the testsuite. (darwin_read_write_inferior): Rename err variable to match other uses. Adjust debug message. Handle submaps. (darwin_xfer_memory): Adjust for per inferior structures. (set_enable_mach_exceptions): Ditto. (darwin_pid_to_exec_file): New function. (darwin_get_ada_task_ptid): Ditto. (darwin_supports_multi_process): Ditto. (_initialize_darwin_inferior): Remove useless assertion, adjust for per inferior structures. Add new target operations.
2009-06-19 16:30:30 +02:00
{
/* The thread port from a GDB point of view. */
thread_t gdb_port;
/* The thread port from the inferior point of view. Not to be used inside
gdb except for get_ada_task_ptid. */
thread_t inf_port;
/* Current message state.
If the kernel has sent a message it expects a reply and the inferior
can't be killed before. */
enum darwin_msg_state msg_state;
/* True if this thread is single-stepped. */
unsigned char single_step;
2009-06-19 Tristan Gingold <gingold@adacore.com> * machoread.c (macho_symtab_read): Adjust for bfd changes. * darwin-nat.h (struct darwin_exception_msg): New type to describe a mach exception. (struct private_thread_info): New type to describe the state of the thread. (DEF_VEC_I thread_t): Removed, replaced by ... (DEF_VEC_O darwin_thread_t): ... this new type. (struct darwin_inferior): Renamed to ... (struct private_inferior): ... this type. Fields added. (darwin_not_port): Moved into the private inferior structure. * darwin-nat.c: Add includes, improve comments. Rewrite to handle multiple threads and processes. (darwin_resume_to): New function and protype. (darwin_resume, darwin_wait_to, darwin_wait): Ditto. (darwin_kill_inferior): Add ops argument. (darwin_pid_to_str): New function. (darwin_thread_alive): Ditto. (darwin_inf, darwin_not_port): Removed. (darwin_inf_fake_stop): New variable. (msgin, msgout, msg_state, exc_msg): Removed. (mach_check_error): Use warning instead of error. (darwin_ptrace): Adjust debug level. (cmp_thread_t): Fix names (typo). (darwin_check_new_threads): Argument is now an inferior, adjust for new structures, add no change check, ignore dead ports, handle first thread case. (find_inferior_task_it): New function. (find_inferior_notify_it): Ditto. (darwin_find_inferior_by_task): Ditto. (darwin_find_inferior_by_notify): Ditto. (darwin_find_thread): Ditto. (darwin_suspend_inferior): Ditto. (darwin_resume_inferior): Ditto. (catch_exception_raise_state): Removed. (catch_exception_raise_state_identity): Removed. (darwin_suspend_inferior_it): New function. (darwin_resume_inferior_it): Ditto. (darwin_dump_message): New function, extracted from darwin_wait. (darwin_decode_exception_message): New function. (darwin_encode_reply): New function. (catch_exception_raise): Removed. (darwin_send_reply): New function, extracted from darwin_resume. (darwin_resume_thread): New function, extracted from darwin_resume. (struct resume_inferior_threads_param): New type. (darwin_resume_inferior_threads_it): New function. (darwin_resume_inferior_threads): New function. (darwin_suspend_inferior_threads): New function. (darwin_resume): Mostly rewritten to handle multiple threads and some corner cases. (darwin_decode_message): New function extracted from darwin_wait. (cancel_breakpoint): New function. (darwin_wait): Mostly rewritten. Handle multiple threads. (darwin_mourn_inferior): Adjust for per process structures. (darwin_reply_to_all_pending_messages): New function. (darwin_stop_inferior): Adjust for per inferior structures. (darwin_attach_pid): Ditto. (darwin_init_thread_list): Ditto. (darwin_attach): Ditto. (darwin_detach): Ditto. (darwin_files_info): Now empty. (darwin_pid_to_str): Adjust returns string to match one expected by the testsuite. (darwin_read_write_inferior): Rename err variable to match other uses. Adjust debug message. Handle submaps. (darwin_xfer_memory): Adjust for per inferior structures. (set_enable_mach_exceptions): Ditto. (darwin_pid_to_exec_file): New function. (darwin_get_ada_task_ptid): Ditto. (darwin_supports_multi_process): Ditto. (_initialize_darwin_inferior): Remove useless assertion, adjust for per inferior structures. Add new target operations.
2009-06-19 16:30:30 +02:00
/* True if a signal was manually sent to the thread. */
unsigned char signaled;
/* The last exception received. */
struct darwin_exception_msg event;
};
Create private_thread_info hierarchy There are multiple definitions of the private_thread_info structure compiled in the same GDB build. Because of the one definition rule, we need to change this if we want to be able to make them non-POD (e.g. use std::vector fields). This patch creates a class hierarchy, with private_thread_info being an abstract base class, and all the specific implementations inheriting from it. In order to poison XNEW/xfree for non-POD types, it is also needed to get rid of the xfree in thread_info::~thread_info, which operates on an opaque type. This is replaced by thread_info::priv now being a unique_ptr, which calls the destructor of the private_thread_info subclass when the thread is being destroyed. Including gdbthread.h from darwin-nat.h gave these errors: /Users/simark/src/binutils-gdb/gdb/gdbthread.h:609:3: error: must use 'class' tag to refer to type 'thread_info' in this scope thread_info *m_thread; ^ class /usr/include/mach/thread_act.h:240:15: note: class 'thread_info' is hidden by a non-type declaration of 'thread_info' here kern_return_t thread_info ^ It turns out that there is a thread_info function in the Darwin/XNU/mach API: http://web.mit.edu/darwin/src/modules/xnu/osfmk/man/thread_info.html Therefore, I had to add the class keyword at a couple of places in gdbthread.h, I don't really see a way around it. gdb/ChangeLog: * gdbthread.h (private_thread_info): Define structure type, add virtual pure destructor. (thread_info) <priv>: Change type to unique_ptr. <private_dtor>: Remove. * thread.c (add_thread_with_info): Adjust to use of unique_ptr. (private_thread_info::~private_thread_info): Provide default implementation. (thread_info::~thread_info): Don't call private_dtor nor manually free priv. * aix-thread.c (private_thread_info): Rename to ... (aix_thread_info): ... this. (get_aix_thread_info): New. (sync_threadlists): Adjust. (iter_tid): Adjust. (aix_thread_resume): Adjust. (aix_thread_fetch_registers): Adjust. (aix_thread_store_registers): Adjust. (aix_thread_extra_thread_info): Adjust. * darwin-nat.h (private_thread_info): Rename to ... (darwin_thread_info): ... this. (get_darwin_thread_info): New. * darwin-nat.c (darwin_init_thread_list): Adjust. (darwin_check_new_threads): Adjust. (thread_info_from_private_thread_info): Adjust. * linux-thread-db.c (private_thread_info): Rename to ... (thread_db_thread_info): ... this, initialize fields. (get_thread_db_thread_info): New. <dying>: Change type to bool. (update_thread_state): Adjust to type rename. (record_thread): Adjust to type rename an use of unique_ptr. (thread_db_pid_to_str): Likewise. (thread_db_extra_thread_info): Likewise. (thread_db_thread_handle_to_thread_info): Likewise. (thread_db_get_thread_local_address): Likewise. * nto-tdep.h (private_thread_info): Rename to ... (nto_thread_info): ... this, initialize fields. (get_nto_thread_info): New. <name>: Change type to std::string. * nto-tdep.c (nto_extra_thread_info): Adjust to type rename and use of unique_ptr. * nto-procfs.c (update_thread_private_data_name): Adjust to std::string change, allocate nto_private_thread_info with new. (update_thread_private_data): Adjust to unique_ptr. * remote.c (private_thread_info): Rename to ... (remote_thread_info): ... this, initialize data members with default values. <extra, name>: Change type to std::string. <thread_handle>: Change type to non-pointer. (free_private_thread_info): Remove. (get_private_info_thread): Rename to... (get_remote_thread_info): ... this, change return type, adjust to use of unique_ptr, use remote_thread_info constructor. (remote_add_thread): Adjust. (get_private_info_ptid): Rename to... (get_remote_thread_info): ...this, change return type. (remote_thread_name): Use get_remote_thread_info, adjust to change to std::string. (struct thread_item) <~thread_item>: Remove. <thread_handle>: Make non pointer. (start_thread): Adjust to thread_item::thread_handle type change. (remote_update_thread_list): Adjust to type name change, move strings from temporary to long-lived object instead of duplicating. (remote_threads_extra_info): Use get_remote_thread_info. (process_initial_stop_replies): Likewise. (resume_clear_thread_private_info): Likewise. (remote_resume): Adjust to type name change. (remote_commit_resume): Use get_remote_thread_info. (process_stop_reply): Adjust to type name change. (remote_stopped_by_sw_breakpoint): Use get_remote_thread_info. (remote_stopped_by_hw_breakpoint): Likewise. (remote_stopped_by_watchpoint): Likewise. (remote_stopped_data_address): Likewise. (remote_core_of_thread): Likewise. (remote_thread_handle_to_thread_info): Use get_private_info_thread, adjust to thread_handle field type change.
2017-11-24 16:40:31 +01:00
typedef struct darwin_thread_info darwin_thread_t;
static inline darwin_thread_info *
get_darwin_thread_info (class thread_info *thread)
{
return static_cast<darwin_thread_info *> (thread->priv.get ());
}
2009-06-19 Tristan Gingold <gingold@adacore.com> * machoread.c (macho_symtab_read): Adjust for bfd changes. * darwin-nat.h (struct darwin_exception_msg): New type to describe a mach exception. (struct private_thread_info): New type to describe the state of the thread. (DEF_VEC_I thread_t): Removed, replaced by ... (DEF_VEC_O darwin_thread_t): ... this new type. (struct darwin_inferior): Renamed to ... (struct private_inferior): ... this type. Fields added. (darwin_not_port): Moved into the private inferior structure. * darwin-nat.c: Add includes, improve comments. Rewrite to handle multiple threads and processes. (darwin_resume_to): New function and protype. (darwin_resume, darwin_wait_to, darwin_wait): Ditto. (darwin_kill_inferior): Add ops argument. (darwin_pid_to_str): New function. (darwin_thread_alive): Ditto. (darwin_inf, darwin_not_port): Removed. (darwin_inf_fake_stop): New variable. (msgin, msgout, msg_state, exc_msg): Removed. (mach_check_error): Use warning instead of error. (darwin_ptrace): Adjust debug level. (cmp_thread_t): Fix names (typo). (darwin_check_new_threads): Argument is now an inferior, adjust for new structures, add no change check, ignore dead ports, handle first thread case. (find_inferior_task_it): New function. (find_inferior_notify_it): Ditto. (darwin_find_inferior_by_task): Ditto. (darwin_find_inferior_by_notify): Ditto. (darwin_find_thread): Ditto. (darwin_suspend_inferior): Ditto. (darwin_resume_inferior): Ditto. (catch_exception_raise_state): Removed. (catch_exception_raise_state_identity): Removed. (darwin_suspend_inferior_it): New function. (darwin_resume_inferior_it): Ditto. (darwin_dump_message): New function, extracted from darwin_wait. (darwin_decode_exception_message): New function. (darwin_encode_reply): New function. (catch_exception_raise): Removed. (darwin_send_reply): New function, extracted from darwin_resume. (darwin_resume_thread): New function, extracted from darwin_resume. (struct resume_inferior_threads_param): New type. (darwin_resume_inferior_threads_it): New function. (darwin_resume_inferior_threads): New function. (darwin_suspend_inferior_threads): New function. (darwin_resume): Mostly rewritten to handle multiple threads and some corner cases. (darwin_decode_message): New function extracted from darwin_wait. (cancel_breakpoint): New function. (darwin_wait): Mostly rewritten. Handle multiple threads. (darwin_mourn_inferior): Adjust for per process structures. (darwin_reply_to_all_pending_messages): New function. (darwin_stop_inferior): Adjust for per inferior structures. (darwin_attach_pid): Ditto. (darwin_init_thread_list): Ditto. (darwin_attach): Ditto. (darwin_detach): Ditto. (darwin_files_info): Now empty. (darwin_pid_to_str): Adjust returns string to match one expected by the testsuite. (darwin_read_write_inferior): Rename err variable to match other uses. Adjust debug message. Handle submaps. (darwin_xfer_memory): Adjust for per inferior structures. (set_enable_mach_exceptions): Ditto. (darwin_pid_to_exec_file): New function. (darwin_get_ada_task_ptid): Ditto. (darwin_supports_multi_process): Ditto. (_initialize_darwin_inferior): Remove useless assertion, adjust for per inferior structures. Add new target operations.
2009-06-19 16:30:30 +02:00
/* Describe an inferior. */
Create private_inferior class hierarchy There are currently multiple definitions of private_inferior, defined in remote.c and darwin-nat.h. The patch that poisons XNEW and friends for non-POD types trips on that, because private_inferior is freed in ~inferior(), where it is an opaque type. Since the compiler can't tell whether the type is POD, it gives an error. Also, we can't start using C++ features in these structures (make them non-POD) as long as there are multiple definitions with the same name. For these reasons, this patch makes a class hierarchy, with private_inferior being the abstract base class, and darwin_inferior & remote_inferior inheriting from it. Destruction is done through the virtual destructor. I stumbled on some suspicious code in the darwin implementation though. darwin_check_new_threads does an XCNEW(darwin_thread_t) when it finds a new thread, allocating a new structure for it (darwin_thread_t is a typedef for private_thread_info). It then VEC_safe_pushes it in a vector defined as DEF_VEC_O (a vector of objects). This means that the structure content gets copied in the vector. The thread_info object is created with the XCNEW'ed structure as the private thread info, while the rest of the code works with the instance in the vector. We have therefore two distinct instances of darwin_thread_t/private_thread_info for each thread. This is not really a problem in practice, because thread_info::priv is not used in the darwin code. I still find it weird and far from ideal, so I tried to fix it by changing the vector to be a vector of pointers. There should now be a single instance of the structure for each thread. The deallocation of the darwin_thread_t/private_thread_info structure is done by the thread_info destructor. I am able to build on macOS, but not really test, since the port seems a bit broken. I am not able to debug reliably on the machine I have access to, which runs macOS 10.12.6. gdb/ChangeLog: * inferior.h (private_inferior): Define structure type, add virtual pure destructor. (inferior) <priv>: Change type to unique_ptr. * inferior.c (private_inferior::~private_inferior): Provide default implementation. (inferior::~inferior): Don't free priv field. (exit_inferior_1): Likewise. * darwin-nat.h (struct darwin_exception_info): Initialize fields. (darwin_exception_info): Remove typedef. (DEF_VEC_O (darwin_thread_t)); Remove. (private_inferior): Rename to ... (darwin_private_inferior): ... this, extend private_inferior. (get_darwin_inferior): New. <threads>: Change type to std::vector of darwin_thread_t pointers. * darwin-nat.c (darwin_check_new_threads): Adjust. (find_inferior_task_it): Adjust. (darwin_find_thread); Adjust. (darwin_suspend_inferior): Adjust. (darwin_resume_inferior): Adjust. (darwin_find_new_inferior): Adjust. (darwin_decode_notify_message): Adjust. (darwin_send_reply): Adjust. (darwin_resume_inferior_threads): Adjust. (darwin_suspend_inferior_threads): Adjust. (darwin_decode_message): Adjust. (darwin_wait): Adjust. (darwin_interrupt): Adjust. (darwin_deallocate_threads): Adjust. (darwin_mourn_inferior): Adjust, don't free private data. (darwin_reply_to_all_pending_messages): Adjust. (darwin_stop_inferior): Adjust. (darwin_setup_exceptions): Adjust. (darwin_kill_inferior): Adjust. (darwin_setup_request_notification): Adjust. (darwin_attach_pid): Adjust. (darwin_init_thread_list): Adjust. (darwin_setup_fake_stop_event): Adjust. (darwin_attach): Adjust. (darwin_detach): Adjust. (darwin_xfer_partial): Adjust. (set_enable_mach_exceptions): Adjust. (darwin_pid_to_exec_file): Adjust. (darwin_get_ada_task_ptid): Adjust. * darwin-nat-info.c (get_task_from_args): Adjust. (info_mach_ports_command): Adjust. (info_mach_region_command): Adjust. (info_mach_exceptions_command): Adjust. * remote.c (private_inferior): Rename to ... (remote_private_inferior): ... this, initialize fields. (get_remote_inferior); New. (remote_commit_resume): Use get_remote_inferior. (check_pending_event_prevents_wildcard_vcont_callback): Likewise.
2017-11-24 16:39:30 +01:00
struct darwin_inferior : public private_inferior
2009-06-19 Tristan Gingold <gingold@adacore.com> * machoread.c (macho_symtab_read): Adjust for bfd changes. * darwin-nat.h (struct darwin_exception_msg): New type to describe a mach exception. (struct private_thread_info): New type to describe the state of the thread. (DEF_VEC_I thread_t): Removed, replaced by ... (DEF_VEC_O darwin_thread_t): ... this new type. (struct darwin_inferior): Renamed to ... (struct private_inferior): ... this type. Fields added. (darwin_not_port): Moved into the private inferior structure. * darwin-nat.c: Add includes, improve comments. Rewrite to handle multiple threads and processes. (darwin_resume_to): New function and protype. (darwin_resume, darwin_wait_to, darwin_wait): Ditto. (darwin_kill_inferior): Add ops argument. (darwin_pid_to_str): New function. (darwin_thread_alive): Ditto. (darwin_inf, darwin_not_port): Removed. (darwin_inf_fake_stop): New variable. (msgin, msgout, msg_state, exc_msg): Removed. (mach_check_error): Use warning instead of error. (darwin_ptrace): Adjust debug level. (cmp_thread_t): Fix names (typo). (darwin_check_new_threads): Argument is now an inferior, adjust for new structures, add no change check, ignore dead ports, handle first thread case. (find_inferior_task_it): New function. (find_inferior_notify_it): Ditto. (darwin_find_inferior_by_task): Ditto. (darwin_find_inferior_by_notify): Ditto. (darwin_find_thread): Ditto. (darwin_suspend_inferior): Ditto. (darwin_resume_inferior): Ditto. (catch_exception_raise_state): Removed. (catch_exception_raise_state_identity): Removed. (darwin_suspend_inferior_it): New function. (darwin_resume_inferior_it): Ditto. (darwin_dump_message): New function, extracted from darwin_wait. (darwin_decode_exception_message): New function. (darwin_encode_reply): New function. (catch_exception_raise): Removed. (darwin_send_reply): New function, extracted from darwin_resume. (darwin_resume_thread): New function, extracted from darwin_resume. (struct resume_inferior_threads_param): New type. (darwin_resume_inferior_threads_it): New function. (darwin_resume_inferior_threads): New function. (darwin_suspend_inferior_threads): New function. (darwin_resume): Mostly rewritten to handle multiple threads and some corner cases. (darwin_decode_message): New function extracted from darwin_wait. (cancel_breakpoint): New function. (darwin_wait): Mostly rewritten. Handle multiple threads. (darwin_mourn_inferior): Adjust for per process structures. (darwin_reply_to_all_pending_messages): New function. (darwin_stop_inferior): Adjust for per inferior structures. (darwin_attach_pid): Ditto. (darwin_init_thread_list): Ditto. (darwin_attach): Ditto. (darwin_detach): Ditto. (darwin_files_info): Now empty. (darwin_pid_to_str): Adjust returns string to match one expected by the testsuite. (darwin_read_write_inferior): Rename err variable to match other uses. Adjust debug message. Handle submaps. (darwin_xfer_memory): Adjust for per inferior structures. (set_enable_mach_exceptions): Ditto. (darwin_pid_to_exec_file): New function. (darwin_get_ada_task_ptid): Ditto. (darwin_supports_multi_process): Ditto. (_initialize_darwin_inferior): Remove useless assertion, adjust for per inferior structures. Add new target operations.
2009-06-19 16:30:30 +02:00
{
/* Corresponding task port. */
Create private_inferior class hierarchy There are currently multiple definitions of private_inferior, defined in remote.c and darwin-nat.h. The patch that poisons XNEW and friends for non-POD types trips on that, because private_inferior is freed in ~inferior(), where it is an opaque type. Since the compiler can't tell whether the type is POD, it gives an error. Also, we can't start using C++ features in these structures (make them non-POD) as long as there are multiple definitions with the same name. For these reasons, this patch makes a class hierarchy, with private_inferior being the abstract base class, and darwin_inferior & remote_inferior inheriting from it. Destruction is done through the virtual destructor. I stumbled on some suspicious code in the darwin implementation though. darwin_check_new_threads does an XCNEW(darwin_thread_t) when it finds a new thread, allocating a new structure for it (darwin_thread_t is a typedef for private_thread_info). It then VEC_safe_pushes it in a vector defined as DEF_VEC_O (a vector of objects). This means that the structure content gets copied in the vector. The thread_info object is created with the XCNEW'ed structure as the private thread info, while the rest of the code works with the instance in the vector. We have therefore two distinct instances of darwin_thread_t/private_thread_info for each thread. This is not really a problem in practice, because thread_info::priv is not used in the darwin code. I still find it weird and far from ideal, so I tried to fix it by changing the vector to be a vector of pointers. There should now be a single instance of the structure for each thread. The deallocation of the darwin_thread_t/private_thread_info structure is done by the thread_info destructor. I am able to build on macOS, but not really test, since the port seems a bit broken. I am not able to debug reliably on the machine I have access to, which runs macOS 10.12.6. gdb/ChangeLog: * inferior.h (private_inferior): Define structure type, add virtual pure destructor. (inferior) <priv>: Change type to unique_ptr. * inferior.c (private_inferior::~private_inferior): Provide default implementation. (inferior::~inferior): Don't free priv field. (exit_inferior_1): Likewise. * darwin-nat.h (struct darwin_exception_info): Initialize fields. (darwin_exception_info): Remove typedef. (DEF_VEC_O (darwin_thread_t)); Remove. (private_inferior): Rename to ... (darwin_private_inferior): ... this, extend private_inferior. (get_darwin_inferior): New. <threads>: Change type to std::vector of darwin_thread_t pointers. * darwin-nat.c (darwin_check_new_threads): Adjust. (find_inferior_task_it): Adjust. (darwin_find_thread); Adjust. (darwin_suspend_inferior): Adjust. (darwin_resume_inferior): Adjust. (darwin_find_new_inferior): Adjust. (darwin_decode_notify_message): Adjust. (darwin_send_reply): Adjust. (darwin_resume_inferior_threads): Adjust. (darwin_suspend_inferior_threads): Adjust. (darwin_decode_message): Adjust. (darwin_wait): Adjust. (darwin_interrupt): Adjust. (darwin_deallocate_threads): Adjust. (darwin_mourn_inferior): Adjust, don't free private data. (darwin_reply_to_all_pending_messages): Adjust. (darwin_stop_inferior): Adjust. (darwin_setup_exceptions): Adjust. (darwin_kill_inferior): Adjust. (darwin_setup_request_notification): Adjust. (darwin_attach_pid): Adjust. (darwin_init_thread_list): Adjust. (darwin_setup_fake_stop_event): Adjust. (darwin_attach): Adjust. (darwin_detach): Adjust. (darwin_xfer_partial): Adjust. (set_enable_mach_exceptions): Adjust. (darwin_pid_to_exec_file): Adjust. (darwin_get_ada_task_ptid): Adjust. * darwin-nat-info.c (get_task_from_args): Adjust. (info_mach_ports_command): Adjust. (info_mach_region_command): Adjust. (info_mach_exceptions_command): Adjust. * remote.c (private_inferior): Rename to ... (remote_private_inferior): ... this, initialize fields. (get_remote_inferior); New. (remote_commit_resume): Use get_remote_inferior. (check_pending_event_prevents_wildcard_vcont_callback): Likewise.
2017-11-24 16:39:30 +01:00
task_t task = 0;
2009-06-19 Tristan Gingold <gingold@adacore.com> * machoread.c (macho_symtab_read): Adjust for bfd changes. * darwin-nat.h (struct darwin_exception_msg): New type to describe a mach exception. (struct private_thread_info): New type to describe the state of the thread. (DEF_VEC_I thread_t): Removed, replaced by ... (DEF_VEC_O darwin_thread_t): ... this new type. (struct darwin_inferior): Renamed to ... (struct private_inferior): ... this type. Fields added. (darwin_not_port): Moved into the private inferior structure. * darwin-nat.c: Add includes, improve comments. Rewrite to handle multiple threads and processes. (darwin_resume_to): New function and protype. (darwin_resume, darwin_wait_to, darwin_wait): Ditto. (darwin_kill_inferior): Add ops argument. (darwin_pid_to_str): New function. (darwin_thread_alive): Ditto. (darwin_inf, darwin_not_port): Removed. (darwin_inf_fake_stop): New variable. (msgin, msgout, msg_state, exc_msg): Removed. (mach_check_error): Use warning instead of error. (darwin_ptrace): Adjust debug level. (cmp_thread_t): Fix names (typo). (darwin_check_new_threads): Argument is now an inferior, adjust for new structures, add no change check, ignore dead ports, handle first thread case. (find_inferior_task_it): New function. (find_inferior_notify_it): Ditto. (darwin_find_inferior_by_task): Ditto. (darwin_find_inferior_by_notify): Ditto. (darwin_find_thread): Ditto. (darwin_suspend_inferior): Ditto. (darwin_resume_inferior): Ditto. (catch_exception_raise_state): Removed. (catch_exception_raise_state_identity): Removed. (darwin_suspend_inferior_it): New function. (darwin_resume_inferior_it): Ditto. (darwin_dump_message): New function, extracted from darwin_wait. (darwin_decode_exception_message): New function. (darwin_encode_reply): New function. (catch_exception_raise): Removed. (darwin_send_reply): New function, extracted from darwin_resume. (darwin_resume_thread): New function, extracted from darwin_resume. (struct resume_inferior_threads_param): New type. (darwin_resume_inferior_threads_it): New function. (darwin_resume_inferior_threads): New function. (darwin_suspend_inferior_threads): New function. (darwin_resume): Mostly rewritten to handle multiple threads and some corner cases. (darwin_decode_message): New function extracted from darwin_wait. (cancel_breakpoint): New function. (darwin_wait): Mostly rewritten. Handle multiple threads. (darwin_mourn_inferior): Adjust for per process structures. (darwin_reply_to_all_pending_messages): New function. (darwin_stop_inferior): Adjust for per inferior structures. (darwin_attach_pid): Ditto. (darwin_init_thread_list): Ditto. (darwin_attach): Ditto. (darwin_detach): Ditto. (darwin_files_info): Now empty. (darwin_pid_to_str): Adjust returns string to match one expected by the testsuite. (darwin_read_write_inferior): Rename err variable to match other uses. Adjust debug message. Handle submaps. (darwin_xfer_memory): Adjust for per inferior structures. (set_enable_mach_exceptions): Ditto. (darwin_pid_to_exec_file): New function. (darwin_get_ada_task_ptid): Ditto. (darwin_supports_multi_process): Ditto. (_initialize_darwin_inferior): Remove useless assertion, adjust for per inferior structures. Add new target operations.
2009-06-19 16:30:30 +02:00
/* Port which will receive the dead-name notification for the task port.
This is used to detect the death of the task. */
Create private_inferior class hierarchy There are currently multiple definitions of private_inferior, defined in remote.c and darwin-nat.h. The patch that poisons XNEW and friends for non-POD types trips on that, because private_inferior is freed in ~inferior(), where it is an opaque type. Since the compiler can't tell whether the type is POD, it gives an error. Also, we can't start using C++ features in these structures (make them non-POD) as long as there are multiple definitions with the same name. For these reasons, this patch makes a class hierarchy, with private_inferior being the abstract base class, and darwin_inferior & remote_inferior inheriting from it. Destruction is done through the virtual destructor. I stumbled on some suspicious code in the darwin implementation though. darwin_check_new_threads does an XCNEW(darwin_thread_t) when it finds a new thread, allocating a new structure for it (darwin_thread_t is a typedef for private_thread_info). It then VEC_safe_pushes it in a vector defined as DEF_VEC_O (a vector of objects). This means that the structure content gets copied in the vector. The thread_info object is created with the XCNEW'ed structure as the private thread info, while the rest of the code works with the instance in the vector. We have therefore two distinct instances of darwin_thread_t/private_thread_info for each thread. This is not really a problem in practice, because thread_info::priv is not used in the darwin code. I still find it weird and far from ideal, so I tried to fix it by changing the vector to be a vector of pointers. There should now be a single instance of the structure for each thread. The deallocation of the darwin_thread_t/private_thread_info structure is done by the thread_info destructor. I am able to build on macOS, but not really test, since the port seems a bit broken. I am not able to debug reliably on the machine I have access to, which runs macOS 10.12.6. gdb/ChangeLog: * inferior.h (private_inferior): Define structure type, add virtual pure destructor. (inferior) <priv>: Change type to unique_ptr. * inferior.c (private_inferior::~private_inferior): Provide default implementation. (inferior::~inferior): Don't free priv field. (exit_inferior_1): Likewise. * darwin-nat.h (struct darwin_exception_info): Initialize fields. (darwin_exception_info): Remove typedef. (DEF_VEC_O (darwin_thread_t)); Remove. (private_inferior): Rename to ... (darwin_private_inferior): ... this, extend private_inferior. (get_darwin_inferior): New. <threads>: Change type to std::vector of darwin_thread_t pointers. * darwin-nat.c (darwin_check_new_threads): Adjust. (find_inferior_task_it): Adjust. (darwin_find_thread); Adjust. (darwin_suspend_inferior): Adjust. (darwin_resume_inferior): Adjust. (darwin_find_new_inferior): Adjust. (darwin_decode_notify_message): Adjust. (darwin_send_reply): Adjust. (darwin_resume_inferior_threads): Adjust. (darwin_suspend_inferior_threads): Adjust. (darwin_decode_message): Adjust. (darwin_wait): Adjust. (darwin_interrupt): Adjust. (darwin_deallocate_threads): Adjust. (darwin_mourn_inferior): Adjust, don't free private data. (darwin_reply_to_all_pending_messages): Adjust. (darwin_stop_inferior): Adjust. (darwin_setup_exceptions): Adjust. (darwin_kill_inferior): Adjust. (darwin_setup_request_notification): Adjust. (darwin_attach_pid): Adjust. (darwin_init_thread_list): Adjust. (darwin_setup_fake_stop_event): Adjust. (darwin_attach): Adjust. (darwin_detach): Adjust. (darwin_xfer_partial): Adjust. (set_enable_mach_exceptions): Adjust. (darwin_pid_to_exec_file): Adjust. (darwin_get_ada_task_ptid): Adjust. * darwin-nat-info.c (get_task_from_args): Adjust. (info_mach_ports_command): Adjust. (info_mach_region_command): Adjust. (info_mach_exceptions_command): Adjust. * remote.c (private_inferior): Rename to ... (remote_private_inferior): ... this, initialize fields. (get_remote_inferior); New. (remote_commit_resume): Use get_remote_inferior. (check_pending_event_prevents_wildcard_vcont_callback): Likewise.
2017-11-24 16:39:30 +01:00
mach_port_t notify_port = 0;
/* Initial exception handling. */
darwin_exception_info exception_info;
2009-06-19 Tristan Gingold <gingold@adacore.com> * machoread.c (macho_symtab_read): Adjust for bfd changes. * darwin-nat.h (struct darwin_exception_msg): New type to describe a mach exception. (struct private_thread_info): New type to describe the state of the thread. (DEF_VEC_I thread_t): Removed, replaced by ... (DEF_VEC_O darwin_thread_t): ... this new type. (struct darwin_inferior): Renamed to ... (struct private_inferior): ... this type. Fields added. (darwin_not_port): Moved into the private inferior structure. * darwin-nat.c: Add includes, improve comments. Rewrite to handle multiple threads and processes. (darwin_resume_to): New function and protype. (darwin_resume, darwin_wait_to, darwin_wait): Ditto. (darwin_kill_inferior): Add ops argument. (darwin_pid_to_str): New function. (darwin_thread_alive): Ditto. (darwin_inf, darwin_not_port): Removed. (darwin_inf_fake_stop): New variable. (msgin, msgout, msg_state, exc_msg): Removed. (mach_check_error): Use warning instead of error. (darwin_ptrace): Adjust debug level. (cmp_thread_t): Fix names (typo). (darwin_check_new_threads): Argument is now an inferior, adjust for new structures, add no change check, ignore dead ports, handle first thread case. (find_inferior_task_it): New function. (find_inferior_notify_it): Ditto. (darwin_find_inferior_by_task): Ditto. (darwin_find_inferior_by_notify): Ditto. (darwin_find_thread): Ditto. (darwin_suspend_inferior): Ditto. (darwin_resume_inferior): Ditto. (catch_exception_raise_state): Removed. (catch_exception_raise_state_identity): Removed. (darwin_suspend_inferior_it): New function. (darwin_resume_inferior_it): Ditto. (darwin_dump_message): New function, extracted from darwin_wait. (darwin_decode_exception_message): New function. (darwin_encode_reply): New function. (catch_exception_raise): Removed. (darwin_send_reply): New function, extracted from darwin_resume. (darwin_resume_thread): New function, extracted from darwin_resume. (struct resume_inferior_threads_param): New type. (darwin_resume_inferior_threads_it): New function. (darwin_resume_inferior_threads): New function. (darwin_suspend_inferior_threads): New function. (darwin_resume): Mostly rewritten to handle multiple threads and some corner cases. (darwin_decode_message): New function extracted from darwin_wait. (cancel_breakpoint): New function. (darwin_wait): Mostly rewritten. Handle multiple threads. (darwin_mourn_inferior): Adjust for per process structures. (darwin_reply_to_all_pending_messages): New function. (darwin_stop_inferior): Adjust for per inferior structures. (darwin_attach_pid): Ditto. (darwin_init_thread_list): Ditto. (darwin_attach): Ditto. (darwin_detach): Ditto. (darwin_files_info): Now empty. (darwin_pid_to_str): Adjust returns string to match one expected by the testsuite. (darwin_read_write_inferior): Rename err variable to match other uses. Adjust debug message. Handle submaps. (darwin_xfer_memory): Adjust for per inferior structures. (set_enable_mach_exceptions): Ditto. (darwin_pid_to_exec_file): New function. (darwin_get_ada_task_ptid): Ditto. (darwin_supports_multi_process): Ditto. (_initialize_darwin_inferior): Remove useless assertion, adjust for per inferior structures. Add new target operations.
2009-06-19 16:30:30 +02:00
/* Number of messages that have been received but not yet replied. */
Create private_inferior class hierarchy There are currently multiple definitions of private_inferior, defined in remote.c and darwin-nat.h. The patch that poisons XNEW and friends for non-POD types trips on that, because private_inferior is freed in ~inferior(), where it is an opaque type. Since the compiler can't tell whether the type is POD, it gives an error. Also, we can't start using C++ features in these structures (make them non-POD) as long as there are multiple definitions with the same name. For these reasons, this patch makes a class hierarchy, with private_inferior being the abstract base class, and darwin_inferior & remote_inferior inheriting from it. Destruction is done through the virtual destructor. I stumbled on some suspicious code in the darwin implementation though. darwin_check_new_threads does an XCNEW(darwin_thread_t) when it finds a new thread, allocating a new structure for it (darwin_thread_t is a typedef for private_thread_info). It then VEC_safe_pushes it in a vector defined as DEF_VEC_O (a vector of objects). This means that the structure content gets copied in the vector. The thread_info object is created with the XCNEW'ed structure as the private thread info, while the rest of the code works with the instance in the vector. We have therefore two distinct instances of darwin_thread_t/private_thread_info for each thread. This is not really a problem in practice, because thread_info::priv is not used in the darwin code. I still find it weird and far from ideal, so I tried to fix it by changing the vector to be a vector of pointers. There should now be a single instance of the structure for each thread. The deallocation of the darwin_thread_t/private_thread_info structure is done by the thread_info destructor. I am able to build on macOS, but not really test, since the port seems a bit broken. I am not able to debug reliably on the machine I have access to, which runs macOS 10.12.6. gdb/ChangeLog: * inferior.h (private_inferior): Define structure type, add virtual pure destructor. (inferior) <priv>: Change type to unique_ptr. * inferior.c (private_inferior::~private_inferior): Provide default implementation. (inferior::~inferior): Don't free priv field. (exit_inferior_1): Likewise. * darwin-nat.h (struct darwin_exception_info): Initialize fields. (darwin_exception_info): Remove typedef. (DEF_VEC_O (darwin_thread_t)); Remove. (private_inferior): Rename to ... (darwin_private_inferior): ... this, extend private_inferior. (get_darwin_inferior): New. <threads>: Change type to std::vector of darwin_thread_t pointers. * darwin-nat.c (darwin_check_new_threads): Adjust. (find_inferior_task_it): Adjust. (darwin_find_thread); Adjust. (darwin_suspend_inferior): Adjust. (darwin_resume_inferior): Adjust. (darwin_find_new_inferior): Adjust. (darwin_decode_notify_message): Adjust. (darwin_send_reply): Adjust. (darwin_resume_inferior_threads): Adjust. (darwin_suspend_inferior_threads): Adjust. (darwin_decode_message): Adjust. (darwin_wait): Adjust. (darwin_interrupt): Adjust. (darwin_deallocate_threads): Adjust. (darwin_mourn_inferior): Adjust, don't free private data. (darwin_reply_to_all_pending_messages): Adjust. (darwin_stop_inferior): Adjust. (darwin_setup_exceptions): Adjust. (darwin_kill_inferior): Adjust. (darwin_setup_request_notification): Adjust. (darwin_attach_pid): Adjust. (darwin_init_thread_list): Adjust. (darwin_setup_fake_stop_event): Adjust. (darwin_attach): Adjust. (darwin_detach): Adjust. (darwin_xfer_partial): Adjust. (set_enable_mach_exceptions): Adjust. (darwin_pid_to_exec_file): Adjust. (darwin_get_ada_task_ptid): Adjust. * darwin-nat-info.c (get_task_from_args): Adjust. (info_mach_ports_command): Adjust. (info_mach_region_command): Adjust. (info_mach_exceptions_command): Adjust. * remote.c (private_inferior): Rename to ... (remote_private_inferior): ... this, initialize fields. (get_remote_inferior); New. (remote_commit_resume): Use get_remote_inferior. (check_pending_event_prevents_wildcard_vcont_callback): Likewise.
2017-11-24 16:39:30 +01:00
unsigned int pending_messages = 0;
2009-06-19 Tristan Gingold <gingold@adacore.com> * machoread.c (macho_symtab_read): Adjust for bfd changes. * darwin-nat.h (struct darwin_exception_msg): New type to describe a mach exception. (struct private_thread_info): New type to describe the state of the thread. (DEF_VEC_I thread_t): Removed, replaced by ... (DEF_VEC_O darwin_thread_t): ... this new type. (struct darwin_inferior): Renamed to ... (struct private_inferior): ... this type. Fields added. (darwin_not_port): Moved into the private inferior structure. * darwin-nat.c: Add includes, improve comments. Rewrite to handle multiple threads and processes. (darwin_resume_to): New function and protype. (darwin_resume, darwin_wait_to, darwin_wait): Ditto. (darwin_kill_inferior): Add ops argument. (darwin_pid_to_str): New function. (darwin_thread_alive): Ditto. (darwin_inf, darwin_not_port): Removed. (darwin_inf_fake_stop): New variable. (msgin, msgout, msg_state, exc_msg): Removed. (mach_check_error): Use warning instead of error. (darwin_ptrace): Adjust debug level. (cmp_thread_t): Fix names (typo). (darwin_check_new_threads): Argument is now an inferior, adjust for new structures, add no change check, ignore dead ports, handle first thread case. (find_inferior_task_it): New function. (find_inferior_notify_it): Ditto. (darwin_find_inferior_by_task): Ditto. (darwin_find_inferior_by_notify): Ditto. (darwin_find_thread): Ditto. (darwin_suspend_inferior): Ditto. (darwin_resume_inferior): Ditto. (catch_exception_raise_state): Removed. (catch_exception_raise_state_identity): Removed. (darwin_suspend_inferior_it): New function. (darwin_resume_inferior_it): Ditto. (darwin_dump_message): New function, extracted from darwin_wait. (darwin_decode_exception_message): New function. (darwin_encode_reply): New function. (catch_exception_raise): Removed. (darwin_send_reply): New function, extracted from darwin_resume. (darwin_resume_thread): New function, extracted from darwin_resume. (struct resume_inferior_threads_param): New type. (darwin_resume_inferior_threads_it): New function. (darwin_resume_inferior_threads): New function. (darwin_suspend_inferior_threads): New function. (darwin_resume): Mostly rewritten to handle multiple threads and some corner cases. (darwin_decode_message): New function extracted from darwin_wait. (cancel_breakpoint): New function. (darwin_wait): Mostly rewritten. Handle multiple threads. (darwin_mourn_inferior): Adjust for per process structures. (darwin_reply_to_all_pending_messages): New function. (darwin_stop_inferior): Adjust for per inferior structures. (darwin_attach_pid): Ditto. (darwin_init_thread_list): Ditto. (darwin_attach): Ditto. (darwin_detach): Ditto. (darwin_files_info): Now empty. (darwin_pid_to_str): Adjust returns string to match one expected by the testsuite. (darwin_read_write_inferior): Rename err variable to match other uses. Adjust debug message. Handle submaps. (darwin_xfer_memory): Adjust for per inferior structures. (set_enable_mach_exceptions): Ditto. (darwin_pid_to_exec_file): New function. (darwin_get_ada_task_ptid): Ditto. (darwin_supports_multi_process): Ditto. (_initialize_darwin_inferior): Remove useless assertion, adjust for per inferior structures. Add new target operations.
2009-06-19 16:30:30 +02:00
/* Set if inferior is not controlled by ptrace(2) but through Mach. */
Create private_inferior class hierarchy There are currently multiple definitions of private_inferior, defined in remote.c and darwin-nat.h. The patch that poisons XNEW and friends for non-POD types trips on that, because private_inferior is freed in ~inferior(), where it is an opaque type. Since the compiler can't tell whether the type is POD, it gives an error. Also, we can't start using C++ features in these structures (make them non-POD) as long as there are multiple definitions with the same name. For these reasons, this patch makes a class hierarchy, with private_inferior being the abstract base class, and darwin_inferior & remote_inferior inheriting from it. Destruction is done through the virtual destructor. I stumbled on some suspicious code in the darwin implementation though. darwin_check_new_threads does an XCNEW(darwin_thread_t) when it finds a new thread, allocating a new structure for it (darwin_thread_t is a typedef for private_thread_info). It then VEC_safe_pushes it in a vector defined as DEF_VEC_O (a vector of objects). This means that the structure content gets copied in the vector. The thread_info object is created with the XCNEW'ed structure as the private thread info, while the rest of the code works with the instance in the vector. We have therefore two distinct instances of darwin_thread_t/private_thread_info for each thread. This is not really a problem in practice, because thread_info::priv is not used in the darwin code. I still find it weird and far from ideal, so I tried to fix it by changing the vector to be a vector of pointers. There should now be a single instance of the structure for each thread. The deallocation of the darwin_thread_t/private_thread_info structure is done by the thread_info destructor. I am able to build on macOS, but not really test, since the port seems a bit broken. I am not able to debug reliably on the machine I have access to, which runs macOS 10.12.6. gdb/ChangeLog: * inferior.h (private_inferior): Define structure type, add virtual pure destructor. (inferior) <priv>: Change type to unique_ptr. * inferior.c (private_inferior::~private_inferior): Provide default implementation. (inferior::~inferior): Don't free priv field. (exit_inferior_1): Likewise. * darwin-nat.h (struct darwin_exception_info): Initialize fields. (darwin_exception_info): Remove typedef. (DEF_VEC_O (darwin_thread_t)); Remove. (private_inferior): Rename to ... (darwin_private_inferior): ... this, extend private_inferior. (get_darwin_inferior): New. <threads>: Change type to std::vector of darwin_thread_t pointers. * darwin-nat.c (darwin_check_new_threads): Adjust. (find_inferior_task_it): Adjust. (darwin_find_thread); Adjust. (darwin_suspend_inferior): Adjust. (darwin_resume_inferior): Adjust. (darwin_find_new_inferior): Adjust. (darwin_decode_notify_message): Adjust. (darwin_send_reply): Adjust. (darwin_resume_inferior_threads): Adjust. (darwin_suspend_inferior_threads): Adjust. (darwin_decode_message): Adjust. (darwin_wait): Adjust. (darwin_interrupt): Adjust. (darwin_deallocate_threads): Adjust. (darwin_mourn_inferior): Adjust, don't free private data. (darwin_reply_to_all_pending_messages): Adjust. (darwin_stop_inferior): Adjust. (darwin_setup_exceptions): Adjust. (darwin_kill_inferior): Adjust. (darwin_setup_request_notification): Adjust. (darwin_attach_pid): Adjust. (darwin_init_thread_list): Adjust. (darwin_setup_fake_stop_event): Adjust. (darwin_attach): Adjust. (darwin_detach): Adjust. (darwin_xfer_partial): Adjust. (set_enable_mach_exceptions): Adjust. (darwin_pid_to_exec_file): Adjust. (darwin_get_ada_task_ptid): Adjust. * darwin-nat-info.c (get_task_from_args): Adjust. (info_mach_ports_command): Adjust. (info_mach_region_command): Adjust. (info_mach_exceptions_command): Adjust. * remote.c (private_inferior): Rename to ... (remote_private_inferior): ... this, initialize fields. (get_remote_inferior); New. (remote_commit_resume): Use get_remote_inferior. (check_pending_event_prevents_wildcard_vcont_callback): Likewise.
2017-11-24 16:39:30 +01:00
bool no_ptrace = false;
2009-06-19 Tristan Gingold <gingold@adacore.com> * machoread.c (macho_symtab_read): Adjust for bfd changes. * darwin-nat.h (struct darwin_exception_msg): New type to describe a mach exception. (struct private_thread_info): New type to describe the state of the thread. (DEF_VEC_I thread_t): Removed, replaced by ... (DEF_VEC_O darwin_thread_t): ... this new type. (struct darwin_inferior): Renamed to ... (struct private_inferior): ... this type. Fields added. (darwin_not_port): Moved into the private inferior structure. * darwin-nat.c: Add includes, improve comments. Rewrite to handle multiple threads and processes. (darwin_resume_to): New function and protype. (darwin_resume, darwin_wait_to, darwin_wait): Ditto. (darwin_kill_inferior): Add ops argument. (darwin_pid_to_str): New function. (darwin_thread_alive): Ditto. (darwin_inf, darwin_not_port): Removed. (darwin_inf_fake_stop): New variable. (msgin, msgout, msg_state, exc_msg): Removed. (mach_check_error): Use warning instead of error. (darwin_ptrace): Adjust debug level. (cmp_thread_t): Fix names (typo). (darwin_check_new_threads): Argument is now an inferior, adjust for new structures, add no change check, ignore dead ports, handle first thread case. (find_inferior_task_it): New function. (find_inferior_notify_it): Ditto. (darwin_find_inferior_by_task): Ditto. (darwin_find_inferior_by_notify): Ditto. (darwin_find_thread): Ditto. (darwin_suspend_inferior): Ditto. (darwin_resume_inferior): Ditto. (catch_exception_raise_state): Removed. (catch_exception_raise_state_identity): Removed. (darwin_suspend_inferior_it): New function. (darwin_resume_inferior_it): Ditto. (darwin_dump_message): New function, extracted from darwin_wait. (darwin_decode_exception_message): New function. (darwin_encode_reply): New function. (catch_exception_raise): Removed. (darwin_send_reply): New function, extracted from darwin_resume. (darwin_resume_thread): New function, extracted from darwin_resume. (struct resume_inferior_threads_param): New type. (darwin_resume_inferior_threads_it): New function. (darwin_resume_inferior_threads): New function. (darwin_suspend_inferior_threads): New function. (darwin_resume): Mostly rewritten to handle multiple threads and some corner cases. (darwin_decode_message): New function extracted from darwin_wait. (cancel_breakpoint): New function. (darwin_wait): Mostly rewritten. Handle multiple threads. (darwin_mourn_inferior): Adjust for per process structures. (darwin_reply_to_all_pending_messages): New function. (darwin_stop_inferior): Adjust for per inferior structures. (darwin_attach_pid): Ditto. (darwin_init_thread_list): Ditto. (darwin_attach): Ditto. (darwin_detach): Ditto. (darwin_files_info): Now empty. (darwin_pid_to_str): Adjust returns string to match one expected by the testsuite. (darwin_read_write_inferior): Rename err variable to match other uses. Adjust debug message. Handle submaps. (darwin_xfer_memory): Adjust for per inferior structures. (set_enable_mach_exceptions): Ditto. (darwin_pid_to_exec_file): New function. (darwin_get_ada_task_ptid): Ditto. (darwin_supports_multi_process): Ditto. (_initialize_darwin_inferior): Remove useless assertion, adjust for per inferior structures. Add new target operations.
2009-06-19 16:30:30 +02:00
/* True if this task is suspended. */
Create private_inferior class hierarchy There are currently multiple definitions of private_inferior, defined in remote.c and darwin-nat.h. The patch that poisons XNEW and friends for non-POD types trips on that, because private_inferior is freed in ~inferior(), where it is an opaque type. Since the compiler can't tell whether the type is POD, it gives an error. Also, we can't start using C++ features in these structures (make them non-POD) as long as there are multiple definitions with the same name. For these reasons, this patch makes a class hierarchy, with private_inferior being the abstract base class, and darwin_inferior & remote_inferior inheriting from it. Destruction is done through the virtual destructor. I stumbled on some suspicious code in the darwin implementation though. darwin_check_new_threads does an XCNEW(darwin_thread_t) when it finds a new thread, allocating a new structure for it (darwin_thread_t is a typedef for private_thread_info). It then VEC_safe_pushes it in a vector defined as DEF_VEC_O (a vector of objects). This means that the structure content gets copied in the vector. The thread_info object is created with the XCNEW'ed structure as the private thread info, while the rest of the code works with the instance in the vector. We have therefore two distinct instances of darwin_thread_t/private_thread_info for each thread. This is not really a problem in practice, because thread_info::priv is not used in the darwin code. I still find it weird and far from ideal, so I tried to fix it by changing the vector to be a vector of pointers. There should now be a single instance of the structure for each thread. The deallocation of the darwin_thread_t/private_thread_info structure is done by the thread_info destructor. I am able to build on macOS, but not really test, since the port seems a bit broken. I am not able to debug reliably on the machine I have access to, which runs macOS 10.12.6. gdb/ChangeLog: * inferior.h (private_inferior): Define structure type, add virtual pure destructor. (inferior) <priv>: Change type to unique_ptr. * inferior.c (private_inferior::~private_inferior): Provide default implementation. (inferior::~inferior): Don't free priv field. (exit_inferior_1): Likewise. * darwin-nat.h (struct darwin_exception_info): Initialize fields. (darwin_exception_info): Remove typedef. (DEF_VEC_O (darwin_thread_t)); Remove. (private_inferior): Rename to ... (darwin_private_inferior): ... this, extend private_inferior. (get_darwin_inferior): New. <threads>: Change type to std::vector of darwin_thread_t pointers. * darwin-nat.c (darwin_check_new_threads): Adjust. (find_inferior_task_it): Adjust. (darwin_find_thread); Adjust. (darwin_suspend_inferior): Adjust. (darwin_resume_inferior): Adjust. (darwin_find_new_inferior): Adjust. (darwin_decode_notify_message): Adjust. (darwin_send_reply): Adjust. (darwin_resume_inferior_threads): Adjust. (darwin_suspend_inferior_threads): Adjust. (darwin_decode_message): Adjust. (darwin_wait): Adjust. (darwin_interrupt): Adjust. (darwin_deallocate_threads): Adjust. (darwin_mourn_inferior): Adjust, don't free private data. (darwin_reply_to_all_pending_messages): Adjust. (darwin_stop_inferior): Adjust. (darwin_setup_exceptions): Adjust. (darwin_kill_inferior): Adjust. (darwin_setup_request_notification): Adjust. (darwin_attach_pid): Adjust. (darwin_init_thread_list): Adjust. (darwin_setup_fake_stop_event): Adjust. (darwin_attach): Adjust. (darwin_detach): Adjust. (darwin_xfer_partial): Adjust. (set_enable_mach_exceptions): Adjust. (darwin_pid_to_exec_file): Adjust. (darwin_get_ada_task_ptid): Adjust. * darwin-nat-info.c (get_task_from_args): Adjust. (info_mach_ports_command): Adjust. (info_mach_region_command): Adjust. (info_mach_exceptions_command): Adjust. * remote.c (private_inferior): Rename to ... (remote_private_inferior): ... this, initialize fields. (get_remote_inferior); New. (remote_commit_resume): Use get_remote_inferior. (check_pending_event_prevents_wildcard_vcont_callback): Likewise.
2017-11-24 16:39:30 +01:00
bool suspended = false;
2009-06-19 Tristan Gingold <gingold@adacore.com> * machoread.c (macho_symtab_read): Adjust for bfd changes. * darwin-nat.h (struct darwin_exception_msg): New type to describe a mach exception. (struct private_thread_info): New type to describe the state of the thread. (DEF_VEC_I thread_t): Removed, replaced by ... (DEF_VEC_O darwin_thread_t): ... this new type. (struct darwin_inferior): Renamed to ... (struct private_inferior): ... this type. Fields added. (darwin_not_port): Moved into the private inferior structure. * darwin-nat.c: Add includes, improve comments. Rewrite to handle multiple threads and processes. (darwin_resume_to): New function and protype. (darwin_resume, darwin_wait_to, darwin_wait): Ditto. (darwin_kill_inferior): Add ops argument. (darwin_pid_to_str): New function. (darwin_thread_alive): Ditto. (darwin_inf, darwin_not_port): Removed. (darwin_inf_fake_stop): New variable. (msgin, msgout, msg_state, exc_msg): Removed. (mach_check_error): Use warning instead of error. (darwin_ptrace): Adjust debug level. (cmp_thread_t): Fix names (typo). (darwin_check_new_threads): Argument is now an inferior, adjust for new structures, add no change check, ignore dead ports, handle first thread case. (find_inferior_task_it): New function. (find_inferior_notify_it): Ditto. (darwin_find_inferior_by_task): Ditto. (darwin_find_inferior_by_notify): Ditto. (darwin_find_thread): Ditto. (darwin_suspend_inferior): Ditto. (darwin_resume_inferior): Ditto. (catch_exception_raise_state): Removed. (catch_exception_raise_state_identity): Removed. (darwin_suspend_inferior_it): New function. (darwin_resume_inferior_it): Ditto. (darwin_dump_message): New function, extracted from darwin_wait. (darwin_decode_exception_message): New function. (darwin_encode_reply): New function. (catch_exception_raise): Removed. (darwin_send_reply): New function, extracted from darwin_resume. (darwin_resume_thread): New function, extracted from darwin_resume. (struct resume_inferior_threads_param): New type. (darwin_resume_inferior_threads_it): New function. (darwin_resume_inferior_threads): New function. (darwin_suspend_inferior_threads): New function. (darwin_resume): Mostly rewritten to handle multiple threads and some corner cases. (darwin_decode_message): New function extracted from darwin_wait. (cancel_breakpoint): New function. (darwin_wait): Mostly rewritten. Handle multiple threads. (darwin_mourn_inferior): Adjust for per process structures. (darwin_reply_to_all_pending_messages): New function. (darwin_stop_inferior): Adjust for per inferior structures. (darwin_attach_pid): Ditto. (darwin_init_thread_list): Ditto. (darwin_attach): Ditto. (darwin_detach): Ditto. (darwin_files_info): Now empty. (darwin_pid_to_str): Adjust returns string to match one expected by the testsuite. (darwin_read_write_inferior): Rename err variable to match other uses. Adjust debug message. Handle submaps. (darwin_xfer_memory): Adjust for per inferior structures. (set_enable_mach_exceptions): Ditto. (darwin_pid_to_exec_file): New function. (darwin_get_ada_task_ptid): Ditto. (darwin_supports_multi_process): Ditto. (_initialize_darwin_inferior): Remove useless assertion, adjust for per inferior structures. Add new target operations.
2009-06-19 16:30:30 +02:00
/* Sorted vector of known threads. */
Create private_inferior class hierarchy There are currently multiple definitions of private_inferior, defined in remote.c and darwin-nat.h. The patch that poisons XNEW and friends for non-POD types trips on that, because private_inferior is freed in ~inferior(), where it is an opaque type. Since the compiler can't tell whether the type is POD, it gives an error. Also, we can't start using C++ features in these structures (make them non-POD) as long as there are multiple definitions with the same name. For these reasons, this patch makes a class hierarchy, with private_inferior being the abstract base class, and darwin_inferior & remote_inferior inheriting from it. Destruction is done through the virtual destructor. I stumbled on some suspicious code in the darwin implementation though. darwin_check_new_threads does an XCNEW(darwin_thread_t) when it finds a new thread, allocating a new structure for it (darwin_thread_t is a typedef for private_thread_info). It then VEC_safe_pushes it in a vector defined as DEF_VEC_O (a vector of objects). This means that the structure content gets copied in the vector. The thread_info object is created with the XCNEW'ed structure as the private thread info, while the rest of the code works with the instance in the vector. We have therefore two distinct instances of darwin_thread_t/private_thread_info for each thread. This is not really a problem in practice, because thread_info::priv is not used in the darwin code. I still find it weird and far from ideal, so I tried to fix it by changing the vector to be a vector of pointers. There should now be a single instance of the structure for each thread. The deallocation of the darwin_thread_t/private_thread_info structure is done by the thread_info destructor. I am able to build on macOS, but not really test, since the port seems a bit broken. I am not able to debug reliably on the machine I have access to, which runs macOS 10.12.6. gdb/ChangeLog: * inferior.h (private_inferior): Define structure type, add virtual pure destructor. (inferior) <priv>: Change type to unique_ptr. * inferior.c (private_inferior::~private_inferior): Provide default implementation. (inferior::~inferior): Don't free priv field. (exit_inferior_1): Likewise. * darwin-nat.h (struct darwin_exception_info): Initialize fields. (darwin_exception_info): Remove typedef. (DEF_VEC_O (darwin_thread_t)); Remove. (private_inferior): Rename to ... (darwin_private_inferior): ... this, extend private_inferior. (get_darwin_inferior): New. <threads>: Change type to std::vector of darwin_thread_t pointers. * darwin-nat.c (darwin_check_new_threads): Adjust. (find_inferior_task_it): Adjust. (darwin_find_thread); Adjust. (darwin_suspend_inferior): Adjust. (darwin_resume_inferior): Adjust. (darwin_find_new_inferior): Adjust. (darwin_decode_notify_message): Adjust. (darwin_send_reply): Adjust. (darwin_resume_inferior_threads): Adjust. (darwin_suspend_inferior_threads): Adjust. (darwin_decode_message): Adjust. (darwin_wait): Adjust. (darwin_interrupt): Adjust. (darwin_deallocate_threads): Adjust. (darwin_mourn_inferior): Adjust, don't free private data. (darwin_reply_to_all_pending_messages): Adjust. (darwin_stop_inferior): Adjust. (darwin_setup_exceptions): Adjust. (darwin_kill_inferior): Adjust. (darwin_setup_request_notification): Adjust. (darwin_attach_pid): Adjust. (darwin_init_thread_list): Adjust. (darwin_setup_fake_stop_event): Adjust. (darwin_attach): Adjust. (darwin_detach): Adjust. (darwin_xfer_partial): Adjust. (set_enable_mach_exceptions): Adjust. (darwin_pid_to_exec_file): Adjust. (darwin_get_ada_task_ptid): Adjust. * darwin-nat-info.c (get_task_from_args): Adjust. (info_mach_ports_command): Adjust. (info_mach_region_command): Adjust. (info_mach_exceptions_command): Adjust. * remote.c (private_inferior): Rename to ... (remote_private_inferior): ... this, initialize fields. (get_remote_inferior); New. (remote_commit_resume): Use get_remote_inferior. (check_pending_event_prevents_wildcard_vcont_callback): Likewise.
2017-11-24 16:39:30 +01:00
std::vector<darwin_thread_t *> threads;
};
Create private_inferior class hierarchy There are currently multiple definitions of private_inferior, defined in remote.c and darwin-nat.h. The patch that poisons XNEW and friends for non-POD types trips on that, because private_inferior is freed in ~inferior(), where it is an opaque type. Since the compiler can't tell whether the type is POD, it gives an error. Also, we can't start using C++ features in these structures (make them non-POD) as long as there are multiple definitions with the same name. For these reasons, this patch makes a class hierarchy, with private_inferior being the abstract base class, and darwin_inferior & remote_inferior inheriting from it. Destruction is done through the virtual destructor. I stumbled on some suspicious code in the darwin implementation though. darwin_check_new_threads does an XCNEW(darwin_thread_t) when it finds a new thread, allocating a new structure for it (darwin_thread_t is a typedef for private_thread_info). It then VEC_safe_pushes it in a vector defined as DEF_VEC_O (a vector of objects). This means that the structure content gets copied in the vector. The thread_info object is created with the XCNEW'ed structure as the private thread info, while the rest of the code works with the instance in the vector. We have therefore two distinct instances of darwin_thread_t/private_thread_info for each thread. This is not really a problem in practice, because thread_info::priv is not used in the darwin code. I still find it weird and far from ideal, so I tried to fix it by changing the vector to be a vector of pointers. There should now be a single instance of the structure for each thread. The deallocation of the darwin_thread_t/private_thread_info structure is done by the thread_info destructor. I am able to build on macOS, but not really test, since the port seems a bit broken. I am not able to debug reliably on the machine I have access to, which runs macOS 10.12.6. gdb/ChangeLog: * inferior.h (private_inferior): Define structure type, add virtual pure destructor. (inferior) <priv>: Change type to unique_ptr. * inferior.c (private_inferior::~private_inferior): Provide default implementation. (inferior::~inferior): Don't free priv field. (exit_inferior_1): Likewise. * darwin-nat.h (struct darwin_exception_info): Initialize fields. (darwin_exception_info): Remove typedef. (DEF_VEC_O (darwin_thread_t)); Remove. (private_inferior): Rename to ... (darwin_private_inferior): ... this, extend private_inferior. (get_darwin_inferior): New. <threads>: Change type to std::vector of darwin_thread_t pointers. * darwin-nat.c (darwin_check_new_threads): Adjust. (find_inferior_task_it): Adjust. (darwin_find_thread); Adjust. (darwin_suspend_inferior): Adjust. (darwin_resume_inferior): Adjust. (darwin_find_new_inferior): Adjust. (darwin_decode_notify_message): Adjust. (darwin_send_reply): Adjust. (darwin_resume_inferior_threads): Adjust. (darwin_suspend_inferior_threads): Adjust. (darwin_decode_message): Adjust. (darwin_wait): Adjust. (darwin_interrupt): Adjust. (darwin_deallocate_threads): Adjust. (darwin_mourn_inferior): Adjust, don't free private data. (darwin_reply_to_all_pending_messages): Adjust. (darwin_stop_inferior): Adjust. (darwin_setup_exceptions): Adjust. (darwin_kill_inferior): Adjust. (darwin_setup_request_notification): Adjust. (darwin_attach_pid): Adjust. (darwin_init_thread_list): Adjust. (darwin_setup_fake_stop_event): Adjust. (darwin_attach): Adjust. (darwin_detach): Adjust. (darwin_xfer_partial): Adjust. (set_enable_mach_exceptions): Adjust. (darwin_pid_to_exec_file): Adjust. (darwin_get_ada_task_ptid): Adjust. * darwin-nat-info.c (get_task_from_args): Adjust. (info_mach_ports_command): Adjust. (info_mach_region_command): Adjust. (info_mach_exceptions_command): Adjust. * remote.c (private_inferior): Rename to ... (remote_private_inferior): ... this, initialize fields. (get_remote_inferior); New. (remote_commit_resume): Use get_remote_inferior. (check_pending_event_prevents_wildcard_vcont_callback): Likewise.
2017-11-24 16:39:30 +01:00
/* Return the darwin_inferior attached to INF. */
static inline darwin_inferior *
get_darwin_inferior (inferior *inf)
{
return static_cast<darwin_inferior *> (inf->priv.get ());
}
/* Exception port. */
extern mach_port_t darwin_ex_port;
/* Port set. */
extern mach_port_t darwin_port_set;
/* A copy of mach_host_self (). */
extern mach_port_t darwin_host_self;
/* FUNCTION_NAME is defined in common-utils.h (or not). */
#ifdef FUNCTION_NAME
#define MACH_CHECK_ERROR(ret) \
mach_check_error (ret, __FILE__, __LINE__, FUNCTION_NAME)
#else
#define MACH_CHECK_ERROR(ret) \
mach_check_error (ret, __FILE__, __LINE__, "??")
#endif
extern void mach_check_error (kern_return_t ret, const char *file,
unsigned int line, const char *func);
void darwin_set_sstep (thread_t thread, int enable);
/* This one is called in darwin-nat.c, but needs to be provided by the
platform specific nat code. It allows each platform to add platform specific
stuff to the darwin_ops. */
extern void darwin_complete_target (struct target_ops *target);
void darwin_check_osabi (darwin_inferior *inf, thread_t thread);
#endif /* __DARWIN_NAT_H__ */