From 95a45fc165be890faac873b615b6bf449bcb1207 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 'core_of_thread' into a method gdbserver/ChangeLog: 2020-02-20 Tankut Baris Aktemur Turn process_stratum_target's core_of_thread 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_core_of_thread): Update the macro. * target.cc (process_target::core_of_thread): Define. Update the derived classes and callers below. * linux-low.cc (linux_target_ops): Update. (linux_process_target::core_of_thread): Define. * 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 | 19 +++++++++++++++++++ gdbserver/linux-low.cc | 7 ++++++- 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, 37 insertions(+), 9 deletions(-) diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index e9cda50689..5c9928ae19 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,3 +1,22 @@ +2020-02-20 Tankut Baris Aktemur + + Turn process_stratum_target's core_of_thread 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_core_of_thread): Update the macro. + * target.cc (process_target::core_of_thread): Define. + + Update the derived classes and callers below. + + * linux-low.cc (linux_target_ops): Update. + (linux_process_target::core_of_thread): Define. + * 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 handle_monitor_command op into a diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index 19d84c2d04..6ed6c48763 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -6408,6 +6408,12 @@ linux_process_target::handle_monitor_command (char *mon) #endif } +int +linux_process_target::core_of_thread (ptid_t ptid) +{ + return linux_common_core_of_thread (ptid); +} + static int linux_supports_disable_randomization (void) { @@ -7439,7 +7445,6 @@ linux_get_hwcap2 (int wordsize) static linux_process_target the_linux_target; static process_stratum_target linux_target_ops = { - linux_common_core_of_thread, linux_read_loadmap, linux_process_qsupported, linux_supports_tracepoints, diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index d315722073..1d89ebd7a2 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -375,6 +375,8 @@ public: void handle_new_gdb_connection () override; int handle_monitor_command (char *mon) override; + + int core_of_thread (ptid_t ptid) 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 d489886755..2e177594c3 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, /* core_of_thread */ NULL, /* read_loadmap */ NULL, /* process_qsupported */ NULL, /* supports_tracepoints */ diff --git a/gdbserver/nto-low.cc b/gdbserver/nto-low.cc index 9cd30da32e..9a70871290 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, /* core_of_thread */ NULL, /* read_loadmap */ NULL, /* process_qsupported */ NULL, /* supports_tracepoints */ diff --git a/gdbserver/target.cc b/gdbserver/target.cc index 74cd90a48a..e1c802d65b 100644 --- a/gdbserver/target.cc +++ b/gdbserver/target.cc @@ -583,3 +583,9 @@ process_target::handle_monitor_command (char *mon) { return 0; } + +int +process_target::core_of_thread (ptid_t ptid) +{ + return -1; +} diff --git a/gdbserver/target.h b/gdbserver/target.h index b607ca6254..96d986a09a 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -70,9 +70,6 @@ class process_target; shared code. */ struct process_stratum_target { - /* Returns the core given a thread, or -1 if not known. */ - int (*core_of_thread) (ptid_t); - /* Read loadmaps. Read LEN bytes at OFFSET into a buffer at MYADDR. */ int (*read_loadmap) (const char *annex, CORE_ADDR offset, unsigned char *myaddr, unsigned int len); @@ -486,6 +483,9 @@ public: /* The target-specific routine to process monitor command. Returns 1 if handled, or 0 to perform default processing. */ virtual int handle_monitor_command (char *mon); + + /* Returns the core given a thread, or -1 if not known. */ + virtual int core_of_thread (ptid_t ptid); }; extern process_stratum_target *the_target; @@ -700,8 +700,7 @@ int prepare_to_access_memory (void); void done_accessing_memory (void); #define target_core_of_thread(ptid) \ - (the_target->core_of_thread ? (*the_target->core_of_thread) (ptid) \ - : -1) + the_target->pt->core_of_thread (ptid) #define target_thread_name(ptid) \ (the_target->thread_name ? (*the_target->thread_name) (ptid) \ diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index fcb3906197..c0b7326823 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, /* core_of_thread */ NULL, /* read_loadmap */ NULL, /* process_qsupported */ NULL, /* supports_tracepoints */ -- 2.34.1