From 62fe396b1cba6b0c3d06b758d9f8254c6d538ad8 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 8 Apr 2020 14:33:35 -0600 Subject: Change two windows_thread_info members to "bool" This changes a couple of fields of windows_thread_info to have type "bool". It also updates the comment of another field, to clarify the possible values it can hold. gdb/ChangeLog 2020-04-08 Tom Tromey * windows-nat.c (thread_rec) (windows_nat_target::fetch_registers): Update. * nat/windows-nat.h (struct windows_thread_info) : Update comment. : Now bool. gdbserver/ChangeLog 2020-04-08 Tom Tromey * win32-i386-low.c (update_debug_registers) (i386_prepare_to_resume, i386_thread_added): Update. --- gdb/ChangeLog | 8 ++++++++ gdb/nat/windows-nat.h | 9 ++++++--- gdb/windows-nat.c | 4 ++-- gdbserver/ChangeLog | 5 +++++ gdbserver/win32-i386-low.cc | 6 +++--- 5 files changed, 24 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f0b1f33..6fce48c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,13 @@ 2020-04-08 Tom Tromey + * windows-nat.c (thread_rec) + (windows_nat_target::fetch_registers): Update. + * nat/windows-nat.h (struct windows_thread_info) : + Update comment. + : Now bool. + +2020-04-08 Tom Tromey + * windows-nat.c (windows_add_thread): Use new. (windows_init_thread_list, windows_delete_thread): Use delete. (get_windows_debug_event): Update. diff --git a/gdb/nat/windows-nat.h b/gdb/nat/windows-nat.h index a3da268..27fd7ed 100644 --- a/gdb/nat/windows-nat.h +++ b/gdb/nat/windows-nat.h @@ -48,7 +48,10 @@ struct windows_thread_info /* Thread Information Block address. */ CORE_ADDR thread_local_base; - /* Non zero if SuspendThread was called on this thread. */ + /* This keeps track of whether SuspendThread was called on this + thread. -1 means there was a failure or that the thread was + explicitly not suspended, 1 means it was called, and 0 means it + was not. */ int suspended = 0; #ifdef _WIN32_WCE @@ -67,11 +70,11 @@ struct windows_thread_info /* Whether debug registers changed since we last set CONTEXT back to the thread. */ - int debug_registers_changed = 0; + bool debug_registers_changed = false; /* Nonzero if CONTEXT is invalidated and must be re-read from the inferior thread. */ - int reload_context = 0; + bool reload_context = false; /* The name of the thread, allocated by xmalloc. */ char *name = nullptr; diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index 715cf60..b7f21cb 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -439,7 +439,7 @@ thread_rec (DWORD id, int get_context) } else if (get_context < 0) th->suspended = -1; - th->reload_context = 1; + th->reload_context = true; } return th; } @@ -695,7 +695,7 @@ windows_nat_target::fetch_registers (struct regcache *regcache, int r) dr[7] = th->context.Dr7; } } - th->reload_context = 0; + th->reload_context = false; } if (r < 0) diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index be2f767..25b5768 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,5 +1,10 @@ 2020-04-08 Tom Tromey + * win32-i386-low.c (update_debug_registers) + (i386_prepare_to_resume, i386_thread_added): Update. + +2020-04-08 Tom Tromey + * win32-low.c (child_add_thread): Use new. (delete_thread_info): Use delete. diff --git a/gdbserver/win32-i386-low.cc b/gdbserver/win32-i386-low.cc index 29ee49f..1b78cf9 100644 --- a/gdbserver/win32-i386-low.cc +++ b/gdbserver/win32-i386-low.cc @@ -44,7 +44,7 @@ update_debug_registers (thread_info *thread) /* The actual update is done later just before resuming the lwp, we just mark that the registers need updating. */ - th->debug_registers_changed = 1; + th->debug_registers_changed = true; } /* Update the inferior's debug register REGNUM from STATE. */ @@ -253,14 +253,14 @@ i386_prepare_to_resume (windows_thread_info *th) FIXME: should we set dr6 also ?? */ th->context.Dr7 = dr->dr_control_mirror; - th->debug_registers_changed = 0; + th->debug_registers_changed = false; } } static void i386_thread_added (windows_thread_info *th) { - th->debug_registers_changed = 1; + th->debug_registers_changed = true; } static void -- cgit v1.1