From patchwork Mon Feb 17 16:57:55 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: 38162 Received: (qmail 122188 invoked by alias); 17 Feb 2020 17:01:42 -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 118274 invoked by uid 89); 17 Feb 2020 17:00:46 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.3 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: mga04.intel.com Received: from mga04.intel.com (HELO mga04.intel.com) (192.55.52.120) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 17 Feb 2020 16:59:42 +0000 Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Feb 2020 08:59:30 -0800 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga004.jf.intel.com with ESMTP; 17 Feb 2020 08:59:29 -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 01HGxSfs028354; Mon, 17 Feb 2020 16:59:28 GMT Received: from ulvlx001.iul.intel.com (localhost [127.0.0.1]) by ulvlx001.iul.intel.com with ESMTP id 01HGxSAp027328; Mon, 17 Feb 2020 17:59:28 +0100 Received: (from taktemur@localhost) by ulvlx001.iul.intel.com with LOCAL id 01HGxSrC027324; Mon, 17 Feb 2020 17:59:28 +0100 From: Tankut Baris Aktemur To: gdb-patches@sourceware.org Cc: palves@redhat.com Subject: [PATCH v2 47/58] gdbserver: turn target op 'supports_agent' into a method Date: Mon, 17 Feb 2020 17:57:55 +0100 Message-Id: <8a70f2bd6fc74afe52cda84f167aa3c154af25cf.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_agent 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_agent): Update the macro. * target.cc (process_target::supports_agent): Define. Update the derived classes and callers below. * linux-low.cc (linux_target_ops): Update. (linux_supports_agent): Turn into ... (linux_process_target::supports_agent): ... 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 | 9 ++++----- gdbserver/win32-low.cc | 1 - 7 files changed, 15 insertions(+), 12 deletions(-) diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index cab3c679d47..9ba2927eef4 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -6420,10 +6420,10 @@ linux_process_target::supports_disable_randomization () #endif } -static int -linux_supports_agent (void) +bool +linux_process_target::supports_agent () { - return 1; + return true; } static int @@ -7459,7 +7459,6 @@ linux_get_hwcap2 (int wordsize) static linux_process_target the_linux_target; static process_stratum_target linux_target_ops = { - linux_supports_agent, #ifdef HAVE_LINUX_BTRACE linux_enable_btrace, linux_low_disable_btrace, diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index 463e4e9b708..0f0f3e0b869 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -431,6 +431,8 @@ public: unsigned char *readbuf, unsigned const char *writebuf, CORE_ADDR offset, int len) override; + + bool supports_agent () 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 74e7de526f7..031166ed126 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, /* support_agent */ NULL, /* enable_btrace */ NULL, /* disable_btrace */ NULL, /* read_btrace */ diff --git a/gdbserver/nto-low.cc b/gdbserver/nto-low.cc index 037a053183d..27fe3ca4132 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, /* support_agent */ NULL, /* enable_btrace */ NULL, /* disable_btrace */ NULL, /* read_btrace */ diff --git a/gdbserver/target.cc b/gdbserver/target.cc index fa04bd011b5..2bbd8b4d7a9 100644 --- a/gdbserver/target.cc +++ b/gdbserver/target.cc @@ -720,3 +720,9 @@ process_target::qxfer_libraries_svr4 (const char *annex, { gdb_assert_not_reached ("target op qxfer_libraries_svr4 not supported"); } + +bool +process_target::supports_agent () +{ + return false; +} diff --git a/gdbserver/target.h b/gdbserver/target.h index fe0a7df5794..8a1c12260f1 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -70,9 +70,6 @@ class process_target; shared code. */ struct process_stratum_target { - /* Return true if target supports debugging agent. */ - int (*supports_agent) (void); - /* Enable branch tracing for PTID based on CONF and allocate a branch trace target information struct for reading and for disabling branch trace. */ struct btrace_target_info *(*enable_btrace) @@ -497,6 +494,9 @@ public: unsigned char *readbuf, unsigned const char *writebuf, CORE_ADDR offset, int len); + + /* Return true if target supports debugging agent. */ + virtual bool supports_agent (); }; extern process_stratum_target *the_target; @@ -607,8 +607,7 @@ int kill_inferior (process_info *proc); the_target->pt->supports_disable_randomization () #define target_supports_agent() \ - (the_target->supports_agent ? \ - (*the_target->supports_agent) () : 0) + the_target->pt->supports_agent () static inline struct btrace_target_info * target_enable_btrace (ptid_t ptid, const struct btrace_config *conf) diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index 54d7fde89b6..84b6ea3e285 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -1858,7 +1858,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, /* support_agent */ NULL, /* enable_btrace */ NULL, /* disable_btrace */ NULL, /* read_btrace */