From patchwork Tue Feb 11 09:02:08 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: 37947 Received: (qmail 128708 invoked by alias); 11 Feb 2020 09:04:34 -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 121939 invoked by uid 89); 11 Feb 2020 09:03:55 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-24.9 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:49 +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:29 -0800 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by fmsmga008.fm.intel.com with ESMTP; 11 Feb 2020 01:03:28 -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 01B93RoM002325; Tue, 11 Feb 2020 09:03:27 GMT Received: from ulvlx001.iul.intel.com (localhost [127.0.0.1]) by ulvlx001.iul.intel.com with ESMTP id 01B93RSB010737; Tue, 11 Feb 2020 10:03:27 +0100 Received: (from taktemur@localhost) by ulvlx001.iul.intel.com with LOCAL id 01B93R5u010733; Tue, 11 Feb 2020 10:03:27 +0100 From: Tankut Baris Aktemur To: gdb-patches@sourceware.org Subject: [PATCH 56/58] gdbserver: turn target op 'get_ipa_tdesc_idx' into a method Date: Tue, 11 Feb 2020 10:02:08 +0100 Message-Id: <6936ecc1ec3972cefae0762f86f75150a583487e.1581410935.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 get_ipa_tdesc_idx op a method of process_target. * target.h (struct process_stratum_target): Remove the target op. (class process_target): Add the target op. (target_get_ipa_tdesc_idx): Update the macro. * target.c (process_target::get_ipa_tdesc_idx): Define. Update the derived structs and callers below. * linux-low.c (linux_target_ops): Update. (linux_get_ipa_tdesc_idx): Turn into ... (linux_process_target::get_ipa_tdesc_idx): ... 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 | 5 ++--- gdbserver/linux-low.h | 2 ++ gdbserver/lynx-low.c | 1 - gdbserver/nto-low.c | 1 - gdbserver/target.c | 6 ++++++ gdbserver/target.h | 9 ++++----- gdbserver/win32-low.c | 1 - 7 files changed, 14 insertions(+), 11 deletions(-) diff --git a/gdbserver/linux-low.c b/gdbserver/linux-low.c index 4cbb82429a7..cd84cef326a 100644 --- a/gdbserver/linux-low.c +++ b/gdbserver/linux-low.c @@ -6564,8 +6564,8 @@ linux_process_target::supports_catch_syscall () && linux_supports_tracesysgood ()); } -static int -linux_get_ipa_tdesc_idx (void) +int +linux_process_target::get_ipa_tdesc_idx () { if (the_low_target.get_ipa_tdesc_idx == NULL) return 0; @@ -7513,7 +7513,6 @@ linux_get_hwcap2 (int wordsize) static linux_process_target the_linux_target; static process_stratum_target linux_target_ops = { - linux_get_ipa_tdesc_idx, &the_linux_target, }; diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index 7d8931598b3..b1960645939 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -482,6 +482,8 @@ public: bool supports_software_single_step () override; bool supports_catch_syscall () override; + + int get_ipa_tdesc_idx () 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 888adb1cfb6..778afd190b6 100644 --- a/gdbserver/lynx-low.c +++ b/gdbserver/lynx-low.c @@ -742,7 +742,6 @@ static lynx_process_target the_lynx_target; /* The LynxOS target_ops vector. */ static process_stratum_target lynx_target_ops = { - NULL, /* get_ipa_tdesc_idx */ &the_lynx_target, }; diff --git a/gdbserver/nto-low.c b/gdbserver/nto-low.c index b3d80c48f33..cd461be8378 100644 --- a/gdbserver/nto-low.c +++ b/gdbserver/nto-low.c @@ -947,7 +947,6 @@ nto_process_target::sw_breakpoint_from_kind (int kind, int *size) static nto_process_target the_nto_target; static process_stratum_target nto_target_ops = { - NULL, /* get_ipa_tdesc_idx */ &the_nto_target, }; diff --git a/gdbserver/target.c b/gdbserver/target.c index 16c1d661f6c..5c80a379f65 100644 --- a/gdbserver/target.c +++ b/gdbserver/target.c @@ -826,3 +826,9 @@ process_target::supports_catch_syscall () { return false; } + +int +process_target::get_ipa_tdesc_idx () +{ + return 0; +} diff --git a/gdbserver/target.h b/gdbserver/target.h index b825cbd53a7..1b5059c1beb 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -70,9 +70,6 @@ class process_target; shared code. */ struct process_stratum_target { - /* Return tdesc index for IPA. */ - int (*get_ipa_tdesc_idx) (void); - /* The object that will gradually replace this struct. */ process_target *pt; }; @@ -504,6 +501,9 @@ public: /* Return true if the target supports catch syscall. */ virtual bool supports_catch_syscall (); + + /* Return tdesc index for IPA. */ + virtual int get_ipa_tdesc_idx (); }; extern process_stratum_target *the_target; @@ -561,8 +561,7 @@ int kill_inferior (process_info *proc); the_target->pt->supports_catch_syscall () #define target_get_ipa_tdesc_idx() \ - (the_target->get_ipa_tdesc_idx \ - ? (*the_target->get_ipa_tdesc_idx) () : 0) + the_target->pt->get_ipa_tdesc_idx () #define target_supports_tracepoints() \ the_target->pt->supports_tracepoints () diff --git a/gdbserver/win32-low.c b/gdbserver/win32-low.c index c45c81beff8..567e2ebe3db 100644 --- a/gdbserver/win32-low.c +++ b/gdbserver/win32-low.c @@ -1848,7 +1848,6 @@ win32_process_target::sw_breakpoint_from_kind (int kind, int *size) static win32_process_target the_win32_target; static process_stratum_target win32_target_ops = { - NULL, /* get_ipa_tdesc_idx */ &the_win32_target, };