From 55cf302157892947a18d1ecd0cdc89a49119b46b 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 'handle_monitor_command' into a method gdbserver/ChangeLog: 2020-02-20 Tankut Baris Aktemur Turn process_stratum_target's handle_monitor_command 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_handle_monitor_command): Update the macro. * target.cc (process_target::handle_monitor_command): Define. Update the derived classes and callers below. * server.cc (handle_query): Update. * linux-low.cc (linux_target_ops): Update. (linux_process_target::handle_monitor_command): 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 | 20 ++++++++++++++++++++ gdbserver/linux-low.cc | 15 ++++++++++----- gdbserver/linux-low.h | 2 ++ gdbserver/lynx-low.cc | 1 - gdbserver/nto-low.cc | 1 - gdbserver/server.cc | 3 +-- gdbserver/target.cc | 6 ++++++ gdbserver/target.h | 8 ++++---- gdbserver/win32-low.cc | 1 - 9 files changed, 43 insertions(+), 14 deletions(-) diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index 271ef7e967a..e9cda506896 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,3 +1,23 @@ +2020-02-20 Tankut Baris Aktemur + + Turn process_stratum_target's handle_monitor_command 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_handle_monitor_command): Update the macro. + * target.cc (process_target::handle_monitor_command): Define. + + Update the derived classes and callers below. + + * server.cc (handle_query): Update. + * linux-low.cc (linux_target_ops): Update. + (linux_process_target::handle_monitor_command): 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_new_gdb_connection op into a diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index b323489b1f6..19d84c2d042 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -6398,6 +6398,16 @@ linux_process_target::handle_new_gdb_connection () }); } +int +linux_process_target::handle_monitor_command (char *mon) +{ +#ifdef USE_THREAD_DB + return thread_db_handle_monitor_command (mon); +#else + return 0; +#endif +} + static int linux_supports_disable_randomization (void) { @@ -7429,11 +7439,6 @@ linux_get_hwcap2 (int wordsize) static linux_process_target the_linux_target; static process_stratum_target linux_target_ops = { -#ifdef USE_THREAD_DB - thread_db_handle_monitor_command, -#else - NULL, -#endif linux_common_core_of_thread, linux_read_loadmap, linux_process_qsupported, diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index aa3baf3327f..d3157220730 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -373,6 +373,8 @@ public: bool supports_exec_events () override; void handle_new_gdb_connection () override; + + int handle_monitor_command (char *mon) 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 f19713981bc..d489886755e 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, /* handle_monitor_command */ NULL, /* core_of_thread */ NULL, /* read_loadmap */ NULL, /* process_qsupported */ diff --git a/gdbserver/nto-low.cc b/gdbserver/nto-low.cc index 3cb0f638f20..9cd30da32e6 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, /* handle_monitor_command */ NULL, /* core_of_thread */ NULL, /* read_loadmap */ NULL, /* process_qsupported */ diff --git a/gdbserver/server.cc b/gdbserver/server.cc index f427e7706fb..f9817881d77 100644 --- a/gdbserver/server.cc +++ b/gdbserver/server.cc @@ -2577,8 +2577,7 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p) write_ok (own_buf); - if (the_target->handle_monitor_command == NULL - || (*the_target->handle_monitor_command) (mon) == 0) + if (the_target->pt->handle_monitor_command (mon) == 0) /* Default processing. */ handle_monitor_command (mon, own_buf); diff --git a/gdbserver/target.cc b/gdbserver/target.cc index 3416a3f449f..74cd90a48a4 100644 --- a/gdbserver/target.cc +++ b/gdbserver/target.cc @@ -577,3 +577,9 @@ process_target::handle_new_gdb_connection () { /* Nop. */ } + +int +process_target::handle_monitor_command (char *mon) +{ + return 0; +} diff --git a/gdbserver/target.h b/gdbserver/target.h index b6150631674..b607ca62540 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -70,10 +70,6 @@ class process_target; shared code. */ struct process_stratum_target { - /* If not NULL, target-specific routine to process monitor command. - Returns 1 if handled, or 0 to perform default processing. */ - int (*handle_monitor_command) (char *); - /* Returns the core given a thread, or -1 if not known. */ int (*core_of_thread) (ptid_t); @@ -486,6 +482,10 @@ public: /* Allows target to re-initialize connection-specific settings. */ virtual void handle_new_gdb_connection (); + + /* 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); }; extern process_stratum_target *the_target; diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index 024479d1540..fcb3906197d 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, /* handle_monitor_command */ NULL, /* core_of_thread */ NULL, /* read_loadmap */ NULL, /* process_qsupported */ -- 2.39.2