X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=gdb%2Fdarwin-nat.h;h=e3dcd963706126d65fbe0def37d09c3d095cc9cf;hb=1d2eeb660f0885807320792ee18c033b34522225;hp=9d45bdabe8e2d311efebb4f27c30d9b115aae4f5;hpb=57810aa7e8032c598897454daea14ed17df0f89d;p=binutils-gdb.git
diff --git a/gdb/darwin-nat.h b/gdb/darwin-nat.h
index 9d45bdabe8e..e3dcd963706 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-2018 Free Software Foundation, Inc.
+ Copyright (C) 1995-2022 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
@@ -14,26 +14,79 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see . */
-#ifndef __DARWIN_NAT_H__
-#define __DARWIN_NAT_H__
+#ifndef DARWIN_NAT_H
+#define DARWIN_NAT_H
#include "inf-child.h"
#include
#include "gdbthread.h"
+struct darwin_exception_msg
+{
+ 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
+};
+
+struct darwin_thread_info : public private_thread_info
+{
+ /* The thread port from a GDB point of view. */
+ 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 = 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 = DARWIN_RUNNING;
+
+ /* True if this thread is single-stepped. */
+ bool single_step = false;
+
+ /* True if a signal was manually sent to the thread. */
+ bool signaled = false;
+
+ /* The last exception received. */
+ struct darwin_exception_msg event {};
+};
+typedef struct darwin_thread_info darwin_thread_t;
+
/* 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);
+ 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;
+ ptid_t wait (ptid_t, struct target_waitstatus *, target_wait_flags) override;
void mourn_inferior () override;
@@ -45,9 +98,9 @@ class darwin_nat_target : public inf_child_target
bool thread_alive (ptid_t ptid) override;
- const char *pid_to_str (ptid_t) override;
+ std::string pid_to_str (ptid_t) override;
- char *pid_to_exec_file (int pid) override;
+ const char *pid_to_exec_file (int pid) override;
enum target_xfer_status xfer_partial (enum target_object object,
const char *annex,
@@ -58,7 +111,22 @@ class darwin_nat_target : public inf_child_target
bool supports_multi_process () override;
- ptid_t get_ada_task_ptid (long lwp, long thread) override;
+ ptid_t get_ada_task_ptid (long lwp, ULONGEST thread) override;
+
+private:
+ ptid_t wait_1 (ptid_t, struct target_waitstatus *);
+ void check_new_threads (inferior *inf);
+ int decode_exception_message (mach_msg_header_t *hdr,
+ inferior **pinf,
+ darwin_thread_t **pthread);
+ ptid_t decode_message (mach_msg_header_t *hdr,
+ darwin_thread_t **pthread,
+ inferior **pinf,
+ target_waitstatus *status);
+ void stop_inferior (inferior *inf);
+ void init_thread_list (inferior *inf);
+ void ptrace_him (int pid);
+ int cancel_breakpoint (ptid_t ptid);
};
/* Describe the mach exception handling state for a task. This state is saved
@@ -83,59 +151,6 @@ struct darwin_exception_info
mach_msg_type_number_t count = 0;
};
-struct darwin_exception_msg
-{
- 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
-};
-
-struct darwin_thread_info : public 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 darwin_thread_info darwin_thread_t;
-
static inline darwin_thread_info *
get_darwin_thread_info (class thread_info *thread)
{
@@ -185,14 +200,8 @@ 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
+ mach_check_error (ret, __FILE__, __LINE__, __func__)
extern void mach_check_error (kern_return_t ret, const char *file,
unsigned int line, const char *func);
@@ -201,4 +210,4 @@ void darwin_set_sstep (thread_t thread, int enable);
void darwin_check_osabi (darwin_inferior *inf, thread_t thread);
-#endif /* __DARWIN_NAT_H__ */
+#endif /* DARWIN_NAT_H */