From f99b2890dd5f073cb10bca6105caa0805c913d8a Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Tue, 9 May 2023 10:18:09 +0100 Subject: Windows gdb+gdbserver: Eliminate windows_process_info::thread_rec After the previous patches, thread_rec is no longer called anywhere. Delete it. Change-Id: Ib14e5807fc427e1c3c4a393a9ea7b36b6047a2d7 --- gdb/nat/windows-nat.h | 13 ------------- gdb/windows-nat.c | 10 ---------- gdbserver/win32-low.cc | 15 --------------- gdbserver/win32-low.h | 3 --- 4 files changed, 41 deletions(-) diff --git a/gdb/nat/windows-nat.h b/gdb/nat/windows-nat.h index e18edc9..fdbab0f 100644 --- a/gdb/nat/windows-nat.h +++ b/gdb/nat/windows-nat.h @@ -98,11 +98,6 @@ struct windows_thread_info }; -/* Possible values to pass to 'thread_rec'. */ -enum thread_disposition_type -{ -}; - /* A single pending stop. See "pending_stops" for more information. */ struct pending_stop @@ -172,14 +167,6 @@ struct windows_process_info This function must be supplied by the embedding application. */ virtual windows_thread_info *find_thread (ptid_t ptid) = 0; - /* Find a thread record given a thread id. THREAD_DISPOSITION - controls whether the thread is suspended, and whether the context - is invalidated. - - This function must be supplied by the embedding application. */ - virtual windows_thread_info *thread_rec (ptid_t ptid, - thread_disposition_type disposition) = 0; - /* Handle OUTPUT_DEBUG_STRING_EVENT from child process. Updates OURSTATUS and returns the thread id if this represents a thread change (this is specific to Cygwin), otherwise 0. diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index f5435d7..9b1bede 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -91,8 +91,6 @@ struct windows_solib struct windows_per_inferior : public windows_process_info { windows_thread_info *find_thread (ptid_t ptid) override; - windows_thread_info *thread_rec (ptid_t ptid, - thread_disposition_type disposition) override; DWORD handle_output_debug_string (struct target_waitstatus *ourstatus) override; void handle_load_dll (const char *dll_name, LPVOID base) override; void handle_unload_dll () override; @@ -537,14 +535,6 @@ windows_per_inferior::invalidate_context (windows_thread_info *th) th->context.ContextFlags = 0; } -windows_thread_info * -windows_per_inferior::thread_rec - (ptid_t ptid, thread_disposition_type disposition) -{ - windows_thread_info *th = find_thread (ptid); - return th; -} - /* Add a thread to the thread list. PTID is the ptid of the thread to be added. diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index b693da5..0d67cd9 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -150,21 +150,6 @@ gdbserver_windows_process::find_thread (ptid_t ptid) return (windows_thread_info *) thread_target_data (thread); } -/* See nat/windows-nat.h. */ - -windows_thread_info * -gdbserver_windows_process::thread_rec - (ptid_t ptid, thread_disposition_type disposition) -{ - thread_info *thread = find_thread_ptid (ptid); - if (thread == NULL) - return NULL; - - windows_thread_info *th = (windows_thread_info *) thread_target_data (thread); - win32_require_context (th); - return th; -} - /* Add a thread to the thread list. */ static windows_thread_info * child_add_thread (DWORD pid, DWORD tid, HANDLE h, void *tlb) diff --git a/gdbserver/win32-low.h b/gdbserver/win32-low.h index 8162d97..7ee4de4 100644 --- a/gdbserver/win32-low.h +++ b/gdbserver/win32-low.h @@ -175,9 +175,6 @@ public: struct gdbserver_windows_process : public windows_nat::windows_process_info { windows_nat::windows_thread_info *find_thread (ptid_t ptid) override; - windows_nat::windows_thread_info *thread_rec - (ptid_t ptid, - windows_nat::thread_disposition_type disposition) override; DWORD handle_output_debug_string (struct target_waitstatus *ourstatus) override; void handle_load_dll (const char *dll_name, LPVOID base) override; void handle_unload_dll () override; -- cgit v1.1