From ef03dad808f48e8a6014ca7284e4d52a1e22f27c Mon Sep 17 00:00:00 2001 From: Tankut Baris Aktemur Date: Mon, 17 Feb 2020 16:11:51 +0100 Subject: [PATCH] gdbserver: turn target op 'attach' into a method gdbserver/ChangeLog: 2020-02-20 Tankut Baris Aktemur Turn process_stratum_target's attach op into a method of process_target. * target.h (struct process_stratum_target): Remove the target op. (class process_target): Add the target op. (myattach): Update the macro. Update the derived classes and callers below. * linux-low.cc (linux_target_ops): Update. (linux_attach): Turn into ... (linux_process_target::attach): ... this. * linux-low.h (class linux_process_target): Update. * lynx-low.cc (lynx_target_ops): Update. (lynx_attach): Turn into ... (lynx_process_target::attach): ... this. * lynx-low.h (class lynx_process_target): Update. * nto-low.cc (nto_target_ops): Update. (nto_attach): Turn into ... (nto_process_target::attach): ... this. * nto-low.h (class nto_process_target): Update. * win32-low.cc (win32_target_ops): Update. (win32_attach): Turn into ... (win32_process_target::attach): ... this. * win32-low.h (class win32_process_target): Update. --- gdbserver/ChangeLog | 28 ++++++++++++++++++++++++++++ gdbserver/linux-low.cc | 5 ++--- gdbserver/linux-low.h | 2 ++ gdbserver/lynx-low.cc | 5 ++--- gdbserver/lynx-low.h | 2 ++ gdbserver/nto-low.cc | 5 ++--- gdbserver/nto-low.h | 2 ++ gdbserver/target.h | 21 ++++++++++----------- gdbserver/win32-low.cc | 5 ++--- gdbserver/win32-low.h | 2 ++ 10 files changed, 54 insertions(+), 23 deletions(-) diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index 29584074ef..97acb6bdc2 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,3 +1,31 @@ +2020-02-20 Tankut Baris Aktemur + + Turn process_stratum_target's attach op into a method of + process_target. + + * target.h (struct process_stratum_target): Remove the target op. + (class process_target): Add the target op. + (myattach): Update the macro. + + Update the derived classes and callers below. + + * linux-low.cc (linux_target_ops): Update. + (linux_attach): Turn into ... + (linux_process_target::attach): ... this. + * linux-low.h (class linux_process_target): Update. + * lynx-low.cc (lynx_target_ops): Update. + (lynx_attach): Turn into ... + (lynx_process_target::attach): ... this. + * lynx-low.h (class lynx_process_target): Update. + * nto-low.cc (nto_target_ops): Update. + (nto_attach): Turn into ... + (nto_process_target::attach): ... this. + * nto-low.h (class nto_process_target): Update. + * win32-low.cc (win32_target_ops): Update. + (win32_attach): Turn into ... + (win32_process_target::attach): ... this. + * win32-low.h (class win32_process_target): Update. + 2020-02-20 Tankut Baris Aktemur Turn process_stratum_target's post_create_inferior op into a method diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index 2e3daa2733..aae29306df 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -1181,8 +1181,8 @@ static void async_file_mark (void); /* Attach to PID. If PID is the tgid, attach to it and all of its threads. */ -static int -linux_attach (unsigned long pid) +int +linux_process_target::attach (unsigned long pid) { struct process_info *proc; struct thread_info *initial_thread; @@ -7359,7 +7359,6 @@ linux_get_hwcap2 (int wordsize) static linux_process_target the_linux_target; static process_stratum_target linux_target_ops = { - linux_attach, linux_kill, linux_detach, linux_mourn, diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index 870a0d4d86..5458a9b99b 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -274,6 +274,8 @@ public: const std::vector &program_args) override; void post_create_inferior () override; + + int attach (unsigned long pid) 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 d9f96de70f..60abc75d8d 100644 --- a/gdbserver/lynx-low.cc +++ b/gdbserver/lynx-low.cc @@ -309,8 +309,8 @@ lynx_add_threads_after_attach (int pid) /* Implement the attach target_ops method. */ -static int -lynx_attach (unsigned long pid) +int +lynx_process_target::attach (unsigned long pid) { ptid_t ptid = lynx_ptid_t (pid, 0); @@ -726,7 +726,6 @@ static lynx_process_target the_lynx_target; /* The LynxOS target_ops vector. */ static process_stratum_target lynx_target_ops = { - lynx_attach, lynx_kill, lynx_detach, lynx_mourn, diff --git a/gdbserver/lynx-low.h b/gdbserver/lynx-low.h index 66cfdfa870..142a774011 100644 --- a/gdbserver/lynx-low.h +++ b/gdbserver/lynx-low.h @@ -60,6 +60,8 @@ public: int create_inferior (const char *program, const std::vector &program_args) override; + + int attach (unsigned long pid) 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 c295be732d..77b5fce4c5 100644 --- a/gdbserver/nto-low.cc +++ b/gdbserver/nto-low.cc @@ -385,8 +385,8 @@ nto_process_target::create_inferior (const char *program, /* Attach to process PID. */ -static int -nto_attach (unsigned long pid) +int +nto_process_target::attach (unsigned long pid) { TRACE ("%s %ld\n", __func__, pid); if (do_attach (pid) != 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_attach, nto_kill, nto_detach, nto_mourn, diff --git a/gdbserver/nto-low.h b/gdbserver/nto-low.h index 3bad08b82a..f6faacb425 100644 --- a/gdbserver/nto-low.h +++ b/gdbserver/nto-low.h @@ -50,6 +50,8 @@ public: int create_inferior (const char *program, const std::vector &program_args) override; + + int attach (unsigned long pid) override; }; /* The inferior's target description. This is a global because the diff --git a/gdbserver/target.h b/gdbserver/target.h index 87036e8384..bd99737d4f 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -70,16 +70,6 @@ class process_target; shared code. */ struct process_stratum_target { - /* Attach to a running process. - - PID is the process ID to attach to, specified by the user - or a higher layer. - - Returns -1 if attaching is unsupported, 0 on success, and calls - error() otherwise. */ - - int (*attach) (unsigned long pid); - /* Kill process PROC. Return -1 on failure, and 0 on success. */ int (*kill) (process_info *proc); @@ -489,6 +479,15 @@ public: /* Do additional setup after a new process is created, including exec-wrapper completion. */ virtual void post_create_inferior (); + + /* Attach to a running process. + + PID is the process ID to attach to, specified by the user + or a higher layer. + + Returns -1 if attaching is unsupported, 0 on success, and calls + error() otherwise. */ + virtual int attach (unsigned long pid) = 0; }; extern process_stratum_target *the_target; @@ -502,7 +501,7 @@ void set_target_ops (process_stratum_target *); the_target->pt->post_create_inferior () #define myattach(pid) \ - (*the_target->attach) (pid) + the_target->pt->attach (pid) int kill_inferior (process_info *proc); diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index a9b1bfb2fd..0e7c164052 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -726,8 +726,8 @@ win32_process_target::create_inferior (const char *program, /* Attach to a running process. PID is the process ID to attach to, specified by the user or a higher layer. */ -static int -win32_attach (unsigned long pid) +int +win32_process_target::attach (unsigned long pid) { HANDLE h; winapi_DebugSetProcessKillOnExit DebugSetProcessKillOnExit = NULL; @@ -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_attach, win32_kill, win32_detach, win32_mourn, diff --git a/gdbserver/win32-low.h b/gdbserver/win32-low.h index c922d73506..fd6662dcab 100644 --- a/gdbserver/win32-low.h +++ b/gdbserver/win32-low.h @@ -109,6 +109,8 @@ public: int create_inferior (const char *program, const std::vector &program_args) override; + + int attach (unsigned long pid) override; }; /* Retrieve the context for this thread, if not already retrieved. */ -- 2.34.1