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

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.
This commit is contained in:
Tankut Baris Aktemur 2020-02-17 16:11:52 +01:00
parent 13d3d99b27
commit 0e4d7e35fb
12 changed files with 58 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gdbserver/ChangeLog
View File

@ -1,3 +1,36 @@
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

6
gdbserver/linux-low.cc
View File

@ -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,

2
gdbserver/linux-low.h
View File

@ -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)))

5
gdbserver/lynx-low.cc
View File

@ -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,

2
gdbserver/lynx-low.h
View File

@ -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

5
gdbserver/nto-low.cc
View File

@ -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,

2
gdbserver/nto-low.h
View File

@ -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

2
gdbserver/server.cc
View File

@ -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);

6
gdbserver/target.cc
View File

@ -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. */

7
gdbserver/target.h
View File

@ -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;

10
gdbserver/win32-low.cc
View File

@ -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,

2
gdbserver/win32-low.h
View File

@ -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. */