[33/58] gdbserver: turn target op 'handle_monitor_command' into a method
Commit Message
gdbserver/ChangeLog:
2020-02-10 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
Make process_stratum_target's handle_monitor_command op 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.c (process_target::handle_monitor_command): Define.
Update the derived structs and callers below.
* server.c (handle_query): Update.
* linux-low.c (linux_target_ops): Update.
(linux_process_target::handle_monitor_command): Define.
* linux-low.h (class linux_process_target): Update.
* lynx-low.c (lynx_target_ops): Update.
* nto-low.c (nto_target_ops): Update.
* win32-low.c (win32_target_ops): Update.
---
gdbserver/linux-low.c | 15 ++++++++++-----
gdbserver/linux-low.h | 2 ++
gdbserver/lynx-low.c | 1 -
gdbserver/nto-low.c | 1 -
gdbserver/server.c | 3 +--
gdbserver/target.c | 6 ++++++
gdbserver/target.h | 8 ++++----
gdbserver/win32-low.c | 1 -
8 files changed, 23 insertions(+), 14 deletions(-)
@@ -6387,6 +6387,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)
{
@@ -7418,11 +7428,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,
@@ -376,6 +376,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)))
@@ -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 */
@@ -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 */
@@ -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);
@@ -577,3 +577,9 @@ process_target::handle_new_gdb_connection ()
{
/* Nop. */
}
+
+int
+process_target::handle_monitor_command (char *mon)
+{
+ return 0;
+}
@@ -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;
@@ -1842,7 +1842,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 */