diff options
| -rw-r--r-- | gdbserver/ChangeLog | 31 | ||||
| -rw-r--r-- | gdbserver/linux-low.cc | 12 | ||||
| -rw-r--r-- | gdbserver/linux-low.h | 2 | ||||
| -rw-r--r-- | gdbserver/lynx-low.cc | 9 | ||||
| -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, 56 insertions, 23 deletions
diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index ac10f27..eac95ee 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,5 +1,36 @@ 2020-02-20 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com> + Turn process_stratum_target's mourn 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_mourn_inferior): Update. + * linux-low.cc (linux_target_ops): Update. + (linux_mourn): Turn into ... + (linux_process_target::mourn): ... this. + (handle_extended_wait): Update. + (linux_process_target::kill): Update. + (linux_process_target::detach): Update. + * linux-low.h (class linux_process_target): Update. + * lynx-low.cc (lynx_target_ops): Update. + (lynx_mourn): Turn into ... + (lynx_process_target::mourn): ... this. + * lynx-low.h (class lynx_process_target): Update. + * nto-low.cc (nto_target_ops): Update. + (nto_mourn): Turn into ... + (nto_process_target::mourn): ... this. + * nto-low.h (class nto_process_target): Update. + * win32-low.cc (win32_target_ops): Update. + (win32_mourn): Turn into ... + (win32_process_target::mourn): ... 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 detach op into a method of process_target. diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index 1feb7d9..66790ee 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -270,7 +270,6 @@ static int linux_wait_for_event_filtered (ptid_t wait_ptid, ptid_t filter_ptid, int *wstat, int options); static int linux_wait_for_event (ptid_t ptid, int *wstat, int options); static struct lwp_info *add_lwp (ptid_t ptid); -static void linux_mourn (struct process_info *process); static int linux_stopped_by_watchpoint (void); static void mark_lwp_dead (struct lwp_info *lwp, int wstat); static int lwp_is_marked_dead (struct lwp_info *lwp); @@ -707,7 +706,7 @@ handle_extended_wait (struct lwp_info **orig_event_lwp, int wstat) syscalls_to_catch = std::move (proc->syscalls_to_catch); /* Delete the execing process and all its threads. */ - linux_mourn (proc); + the_target->pt->mourn (proc); current_thread = NULL; /* Create a new process/lwp/thread. */ @@ -1413,7 +1412,7 @@ linux_process_target::kill (process_info *process) else kill_wait_lwp (lwp); - the_target->mourn (process); + mourn (process); /* Since we presently can only stop all lwps of all processes, we need to unstop lwps of other processes. */ @@ -1634,7 +1633,7 @@ linux_process_target::detach (process_info *process) main_lwp = find_lwp_pid (ptid_t (process->pid)); linux_detach_one_lwp (main_lwp); - the_target->mourn (process); + mourn (process); /* Since we presently can only stop all lwps of all processes, we need to unstop lwps of other processes. */ @@ -1644,8 +1643,8 @@ linux_process_target::detach (process_info *process) /* Remove all LWPs that belong to process PROC from the lwp list. */ -static void -linux_mourn (struct process_info *process) +void +linux_process_target::mourn (process_info *process) { struct process_info_private *priv; @@ -7359,7 +7358,6 @@ linux_get_hwcap2 (int wordsize) static linux_process_target the_linux_target; static process_stratum_target linux_target_ops = { - linux_mourn, linux_join, linux_thread_alive, linux_resume, diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index e8789e9..8f43812 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -280,6 +280,8 @@ public: int kill (process_info *proc) override; int detach (process_info *proc) override; + + void mourn (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 a6eceaf..558f4ae 100644 --- a/gdbserver/lynx-low.cc +++ b/gdbserver/lynx-low.cc @@ -529,7 +529,7 @@ lynx_process_target::kill (process_info *process) lynx_ptrace (PTRACE_KILL, ptid, 0, 0, 0); lynx_wait (ptid, &status, 0); - the_target->mourn (process); + mourn (process); return 0; } @@ -541,14 +541,14 @@ lynx_process_target::detach (process_info *process) ptid_t ptid = lynx_ptid_t (process->pid, 0); lynx_ptrace (PTRACE_DETACH, ptid, 0, 0, 0); - the_target->mourn (process); + mourn (process); return 0; } /* Implement the mourn target_ops method. */ -static void -lynx_mourn (struct process_info *proc) +void +lynx_process_target::mourn (struct process_info *proc) { for_each_thread (proc->pid, remove_thread); @@ -726,7 +726,6 @@ static lynx_process_target the_lynx_target; /* The LynxOS target_ops vector. */ static process_stratum_target lynx_target_ops = { - lynx_mourn, lynx_join, lynx_thread_alive, lynx_resume, diff --git a/gdbserver/lynx-low.h b/gdbserver/lynx-low.h index 9b8065e..6cffe6d 100644 --- a/gdbserver/lynx-low.h +++ b/gdbserver/lynx-low.h @@ -66,6 +66,8 @@ public: int kill (process_info *proc) override; int detach (process_info *proc) override; + + void mourn (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 ceff0d4..263f73d 100644 --- a/gdbserver/nto-low.cc +++ b/gdbserver/nto-low.cc @@ -417,8 +417,8 @@ nto_process_target::detach (process_info *proc) return 0; } -static void -nto_mourn (struct process_info *process) +void +nto_process_target::mourn (struct process_info *process) { remove_process (process); } @@ -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_mourn, NULL, /* nto_join */ nto_thread_alive, nto_resume, diff --git a/gdbserver/nto-low.h b/gdbserver/nto-low.h index e7e10fc..69728b8 100644 --- a/gdbserver/nto-low.h +++ b/gdbserver/nto-low.h @@ -56,6 +56,8 @@ public: int kill (process_info *proc) override; int detach (process_info *proc) override; + + void mourn (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 a9632aa..f6d8d92 100644 --- a/gdbserver/target.cc +++ b/gdbserver/target.cc @@ -231,7 +231,7 @@ target_wait (ptid_t ptid, struct target_waitstatus *status, int options) void target_mourn_inferior (ptid_t ptid) { - (*the_target->mourn) (find_process_pid (ptid.pid ())); + the_target->pt->mourn (find_process_pid (ptid.pid ())); } /* See target/target.h. */ diff --git a/gdbserver/target.h b/gdbserver/target.h index 6c7c286..d6b7377 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -70,10 +70,6 @@ class process_target; shared code. */ struct process_stratum_target { - /* The inferior process has died. Do what is right. */ - - void (*mourn) (struct process_info *proc); - /* Wait for process PID to exit. */ void (*join) (int pid); @@ -486,6 +482,9 @@ public: /* Detach from process PROC. Return -1 on failure, and 0 on success. */ virtual int detach (process_info *proc) = 0; + + /* The inferior process has died. Do what is right. */ + virtual void mourn (process_info *proc) = 0; }; extern process_stratum_target *the_target; diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index 9cefb29..9bccc1b 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -878,8 +878,8 @@ win32_process_target::detach (process_info *process) return 0; } -static void -win32_mourn (struct process_info *process) +void +win32_process_target::mourn (struct process_info *process) { remove_process (process); } @@ -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_mourn, win32_join, win32_thread_alive, win32_resume, diff --git a/gdbserver/win32-low.h b/gdbserver/win32-low.h index 10096b8..d07d998 100644 --- a/gdbserver/win32-low.h +++ b/gdbserver/win32-low.h @@ -115,6 +115,8 @@ public: int kill (process_info *proc) override; int detach (process_info *proc) override; + + void mourn (process_info *proc) override; }; /* Retrieve the context for this thread, if not already retrieved. */ |