From patchwork Tue Feb 11 09:01:36 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: 37908 Received: (qmail 119792 invoked by alias); 11 Feb 2020 09:03:41 -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 118287 invoked by uid 89); 11 Feb 2020 09:03:30 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-23.7 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=Under, 3356 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:23 +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:21 -0800 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga007.jf.intel.com with ESMTP; 11 Feb 2020 01:03:20 -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 01B93KLe002199; 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 01B93Jm7010513; Tue, 11 Feb 2020 10:03:19 +0100 Received: (from taktemur@localhost) by ulvlx001.iul.intel.com with LOCAL id 01B93JRl010509; Tue, 11 Feb 2020 10:03:19 +0100 From: Tankut Baris Aktemur To: gdb-patches@sourceware.org Subject: [PATCH 24/58] gdbserver: turn target op 'read_offsets' into a method Date: Tue, 11 Feb 2020 10:01:36 +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 read_offsets 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_read_offsets'. * target.c (process_target::read_offsets): Define. (process_target::supports_read_offsets): Define. Update the derived structs and callers below. * server.c (handle_query): Update. * linux-low.c (linux_target_ops): Update. (linux_process_target::supports_read_offsets): Define. (linux_read_offsets): Turn into ... (linux_process_target::read_offsets): ... 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 | 17 ++++++++--------- gdbserver/linux-low.h | 8 ++++++++ gdbserver/lynx-low.c | 1 - gdbserver/nto-low.c | 1 - gdbserver/server.c | 4 ++-- gdbserver/target.c | 12 ++++++++++++ gdbserver/target.h | 14 ++++++++------ gdbserver/win32-low.c | 1 - 8 files changed, 38 insertions(+), 20 deletions(-) diff --git a/gdbserver/linux-low.c b/gdbserver/linux-low.c index a01ecd0c562..93cd2bf57d4 100644 --- a/gdbserver/linux-low.c +++ b/gdbserver/linux-low.c @@ -6068,11 +6068,17 @@ linux_process_target::stopped_data_address () the target has different ways of acquiring this information, like loadmaps. */ +bool +linux_process_target::supports_read_offsets () +{ + return true; +} + /* Under uClinux, programs are loaded at non-zero offsets, which we need to tell gdb about. */ -static int -linux_read_offsets (CORE_ADDR *text_p, CORE_ADDR *data_p) +int +linux_process_target::read_offsets (CORE_ADDR *text_p, CORE_ADDR *data_p) { unsigned long text, text_end, data; int pid = lwpid_of (current_thread); @@ -7375,13 +7381,6 @@ linux_get_hwcap2 (int wordsize) static linux_process_target the_linux_target; static process_stratum_target linux_target_ops = { -#if defined(__UCLIBC__) && defined(HAS_NOMMU) \ - && defined(PT_TEXT_ADDR) && defined(PT_DATA_ADDR) \ - && defined(PT_TEXT_END_ADDR) - linux_read_offsets, -#else - NULL, -#endif #ifdef USE_THREAD_DB thread_db_get_tls_address, #else diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index 59a1d9321d9..5cf2e62dffb 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -335,6 +335,14 @@ public: bool stopped_by_watchpoint () override; CORE_ADDR stopped_data_address () override; + +#if defined(__UCLIBC__) && defined(HAS_NOMMU) \ + && defined(PT_TEXT_ADDR) && defined(PT_DATA_ADDR) \ + && defined(PT_TEXT_END_ADDR) + bool supports_read_offsets () override; + + int read_offsets (CORE_ADDR *text, CORE_ADDR *data) 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 0d4934fb313..2a3eda61b5f 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, /* read_offsets */ NULL, /* get_tls_address */ NULL, /* hostio_last_error */ NULL, /* qxfer_osdata */ diff --git a/gdbserver/nto-low.c b/gdbserver/nto-low.c index fc7a6032fd6..5d4540cff7e 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_read_offsets */ NULL, /* thread_db_set_tls_address */ hostio_last_error_from_errno, NULL, /* nto_qxfer_osdata */ diff --git a/gdbserver/server.c b/gdbserver/server.c index f13061c871b..b4fd9c6a5e5 100644 --- a/gdbserver/server.c +++ b/gdbserver/server.c @@ -2234,13 +2234,13 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p) } } - if (the_target->read_offsets != NULL + if (the_target->pt->supports_read_offsets () && strcmp ("qOffsets", own_buf) == 0) { CORE_ADDR text, data; require_running_or_return (own_buf); - if (the_target->read_offsets (&text, &data)) + if (the_target->pt->read_offsets (&text, &data)) sprintf (own_buf, "Text=%lX;Data=%lX;Bss=%lX", (long)text, (long)data, (long)data); else diff --git a/gdbserver/target.c b/gdbserver/target.c index 00f5f794b85..501a8d675db 100644 --- a/gdbserver/target.c +++ b/gdbserver/target.c @@ -481,3 +481,15 @@ process_target::stopped_data_address () { return 0; } + +bool +process_target::supports_read_offsets () +{ + return false; +} + +int +process_target::read_offsets (CORE_ADDR *text, CORE_ADDR *data) +{ + gdb_assert_not_reached ("target op read_offsets not supported"); +} diff --git a/gdbserver/target.h b/gdbserver/target.h index f9c749fdfcb..8919d43317e 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -70,12 +70,6 @@ class process_target; shared code. */ struct process_stratum_target { - /* Reports the text, data offsets of the executable. This is - needed for uclinux where the executable is relocated during load - time. */ - - int (*read_offsets) (CORE_ADDR *text, CORE_ADDR *data); - /* Fetch the address associated with a specific thread local storage area, determined by the specified THREAD, OFFSET, and LOAD_MODULE. Stores it in *ADDRESS and returns zero on success; otherwise returns @@ -475,6 +469,14 @@ public: /* Returns the address associated with the watchpoint that hit, if any; returns 0 otherwise. */ virtual CORE_ADDR stopped_data_address (); + + /* Return true if the read_offsets target op is supported. */ + virtual bool supports_read_offsets (); + + /* Reports the text, data offsets of the executable. This is + needed for uclinux where the executable is relocated during load + time. */ + virtual int read_offsets (CORE_ADDR *text, CORE_ADDR *data); }; extern process_stratum_target *the_target; diff --git a/gdbserver/win32-low.c b/gdbserver/win32-low.c index 970c532c149..48b70a5e334 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, /* read_offsets */ NULL, /* get_tls_address */ #ifdef _WIN32_WCE wince_hostio_last_error,