diff options
| -rw-r--r-- | gdbserver/ChangeLog | 28 | ||||
| -rw-r--r-- | gdbserver/linux-low.cc | 5 | ||||
| -rw-r--r-- | gdbserver/linux-low.h | 2 | ||||
| -rw-r--r-- | gdbserver/lynx-low.cc | 5 | ||||
| -rw-r--r-- | gdbserver/lynx-low.h | 2 | ||||
| -rw-r--r-- | gdbserver/nto-low.cc | 5 | ||||
| -rw-r--r-- | gdbserver/nto-low.h | 2 | ||||
| -rw-r--r-- | gdbserver/target.cc | 2 | ||||
| -rw-r--r-- | gdbserver/target.h | 7 | ||||
| -rw-r--r-- | gdbserver/win32-low.cc | 5 | ||||
| -rw-r--r-- | gdbserver/win32-low.h | 2 |
11 files changed, 48 insertions, 17 deletions
diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index 97acb6b..da55b38 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,5 +1,33 @@ 2020-02-20 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com> + Turn process_stratum_target's kill 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 (kill_inferior): Update. + * linux-low.cc (linux_target_ops): Update. + (linux_kill): Turn into ... + (linux_process_target::kill): ... this. + * linux-low.h (class linux_process_target): Update. + * lynx-low.cc (lynx_target_ops): Update. + (lynx_kill): Turn into ... + (lynx_process_target::kill): ... this. + * lynx-low.h (class lynx_process_target): Update. + * nto-low.cc (nto_target_ops): Update. + (nto_kill): Turn into ... + (nto_process_target::kill): ... this. + * nto-low.h (class nto_process_target): Update. + * win32-low.cc (win32_target_ops): Update. + (win32_kill): Turn into ... + (win32_process_target::kill): ... 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 attach op into a method of process_target. diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index aae2930..4510e3a 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -1386,8 +1386,8 @@ kill_one_lwp_callback (thread_info *thread, int pid) kill_wait_lwp (lwp); } -static int -linux_kill (process_info *process) +int +linux_process_target::kill (process_info *process) { int pid = process->pid; @@ -7359,7 +7359,6 @@ linux_get_hwcap2 (int wordsize) static linux_process_target the_linux_target; static process_stratum_target linux_target_ops = { - linux_kill, linux_detach, linux_mourn, linux_join, diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index 5458a9b..4f88011 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -276,6 +276,8 @@ public: void post_create_inferior () override; int attach (unsigned long pid) override; + + int kill (process_info *proc) 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 60abc75..f6359e8 100644 --- a/gdbserver/lynx-low.cc +++ b/gdbserver/lynx-low.cc @@ -521,8 +521,8 @@ lynx_wait (ptid_t ptid, struct target_waitstatus *status, int options) /* Implement the kill target_ops method. */ -static int -lynx_kill (process_info *process) +int +lynx_process_target::kill (process_info *process) { ptid_t ptid = lynx_ptid_t (process->pid, 0); struct target_waitstatus status; @@ -726,7 +726,6 @@ static lynx_process_target the_lynx_target; /* The LynxOS target_ops vector. */ static process_stratum_target lynx_target_ops = { - lynx_kill, lynx_detach, lynx_mourn, lynx_join, diff --git a/gdbserver/lynx-low.h b/gdbserver/lynx-low.h index 142a774..cf357ff 100644 --- a/gdbserver/lynx-low.h +++ b/gdbserver/lynx-low.h @@ -62,6 +62,8 @@ public: const std::vector<char *> &program_args) override; int attach (unsigned long pid) override; + + int kill (process_info *proc) 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 77b5fce..15b3dc3 100644 --- a/gdbserver/nto-low.cc +++ b/gdbserver/nto-low.cc @@ -396,8 +396,8 @@ nto_process_target::attach (unsigned long pid) /* Send signal to process PID. */ -static int -nto_kill (process_info *proc) +int +nto_process_target::kill (process_info *proc) { int pid = proc->pid; @@ -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_kill, nto_detach, nto_mourn, NULL, /* nto_join */ diff --git a/gdbserver/nto-low.h b/gdbserver/nto-low.h index f6faacb..5564dda 100644 --- a/gdbserver/nto-low.h +++ b/gdbserver/nto-low.h @@ -52,6 +52,8 @@ public: const std::vector<char *> &program_args) override; int attach (unsigned long pid) override; + + int kill (process_info *proc) override; }; /* The inferior's target description. This is a global because the diff --git a/gdbserver/target.cc b/gdbserver/target.cc index 81092e8..a9632aa 100644 --- a/gdbserver/target.cc +++ b/gdbserver/target.cc @@ -319,7 +319,7 @@ kill_inferior (process_info *proc) { gdb_agent_about_to_close (proc->pid); - return (*the_target->kill) (proc); + return the_target->pt->kill (proc); } /* Target can do hardware single step. */ diff --git a/gdbserver/target.h b/gdbserver/target.h index bd99737..0f3cb35 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -70,10 +70,6 @@ class process_target; shared code. */ struct process_stratum_target { - /* Kill process PROC. Return -1 on failure, and 0 on success. */ - - int (*kill) (process_info *proc); - /* Detach from process PROC. Return -1 on failure, and 0 on success. */ @@ -488,6 +484,9 @@ public: Returns -1 if attaching is unsupported, 0 on success, and calls error() otherwise. */ virtual int attach (unsigned long pid) = 0; + + /* Kill process PROC. Return -1 on failure, and 0 on success. */ + virtual int kill (process_info *proc) = 0; }; extern process_stratum_target *the_target; diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index 0e7c164..a7fb124 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -819,8 +819,8 @@ win32_clear_inferiors (void) /* Implementation of target_ops::kill. */ -static int -win32_kill (process_info *process) +int +win32_process_target::kill (process_info *process) { TerminateProcess (current_process_handle, 0); for (;;) @@ -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_kill, win32_detach, win32_mourn, win32_join, diff --git a/gdbserver/win32-low.h b/gdbserver/win32-low.h index fd6662d..45a6262 100644 --- a/gdbserver/win32-low.h +++ b/gdbserver/win32-low.h @@ -111,6 +111,8 @@ public: const std::vector<char *> &program_args) override; int attach (unsigned long pid) override; + + int kill (process_info *proc) override; }; /* Retrieve the context for this thread, if not already retrieved. */ |