From patchwork Tue Feb 11 09:01:57 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: 37926 Received: (qmail 122233 invoked by alias); 11 Feb 2020 09:03:57 -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 119762 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: mga03.intel.com Received: from mga03.intel.com (HELO mga03.intel.com) (134.134.136.65) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 11 Feb 2020 09:03:29 +0000 Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Feb 2020 01:03:26 -0800 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by fmsmga005.fm.intel.com with ESMTP; 11 Feb 2020 01:03:25 -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 01B93OMq002292; 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 01B93OI3010660; Tue, 11 Feb 2020 10:03:24 +0100 Received: (from taktemur@localhost) by ulvlx001.iul.intel.com with LOCAL id 01B93OXm010656; Tue, 11 Feb 2020 10:03:24 +0100 From: Tankut Baris Aktemur To: gdb-patches@sourceware.org Subject: [PATCH 45/58] gdbserver: turn target op 'supports_disable_randomization' into a method Date: Tue, 11 Feb 2020 10:01:57 +0100 Message-Id: <5ef8979be7055c780553bbab07ef93aabe608dc7.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 supports_disable_randomization op a method of process_target. * target.h (struct process_stratum_target): Remove the target op. (class process_target): Add the target op. (target_supports_disable_randomization): Update the macro. * target.c (process_target::supports_disable_randomization): Define. Update the derived structs and callers below. * linux-low.c (linux_target_ops): Update. (linux_supports_disable_randomization): Turn into ... (linux_process_target::supports_disable_randomization): ... 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 | 9 ++++----- 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, 16 insertions(+), 13 deletions(-) diff --git a/gdbserver/linux-low.c b/gdbserver/linux-low.c index 93a79cb4e37..1a35b5ed681 100644 --- a/gdbserver/linux-low.c +++ b/gdbserver/linux-low.c @@ -6403,13 +6403,13 @@ linux_process_target::core_of_thread (ptid_t ptid) return linux_common_core_of_thread (ptid); } -static int -linux_supports_disable_randomization (void) +bool +linux_process_target::supports_disable_randomization () { #ifdef HAVE_PERSONALITY - return 1; + return true; #else - return 0; + return false; #endif } @@ -7445,7 +7445,6 @@ linux_get_hwcap2 (int wordsize) static linux_process_target the_linux_target; static process_stratum_target linux_target_ops = { - linux_supports_disable_randomization, linux_qxfer_libraries_svr4, linux_supports_agent, #ifdef HAVE_LINUX_BTRACE diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index 6f53450898e..90569ec2abc 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -425,6 +425,8 @@ public: int get_min_fast_tracepoint_insn_len () override; struct emit_ops *emit_ops () override; + + bool supports_disable_randomization () 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 8b5d26b8956..0f2eb05c4ef 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, /* supports_disable_randomization */ NULL, /* qxfer_libraries_svr4 */ NULL, /* support_agent */ NULL, /* enable_btrace */ diff --git a/gdbserver/nto-low.c b/gdbserver/nto-low.c index be496bd6686..2c6ad118026 100644 --- a/gdbserver/nto-low.c +++ b/gdbserver/nto-low.c @@ -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, /* supports_disable_randomization */ NULL, /* qxfer_libraries_svr4 */ NULL, /* support_agent */ NULL, /* enable_btrace */ diff --git a/gdbserver/target.c b/gdbserver/target.c index 5bd591df16d..0c8c13ae2f3 100644 --- a/gdbserver/target.c +++ b/gdbserver/target.c @@ -699,3 +699,9 @@ process_target::emit_ops () { return nullptr; } + +bool +process_target::supports_disable_randomization () +{ + return false; +} diff --git a/gdbserver/target.h b/gdbserver/target.h index fea4f8e23e5..85ce8034543 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -70,9 +70,6 @@ class process_target; shared code. */ struct process_stratum_target { - /* Returns true if the target supports disabling randomization. */ - int (*supports_disable_randomization) (void); - /* Read solib info on SVR4 platforms. */ int (*qxfer_libraries_svr4) (const char *annex, unsigned char *readbuf, unsigned const char *writebuf, @@ -493,6 +490,9 @@ public: /* Return the bytecode operations vector for the current inferior. Returns nullptr if bytecode compilation is not supported. */ virtual struct emit_ops *emit_ops (); + + /* Returns true if the target supports disabling randomization. */ + virtual bool supports_disable_randomization (); }; extern process_stratum_target *the_target; @@ -600,8 +600,7 @@ int kill_inferior (process_info *proc); the_target->pt->emit_ops () #define target_supports_disable_randomization() \ - (the_target->supports_disable_randomization ? \ - (*the_target->supports_disable_randomization) () : 0) + the_target->pt->supports_disable_randomization () #define target_supports_agent() \ (the_target->supports_agent ? \ diff --git a/gdbserver/win32-low.c b/gdbserver/win32-low.c index 342f19fcdcf..81c04f65251 100644 --- a/gdbserver/win32-low.c +++ b/gdbserver/win32-low.c @@ -1848,7 +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, /* supports_disable_randomization */ NULL, /* qxfer_libraries_svr4 */ NULL, /* support_agent */ NULL, /* enable_btrace */