[v2,45/58] gdbserver: turn target op 'supports_disable_randomization' into a method
Commit Message
gdbserver/ChangeLog:
2020-02-10 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
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/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 -
7 files changed, 16 insertions(+), 13 deletions(-)
@@ -6410,13 +6410,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
}
@@ -7452,7 +7452,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
@@ -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)))
@@ -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 */
@@ -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 */
@@ -699,3 +699,9 @@ process_target::emit_ops ()
{
return nullptr;
}
+
+bool
+process_target::supports_disable_randomization ()
+{
+ return false;
+}
@@ -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 ? \
@@ -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 */