From bb00b29d7802d6b28c24bd269bb170ac66aa932a Mon Sep 17 00:00:00 2001 From: Tristan Gingold Date: Fri, 19 Jun 2009 14:30:30 +0000 Subject: 2009-06-19 Tristan Gingold * 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. --- gdb/darwin-nat.h | 79 ++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 62 insertions(+), 17 deletions(-) (limited to 'gdb/darwin-nat.h') diff --git a/gdb/darwin-nat.h b/gdb/darwin-nat.h index 43a1522..3d216cc 100644 --- a/gdb/darwin-nat.h +++ b/gdb/darwin-nat.h @@ -22,9 +22,6 @@ #include #include "gdb_assert.h" -/* Define the threads vector type. */ -DEF_VEC_I (thread_t); - /* 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 @@ -48,35 +45,83 @@ struct darwin_exception_info }; typedef struct darwin_exception_info darwin_exception_info; -/* Describe an inferior. */ -struct darwin_inferior +struct darwin_exception_msg { - /* Inferior PID. */ - int pid; + 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 { DARWIN_RUNNING, DARWIN_STOPPED, DARWIN_MESSAGE }; + +struct private_thread_info +{ + /* 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; + /* True if a signal was manually sent to the thread. */ + unsigned char signaled; + + /* The last exception received. */ + struct darwin_exception_msg event; +}; +typedef struct private_thread_info darwin_thread_t; + +/* Define the threads vector type. */ +DEF_VEC_O (darwin_thread_t); + + +/* Describe an inferior. */ +struct private_inferior +{ /* Corresponding task port. */ task_t task; - /* Previous port for request notification on task. */ - mach_port_t prev_not_port; + /* 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; /* Initial exception handling. */ darwin_exception_info exception_info; + /* Number of messages that have been received but not yet replied. */ + unsigned int pending_messages; + + /* Set if inferior is not controlled by ptrace(2) but through Mach. */ + unsigned char no_ptrace; + + /* True if this task is suspended. */ + unsigned char suspended; + /* Sorted vector of known threads. */ - VEC(thread_t) *threads; + VEC(darwin_thread_t) *threads; }; -typedef struct darwin_inferior darwin_inferior; - -/* Current inferior. */ -extern darwin_inferior *darwin_inf; +typedef struct private_inferior darwin_inferior; /* Exception port. */ extern mach_port_t darwin_ex_port; -/* Notification port. */ -extern mach_port_t darwin_not_port; - /* Port set. */ extern mach_port_t darwin_port_set; -- cgit v1.1