From patchwork Mon Feb 17 16:57:45 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: 38172 Received: (qmail 122832 invoked by alias); 17 Feb 2020 17:01:46 -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 120716 invoked by uid 89); 17 Feb 2020 17:01:16 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.4 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: mga14.intel.com Received: from mga14.intel.com (HELO mga14.intel.com) (192.55.52.115) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 17 Feb 2020 17:00:51 +0000 Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Feb 2020 08:59:28 -0800 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga005.jf.intel.com with ESMTP; 17 Feb 2020 08:59:27 -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 01HGxQuQ028265; Mon, 17 Feb 2020 16:59:26 GMT Received: from ulvlx001.iul.intel.com (localhost [127.0.0.1]) by ulvlx001.iul.intel.com with ESMTP id 01HGxQad027256; Mon, 17 Feb 2020 17:59:26 +0100 Received: (from taktemur@localhost) by ulvlx001.iul.intel.com with LOCAL id 01HGxPw4027252; Mon, 17 Feb 2020 17:59:26 +0100 From: Tankut Baris Aktemur To: gdb-patches@sourceware.org Cc: palves@redhat.com Subject: [PATCH v2 37/58] gdbserver: turn target op 'supports_tracepoints' into a method Date: Mon, 17 Feb 2020 17:57:45 +0100 Message-Id: <9ce053541fdd4a698e0948066ea434962b5716e3.1581956647.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 Turn process_stratum_target's supports_tracepoints op into 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.cc (process_target::supports_tracepoints): Define. Update the derived classes and callers below. * linux-low.cc (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.cc (lynx_target_ops): Update. * nto-low.cc (nto_target_ops): Update. * win32-low.cc (win32_target_ops): Update. --- gdbserver/linux-low.cc | 7 +++---- gdbserver/linux-low.h | 2 ++ gdbserver/lynx-low.cc | 1 - gdbserver/nto-low.cc | 1 - gdbserver/target.cc | 6 ++++++ gdbserver/target.h | 10 ++++------ gdbserver/win32-low.cc | 1 - 7 files changed, 15 insertions(+), 13 deletions(-) diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index fbfb295b923..5e325eb0e7f 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -6542,11 +6542,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) (); } @@ -7445,7 +7445,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 5c75ae44ecd..1d71ff51cf2 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -386,6 +386,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.cc b/gdbserver/lynx-low.cc index c42a9b401e5..5a0648987c7 100644 --- a/gdbserver/lynx-low.cc +++ b/gdbserver/lynx-low.cc @@ -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.cc b/gdbserver/nto-low.cc index 86863f67f72..efb342f5938 100644 --- a/gdbserver/nto-low.cc +++ b/gdbserver/nto-low.cc @@ -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.cc b/gdbserver/target.cc index 49e4b01495c..ded8f3fee9d 100644 --- a/gdbserver/target.cc +++ b/gdbserver/target.cc @@ -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 61f13e3a6f6..e36f121a9ae 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.cc b/gdbserver/win32-low.cc index f068091dc98..87a59648c30 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -1852,7 +1852,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 */