From patchwork Tue Feb 11 09:01:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tankut Baris Aktemur X-Patchwork-Id: 37914 Received: (qmail 121182 invoked by alias); 11 Feb 2020 09:03:50 -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 118717 invoked by uid 89); 11 Feb 2020 09:03:33 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-23.9 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: mga17.intel.com Received: from mga17.intel.com (HELO mga17.intel.com) (192.55.52.151) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 11 Feb 2020 09:03:25 +0000 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Feb 2020 01:03:23 -0800 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by fmsmga004.fm.intel.com with ESMTP; 11 Feb 2020 01:03:22 -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 01B93LAB002235; Tue, 11 Feb 2020 09:03:21 GMT Received: from ulvlx001.iul.intel.com (localhost [127.0.0.1]) by ulvlx001.iul.intel.com with ESMTP id 01B93LQZ010569; Tue, 11 Feb 2020 10:03:21 +0100 Received: (from taktemur@localhost) by ulvlx001.iul.intel.com with LOCAL id 01B93Lob010565; Tue, 11 Feb 2020 10:03:21 +0100 From: Tankut Baris Aktemur To: gdb-patches@sourceware.org Subject: [PATCH 32/58] gdbserver: turn target op 'handle_new_gdb_connection' into a method Date: Tue, 11 Feb 2020 10:01:44 +0100 Message-Id: <2cda8c87a2eadff529e5f6dac799cdf7886ab832.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_new_gdb_connection 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_new_gdb_connection): Update the macro. * target.c (process_target::handle_new_gdb_connection): Define. Update the derived structs and callers below. * linux-low.c (linux_target_ops): Update. (linux_handle_new_gdb_connection): Turn into ... (linux_process_target::handle_new_gdb_connection): ... this. * 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 | 5 ++--- gdbserver/linux-low.h | 2 ++ gdbserver/lynx-low.c | 1 - gdbserver/nto-low.c | 1 - gdbserver/target.c | 6 ++++++ gdbserver/target.h | 12 ++++-------- gdbserver/win32-low.c | 1 - 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/gdbserver/linux-low.c b/gdbserver/linux-low.c index 0d133eb856e..4ec396af289 100644 --- a/gdbserver/linux-low.c +++ b/gdbserver/linux-low.c @@ -6361,8 +6361,8 @@ linux_process_target::supports_exec_events () ptrace flags for all inferiors. This is in case the new GDB connection doesn't support the same set of events that the previous one did. */ -static void -linux_handle_new_gdb_connection (void) +void +linux_process_target::handle_new_gdb_connection () { /* Request that all the lwps reset their ptrace options. */ for_each_thread ([] (thread_info *thread) @@ -7418,7 +7418,6 @@ linux_get_hwcap2 (int wordsize) static linux_process_target the_linux_target; static process_stratum_target linux_target_ops = { - linux_handle_new_gdb_connection, #ifdef USE_THREAD_DB thread_db_handle_monitor_command, #else diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index d6482311829..0881155cc5e 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -374,6 +374,8 @@ public: bool supports_vfork_events () override; bool supports_exec_events () override; + + void handle_new_gdb_connection () 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 eaca6cde875..7bfd71c5321 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_new_gdb_connection */ NULL, /* handle_monitor_command */ NULL, /* core_of_thread */ NULL, /* read_loadmap */ diff --git a/gdbserver/nto-low.c b/gdbserver/nto-low.c index 9ae100f9000..8ff8063dfba 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_new_gdb_connection */ NULL, /* handle_monitor_command */ NULL, /* core_of_thread */ NULL, /* read_loadmap */ diff --git a/gdbserver/target.c b/gdbserver/target.c index 15d48427f31..3416a3f449f 100644 --- a/gdbserver/target.c +++ b/gdbserver/target.c @@ -571,3 +571,9 @@ process_target::supports_exec_events () { return false; } + +void +process_target::handle_new_gdb_connection () +{ + /* Nop. */ +} diff --git a/gdbserver/target.h b/gdbserver/target.h index ff09b1f9618..1138ed2e440 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -70,9 +70,6 @@ class process_target; shared code. */ struct process_stratum_target { - /* Allows target to re-initialize connection-specific settings. */ - void (*handle_new_gdb_connection) (void); - /* 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 *); @@ -486,6 +483,9 @@ public: /* Returns true if exec events are supported. */ virtual bool supports_exec_events (); + + /* Allows target to re-initialize connection-specific settings. */ + virtual void handle_new_gdb_connection (); }; extern process_stratum_target *the_target; @@ -513,11 +513,7 @@ int kill_inferior (process_info *proc); the_target->pt->supports_exec_events () #define target_handle_new_gdb_connection() \ - do \ - { \ - if (the_target->handle_new_gdb_connection != NULL) \ - (*the_target->handle_new_gdb_connection) (); \ - } while (0) + the_target->pt->handle_new_gdb_connection () #define detach_inferior(proc) \ the_target->pt->detach (proc) diff --git a/gdbserver/win32-low.c b/gdbserver/win32-low.c index a60b223beb4..bee5cbbf643 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_new_gdb_connection */ NULL, /* handle_monitor_command */ NULL, /* core_of_thread */ NULL, /* read_loadmap */