From patchwork Tue Feb 11 09:01:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Aktemur, Tankut Baris" X-Patchwork-Id: 37928 Received: (qmail 122193 invoked by alias); 11 Feb 2020 09:03:57 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 119713 invoked by uid 89); 11 Feb 2020 09:03:41 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-24.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3 autolearn=ham version=3.3.1 spammy= X-HELO: mga02.intel.com Received: from mga02.intel.com (HELO mga02.intel.com) (134.134.136.20) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 11 Feb 2020 09:03:29 +0000 Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Feb 2020 01:03:24 -0800 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga006.jf.intel.com with ESMTP; 11 Feb 2020 01:03:23 -0800 Received: from ulvlx001.iul.intel.com (ulvlx001.iul.intel.com [172.28.207.17]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id 01B93M9D002238; Tue, 11 Feb 2020 09:03:22 GMT Received: from ulvlx001.iul.intel.com (localhost [127.0.0.1]) by ulvlx001.iul.intel.com with ESMTP id 01B93MYu010576; Tue, 11 Feb 2020 10:03:22 +0100 Received: (from taktemur@localhost) by ulvlx001.iul.intel.com with LOCAL id 01B93LVV010572; Tue, 11 Feb 2020 10:03:22 +0100 From: Tankut Baris Aktemur To: gdb-patches@sourceware.org Subject: [PATCH 33/58] gdbserver: turn target op 'handle_monitor_command' into a method Date: Tue, 11 Feb 2020 10:01:45 +0100 Message-Id: <045e3a18651d1c751de8ce6497c3f53fa9c50313.1581410934.git.tankut.baris.aktemur@intel.com> In-Reply-To: References: In-Reply-To: References: X-IsSubscribed: yes gdbserver/ChangeLog: 2020-02-10 Tankut Baris Aktemur 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(-) diff --git a/gdbserver/linux-low.c b/gdbserver/linux-low.c index 4ec396af289..ef68a8a89e2 100644 --- a/gdbserver/linux-low.c +++ b/gdbserver/linux-low.c @@ -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, diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index 0881155cc5e..c37db38749b 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -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))) diff --git a/gdbserver/lynx-low.c b/gdbserver/lynx-low.c index 7bfd71c5321..5db9d2f154d 100644 --- a/gdbserver/lynx-low.c +++ b/gdbserver/lynx-low.c @@ -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.c b/gdbserver/nto-low.c index 8ff8063dfba..880e8ccecd1 100644 --- a/gdbserver/nto-low.c +++ b/gdbserver/nto-low.c @@ -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.c b/gdbserver/server.c index f427e7706fb..f9817881d77 100644 --- a/gdbserver/server.c +++ b/gdbserver/server.c @@ -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.c b/gdbserver/target.c index 3416a3f449f..74cd90a48a4 100644 --- a/gdbserver/target.c +++ b/gdbserver/target.c @@ -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 1138ed2e440..7d7e371cf32 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.c b/gdbserver/win32-low.c index bee5cbbf643..ed847447e40 100644 --- a/gdbserver/win32-low.c +++ b/gdbserver/win32-low.c @@ -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 */