From patchwork Tue Feb 11 09:01:39 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: 37920 Received: (qmail 121612 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 118923 invoked by uid 89); 11 Feb 2020 09:03:35 -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, 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:25 +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:22 -0800 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by fmsmga008.fm.intel.com with ESMTP; 11 Feb 2020 01:03:21 -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 01B93KTN002220; Tue, 11 Feb 2020 09:03:20 GMT Received: from ulvlx001.iul.intel.com (localhost [127.0.0.1]) by ulvlx001.iul.intel.com with ESMTP id 01B93KGS010534; Tue, 11 Feb 2020 10:03:20 +0100 Received: (from taktemur@localhost) by ulvlx001.iul.intel.com with LOCAL id 01B93KAr010530; Tue, 11 Feb 2020 10:03:20 +0100 From: Tankut Baris Aktemur To: gdb-patches@sourceware.org Subject: [PATCH 27/58] gdbserver: turn target op 'qxfer_osdata' into a method Date: Tue, 11 Feb 2020 10:01:39 +0100 Message-Id: <648c2de40eb81c3392733f1886751ff0159ab297.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 qxfer_osdata op a method of process_target. * target.h (struct process_stratum_target): Remove the target op. (class process_target): Add the target op. Also add 'supports_qxfer_osdata'. * target.c (process_target::qxfer_osdata): Define. (process_target::supports_qxfer_osdata): Define. Update the derived structs and callers below. * server.c (handle_qxfer_osdata): Update. (handle_query): Update. * linux-low.c (linux_target_ops): Update. (linux_process_target::supports_qxfer_osdata): Define. (linux_qxfer_osdata): Turn into ... (linux_process_target::qxfer_osdata): ... 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 | 16 +++++++++++----- gdbserver/linux-low.h | 6 ++++++ gdbserver/lynx-low.c | 1 - gdbserver/nto-low.c | 1 - gdbserver/server.c | 6 +++--- gdbserver/target.c | 14 ++++++++++++++ gdbserver/target.h | 13 ++++++++----- gdbserver/win32-low.c | 1 - 8 files changed, 42 insertions(+), 16 deletions(-) diff --git a/gdbserver/linux-low.c b/gdbserver/linux-low.c index d8209527f0e..595b4282ce2 100644 --- a/gdbserver/linux-low.c +++ b/gdbserver/linux-low.c @@ -6134,10 +6134,17 @@ linux_process_target::get_tls_address (thread_info *thread, #endif } -static int -linux_qxfer_osdata (const char *annex, - unsigned char *readbuf, unsigned const char *writebuf, - CORE_ADDR offset, int len) +bool +linux_process_target::supports_qxfer_osdata () +{ + return true; +} + +int +linux_process_target::qxfer_osdata (const char *annex, + unsigned char *readbuf, + unsigned const char *writebuf, + CORE_ADDR offset, int len) { return linux_common_xfer_osdata (annex, readbuf, offset, len); } @@ -7403,7 +7410,6 @@ linux_get_hwcap2 (int wordsize) static linux_process_target the_linux_target; static process_stratum_target linux_target_ops = { - linux_qxfer_osdata, linux_xfer_siginfo, linux_supports_non_stop, linux_async, diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index be6310da723..5d1164ee944 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -348,6 +348,12 @@ public: int get_tls_address (thread_info *thread, CORE_ADDR offset, CORE_ADDR load_module, CORE_ADDR *address) override; + + bool supports_qxfer_osdata () override; + + int qxfer_osdata (const char *annex, unsigned char *readbuf, + unsigned const char *writebuf, + CORE_ADDR offset, int len) 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 493c48ef355..f9a6b6891dc 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, /* qxfer_osdata */ NULL, /* qxfer_siginfo */ NULL, /* supports_non_stop */ NULL, /* async */ diff --git a/gdbserver/nto-low.c b/gdbserver/nto-low.c index e5f7af2b66e..002b655d407 100644 --- a/gdbserver/nto-low.c +++ b/gdbserver/nto-low.c @@ -956,7 +956,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, /* nto_qxfer_osdata */ NULL, /* xfer_siginfo */ nto_supports_non_stop, NULL, /* async */ diff --git a/gdbserver/server.c b/gdbserver/server.c index 01d41af0f89..59eb1c0c3d7 100644 --- a/gdbserver/server.c +++ b/gdbserver/server.c @@ -1587,10 +1587,10 @@ handle_qxfer_osdata (const char *annex, gdb_byte *readbuf, const gdb_byte *writebuf, ULONGEST offset, LONGEST len) { - if (the_target->qxfer_osdata == NULL || writebuf != NULL) + if (!the_target->pt->supports_qxfer_osdata () || writebuf != NULL) return -2; - return (*the_target->qxfer_osdata) (annex, readbuf, NULL, offset, len); + return the_target->pt->qxfer_osdata (annex, readbuf, NULL, offset, len); } /* Handle qXfer:siginfo:read and qXfer:siginfo:write. */ @@ -2392,7 +2392,7 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p) if (cs.transport_is_reliable) strcat (own_buf, ";QStartNoAckMode+"); - if (the_target->qxfer_osdata != NULL) + if (the_target->pt->supports_qxfer_osdata ()) strcat (own_buf, ";qXfer:osdata:read+"); if (target_supports_multi_process ()) diff --git a/gdbserver/target.c b/gdbserver/target.c index e09ee7d0fa4..c6ed544e669 100644 --- a/gdbserver/target.c +++ b/gdbserver/target.c @@ -513,3 +513,17 @@ process_target::hostio_last_error (char *buf) { hostio_last_error_from_errno (buf); } + +bool +process_target::supports_qxfer_osdata () +{ + return false; +} + +int +process_target::qxfer_osdata (const char *annex, unsigned char *readbuf, + unsigned const char *writebuf, + CORE_ADDR offset, int len) +{ + gdb_assert_not_reached ("target op qxfer_osdata not supported"); +} diff --git a/gdbserver/target.h b/gdbserver/target.h index b3ceaa34ad0..ecc32e16f87 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -70,11 +70,6 @@ class process_target; shared code. */ struct process_stratum_target { - /* Read/Write OS data using qXfer packets. */ - int (*qxfer_osdata) (const char *annex, unsigned char *readbuf, - unsigned const char *writebuf, CORE_ADDR offset, - int len); - /* Read/Write extra signal info. */ int (*qxfer_siginfo) (const char *annex, unsigned char *readbuf, unsigned const char *writebuf, @@ -479,6 +474,14 @@ public: /* Fill BUF with an hostio error packet representing the last hostio error. */ virtual void hostio_last_error (char *buf); + + /* Return true if the qxfer_osdata target op is supported. */ + virtual bool supports_qxfer_osdata (); + + /* Read/Write OS data using qXfer packets. */ + virtual int qxfer_osdata (const char *annex, unsigned char *readbuf, + unsigned const char *writebuf, + CORE_ADDR offset, int len); }; extern process_stratum_target *the_target; diff --git a/gdbserver/win32-low.c b/gdbserver/win32-low.c index dc75221d361..749460ea1aa 100644 --- a/gdbserver/win32-low.c +++ b/gdbserver/win32-low.c @@ -1834,7 +1834,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, /* qxfer_osdata */ win32_xfer_siginfo, NULL, /* supports_non_stop */ NULL, /* async */