From c756403b171fc56562bf478c8602040bba3de856 Mon Sep 17 00:00:00 2001 From: Tankut Baris Aktemur Date: Mon, 17 Feb 2020 16:12:01 +0100 Subject: [PATCH] gdbserver: turn target op 'supports_disable_randomization' into a method gdbserver/ChangeLog: 2020-02-20 Tankut Baris Aktemur Turn process_stratum_target's supports_disable_randomization op into 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.cc (process_target::supports_disable_randomization): Define. Update the derived classes and callers below. * linux-low.cc (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.cc (lynx_target_ops): Update. * nto-low.cc (nto_target_ops): Update. * win32-low.cc (win32_target_ops): Update. --- gdbserver/ChangeLog | 20 ++++++++++++++++++++ gdbserver/linux-low.cc | 9 ++++----- gdbserver/linux-low.h | 2 ++ gdbserver/lynx-low.cc | 1 - gdbserver/nto-low.cc | 1 - gdbserver/target.cc | 6 ++++++ gdbserver/target.h | 9 ++++----- gdbserver/win32-low.cc | 1 - 8 files changed, 36 insertions(+), 13 deletions(-) diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index fc01891dd9..d138fb7028 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,3 +1,23 @@ +2020-02-20 Tankut Baris Aktemur + + Turn process_stratum_target's supports_disable_randomization op + into 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.cc (process_target::supports_disable_randomization): Define. + + Update the derived classes and callers below. + + * linux-low.cc (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.cc (lynx_target_ops): Update. + * nto-low.cc (nto_target_ops): Update. + * win32-low.cc (win32_target_ops): Update. + 2020-02-20 Tankut Baris Aktemur Turn process_stratum_target's emit_ops op into a method of diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index f93d66a41b..8799b50790 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -6414,13 +6414,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 } @@ -7456,7 +7456,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 3a6d2d02df..ba02a06ded 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -422,6 +422,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.cc b/gdbserver/lynx-low.cc index 1c71c60f09..b5fd49f6fa 100644 --- a/gdbserver/lynx-low.cc +++ b/gdbserver/lynx-low.cc @@ -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.cc b/gdbserver/nto-low.cc index 502e610463..81436e2794 100644 --- a/gdbserver/nto-low.cc +++ b/gdbserver/nto-low.cc @@ -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.cc b/gdbserver/target.cc index 44069f1ad4..fa9c9bbb36 100644 --- a/gdbserver/target.cc +++ b/gdbserver/target.cc @@ -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 0d51af7965..04c842d83b 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.cc b/gdbserver/win32-low.cc index 297882bc8a..7522a54e59 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -1858,7 +1858,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 */ -- 2.34.1