From 0df28b1b4b319a63c556bfb4beec491ea715ca57 Mon Sep 17 00:00:00 2001 From: Tankut Baris Aktemur Date: Mon, 17 Feb 2020 16:11:58 +0100 Subject: [PATCH] gdbserver: turn target op 'process_qsupported' into a method gdbserver/ChangeLog: 2020-02-20 Tankut Baris Aktemur Turn process_stratum_target's process_qsupported 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_process_qsupported): Update the macro. * target.cc (process_target::process_qsupported): Define. Update the derived classes and callers below. * linux-low.cc (linux_target_ops): Update. (linux_process_qsupported): Turn into ... (linux_process_target::process_qsupported): ... 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 | 5 ++--- gdbserver/linux-low.h | 2 ++ gdbserver/lynx-low.cc | 1 - gdbserver/nto-low.cc | 1 - gdbserver/target.cc | 6 ++++++ gdbserver/target.h | 14 +++++--------- gdbserver/win32-low.cc | 1 - 8 files changed, 35 insertions(+), 15 deletions(-) diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index 0541c541a52..b8d2014d25c 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,3 +1,23 @@ +2020-02-20 Tankut Baris Aktemur + + Turn process_stratum_target's process_qsupported 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_process_qsupported): Update the macro. + * target.cc (process_target::process_qsupported): Define. + + Update the derived classes and callers below. + + * linux-low.cc (linux_target_ops): Update. + (linux_process_qsupported): Turn into ... + (linux_process_target::process_qsupported): ... 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 read_loadmap op into a method of diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index 03de9e88305..7927a18402a 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -6523,8 +6523,8 @@ linux_process_target::read_loadmap (const char *annex, CORE_ADDR offset, } #endif /* defined PT_GETDSBT || defined PTRACE_GETFDPIC */ -static void -linux_process_qsupported (char **features, int count) +void +linux_process_target::process_qsupported (char **features, int count) { if (the_low_target.process_qsupported != NULL) the_low_target.process_qsupported (features, count); @@ -7449,7 +7449,6 @@ linux_get_hwcap2 (int wordsize) static linux_process_target the_linux_target; static process_stratum_target linux_target_ops = { - linux_process_qsupported, linux_supports_tracepoints, linux_read_pc, linux_write_pc, diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index 9f4fdab33d5..5c75ae44ecd 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -384,6 +384,8 @@ public: int read_loadmap (const char *annex, CORE_ADDR offset, unsigned char *myaddr, unsigned int len) override; #endif + + void process_qsupported (char **features, int count) 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 b384d20a37b..c42a9b401e5 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, /* process_qsupported */ NULL, /* supports_tracepoints */ NULL, /* read_pc */ NULL, /* write_pc */ diff --git a/gdbserver/nto-low.cc b/gdbserver/nto-low.cc index 70d218cb924..86863f67f72 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, /* process_qsupported */ NULL, /* supports_tracepoints */ NULL, /* read_pc */ NULL, /* write_pc */ diff --git a/gdbserver/target.cc b/gdbserver/target.cc index 26b9d8b6afe..49e4b01495c 100644 --- a/gdbserver/target.cc +++ b/gdbserver/target.cc @@ -602,3 +602,9 @@ process_target::read_loadmap (const char *annex, CORE_ADDR offset, { gdb_assert_not_reached ("target op read_loadmap not supported"); } + +void +process_target::process_qsupported (char **features, int count) +{ + /* Nop. */ +} diff --git a/gdbserver/target.h b/gdbserver/target.h index f69bd9d0e01..61f13e3a6f6 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -70,10 +70,6 @@ class process_target; shared code. */ struct process_stratum_target { - /* Target specific qSupported support. FEATURES is an array of - features with COUNT elements. */ - void (*process_qsupported) (char **features, int count); - /* Return 1 if the target supports tracepoints, 0 (or leave the callback NULL) otherwise. */ int (*supports_tracepoints) (void); @@ -489,6 +485,10 @@ public: /* Read loadmaps. Read LEN bytes at OFFSET into a buffer at MYADDR. */ virtual int read_loadmap (const char *annex, CORE_ADDR offset, unsigned char *myaddr, unsigned int len); + + /* Target specific qSupported support. FEATURES is an array of + features with COUNT elements. */ + virtual void process_qsupported (char **features, int count); }; extern process_stratum_target *the_target; @@ -540,11 +540,7 @@ int kill_inferior (process_info *proc); the_target->pt->async (enable) #define target_process_qsupported(features, count) \ - do \ - { \ - if (the_target->process_qsupported) \ - the_target->process_qsupported (features, count); \ - } while (0) + the_target->pt->process_qsupported (features, count) #define target_supports_catch_syscall() \ (the_target->supports_catch_syscall ? \ diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index 9fc882523b0..f068091dc98 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -1852,7 +1852,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, /* process_qsupported */ NULL, /* supports_tracepoints */ NULL, /* read_pc */ NULL, /* write_pc */ -- 2.30.2