From: Simon Marchi <simon.marchi@polymtl.ca>
Date: Wed, 6 Nov 2024 19:47:41 +0000 (-0500)
Subject: gdbserver: remove current_ptid macro
X-Git-Tag: gdb-16-branchpoint~497
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e9690243aa96476b50e4925c1675031def7f4687;p=thirdparty%2Fbinutils-gdb.git

gdbserver: remove current_ptid macro

I think it just makes things more obscure.  Use `thread_info::id`
directly instead.

Change-Id: I141d5fb08ebf45c13cc32c4bba62773249fcb356
Reviewed-By: Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
---

diff --git a/gdbserver/gdbthread.h b/gdbserver/gdbthread.h
index b45dc36c285..87fa3f6a0b7 100644
--- a/gdbserver/gdbthread.h
+++ b/gdbserver/gdbthread.h
@@ -136,9 +136,6 @@ thread_info *find_thread_in_random
 thread_info *find_thread_in_random
   (ptid_t ptid, gdb::function_view<bool (thread_info *)> func);
 
-/* Get current thread ID (Linux task ID).  */
-#define current_ptid (current_thread->id)
-
 /* Get the ptid of THREAD.  */
 
 static inline ptid_t
diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc
index e364114c7d2..28d07d9da8f 100644
--- a/gdbserver/linux-low.cc
+++ b/gdbserver/linux-low.cc
@@ -3970,7 +3970,7 @@ linux_process_target::install_software_single_step_breakpoints (lwp_info *lwp)
   std::vector<CORE_ADDR> next_pcs = low_get_next_pcs (regcache);
 
   for (CORE_ADDR pc : next_pcs)
-    set_single_step_breakpoint (pc, current_ptid);
+    set_single_step_breakpoint (pc, current_thread->id);
 }
 
 int
diff --git a/gdbserver/mem-break.cc b/gdbserver/mem-break.cc
index 1f7af7138cf..818f0042e2a 100644
--- a/gdbserver/mem-break.cc
+++ b/gdbserver/mem-break.cc
@@ -1402,7 +1402,7 @@ set_single_step_breakpoint (CORE_ADDR stop_at, ptid_t ptid)
 {
   struct single_step_breakpoint *bp;
 
-  gdb_assert (current_ptid.pid () == ptid.pid ());
+  gdb_assert (current_thread->id.pid () == ptid.pid ());
 
   bp = (struct single_step_breakpoint *) set_breakpoint_type_at (single_step_breakpoint,
 								stop_at, NULL);
diff --git a/gdbserver/server.cc b/gdbserver/server.cc
index 138a8acc953..0d7b1edba3a 100644
--- a/gdbserver/server.cc
+++ b/gdbserver/server.cc
@@ -3648,7 +3648,7 @@ myresume (char *own_buf, int step, int sig)
 
   if (step || sig || valid_cont_thread)
     {
-      resume_info[0].thread = current_ptid;
+      resume_info[0].thread = current_thread->id;
       if (step)
 	resume_info[0].kind = resume_step;
       else
diff --git a/gdbserver/thread-db.cc b/gdbserver/thread-db.cc
index 96a9ced19ec..0c014835472 100644
--- a/gdbserver/thread-db.cc
+++ b/gdbserver/thread-db.cc
@@ -309,7 +309,7 @@ static void
 thread_db_find_new_threads (void)
 {
   td_err_e err;
-  ptid_t ptid = current_ptid;
+  ptid_t ptid = current_thread->id;
   struct thread_db *thread_db = current_process ()->priv->thread_db;
   int loop, iteration;
 
diff --git a/gdbserver/tracepoint.cc b/gdbserver/tracepoint.cc
index b7d0ef2c293..f7b0a3ee1c1 100644
--- a/gdbserver/tracepoint.cc
+++ b/gdbserver/tracepoint.cc
@@ -6804,7 +6804,7 @@ static int
 run_inferior_command (char *cmd, int len)
 {
   int err = -1;
-  int pid = current_ptid.pid ();
+  int pid = current_thread->id.pid ();
 
   trace_debug ("run_inferior_command: running: %s", cmd);
 
diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc
index 18bdc12f6b5..5ef92a10089 100644
--- a/gdbserver/win32-low.cc
+++ b/gdbserver/win32-low.cc
@@ -74,7 +74,7 @@ const struct target_desc *wow64_win32_tdesc;
 static ptid_t
 current_thread_ptid (void)
 {
-  return current_ptid;
+  return current_thread->id;
 }
 
 /* The current debug event from WaitForDebugEvent.  */