aboutsummaryrefslogtreecommitdiff
path: root/gdbserver
diff options
context:
space:
mode:
authorTom Tromey <tromey@adacore.com>2020-09-18 14:20:44 -0600
committerTom Tromey <tromey@adacore.com>2020-09-18 14:20:44 -0600
commitb60cea74de13b944ad7d40c315f61f5e6bc2a932 (patch)
tree8cf6ba183646cf0bdeac4d20f9df5b1ae7727fbb /gdbserver
parent0295dde6551b898295bd6a2ef7dab425643c4c1e (diff)
downloadfsf-binutils-gdb-b60cea74de13b944ad7d40c315f61f5e6bc2a932.zip
fsf-binutils-gdb-b60cea74de13b944ad7d40c315f61f5e6bc2a932.tar.gz
fsf-binutils-gdb-b60cea74de13b944ad7d40c315f61f5e6bc2a932.tar.bz2
Make target_wait options use enum flags
This changes TARGET_WNOHANG to be a member of an enum, rather than a define, and also adds a DEF_ENUM_FLAGS_TYPE for this type. Then, it changes target_wait and the various target wait methods to use this type rather than "int". This didn't catch any bugs, but it seems like a decent cleanup nevertheless. I did not change deprecated_target_wait_hook, since that's only used out-of-tree (by Insight), and there didn't seem to be a need. I can't build some of these targets, so I modified them on a best-effort basis. I don't think this patch should go in before the release branch is made. gdb/ChangeLog 2020-09-18 Tom Tromey <tromey@adacore.com> * windows-nat.c (struct windows_nat_target) <wait>: Update. (windows_nat_target::wait): Update. * target/wait.h (enum target_wait_flag): New. Use DEF_ENUM_FLAGS_TYPE. * target/target.h (target_wait): Change type of options. * target.h (target_options_to_string, default_target_wait): Update. (struct target_ops) <wait>: Change type of options. * target.c (target_wait, default_target_wait, do_option): Change type of "options". (target_options_to_string): Likewise. * target-delegates.c: Rebuild. * target-debug.h (target_debug_print_target_wait_flags): Rename from target_debug_print_options. * sol-thread.c (class sol_thread_target) <wait>: Update. (sol_thread_target::wait): Update. * rs6000-nat.c (class rs6000_nat_target) <wait>: Update. (rs6000_nat_target::wait): Update. * remote.c (class remote_target) <wait, wait_ns, wait_as>: Update. (remote_target::wait_ns, remote_target::wait_as): Change type of "options". (remote_target::wait): Update. * remote-sim.c (struct gdbsim_target) <wait>: Update. (gdbsim_target::wait): Update. * record-full.c (class record_full_base_target) <wait>: Update. (record_full_wait_1): Change type of "options". (record_full_base_target::wait): Update. * record-btrace.c (class record_btrace_target) <wait>: Update. (record_btrace_target::wait): Update. * ravenscar-thread.c (struct ravenscar_thread_target) <wait>: Update. (ravenscar_thread_target::wait): Update. * procfs.c (class procfs_target) <wait>: Update. (procfs_target::wait): Update. * obsd-nat.h (class obsd_nat_target) <wait>: Update. * obsd-nat.c (obsd_nat_target::wait): Update. * nto-procfs.c (struct nto_procfs_target) <wait>: Update. (nto_procfs_target::wait): Update. * nbsd-nat.h (struct nbsd_nat_target) <wait>: Update. * nbsd-nat.c (nbsd_wait): Change type of "options". (nbsd_nat_target::wait): Update. * linux-thread-db.c (class thread_db_target) <wait>: Update. (thread_db_target::wait): Update. * linux-nat.h (class linux_nat_target) <wait>: Update. * linux-nat.c (linux_nat_target::wait): Update. (linux_nat_wait_1): Update. * infrun.c (do_target_wait_1, do_target_wait): Change type of "options". * inf-ptrace.h (struct inf_ptrace_target) <wait>: Update. * inf-ptrace.c (inf_ptrace_target::wait): Update. * go32-nat.c (struct go32_nat_target) <wait>: Update. (go32_nat_target::wait): Update. * gnu-nat.h (struct gnu_nat_target) <wait>: Update. * gnu-nat.c (gnu_nat_target::wait): Update. * fbsd-nat.h (class fbsd_nat_target) <wait>: Update. * fbsd-nat.c (fbsd_nat_target::wait): Update. * darwin-nat.h (class darwin_nat_target) <wait>: Update. * darwin-nat.c (darwin_nat_target::wait): Update. * bsd-uthread.c (struct bsd_uthread_target) <wait>: Update. (bsd_uthread_target::wait): Update. * aix-thread.c (class aix_thread_target) <wait>: Update. (aix_thread_target::wait): Update. gdbserver/ChangeLog 2020-09-18 Tom Tromey <tromey@adacore.com> * netbsd-low.h (class netbsd_process_target) <wait>: Update. * netbsd-low.cc (netbsd_waitpid, netbsd_wait) (netbsd_process_target::wait): Change type of target_options. * win32-low.h (class win32_process_target) <wait>: Update. * win32-low.cc (win32_process_target::wait): Update. * target.h (class process_stratum_target) <wait>: Update. (mywait): Update. * target.cc (mywait, target_wait): Change type of "options". * linux-low.h (class linux_process_target) <wait, wait_1>: Update. * linux-low.cc (linux_process_target::wait) (linux_process_target::wait_1): Update.
Diffstat (limited to 'gdbserver')
-rw-r--r--gdbserver/ChangeLog15
-rw-r--r--gdbserver/linux-low.cc4
-rw-r--r--gdbserver/linux-low.h4
-rw-r--r--gdbserver/netbsd-low.cc8
-rw-r--r--gdbserver/netbsd-low.h2
-rw-r--r--gdbserver/target.cc7
-rw-r--r--gdbserver/target.h6
-rw-r--r--gdbserver/win32-low.cc2
-rw-r--r--gdbserver/win32-low.h2
9 files changed, 34 insertions, 16 deletions
diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog
index 576c96e..d47fcfd 100644
--- a/gdbserver/ChangeLog
+++ b/gdbserver/ChangeLog
@@ -1,3 +1,18 @@
+2020-09-18 Tom Tromey <tromey@adacore.com>
+
+ * netbsd-low.h (class netbsd_process_target) <wait>: Update.
+ * netbsd-low.cc (netbsd_waitpid, netbsd_wait)
+ (netbsd_process_target::wait): Change type of target_options.
+ * win32-low.h (class win32_process_target) <wait>: Update.
+ * win32-low.cc (win32_process_target::wait): Update.
+ * target.h (class process_stratum_target) <wait>: Update.
+ (mywait): Update.
+ * target.cc (mywait, target_wait): Change type of "options".
+ * linux-low.h (class linux_process_target) <wait, wait_1>:
+ Update.
+ * linux-low.cc (linux_process_target::wait)
+ (linux_process_target::wait_1): Update.
+
2020-09-15 Tom Tromey <tromey@adacore.com>
* linux-x86-low.cc (xmltarget_i386_linux_no_xml)
diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc
index e454933..70d5521 100644
--- a/gdbserver/linux-low.cc
+++ b/gdbserver/linux-low.cc
@@ -2948,7 +2948,7 @@ linux_process_target::gdb_catch_this_syscall (lwp_info *event_child)
ptid_t
linux_process_target::wait_1 (ptid_t ptid, target_waitstatus *ourstatus,
- int target_options)
+ target_wait_flags target_options)
{
client_state &cs = get_client_state ();
int w;
@@ -3710,7 +3710,7 @@ async_file_mark (void)
ptid_t
linux_process_target::wait (ptid_t ptid,
target_waitstatus *ourstatus,
- int target_options)
+ target_wait_flags target_options)
{
ptid_t event_ptid;
diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h
index 0ef659f..56c3533 100644
--- a/gdbserver/linux-low.h
+++ b/gdbserver/linux-low.h
@@ -157,7 +157,7 @@ public:
void resume (thread_resume *resume_info, size_t n) override;
ptid_t wait (ptid_t ptid, target_waitstatus *status,
- int options) override;
+ target_wait_flags options) override;
void fetch_registers (regcache *regcache, int regno) override;
@@ -356,7 +356,7 @@ private:
/* Wait for process, returns status. */
ptid_t wait_1 (ptid_t ptid, target_waitstatus *ourstatus,
- int target_options);
+ target_wait_flags target_options);
/* Stop all lwps that aren't stopped yet, except EXCEPT, if not NULL.
If SUSPEND, then also increase the suspend count of every LWP,
diff --git a/gdbserver/netbsd-low.cc b/gdbserver/netbsd-low.cc
index 8b13b67..3eb2c0f 100644
--- a/gdbserver/netbsd-low.cc
+++ b/gdbserver/netbsd-low.cc
@@ -236,9 +236,11 @@ netbsd_store_waitstatus (struct target_waitstatus *ourstatus, int hoststatus)
/* Implement a safe wrapper around waitpid(). */
static pid_t
-netbsd_waitpid (ptid_t ptid, struct target_waitstatus *ourstatus, int options)
+netbsd_waitpid (ptid_t ptid, struct target_waitstatus *ourstatus,
+ target_wait_flags target_options)
{
int status;
+ int options = (target_options & TARGET_WNOHANG) ? WNOHANG : 0;
pid_t pid
= gdb::handle_eintr<int> (-1, ::waitpid, ptid.pid (), &status, options);
@@ -259,7 +261,7 @@ netbsd_waitpid (ptid_t ptid, struct target_waitstatus *ourstatus, int options)
static ptid_t
netbsd_wait (ptid_t ptid, struct target_waitstatus *ourstatus,
- int target_options)
+ target_wait_flags target_options)
{
pid_t pid = netbsd_waitpid (ptid, ourstatus, target_options);
ptid_t wptid = ptid_t (pid);
@@ -398,7 +400,7 @@ netbsd_wait (ptid_t ptid, struct target_waitstatus *ourstatus,
ptid_t
netbsd_process_target::wait (ptid_t ptid, struct target_waitstatus *ourstatus,
- int target_options)
+ target_wait_flags target_options)
{
while (true)
{
diff --git a/gdbserver/netbsd-low.h b/gdbserver/netbsd-low.h
index 3d2ec34..96ad6d9 100644
--- a/gdbserver/netbsd-low.h
+++ b/gdbserver/netbsd-low.h
@@ -76,7 +76,7 @@ public:
void resume (thread_resume *resume_info, size_t n) override;
ptid_t wait (ptid_t ptid, target_waitstatus *status,
- int options) override;
+ target_wait_flags options) override;
void fetch_registers (regcache *regcache, int regno) override;
diff --git a/gdbserver/target.cc b/gdbserver/target.cc
index 87f62a0..921d26f 100644
--- a/gdbserver/target.cc
+++ b/gdbserver/target.cc
@@ -160,8 +160,8 @@ target_write_memory (CORE_ADDR memaddr, const unsigned char *myaddr,
}
ptid_t
-mywait (ptid_t ptid, struct target_waitstatus *ourstatus, int options,
- int connected_wait)
+mywait (ptid_t ptid, struct target_waitstatus *ourstatus,
+ target_wait_flags options, int connected_wait)
{
ptid_t ret;
@@ -220,7 +220,8 @@ target_stop_and_wait (ptid_t ptid)
/* See target/target.h. */
ptid_t
-target_wait (ptid_t ptid, struct target_waitstatus *status, int options)
+target_wait (ptid_t ptid, struct target_waitstatus *status,
+ target_wait_flags options)
{
return the_target->wait (ptid, status, options);
}
diff --git a/gdbserver/target.h b/gdbserver/target.h
index 13f069f..c2245eb 100644
--- a/gdbserver/target.h
+++ b/gdbserver/target.h
@@ -128,7 +128,7 @@ public:
no child stop to report, return is
null_ptid/TARGET_WAITKIND_IGNORE. */
virtual ptid_t wait (ptid_t ptid, target_waitstatus *status,
- int options) = 0;
+ target_wait_flags options) = 0;
/* Fetch registers from the inferior process.
@@ -663,8 +663,8 @@ target_read_btrace_conf (struct btrace_target_info *tinfo,
#define target_supports_software_single_step() \
the_target->supports_software_single_step ()
-ptid_t mywait (ptid_t ptid, struct target_waitstatus *ourstatus, int options,
- int connected_wait);
+ptid_t mywait (ptid_t ptid, struct target_waitstatus *ourstatus,
+ target_wait_flags options, int connected_wait);
/* Prepare to read or write memory from the inferior process. See the
corresponding process_stratum_target methods for more details. */
diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc
index a11cc74..9980986 100644
--- a/gdbserver/win32-low.cc
+++ b/gdbserver/win32-low.cc
@@ -1610,7 +1610,7 @@ get_child_debug_event (DWORD *continue_status,
Returns the signal which caused the process to stop. */
ptid_t
win32_process_target::wait (ptid_t ptid, target_waitstatus *ourstatus,
- int options)
+ target_wait_flags options)
{
if (cached_status.kind != TARGET_WAITKIND_IGNORE)
{
diff --git a/gdbserver/win32-low.h b/gdbserver/win32-low.h
index f3b4477..d4ad5d8 100644
--- a/gdbserver/win32-low.h
+++ b/gdbserver/win32-low.h
@@ -116,7 +116,7 @@ public:
void resume (thread_resume *resume_info, size_t n) override;
ptid_t wait (ptid_t ptid, target_waitstatus *status,
- int options) override;
+ target_wait_flags options) override;
void fetch_registers (regcache *regcache, int regno) override;