X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fdarwin-nat.h;h=89a7c06f6a1a89419aad90dccc87c89f1064138b;hb=e98ee8c458f3a8405eb93e71b00f801b4bbe3635;hp=7a174764f89584c278aa63f0ee3c79e51c5a630c;hpb=618f726fcb851883a0094aa7fa17003889b7189f;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/darwin-nat.h b/gdb/darwin-nat.h index 7a174764f8..89a7c06f6a 100644 --- a/gdb/darwin-nat.h +++ b/gdb/darwin-nat.h @@ -1,5 +1,5 @@ /* Common things used by the various darwin files - Copyright (C) 1995-2016 Free Software Foundation, Inc. + Copyright (C) 1995-2018 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 @@ -17,7 +17,49 @@ #ifndef __DARWIN_NAT_H__ #define __DARWIN_NAT_H__ +#include "inf-child.h" #include +#include "gdbthread.h" + +/* This needs to be overridden by the platform specific nat code. */ + +class darwin_nat_target : public inf_child_target +{ + void create_inferior (const char *exec_file, + const std::string &allargs, + char **env, int from_tty) override; + + void attach (const char *, int) override; + + void detach (inferior *, int) override; + + ptid_t wait (ptid_t, struct target_waitstatus *, int) override; + + void mourn_inferior () override; + + void kill () override; + + void interrupt () override; + + void resume (ptid_t, int , enum gdb_signal) override; + + bool thread_alive (ptid_t ptid) override; + + const char *pid_to_str (ptid_t) override; + + char *pid_to_exec_file (int pid) override; + + enum target_xfer_status xfer_partial (enum target_object object, + const char *annex, + gdb_byte *readbuf, + const gdb_byte *writebuf, + ULONGEST offset, ULONGEST len, + ULONGEST *xfered_len) override; + + bool supports_multi_process () override; + + ptid_t get_ada_task_ptid (long lwp, long thread) override; +}; /* Describe the mach exception handling state for a task. This state is saved before being changed and restored when a process is detached. @@ -26,21 +68,20 @@ struct darwin_exception_info { /* Exceptions handled by the port. */ - exception_mask_t masks[EXC_TYPES_COUNT]; + exception_mask_t masks[EXC_TYPES_COUNT] {}; /* Ports receiving exception messages. */ - mach_port_t ports[EXC_TYPES_COUNT]; + mach_port_t ports[EXC_TYPES_COUNT] {}; /* Type of messages sent. */ - exception_behavior_t behaviors[EXC_TYPES_COUNT]; + exception_behavior_t behaviors[EXC_TYPES_COUNT] {}; /* Type of state to be sent. */ - thread_state_flavor_t flavors[EXC_TYPES_COUNT]; + thread_state_flavor_t flavors[EXC_TYPES_COUNT] {}; /* Number of elements set. */ - mach_msg_type_number_t count; + mach_msg_type_number_t count = 0; }; -typedef struct darwin_exception_info darwin_exception_info; struct darwin_exception_msg { @@ -70,61 +111,70 @@ enum darwin_msg_state DARWIN_MESSAGE }; -struct private_thread_info +struct darwin_thread_info : public private_thread_info { /* The thread port from a GDB point of view. */ - thread_t gdb_port; + thread_t gdb_port = 0; /* 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; + thread_t inf_port = 0; /* 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; + enum darwin_msg_state msg_state = DARWIN_RUNNING; /* True if this thread is single-stepped. */ - unsigned char single_step; + bool single_step = false; /* True if a signal was manually sent to the thread. */ - unsigned char signaled; + bool signaled = false; /* The last exception received. */ - struct darwin_exception_msg event; + struct darwin_exception_msg event {}; }; -typedef struct private_thread_info darwin_thread_t; - -/* Define the threads vector type. */ -DEF_VEC_O (darwin_thread_t); +typedef struct darwin_thread_info darwin_thread_t; +static inline darwin_thread_info * +get_darwin_thread_info (class thread_info *thread) +{ + return static_cast (thread->priv.get ()); +} /* Describe an inferior. */ -struct private_inferior +struct darwin_inferior : public private_inferior { /* Corresponding task port. */ - task_t task; + task_t task = 0; /* Port which will receive the dead-name notification for the task port. This is used to detect the death of the task. */ - mach_port_t notify_port; + mach_port_t notify_port = 0; /* Initial exception handling. */ darwin_exception_info exception_info; /* Number of messages that have been received but not yet replied. */ - unsigned int pending_messages; + unsigned int pending_messages = 0; /* Set if inferior is not controlled by ptrace(2) but through Mach. */ - unsigned char no_ptrace; + bool no_ptrace = false; /* True if this task is suspended. */ - unsigned char suspended; + bool suspended = false; /* Sorted vector of known threads. */ - VEC(darwin_thread_t) *threads; + std::vector threads; }; -typedef struct private_inferior darwin_inferior; + +/* Return the darwin_inferior attached to INF. */ + +static inline darwin_inferior * +get_darwin_inferior (inferior *inf) +{ + return static_cast (inf->priv.get ()); +} /* Exception port. */ extern mach_port_t darwin_ex_port; @@ -149,11 +199,6 @@ extern void mach_check_error (kern_return_t ret, const char *file, 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__ */