public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
* [binutils-gdb] gdbserver: turn target op 'resume' into a method
@ 2020-02-20 16:38 Tankut Baris Aktemur
0 siblings, 0 replies; only message in thread
From: Tankut Baris Aktemur @ 2020-02-20 16:38 UTC (permalink / raw)
To: gdb-cvs
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=0e4d7e35fbd551e61cf72adae4806aa8c5230a1a
commit 0e4d7e35fbd551e61cf72adae4806aa8c5230a1a
Author: Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
Date: Mon Feb 17 16:11:52 2020 +0100
gdbserver: turn target op 'resume' into a method
gdbserver/ChangeLog:
2020-02-20 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
Turn process_stratum_target's resume op into a method of
process_target.
* target.h (struct process_stratum_target): Remove the target op.
(class process_target): Add the target op.
Update the derived classes and callers below.
* server.cc (resume): Update.
* target.cc (target_stop_and_wait): Update.
(target_continue_no_signal): Update.
(target_continue): Update.
* linux-low.cc (linux_target_ops): Update.
(linux_resume): Turn into ...
(linux_process_target::resume): ... this.
* linux-low.h (class linux_process_target): Update.
* lynx-low.cc (lynx_target_ops): Update.
(lynx_resume): Turn into ...
(lynx_process_target::resume): ... this.
* lynx-low.h (class lynx_process_target): Update.
* nto-low.cc (nto_target_ops): Update.
(nto_resume): Turn into ...
(nto_process_target::resume): ... this.
* nto-low.h (class nto_process_target): Update.
* win32-low.cc (win32_target_ops): Update.
(win32_resume): Turn into ...
(win32_process_target::resume): ... this.
(win32_process_target::detach): Update.
(do_initial_child_stuff): Update.
* win32-low.h (class win32_process_target): Update.
Diff:
---
gdbserver/ChangeLog | 33 +++++++++++++++++++++++++++++++++
gdbserver/linux-low.cc | 6 ++----
gdbserver/linux-low.h | 2 ++
gdbserver/lynx-low.cc | 5 ++---
gdbserver/lynx-low.h | 2 ++
gdbserver/nto-low.cc | 5 ++---
gdbserver/nto-low.h | 2 ++
gdbserver/server.cc | 2 +-
gdbserver/target.cc | 6 +++---
gdbserver/target.h | 7 +++----
gdbserver/win32-low.cc | 10 ++++------
gdbserver/win32-low.h | 2 ++
12 files changed, 58 insertions(+), 24 deletions(-)
diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog
index 818a53c..584443e 100644
--- a/gdbserver/ChangeLog
+++ b/gdbserver/ChangeLog
@@ -1,5 +1,38 @@
2020-02-20 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
+ Turn process_stratum_target's resume op into a method of
+ process_target.
+
+ * target.h (struct process_stratum_target): Remove the target op.
+ (class process_target): Add the target op.
+
+ Update the derived classes and callers below.
+
+ * server.cc (resume): Update.
+ * target.cc (target_stop_and_wait): Update.
+ (target_continue_no_signal): Update.
+ (target_continue): Update.
+ * linux-low.cc (linux_target_ops): Update.
+ (linux_resume): Turn into ...
+ (linux_process_target::resume): ... this.
+ * linux-low.h (class linux_process_target): Update.
+ * lynx-low.cc (lynx_target_ops): Update.
+ (lynx_resume): Turn into ...
+ (lynx_process_target::resume): ... this.
+ * lynx-low.h (class lynx_process_target): Update.
+ * nto-low.cc (nto_target_ops): Update.
+ (nto_resume): Turn into ...
+ (nto_process_target::resume): ... this.
+ * nto-low.h (class nto_process_target): Update.
+ * win32-low.cc (win32_target_ops): Update.
+ (win32_resume): Turn into ...
+ (win32_process_target::resume): ... this.
+ (win32_process_target::detach): Update.
+ (do_initial_child_stuff): Update.
+ * win32-low.h (class win32_process_target): Update.
+
+2020-02-20 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
+
Turn process_stratum_target's thread_alive op into a method of
process_target.
diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc
index f7b1fc0..b2e0626 100644
--- a/gdbserver/linux-low.cc
+++ b/gdbserver/linux-low.cc
@@ -262,7 +262,6 @@ static int stabilizing_threads;
static void linux_resume_one_lwp (struct lwp_info *lwp,
int step, int signal, siginfo_t *info);
-static void linux_resume (struct thread_resume *resume_info, size_t n);
static void stop_all_lwps (int suspend, struct lwp_info *except);
static void unstop_all_lwps (int unsuspend, struct lwp_info *except);
static void unsuspend_all_lwps (struct lwp_info *except);
@@ -5002,8 +5001,8 @@ linux_resume_one_thread (thread_info *thread, bool leave_all_stopped)
lwp->resume = NULL;
}
-static void
-linux_resume (struct thread_resume *resume_info, size_t n)
+void
+linux_process_target::resume (thread_resume *resume_info, size_t n)
{
struct thread_info *need_step_over = NULL;
@@ -7359,7 +7358,6 @@ linux_get_hwcap2 (int wordsize)
static linux_process_target the_linux_target;
static process_stratum_target linux_target_ops = {
- linux_resume,
linux_wait,
linux_fetch_registers,
linux_store_registers,
diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h
index a11964d..a750f7c 100644
--- a/gdbserver/linux-low.h
+++ b/gdbserver/linux-low.h
@@ -286,6 +286,8 @@ public:
void join (int pid) override;
bool thread_alive (ptid_t pid) override;
+
+ void resume (thread_resume *resume_info, size_t n) override;
};
#define get_thread_lwp(thr) ((struct lwp_info *) (thread_target_data (thr)))
diff --git a/gdbserver/lynx-low.cc b/gdbserver/lynx-low.cc
index 2490878..9fc41e4 100644
--- a/gdbserver/lynx-low.cc
+++ b/gdbserver/lynx-low.cc
@@ -326,8 +326,8 @@ lynx_process_target::attach (unsigned long pid)
/* Implement the resume target_ops method. */
-static void
-lynx_resume (struct thread_resume *resume_info, size_t n)
+void
+lynx_process_target::resume (thread_resume *resume_info, size_t n)
{
ptid_t ptid = resume_info[0].thread;
const int request
@@ -726,7 +726,6 @@ static lynx_process_target the_lynx_target;
/* The LynxOS target_ops vector. */
static process_stratum_target lynx_target_ops = {
- lynx_resume,
lynx_wait,
lynx_fetch_registers,
lynx_store_registers,
diff --git a/gdbserver/lynx-low.h b/gdbserver/lynx-low.h
index b12e6cd..4a5e4ba 100644
--- a/gdbserver/lynx-low.h
+++ b/gdbserver/lynx-low.h
@@ -72,6 +72,8 @@ public:
void join (int pid) override;
bool thread_alive (ptid_t pid) override;
+
+ void resume (thread_resume *resume_info, size_t n) override;
};
/* The inferior's target description. This is a global because the
diff --git a/gdbserver/nto-low.cc b/gdbserver/nto-low.cc
index 4153a4a..d998154 100644
--- a/gdbserver/nto-low.cc
+++ b/gdbserver/nto-low.cc
@@ -451,8 +451,8 @@ nto_process_target::thread_alive (ptid_t ptid)
/* Resume inferior's execution. */
-static void
-nto_resume (struct thread_resume *resume_info, size_t n)
+void
+nto_process_target::resume (thread_resume *resume_info, size_t n)
{
/* We can only work in all-stop mode. */
procfs_status status;
@@ -941,7 +941,6 @@ nto_sw_breakpoint_from_kind (int kind, int *size)
static nto_process_target the_nto_target;
static process_stratum_target nto_target_ops = {
- nto_resume,
nto_wait,
nto_fetch_registers,
nto_store_registers,
diff --git a/gdbserver/nto-low.h b/gdbserver/nto-low.h
index e861b5e..5b32ae7 100644
--- a/gdbserver/nto-low.h
+++ b/gdbserver/nto-low.h
@@ -62,6 +62,8 @@ public:
void join (int pid) override;
bool thread_alive (ptid_t pid) override;
+
+ void resume (thread_resume *resume_info, size_t n) override;
};
/* The inferior's target description. This is a global because the
diff --git a/gdbserver/server.cc b/gdbserver/server.cc
index 73f8e18..92feff3 100644
--- a/gdbserver/server.cc
+++ b/gdbserver/server.cc
@@ -2847,7 +2847,7 @@ resume (struct thread_resume *actions, size_t num_actions)
enable_async_io ();
}
- (*the_target->resume) (actions, num_actions);
+ the_target->pt->resume (actions, num_actions);
if (non_stop)
write_ok (cs.own_buf);
diff --git a/gdbserver/target.cc b/gdbserver/target.cc
index f6d8d92..eca53de 100644
--- a/gdbserver/target.cc
+++ b/gdbserver/target.cc
@@ -211,7 +211,7 @@ target_stop_and_wait (ptid_t ptid)
resume_info.thread = ptid;
resume_info.kind = resume_stop;
resume_info.sig = GDB_SIGNAL_0;
- (*the_target->resume) (&resume_info, 1);
+ the_target->pt->resume (&resume_info, 1);
non_stop = true;
mywait (ptid, &status, 0, 0);
@@ -244,7 +244,7 @@ target_continue_no_signal (ptid_t ptid)
resume_info.thread = ptid;
resume_info.kind = resume_continue;
resume_info.sig = GDB_SIGNAL_0;
- (*the_target->resume) (&resume_info, 1);
+ the_target->pt->resume (&resume_info, 1);
}
/* See target/target.h. */
@@ -257,7 +257,7 @@ target_continue (ptid_t ptid, enum gdb_signal signal)
resume_info.thread = ptid;
resume_info.kind = resume_continue;
resume_info.sig = gdb_signal_to_host (signal);
- (*the_target->resume) (&resume_info, 1);
+ the_target->pt->resume (&resume_info, 1);
}
/* See target/target.h. */
diff --git a/gdbserver/target.h b/gdbserver/target.h
index 923c92c..f64009f 100644
--- a/gdbserver/target.h
+++ b/gdbserver/target.h
@@ -70,10 +70,6 @@ class process_target;
shared code. */
struct process_stratum_target
{
- /* Resume the inferior process. */
-
- void (*resume) (struct thread_resume *resume_info, size_t n);
-
/* Wait for the inferior process or thread to change state. Store
status through argument pointer STATUS.
@@ -483,6 +479,9 @@ public:
/* Return true iff the thread with process ID PID is alive. */
virtual bool thread_alive (ptid_t pid) = 0;
+
+ /* Resume the inferior process. */
+ virtual void resume (thread_resume *resume_info, size_t n) = 0;
};
extern process_stratum_target *the_target;
diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc
index 46f0ddd..1f4af2c 100644
--- a/gdbserver/win32-low.cc
+++ b/gdbserver/win32-low.cc
@@ -105,7 +105,6 @@ typedef BOOL (WINAPI *winapi_GenerateConsoleCtrlEvent) (DWORD, DWORD);
static ptid_t win32_wait (ptid_t ptid, struct target_waitstatus *ourstatus,
int options);
-static void win32_resume (struct thread_resume *resume_info, size_t n);
#ifndef _WIN32_WCE
static void win32_add_all_dlls (void);
#endif
@@ -396,7 +395,7 @@ do_initial_child_stuff (HANDLE proch, DWORD pid, int attached)
resume.kind = resume_continue;
resume.sig = 0;
- win32_resume (&resume, 1);
+ the_target->pt->resume (&resume, 1);
}
}
@@ -865,7 +864,7 @@ win32_process_target::detach (process_info *process)
resume.thread = minus_one_ptid;
resume.kind = resume_continue;
resume.sig = 0;
- win32_resume (&resume, 1);
+ this->resume (&resume, 1);
}
if (!DebugActiveProcessStop (current_process_id))
@@ -908,8 +907,8 @@ win32_process_target::thread_alive (ptid_t ptid)
/* Resume the inferior process. RESUME_INFO describes how we want
to resume. */
-static void
-win32_resume (struct thread_resume *resume_info, size_t n)
+void
+win32_process_target::resume (thread_resume *resume_info, size_t n)
{
DWORD tid;
enum gdb_signal sig;
@@ -1839,7 +1838,6 @@ win32_sw_breakpoint_from_kind (int kind, int *size)
static win32_process_target the_win32_target;
static process_stratum_target win32_target_ops = {
- win32_resume,
win32_wait,
win32_fetch_inferior_registers,
win32_store_inferior_registers,
diff --git a/gdbserver/win32-low.h b/gdbserver/win32-low.h
index b222fd3..fbdf3c7 100644
--- a/gdbserver/win32-low.h
+++ b/gdbserver/win32-low.h
@@ -121,6 +121,8 @@ public:
void join (int pid) override;
bool thread_alive (ptid_t pid) override;
+
+ void resume (thread_resume *resume_info, size_t n) override;
};
/* Retrieve the context for this thread, if not already retrieved. */
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-02-20 16:38 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-20 16:38 [binutils-gdb] gdbserver: turn target op 'resume' into a method Tankut Baris Aktemur
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).