OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdbserver: turn target op 'detach' into a method 

gdbserver/ChangeLog:
2020-02-20  Tankut Baris Aktemur  <tankut.baris.aktemur@intel.com>

	Turn process_stratum_target's detach op into a method of
	process_target.

	* target.h (struct process_stratum_target): Remove the target op.
	(class process_target): Add the target op.
	(detach_inferior): Update the macro.

	Update the derived classes and callers below.

	* linux-low.cc (linux_target_ops): Update.
	(linux_detach): Turn into ...
	(linux_process_target::detach): ... this.
	* linux-low.h (class linux_process_target): Update.
	* lynx-low.cc (lynx_target_ops): Update.
	(lynx_detach): Turn into ...
	(lynx_process_target::detach): ... this.
	* lynx-low.h (class lynx_process_target): Update.
	* nto-low.cc (nto_target_ops): Update.
	(nto_detach): Turn into ...
	(nto_process_target::detach): ... this.
	* nto-low.h (class nto_process_target): Update.
	* win32-low.cc (win32_target_ops): Update.
	(win32_detach): Turn into ...
	(win32_process_target::detach): ... this.
	* win32-low.h (class win32_process_target): Update.
This commit is contained in:
Tankut Baris Aktemur 2020-02-17 16:11:51 +01:00
parent c6885a575f
commit 9061c9cfb3
10 changed files with 49 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gdbserver/ChangeLog
View File

@ -1,3 +1,31 @@
2020-02-20 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
Turn process_stratum_target's detach op into a method of
process_target.
* target.h (struct process_stratum_target): Remove the target op.
(class process_target): Add the target op.
(detach_inferior): Update the macro.
Update the derived classes and callers below.
* linux-low.cc (linux_target_ops): Update.
(linux_detach): Turn into ...
(linux_process_target::detach): ... this.
* linux-low.h (class linux_process_target): Update.
* lynx-low.cc (lynx_target_ops): Update.
(lynx_detach): Turn into ...
(lynx_process_target::detach): ... this.
* lynx-low.h (class lynx_process_target): Update.
* nto-low.cc (nto_target_ops): Update.
(nto_detach): Turn into ...
(nto_process_target::detach): ... this.
* nto-low.h (class nto_process_target): Update.
* win32-low.cc (win32_target_ops): Update.
(win32_detach): Turn into ...
(win32_process_target::detach): ... this.
* win32-low.h (class win32_process_target): Update.
2020-02-20 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
Turn process_stratum_target's kill op into a method of

5
gdbserver/linux-low.cc
View File

@ -1603,8 +1603,8 @@ linux_detach_lwp_callback (thread_info *thread)
linux_detach_one_lwp (lwp);
}
static int
linux_detach (process_info *process)
int
linux_process_target::detach (process_info *process)
{
struct lwp_info *main_lwp;
@ -7359,7 +7359,6 @@ linux_get_hwcap2 (int wordsize)
static linux_process_target the_linux_target;
static process_stratum_target linux_target_ops = {
linux_detach,
linux_mourn,
linux_join,
linux_thread_alive,

2
gdbserver/linux-low.h
View File

@ -278,6 +278,8 @@ public:
int attach (unsigned long pid) override;
int kill (process_info *proc) override;
int detach (process_info *proc) override;
};
#define get_thread_lwp(thr) ((struct lwp_info *) (thread_target_data (thr)))

5
gdbserver/lynx-low.cc
View File

@ -535,8 +535,8 @@ lynx_process_target::kill (process_info *process)
/* Implement the detach target_ops method. */
static int
lynx_detach (process_info *process)
int
lynx_process_target::detach (process_info *process)
{
ptid_t ptid = lynx_ptid_t (process->pid, 0);
@ -726,7 +726,6 @@ static lynx_process_target the_lynx_target;
/* The LynxOS target_ops vector. */
static process_stratum_target lynx_target_ops = {
lynx_detach,
lynx_mourn,
lynx_join,
lynx_thread_alive,

2
gdbserver/lynx-low.h
View File

@ -64,6 +64,8 @@ public:
int attach (unsigned long pid) override;
int kill (process_info *proc) override;
int detach (process_info *proc) override;
};
/* The inferior's target description. This is a global because the

5
gdbserver/nto-low.cc
View File

@ -409,8 +409,8 @@ nto_process_target::kill (process_info *proc)
/* Detach from process PID. */
static int
nto_detach (process_info *proc)
int
nto_process_target::detach (process_info *proc)
{
TRACE ("%s %d\n", __func__, proc->pid);
do_detach ();
@ -935,7 +935,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_detach,
nto_mourn,
NULL, /* nto_join */
nto_thread_alive,

2
gdbserver/nto-low.h
View File

@ -54,6 +54,8 @@ public:
int attach (unsigned long pid) override;
int kill (process_info *proc) override;
int detach (process_info *proc) override;
};
/* The inferior's target description. This is a global because the

11
gdbserver/target.h
View File

@ -70,11 +70,6 @@ class process_target;
shared code. */
struct process_stratum_target
{
/* Detach from process PROC. Return -1 on failure, and 0 on
success. */
int (*detach) (process_info *proc);
/* The inferior process has died. Do what is right. */
void (*mourn) (struct process_info *proc);
@ -487,6 +482,10 @@ public:
/* Kill process PROC. Return -1 on failure, and 0 on success. */
virtual int kill (process_info *proc) = 0;
/* Detach from process PROC. Return -1 on failure, and 0 on
success. */
virtual int detach (process_info *proc) = 0;
};
extern process_stratum_target *the_target;
@ -524,7 +523,7 @@ int kill_inferior (process_info *proc);
} while (0)
#define detach_inferior(proc) \
(*the_target->detach) (proc)
the_target->pt->detach (proc)
#define mythread_alive(pid) \
(*the_target->thread_alive) (pid)

5
gdbserver/win32-low.cc
View File

@ -843,8 +843,8 @@ win32_process_target::kill (process_info *process)
/* Implementation of target_ops::detach. */
static int
win32_detach (process_info *process)
int
win32_process_target::detach (process_info *process)
{
winapi_DebugActiveProcessStop DebugActiveProcessStop = NULL;
winapi_DebugSetProcessKillOnExit DebugSetProcessKillOnExit = NULL;
@ -1839,7 +1839,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_detach,
win32_mourn,
win32_join,
win32_thread_alive,

2
gdbserver/win32-low.h
View File

@ -113,6 +113,8 @@ public:
int attach (unsigned long pid) override;
int kill (process_info *proc) override;
int detach (process_info *proc) override;
};
/* Retrieve the context for this thread, if not already retrieved. */