From patchwork Tue Feb 11 09:01:49 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: 37917 Received: (qmail 121529 invoked by alias); 11 Feb 2020 09:03:53 -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 118921 invoked by uid 89); 11 Feb 2020 09:03:34 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-24.0 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: mga06.intel.com Received: from mga06.intel.com (HELO mga06.intel.com) (134.134.136.31) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 11 Feb 2020 09:03:26 +0000 Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Feb 2020 01:03:24 -0800 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga007.jf.intel.com with ESMTP; 11 Feb 2020 01:03:23 -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 01B93NLW002264; Tue, 11 Feb 2020 09:03:23 GMT Received: from ulvlx001.iul.intel.com (localhost [127.0.0.1]) by ulvlx001.iul.intel.com with ESMTP id 01B93MhS010604; Tue, 11 Feb 2020 10:03:22 +0100 Received: (from taktemur@localhost) by ulvlx001.iul.intel.com with LOCAL id 01B93MVn010600; Tue, 11 Feb 2020 10:03:22 +0100 From: Tankut Baris Aktemur To: gdb-patches@sourceware.org Subject: [PATCH 37/58] gdbserver: turn target op 'supports_tracepoints' into a method Date: Tue, 11 Feb 2020 10:01:49 +0100 Message-Id: <5a0893ac584d7b4cac86d848514a9ee6f2538b8a.1581410934.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_tracepoints 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_tracepoints): Update the macro. * target.c (process_target::supports_tracepoints): Define. Update the derived structs and callers below. * linux-low.c (linux_target_ops): Update. (linux_supports_tracepoints): Turn into ... (linux_process_target::supports_tracepoints): ... 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 | 7 +++---- 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, 15 insertions(+), 13 deletions(-) diff --git a/gdbserver/linux-low.c b/gdbserver/linux-low.c index 3bcfa8dd390..758dd1108f8 100644 --- a/gdbserver/linux-low.c +++ b/gdbserver/linux-low.c @@ -6535,11 +6535,11 @@ linux_get_ipa_tdesc_idx (void) return (*the_low_target.get_ipa_tdesc_idx) (); } -static int -linux_supports_tracepoints (void) +bool +linux_process_target::supports_tracepoints () { if (*the_low_target.supports_tracepoints == NULL) - return 0; + return false; return (*the_low_target.supports_tracepoints) (); } @@ -7438,7 +7438,6 @@ linux_get_hwcap2 (int wordsize) static linux_process_target the_linux_target; static process_stratum_target linux_target_ops = { - linux_supports_tracepoints, linux_read_pc, linux_write_pc, linux_thread_stopped, diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index e84d3421e89..e142f6bfeb1 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -389,6 +389,8 @@ public: #endif void process_qsupported (char **features, int count) override; + + bool supports_tracepoints () 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 eb058ad27b6..eeeddc5f175 100644 --- a/gdbserver/lynx-low.c +++ b/gdbserver/lynx-low.c @@ -735,7 +735,6 @@ static lynx_process_target the_lynx_target; /* The LynxOS target_ops vector. */ static process_stratum_target lynx_target_ops = { - NULL, /* supports_tracepoints */ NULL, /* read_pc */ NULL, /* write_pc */ NULL, /* thread_stopped */ diff --git a/gdbserver/nto-low.c b/gdbserver/nto-low.c index d460c805e26..d76014808ba 100644 --- a/gdbserver/nto-low.c +++ b/gdbserver/nto-low.c @@ -947,7 +947,6 @@ nto_sw_breakpoint_from_kind (int kind, int *size) static nto_process_target the_nto_target; static process_stratum_target nto_target_ops = { - NULL, /* supports_tracepoints */ NULL, /* read_pc */ NULL, /* write_pc */ NULL, /* thread_stopped */ diff --git a/gdbserver/target.c b/gdbserver/target.c index 49e4b01495c..ded8f3fee9d 100644 --- a/gdbserver/target.c +++ b/gdbserver/target.c @@ -608,3 +608,9 @@ process_target::process_qsupported (char **features, int count) { /* Nop. */ } + +bool +process_target::supports_tracepoints () +{ + return false; +} diff --git a/gdbserver/target.h b/gdbserver/target.h index f39950e7c9e..8a0146e4c32 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 tracepoints, 0 (or leave the - callback NULL) otherwise. */ - int (*supports_tracepoints) (void); - /* Read PC from REGCACHE. */ CORE_ADDR (*read_pc) (struct regcache *regcache); @@ -489,6 +485,9 @@ public: /* Target specific qSupported support. FEATURES is an array of features with COUNT elements. */ virtual void process_qsupported (char **features, int count); + + /* Return true if the target supports tracepoints, false otherwise. */ + virtual bool supports_tracepoints (); }; extern process_stratum_target *the_target; @@ -551,8 +550,7 @@ int kill_inferior (process_info *proc); ? (*the_target->get_ipa_tdesc_idx) () : 0) #define target_supports_tracepoints() \ - (the_target->supports_tracepoints \ - ? (*the_target->supports_tracepoints) () : 0) + the_target->pt->supports_tracepoints () #define target_supports_fast_tracepoints() \ (the_target->install_fast_tracepoint_jump_pad != NULL) diff --git a/gdbserver/win32-low.c b/gdbserver/win32-low.c index 0db3adde2f2..81746dedcbb 100644 --- a/gdbserver/win32-low.c +++ b/gdbserver/win32-low.c @@ -1842,7 +1842,6 @@ win32_sw_breakpoint_from_kind (int kind, int *size) static win32_process_target the_win32_target; static process_stratum_target win32_target_ops = { - NULL, /* supports_tracepoints */ NULL, /* read_pc */ NULL, /* write_pc */ NULL, /* thread_stopped */