gdbserver: turn target op 'wait' into a method
gdbserver/ChangeLog: 2020-02-20 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com> Turn process_stratum_target's wait 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. * target.cc (target_wait): Update. * linux-low.cc (linux_target_ops): Update. (linux_wait): Turn into ... (linux_process_target::wait): ... this. * linux-low.h (class linux_process_target): Update. * lynx-low.cc (lynx_target_ops): Update. (lynx_wait): Turn into ... (lynx_process_target::wait): ... this. * lynx-low.h (class lynx_process_target): Update. * nto-low.cc (nto_target_ops): Update. (nto_wait): Turn into ... (nto_process_target::wait): ... this. * nto-low.h (class nto_process_target): Update. * win32-low.cc (win32_target_ops): Update. (win32_wait): Turn into ... (win32_process_target::wait): ... this. (do_initial_child_stuff): Update. * win32-low.h (class win32_process_target): Update.
This commit is contained in:
Tankut Baris Aktemur
parent
0e4d7e35fb
commit
6532e7e378
|
|
@ -1,3 +1,32 @@
|
|||
2020-02-20 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
|
||||
|
||||
Turn process_stratum_target's wait 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.
|
||||
|
||||
* target.cc (target_wait): Update.
|
||||
* linux-low.cc (linux_target_ops): Update.
|
||||
(linux_wait): Turn into ...
|
||||
(linux_process_target::wait): ... this.
|
||||
* linux-low.h (class linux_process_target): Update.
|
||||
* lynx-low.cc (lynx_target_ops): Update.
|
||||
(lynx_wait): Turn into ...
|
||||
(lynx_process_target::wait): ... this.
|
||||
* lynx-low.h (class lynx_process_target): Update.
|
||||
* nto-low.cc (nto_target_ops): Update.
|
||||
(nto_wait): Turn into ...
|
||||
(nto_process_target::wait): ... this.
|
||||
* nto-low.h (class nto_process_target): Update.
|
||||
* win32-low.cc (win32_target_ops): Update.
|
||||
(win32_wait): Turn into ...
|
||||
(win32_process_target::wait): ... this.
|
||||
(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 resume op into a method of
|
||||
|
|
|
|||
|
|
@ -3833,9 +3833,10 @@ async_file_mark (void)
|
|||
be awakened anyway. */
|
||||
}
|
||||
|
||||
static ptid_t
|
||||
linux_wait (ptid_t ptid,
|
||||
struct target_waitstatus *ourstatus, int target_options)
|
||||
ptid_t
|
||||
linux_process_target::wait (ptid_t ptid,
|
||||
target_waitstatus *ourstatus,
|
||||
int target_options)
|
||||
{
|
||||
ptid_t event_ptid;
|
||||
|
||||
|
|
@ -7358,7 +7359,6 @@ linux_get_hwcap2 (int wordsize)
|
|||
static linux_process_target the_linux_target;
|
||||
|
||||
static process_stratum_target linux_target_ops = {
|
||||
linux_wait,
|
||||
linux_fetch_registers,
|
||||
linux_store_registers,
|
||||
linux_prepare_to_access_memory,
|
||||
|
|
|
|||
|
|
@ -288,6 +288,9 @@ public:
|
|||
bool thread_alive (ptid_t pid) override;
|
||||
|
||||
void resume (thread_resume *resume_info, size_t n) override;
|
||||
|
||||
ptid_t wait (ptid_t ptid, target_waitstatus *status,
|
||||
int options) override;
|
||||
};
|
||||
|
||||
#define get_thread_lwp(thr) ((struct lwp_info *) (thread_target_data (thr)))
|
||||
|
|
|
|||
|
|
@ -505,12 +505,13 @@ retry:
|
|||
/* A wrapper around lynx_wait_1 that also prints debug traces when
|
||||
such debug traces have been activated. */
|
||||
|
||||
static ptid_t
|
||||
lynx_wait (ptid_t ptid, struct target_waitstatus *status, int options)
|
||||
ptid_t
|
||||
lynx_process_target::wait (ptid_t ptid, target_waitstatus *status,
|
||||
int options)
|
||||
{
|
||||
ptid_t new_ptid;
|
||||
|
||||
lynx_debug ("lynx_wait (pid = %d, tid = %ld)",
|
||||
lynx_debug ("wait (pid = %d, tid = %ld)",
|
||||
lynx_ptid_get_pid (ptid), lynx_ptid_get_tid (ptid));
|
||||
new_ptid = lynx_wait_1 (ptid, status, options);
|
||||
lynx_debug (" -> (pid=%d, tid=%ld, status->kind = %d)",
|
||||
|
|
@ -726,7 +727,6 @@ static lynx_process_target the_lynx_target;
|
|||
/* The LynxOS target_ops vector. */
|
||||
|
||||
static process_stratum_target lynx_target_ops = {
|
||||
lynx_wait,
|
||||
lynx_fetch_registers,
|
||||
lynx_store_registers,
|
||||
NULL, /* prepare_to_access_memory */
|
||||
|
|
|
|||
|
|
@ -74,6 +74,9 @@ public:
|
|||
bool thread_alive (ptid_t pid) override;
|
||||
|
||||
void resume (thread_resume *resume_info, size_t n) override;
|
||||
|
||||
ptid_t wait (ptid_t ptid, target_waitstatus *status,
|
||||
int options) override;
|
||||
};
|
||||
|
||||
/* The inferior's target description. This is a global because the
|
||||
|
|
|
|||
|
|
@ -518,9 +518,9 @@ nto_process_target::resume (thread_resume *resume_info, size_t n)
|
|||
|
||||
Return ptid of thread that caused the event. */
|
||||
|
||||
static ptid_t
|
||||
nto_wait (ptid_t ptid,
|
||||
struct target_waitstatus *ourstatus, int target_options)
|
||||
ptid_t
|
||||
nto_process_target::wait (ptid_t ptid, target_waitstatus *ourstatus,
|
||||
int target_options)
|
||||
{
|
||||
sigset_t set;
|
||||
siginfo_t info;
|
||||
|
|
@ -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_wait,
|
||||
nto_fetch_registers,
|
||||
nto_store_registers,
|
||||
NULL, /* prepare_to_access_memory */
|
||||
|
|
|
|||
|
|
@ -64,6 +64,9 @@ public:
|
|||
bool thread_alive (ptid_t pid) override;
|
||||
|
||||
void resume (thread_resume *resume_info, size_t n) override;
|
||||
|
||||
ptid_t wait (ptid_t ptid, target_waitstatus *status,
|
||||
int options) override;
|
||||
};
|
||||
|
||||
/* The inferior's target description. This is a global because the
|
||||
|
|
|
|||
|
|
@ -223,7 +223,7 @@ target_stop_and_wait (ptid_t ptid)
|
|||
ptid_t
|
||||
target_wait (ptid_t ptid, struct target_waitstatus *status, int options)
|
||||
{
|
||||
return (*the_target->wait) (ptid, status, options);
|
||||
return the_target->pt->wait (ptid, status, options);
|
||||
}
|
||||
|
||||
/* See target/target.h. */
|
||||
|
|
|
|||
|
|
@ -70,19 +70,6 @@ class process_target;
|
|||
shared code. */
|
||||
struct process_stratum_target
|
||||
{
|
||||
/* Wait for the inferior process or thread to change state. Store
|
||||
status through argument pointer STATUS.
|
||||
|
||||
PTID = -1 to wait for any pid to do something, PTID(pid,0,0) to
|
||||
wait for any thread of process pid to do something. Return ptid
|
||||
of child, or -1 in case of error; store status through argument
|
||||
pointer STATUS. OPTIONS is a bit set of options defined as
|
||||
TARGET_W* above. If options contains TARGET_WNOHANG and there's
|
||||
no child stop to report, return is
|
||||
null_ptid/TARGET_WAITKIND_IGNORE. */
|
||||
|
||||
ptid_t (*wait) (ptid_t ptid, struct target_waitstatus *status, int options);
|
||||
|
||||
/* Fetch registers from the inferior process.
|
||||
|
||||
If REGNO is -1, fetch all registers; otherwise, fetch at least REGNO. */
|
||||
|
|
@ -482,6 +469,19 @@ public:
|
|||
|
||||
/* Resume the inferior process. */
|
||||
virtual void resume (thread_resume *resume_info, size_t n) = 0;
|
||||
|
||||
/* Wait for the inferior process or thread to change state. Store
|
||||
status through argument pointer STATUS.
|
||||
|
||||
PTID = -1 to wait for any pid to do something, PTID(pid,0,0) to
|
||||
wait for any thread of process pid to do something. Return ptid
|
||||
of child, or -1 in case of error; store status through argument
|
||||
pointer STATUS. OPTIONS is a bit set of options defined as
|
||||
TARGET_W* above. If options contains TARGET_WNOHANG and there's
|
||||
no child stop to report, return is
|
||||
null_ptid/TARGET_WAITKIND_IGNORE. */
|
||||
virtual ptid_t wait (ptid_t ptid, target_waitstatus *status,
|
||||
int options) = 0;
|
||||
};
|
||||
|
||||
extern process_stratum_target *the_target;
|
||||
|
|
|
|||
|
|
@ -103,8 +103,6 @@ typedef BOOL (WINAPI *winapi_DebugSetProcessKillOnExit) (BOOL KillOnExit);
|
|||
typedef BOOL (WINAPI *winapi_DebugBreakProcess) (HANDLE);
|
||||
typedef BOOL (WINAPI *winapi_GenerateConsoleCtrlEvent) (DWORD, DWORD);
|
||||
|
||||
static ptid_t win32_wait (ptid_t ptid, struct target_waitstatus *ourstatus,
|
||||
int options);
|
||||
#ifndef _WIN32_WCE
|
||||
static void win32_add_all_dlls (void);
|
||||
#endif
|
||||
|
|
@ -379,7 +377,7 @@ do_initial_child_stuff (HANDLE proch, DWORD pid, int attached)
|
|||
{
|
||||
struct target_waitstatus status;
|
||||
|
||||
win32_wait (minus_one_ptid, &status, 0);
|
||||
the_target->pt->wait (minus_one_ptid, &status, 0);
|
||||
|
||||
/* Note win32_wait doesn't return thread events. */
|
||||
if (status.kind != TARGET_WAITKIND_LOADED)
|
||||
|
|
@ -714,7 +712,7 @@ win32_process_target::create_inferior (const char *program,
|
|||
|
||||
/* Wait till we are at 1st instruction in program, return new pid
|
||||
(assuming success). */
|
||||
cs.last_ptid = win32_wait (ptid_t (current_process_id), &cs.last_status, 0);
|
||||
cs.last_ptid = wait (ptid_t (current_process_id), &cs.last_status, 0);
|
||||
|
||||
/* Necessary for handle_v_kill. */
|
||||
signal_pid = current_process_id;
|
||||
|
|
@ -1610,8 +1608,9 @@ get_child_debug_event (struct target_waitstatus *ourstatus)
|
|||
/* Wait for the inferior process to change state.
|
||||
STATUS will be filled in with a response code to send to GDB.
|
||||
Returns the signal which caused the process to stop. */
|
||||
static ptid_t
|
||||
win32_wait (ptid_t ptid, struct target_waitstatus *ourstatus, int options)
|
||||
ptid_t
|
||||
win32_process_target::wait (ptid_t ptid, target_waitstatus *ourstatus,
|
||||
int options)
|
||||
{
|
||||
struct regcache *regcache;
|
||||
|
||||
|
|
@ -1838,7 +1837,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_wait,
|
||||
win32_fetch_inferior_registers,
|
||||
win32_store_inferior_registers,
|
||||
NULL, /* prepare_to_access_memory */
|
||||
|
|
|
|||
|
|
@ -123,6 +123,9 @@ public:
|
|||
bool thread_alive (ptid_t pid) override;
|
||||
|
||||
void resume (thread_resume *resume_info, size_t n) override;
|
||||
|
||||
ptid_t wait (ptid_t ptid, target_waitstatus *status,
|
||||
int options) override;
|
||||
};
|
||||
|
||||
/* Retrieve the context for this thread, if not already retrieved. */
|
||||
|
|
|
|||
Loading…
Reference in New Issue