From patchwork Tue Feb 11 09:01:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tankut Baris Aktemur X-Patchwork-Id: 37895 Received: (qmail 116684 invoked by alias); 11 Feb 2020 09:03:21 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 116495 invoked by uid 89); 11 Feb 2020 09:03:20 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-22.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3 autolearn=ham version=3.3.1 spammy= X-HELO: mga03.intel.com Received: from mga03.intel.com (HELO mga03.intel.com) (134.134.136.65) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 11 Feb 2020 09:03:19 +0000 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Feb 2020 01:03:17 -0800 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by fmsmga001.fm.intel.com with ESMTP; 11 Feb 2020 01:03:16 -0800 Received: from ulvlx001.iul.intel.com (ulvlx001.iul.intel.com [172.28.207.17]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id 01B93FVT002105; Tue, 11 Feb 2020 09:03:15 GMT Received: from ulvlx001.iul.intel.com (localhost [127.0.0.1]) by ulvlx001.iul.intel.com with ESMTP id 01B93FGo010384; Tue, 11 Feb 2020 10:03:15 +0100 Received: (from taktemur@localhost) by ulvlx001.iul.intel.com with LOCAL id 01B93FHQ010380; Tue, 11 Feb 2020 10:03:15 +0100 From: Tankut Baris Aktemur To: gdb-patches@sourceware.org Subject: [PATCH 06/58] gdbserver: turn target op 'detach' into a method Date: Tue, 11 Feb 2020 10:01:18 +0100 Message-Id: In-Reply-To: References: In-Reply-To: References: X-IsSubscribed: yes gdbserver/ChangeLog: 2020-02-10 Tankut Baris Aktemur Make process_stratum_target's detach op a method of process_target. * target.h (struct process_stratum_target): Remove the target op. (class process_target): Add the target op. (detach_inferior): Update the macro. Update the derived structs and callers below. * linux-low.c (linux_target_ops): Update. (linux_detach): Turn into ... (linux_process_target::detach): ... this. * linux-low.h (class linux_process_target): Update. * lynx-low.c (lynx_target_ops): Update. (lynx_detach): Turn into ... (lynx_process_target::detach): ... this. * lynx-low.h (class lynx_process_target): Update. * nto-low.c (nto_target_ops): Update. (nto_detach): Turn into ... (nto_process_target::detach): ... this. * nto-low.h (class nto_process_target): Update. * win32-low.c (win32_target_ops): Update. (win32_detach): Turn into ... (win32_process_target::detach): ... this. * win32-low.h (class win32_process_target): Update. --- gdbserver/linux-low.c | 5 ++--- gdbserver/linux-low.h | 2 ++ gdbserver/lynx-low.c | 5 ++--- gdbserver/lynx-low.h | 2 ++ gdbserver/nto-low.c | 5 ++--- gdbserver/nto-low.h | 2 ++ gdbserver/target.h | 11 +++++------ gdbserver/win32-low.c | 5 ++--- gdbserver/win32-low.h | 2 ++ 9 files changed, 21 insertions(+), 18 deletions(-) diff --git a/gdbserver/linux-low.c b/gdbserver/linux-low.c index 3298d142f26..5fe0cae0b8a 100644 --- a/gdbserver/linux-low.c +++ b/gdbserver/linux-low.c @@ -1603,8 +1603,8 @@ linux_detach_lwp_callback (thread_info *thread) linux_detach_one_lwp (lwp); } -static int -linux_detach (process_info *process) +int +linux_process_target::detach (process_info *process) { struct lwp_info *main_lwp; @@ -7359,7 +7359,6 @@ linux_get_hwcap2 (int wordsize) static linux_process_target the_linux_target; static process_stratum_target linux_target_ops = { - linux_detach, linux_mourn, linux_join, linux_thread_alive, diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index 636032e3212..b2e8b7d591f 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -277,6 +277,8 @@ public: int attach (unsigned long pid) override; int kill (process_info *proc) override; + + int detach (process_info *proc) override; }; #define get_thread_lwp(thr) ((struct lwp_info *) (thread_target_data (thr))) diff --git a/gdbserver/lynx-low.c b/gdbserver/lynx-low.c index fb59d5105cb..e3887020df0 100644 --- a/gdbserver/lynx-low.c +++ b/gdbserver/lynx-low.c @@ -535,8 +535,8 @@ lynx_process_target::kill (process_info *process) /* Implement the detach target_ops method. */ -static int -lynx_detach (process_info *process) +int +lynx_process_target::detach (process_info *process) { ptid_t ptid = lynx_ptid_t (process->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_detach, lynx_mourn, lynx_join, lynx_thread_alive, diff --git a/gdbserver/lynx-low.h b/gdbserver/lynx-low.h index 749b0dee19f..42c5eff4e62 100644 --- a/gdbserver/lynx-low.h +++ b/gdbserver/lynx-low.h @@ -63,6 +63,8 @@ public: int attach (unsigned long pid) override; int kill (process_info *proc) override; + + int detach (process_info *proc) override; }; /* The inferior's target description. This is a global because the diff --git a/gdbserver/nto-low.c b/gdbserver/nto-low.c index 0af8fb1bcee..d5ad30ad5ad 100644 --- a/gdbserver/nto-low.c +++ b/gdbserver/nto-low.c @@ -409,8 +409,8 @@ nto_process_target::kill (process_info *proc) /* Detach from process PID. */ -static int -nto_detach (process_info *proc) +int +nto_process_target::detach (process_info *proc) { TRACE ("%s %d\n", __func__, proc->pid); do_detach (); @@ -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_detach, nto_mourn, NULL, /* nto_join */ nto_thread_alive, diff --git a/gdbserver/nto-low.h b/gdbserver/nto-low.h index fbef01dedc9..87e6c824cf2 100644 --- a/gdbserver/nto-low.h +++ b/gdbserver/nto-low.h @@ -53,6 +53,8 @@ public: int attach (unsigned long pid) override; int kill (process_info *proc) override; + + int detach (process_info *proc) override; }; /* The inferior's target description. This is a global because the diff --git a/gdbserver/target.h b/gdbserver/target.h index a1e9de15c2a..7637bd2b7bc 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -70,11 +70,6 @@ class process_target; shared code. */ struct process_stratum_target { - /* Detach from process PROC. Return -1 on failure, and 0 on - success. */ - - int (*detach) (process_info *proc); - /* The inferior process has died. Do what is right. */ void (*mourn) (struct process_info *proc); @@ -486,6 +481,10 @@ public: /* Kill process PROC. Return -1 on failure, and 0 on success. */ virtual int kill (process_info *proc) = 0; + + /* Detach from process PROC. Return -1 on failure, and 0 on + success. */ + virtual int detach (process_info *proc) = 0; }; extern process_stratum_target *the_target; @@ -523,7 +522,7 @@ int kill_inferior (process_info *proc); } while (0) #define detach_inferior(proc) \ - (*the_target->detach) (proc) + the_target->pt->detach (proc) #define mythread_alive(pid) \ (*the_target->thread_alive) (pid) diff --git a/gdbserver/win32-low.c b/gdbserver/win32-low.c index 7c86080ed3b..a215afec0aa 100644 --- a/gdbserver/win32-low.c +++ b/gdbserver/win32-low.c @@ -832,8 +832,8 @@ win32_process_target::kill (process_info *process) /* Implementation of target_ops::detach. */ -static int -win32_detach (process_info *process) +int +win32_process_target::detach (process_info *process) { winapi_DebugActiveProcessStop DebugActiveProcessStop = NULL; winapi_DebugSetProcessKillOnExit DebugSetProcessKillOnExit = NULL; @@ -1828,7 +1828,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_detach, win32_mourn, win32_join, win32_thread_alive, diff --git a/gdbserver/win32-low.h b/gdbserver/win32-low.h index c2d5b577e98..54a11c981c8 100644 --- a/gdbserver/win32-low.h +++ b/gdbserver/win32-low.h @@ -112,6 +112,8 @@ public: int attach (unsigned long pid) override; int kill (process_info *proc) override; + + int detach (process_info *proc) override; }; /* Retrieve the context for this thread, if not already retrieved. */