From patchwork Tue Feb 11 09:02:00 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: 37930 Received: (qmail 122425 invoked by alias); 11 Feb 2020 09:03:58 -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 119715 invoked by uid 89); 11 Feb 2020 09:03:41 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-24.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: mga05.intel.com Received: from mga05.intel.com (HELO mga05.intel.com) (192.55.52.43) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 11 Feb 2020 09:03:29 +0000 Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Feb 2020 01:03:27 -0800 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga008.jf.intel.com with ESMTP; 11 Feb 2020 01:03:26 -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 01B93Prc002301; Tue, 11 Feb 2020 09:03:25 GMT Received: from ulvlx001.iul.intel.com (localhost [127.0.0.1]) by ulvlx001.iul.intel.com with ESMTP id 01B93PTl010681; Tue, 11 Feb 2020 10:03:25 +0100 Received: (from taktemur@localhost) by ulvlx001.iul.intel.com with LOCAL id 01B93Pc4010677; Tue, 11 Feb 2020 10:03:25 +0100 From: Tankut Baris Aktemur To: gdb-patches@sourceware.org Subject: [PATCH 48/58] gdbserver: turn btrace-related target ops into methods Date: Tue, 11 Feb 2020 10:02:00 +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 btrace-related ops (enable_btrace, disable_btrace, read_btrace, read_btrace_conf) methods of process_target. * target.h (struct process_stratum_target): Remove the target ops. (class process_target): Add the target ops. (target_enable_btrace): Update. (target_disable_btrace): Update. (target_read_btrace): Update. (target_read_btrace_conf): Update. * target.c (process_target::enable_btrace): Define. (process_target::disable_btrace): Define. (process_target::read_btrace): Define. (process_target::read_btrace_conf): Define. Update the derived structs and callers below. * linux-low.c (linux_target_ops): Update. (linux_process_target:enable_btrace): Define as a wrapper around linux_enable_btrace. (linux_low_disable_btrace): Turn into ... (linux_process_target::disable_btrace): ... this. (linux_low_read_btrace): Turn into ... (linux_process_target::read_btrace): ... this. (linux_low_btrace_conf): Turn into ... (linux_process_target::read_btrace_conf): ... 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 | 35 ++++++++++++------------- gdbserver/linux-low.h | 13 +++++++++ gdbserver/lynx-low.c | 4 --- gdbserver/nto-low.c | 4 --- gdbserver/target.c | 27 +++++++++++++++++++ gdbserver/target.h | 61 ++++++++++++++++++------------------------- gdbserver/win32-low.c | 4 --- 7 files changed, 81 insertions(+), 67 deletions(-) diff --git a/gdbserver/linux-low.c b/gdbserver/linux-low.c index 5a3390bff54..4cd18de5249 100644 --- a/gdbserver/linux-low.c +++ b/gdbserver/linux-low.c @@ -7142,10 +7142,17 @@ linux_process_target::qxfer_libraries_svr4 (const char *annex, #ifdef HAVE_LINUX_BTRACE +btrace_target_info * +linux_process_target::enable_btrace (ptid_t ptid, + const btrace_config *conf) +{ + return linux_enable_btrace (ptid, conf); +} + /* See to_disable_btrace target method. */ -static int -linux_low_disable_btrace (struct btrace_target_info *tinfo) +int +linux_process_target::disable_btrace (btrace_target_info *tinfo) { enum btrace_error err; @@ -7204,9 +7211,10 @@ linux_low_encode_raw (struct buffer *buffer, const gdb_byte *data, /* See to_read_btrace target method. */ -static int -linux_low_read_btrace (struct btrace_target_info *tinfo, struct buffer *buffer, - enum btrace_read_type type) +int +linux_process_target::read_btrace (btrace_target_info *tinfo, + buffer *buffer, + enum btrace_read_type type) { struct btrace_data btrace; enum btrace_error err; @@ -7263,9 +7271,9 @@ linux_low_read_btrace (struct btrace_target_info *tinfo, struct buffer *buffer, /* See to_btrace_conf target method. */ -static int -linux_low_btrace_conf (const struct btrace_target_info *tinfo, - struct buffer *buffer) +int +linux_process_target::read_btrace_conf (const btrace_target_info *tinfo, + buffer *buffer) { const struct btrace_config *conf; @@ -7452,17 +7460,6 @@ linux_get_hwcap2 (int wordsize) static linux_process_target the_linux_target; static process_stratum_target linux_target_ops = { -#ifdef HAVE_LINUX_BTRACE - linux_enable_btrace, - linux_low_disable_btrace, - linux_low_read_btrace, - linux_low_btrace_conf, -#else - NULL, - NULL, - NULL, - NULL, -#endif linux_supports_range_stepping, linux_proc_pid_to_exec_file, linux_mntns_open_cloexec, diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index 63cb52e9204..090700cf011 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -436,6 +436,19 @@ public: CORE_ADDR offset, int len) override; bool supports_agent () override; + +#ifdef HAVE_LINUX_BTRACE + btrace_target_info *enable_btrace (ptid_t ptid, + const btrace_config *conf) override; + + int disable_btrace (btrace_target_info *tinfo) override; + + int read_btrace (btrace_target_info *tinfo, buffer *buf, + enum btrace_read_type type) override; + + int read_btrace_conf (const btrace_target_info *tinfo, + buffer *buf) override; +#endif }; #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 bfa76cf7de6..b2a5c2cc22b 100644 --- a/gdbserver/lynx-low.c +++ b/gdbserver/lynx-low.c @@ -735,10 +735,6 @@ static lynx_process_target the_lynx_target; /* The LynxOS target_ops vector. */ static process_stratum_target lynx_target_ops = { - NULL, /* enable_btrace */ - NULL, /* disable_btrace */ - NULL, /* read_btrace */ - NULL, /* read_btrace_conf */ NULL, /* supports_range_stepping */ NULL, /* pid_to_exec_file */ NULL, /* multifs_open */ diff --git a/gdbserver/nto-low.c b/gdbserver/nto-low.c index e97ebe395f7..5978dbbc742 100644 --- a/gdbserver/nto-low.c +++ b/gdbserver/nto-low.c @@ -947,10 +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, /* enable_btrace */ - NULL, /* disable_btrace */ - NULL, /* read_btrace */ - NULL, /* read_btrace_conf */ NULL, /* supports_range_stepping */ NULL, /* pid_to_exec_file */ NULL, /* multifs_open */ diff --git a/gdbserver/target.c b/gdbserver/target.c index 3e4d9730b6f..534508446b4 100644 --- a/gdbserver/target.c +++ b/gdbserver/target.c @@ -726,3 +726,30 @@ process_target::supports_agent () { return false; } + +btrace_target_info * +process_target::enable_btrace (ptid_t ptid, const btrace_config *conf) +{ + error (_("Target does not support branch tracing.")); +} + +int +process_target::disable_btrace (btrace_target_info *tinfo) +{ + error (_("Target does not support branch tracing.")); +} + +int +process_target::read_btrace (btrace_target_info *tinfo, + buffer *buffer, + enum btrace_read_type type) +{ + error (_("Target does not support branch tracing.")); +} + +int +process_target::read_btrace_conf (const btrace_target_info *tinfo, + buffer *buffer) +{ + error (_("Target does not support branch tracing.")); +} diff --git a/gdbserver/target.h b/gdbserver/target.h index a89f7b14269..d3a8cc9d581 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -70,26 +70,6 @@ class process_target; shared code. */ struct process_stratum_target { - /* 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) - (ptid_t ptid, const struct btrace_config *conf); - - /* Disable branch tracing. - Returns zero on success, non-zero otherwise. */ - int (*disable_btrace) (struct btrace_target_info *tinfo); - - /* Read branch trace data into buffer. - Return 0 on success; print an error message into BUFFER and return -1, - otherwise. */ - int (*read_btrace) (struct btrace_target_info *, struct buffer *, - enum btrace_read_type type); - - /* Read the branch trace configuration into BUFFER. - Return 0 on success; print an error message into BUFFER and return -1 - otherwise. */ - int (*read_btrace_conf) (const struct btrace_target_info *, struct buffer *); - /* Return true if target supports range stepping. */ int (*supports_range_stepping) (void); @@ -497,6 +477,27 @@ public: /* Return true if target supports debugging agent. */ virtual bool supports_agent (); + + /* Enable branch tracing for PTID based on CONF and allocate a branch trace + target information struct for reading and for disabling branch trace. */ + virtual btrace_target_info *enable_btrace (ptid_t ptid, + const btrace_config *conf); + + /* Disable branch tracing. + Returns zero on success, non-zero otherwise. */ + virtual int disable_btrace (btrace_target_info *tinfo); + + /* Read branch trace data into buffer. + Return 0 on success; print an error message into BUFFER and return -1, + otherwise. */ + virtual int read_btrace (btrace_target_info *tinfo, buffer *buf, + enum btrace_read_type type); + + /* Read the branch trace configuration into BUFFER. + Return 0 on success; print an error message into BUFFER and return -1 + otherwise. */ + virtual int read_btrace_conf (const btrace_target_info *tinfo, + buffer *buf); }; extern process_stratum_target *the_target; @@ -612,19 +613,13 @@ int kill_inferior (process_info *proc); static inline struct btrace_target_info * target_enable_btrace (ptid_t ptid, const struct btrace_config *conf) { - if (the_target->enable_btrace == nullptr) - error (_("Target does not support branch tracing.")); - - return (*the_target->enable_btrace) (ptid, conf); + return the_target->pt->enable_btrace (ptid, conf); } static inline int target_disable_btrace (struct btrace_target_info *tinfo) { - if (the_target->disable_btrace == nullptr) - error (_("Target does not support branch tracing.")); - - return (*the_target->disable_btrace) (tinfo); + return the_target->pt->disable_btrace (tinfo); } static inline int @@ -632,20 +627,14 @@ target_read_btrace (struct btrace_target_info *tinfo, struct buffer *buffer, enum btrace_read_type type) { - if (the_target->read_btrace == nullptr) - error (_("Target does not support branch tracing.")); - - return (*the_target->read_btrace) (tinfo, buffer, type); + return the_target->pt->read_btrace (tinfo, buffer, type); } static inline int target_read_btrace_conf (struct btrace_target_info *tinfo, struct buffer *buffer) { - if (the_target->read_btrace_conf == nullptr) - error (_("Target does not support branch tracing.")); - - return (*the_target->read_btrace_conf) (tinfo, buffer); + return the_target->pt->read_btrace_conf (tinfo, buffer); } #define target_supports_range_stepping() \ diff --git a/gdbserver/win32-low.c b/gdbserver/win32-low.c index e24c6ced43d..d54bd2cfff1 100644 --- a/gdbserver/win32-low.c +++ b/gdbserver/win32-low.c @@ -1848,10 +1848,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, /* enable_btrace */ - NULL, /* disable_btrace */ - NULL, /* read_btrace */ - NULL, /* read_btrace_conf */ NULL, /* supports_range_stepping */ NULL, /* pid_to_exec_file */ NULL, /* multifs_open */