diff options
author | Tankut Baris Aktemur <tankut.baris.aktemur@intel.com> | 2020-02-17 16:11:52 +0100 |
---|---|---|
committer | Tankut Baris Aktemur <tankut.baris.aktemur@intel.com> | 2020-02-20 17:35:04 +0100 |
commit | 6532e7e378adbe326256ce2410ce753ec30b5ef1 (patch) | |
tree | 934abaeef5e7886a8b3a3da762db7fc3290ed160 /gdbserver/win32-low.cc | |
parent | 0e4d7e35fbd551e61cf72adae4806aa8c5230a1a (diff) | |
download | gdb-6532e7e378adbe326256ce2410ce753ec30b5ef1.zip gdb-6532e7e378adbe326256ce2410ce753ec30b5ef1.tar.gz gdb-6532e7e378adbe326256ce2410ce753ec30b5ef1.tar.bz2 |
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.
Diffstat (limited to 'gdbserver/win32-low.cc')
-rw-r--r-- | gdbserver/win32-low.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index 1f4af2c..e7df444 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -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 */ |