From patchwork Tue Feb 11 09:02:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Aktemur, Tankut Baris" X-Patchwork-Id: 37943 Received: (qmail 125569 invoked by alias); 11 Feb 2020 09:04:15 -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 121368 invoked by uid 89); 11 Feb 2020 09:03:52 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-24.8 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mga12.intel.com Received: from mga12.intel.com (HELO mga12.intel.com) (192.55.52.136) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 11 Feb 2020 09:03:40 +0000 Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Feb 2020 01:03:28 -0800 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by fmsmga008.fm.intel.com with ESMTP; 11 Feb 2020 01:03:28 -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 01B93R08002322; Tue, 11 Feb 2020 09:03:27 GMT Received: from ulvlx001.iul.intel.com (localhost [127.0.0.1]) by ulvlx001.iul.intel.com with ESMTP id 01B93R6e010730; Tue, 11 Feb 2020 10:03:27 +0100 Received: (from taktemur@localhost) by ulvlx001.iul.intel.com with LOCAL id 01B93RJt010726; Tue, 11 Feb 2020 10:03:27 +0100 From: Tankut Baris Aktemur To: gdb-patches@sourceware.org Subject: [PATCH 55/58] gdbserver: turn target op 'supports_catch_syscall' into a method Date: Tue, 11 Feb 2020 10:02:07 +0100 Message-Id: <1d7328cb3881ce2a500ff886a76e5051488454a3.1581410935.git.tankut.baris.aktemur@intel.com> In-Reply-To: References: In-Reply-To: References: X-IsSubscribed: yes gdbserver/ChangeLog: 2020-02-10 Tankut Baris Aktemur Make process_stratum_target's supports_catch_syscall op a method of process_target. * target.h (struct process_stratum_target): Remove the target op. (class process_target): Add the target op. (target_supports_catch_syscall): Update the macro. * target.c (process_target::supports_catch_syscall): Define. Update the derived structs and callers below. * linux-low.c (linux_target_ops): Update. (linux_supports_catch_syscall): Turn into ... (linux_process_target::supports_catch_syscall): ... this. * linux-low.h (class linux_process_target): Update. * lynx-low.c (lynx_target_ops): Update. * nto-low.c (nto_target_ops): Update. * win32-low.c (win32_target_ops): Update. --- gdbserver/linux-low.c | 5 ++--- gdbserver/linux-low.h | 2 ++ gdbserver/lynx-low.c | 1 - gdbserver/nto-low.c | 1 - gdbserver/target.c | 6 ++++++ gdbserver/target.h | 10 ++++------ gdbserver/win32-low.c | 1 - 7 files changed, 14 insertions(+), 12 deletions(-) diff --git a/gdbserver/linux-low.c b/gdbserver/linux-low.c index 9b0d8a18278..4cbb82429a7 100644 --- a/gdbserver/linux-low.c +++ b/gdbserver/linux-low.c @@ -6557,8 +6557,8 @@ linux_process_target::process_qsupported (char **features, int count) the_low_target.process_qsupported (features, count); } -static int -linux_supports_catch_syscall (void) +bool +linux_process_target::supports_catch_syscall () { return (the_low_target.get_syscall_trapinfo != NULL && linux_supports_tracesysgood ()); @@ -7513,7 +7513,6 @@ linux_get_hwcap2 (int wordsize) static linux_process_target the_linux_target; static process_stratum_target linux_target_ops = { - linux_supports_catch_syscall, linux_get_ipa_tdesc_idx, &the_linux_target, }; diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index 582d5c1924d..7d8931598b3 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -480,6 +480,8 @@ public: #endif bool supports_software_single_step () override; + + bool supports_catch_syscall () 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 ab4238cf373..888adb1cfb6 100644 --- a/gdbserver/lynx-low.c +++ b/gdbserver/lynx-low.c @@ -742,7 +742,6 @@ static lynx_process_target the_lynx_target; /* The LynxOS target_ops vector. */ static process_stratum_target lynx_target_ops = { - NULL, /* supports_catch_syscall */ NULL, /* get_ipa_tdesc_idx */ &the_lynx_target, }; diff --git a/gdbserver/nto-low.c b/gdbserver/nto-low.c index 192d6a53ba8..b3d80c48f33 100644 --- a/gdbserver/nto-low.c +++ b/gdbserver/nto-low.c @@ -947,7 +947,6 @@ nto_process_target::sw_breakpoint_from_kind (int kind, int *size) static nto_process_target the_nto_target; static process_stratum_target nto_target_ops = { - NULL, /* supports_catch_syscall */ NULL, /* get_ipa_tdesc_idx */ &the_nto_target, }; diff --git a/gdbserver/target.c b/gdbserver/target.c index 03145cce280..16c1d661f6c 100644 --- a/gdbserver/target.c +++ b/gdbserver/target.c @@ -820,3 +820,9 @@ process_target::supports_software_single_step () { return false; } + +bool +process_target::supports_catch_syscall () +{ + return false; +} diff --git a/gdbserver/target.h b/gdbserver/target.h index 8854bf3791f..b825cbd53a7 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -70,10 +70,6 @@ class process_target; shared code. */ struct process_stratum_target { - /* Return 1 if the target supports catch syscall, 0 (or leave the - callback NULL) otherwise. */ - int (*supports_catch_syscall) (void); - /* Return tdesc index for IPA. */ int (*get_ipa_tdesc_idx) (void); @@ -505,6 +501,9 @@ public: /* Returns true if the target can software single step. */ virtual bool supports_software_single_step (); + + /* Return true if the target supports catch syscall. */ + virtual bool supports_catch_syscall (); }; extern process_stratum_target *the_target; @@ -559,8 +558,7 @@ int kill_inferior (process_info *proc); the_target->pt->process_qsupported (features, count) #define target_supports_catch_syscall() \ - (the_target->supports_catch_syscall ? \ - (*the_target->supports_catch_syscall) () : 0) + the_target->pt->supports_catch_syscall () #define target_get_ipa_tdesc_idx() \ (the_target->get_ipa_tdesc_idx \ diff --git a/gdbserver/win32-low.c b/gdbserver/win32-low.c index c4c52e7b2aa..c45c81beff8 100644 --- a/gdbserver/win32-low.c +++ b/gdbserver/win32-low.c @@ -1848,7 +1848,6 @@ win32_process_target::sw_breakpoint_from_kind (int kind, int *size) static win32_process_target the_win32_target; static process_stratum_target win32_target_ops = { - NULL, /* supports_catch_syscall */ NULL, /* get_ipa_tdesc_idx */ &the_win32_target, };