From: Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
To: gdb-patches@sourceware.org
Subject: [PATCH 13/58] gdbserver: turn prepare_to_access_memory & done_accessing_memory into methods
Date: Tue, 11 Feb 2020 09:03:00 -0000 [thread overview]
Message-ID: <6beedb635f1e185bf62809e19b2803727a7ca593.1581410933.git.tankut.baris.aktemur@intel.com> (raw)
In-Reply-To: <cover.1581410932.git.tankut.baris.aktemur@intel.com>
In-Reply-To: <cover.1581410932.git.tankut.baris.aktemur@intel.com>
gdbserver/ChangeLog:
2020-02-10 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
Make process_stratum_target's prepare_to_access_memory and
done_accessing_memory ops methods of process_target.
* target.h (struct process_stratum_target): Remove the target ops.
(class process_target): Add the target ops.
* target.c (process_target::prepare_to_access_memory): Define.
(process_target::done_accessing_memory): Define.
(prepare_to_access_memory): Update.
(done_accessing_memory): Update.
Update the derived structs and callers below.
* linux-low.c (linux_target_ops): Update.
(linux_prepare_to_access_memory): Turn into ...
(linux_process_target::prepare_to_access_memory): ... this.
(linux_done_accessing_memory): Turn into ...
(linux_process_target::done_accessing_memory): ... 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 | 10 ++++------
gdbserver/linux-low.h | 4 ++++
gdbserver/lynx-low.c | 2 --
gdbserver/nto-low.c | 2 --
gdbserver/target.c | 26 ++++++++++++++++----------
gdbserver/target.h | 32 +++++++++++++++-----------------
gdbserver/win32-low.c | 2 --
7 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/gdbserver/linux-low.c b/gdbserver/linux-low.c
index 9514cffb589..1d05e1b9ff0 100644
--- a/gdbserver/linux-low.c
+++ b/gdbserver/linux-low.c
@@ -6505,8 +6505,8 @@ linux_unpause_all (int unfreeze)
unstop_all_lwps (unfreeze, NULL);
}
-static int
-linux_prepare_to_access_memory (void)
+int
+linux_process_target::prepare_to_access_memory ()
{
/* Neither ptrace nor /proc/PID/mem allow accessing memory through a
running LWP. */
@@ -6515,8 +6515,8 @@ linux_prepare_to_access_memory (void)
return 0;
}
-static void
-linux_done_accessing_memory (void)
+void
+linux_process_target::done_accessing_memory ()
{
/* Neither ptrace nor /proc/PID/mem allow accessing memory through a
running LWP. */
@@ -7359,8 +7359,6 @@ linux_get_hwcap2 (int wordsize)
static linux_process_target the_linux_target;
static process_stratum_target linux_target_ops = {
- linux_prepare_to_access_memory,
- linux_done_accessing_memory,
linux_read_memory,
linux_write_memory,
linux_look_up_symbols,
diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h
index e361f29877c..51622f6d211 100644
--- a/gdbserver/linux-low.h
+++ b/gdbserver/linux-low.h
@@ -294,6 +294,10 @@ public:
void fetch_registers (regcache *regcache, int regno) override;
void store_registers (regcache *regcache, int regno) override;
+
+ int prepare_to_access_memory () override;
+
+ void done_accessing_memory () 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 c27c1182415..365f82b55ce 100644
--- a/gdbserver/lynx-low.c
+++ b/gdbserver/lynx-low.c
@@ -727,8 +727,6 @@ static lynx_process_target the_lynx_target;
/* The LynxOS target_ops vector. */
static process_stratum_target lynx_target_ops = {
- NULL, /* prepare_to_access_memory */
- NULL, /* done_accessing_memory */
lynx_read_memory,
lynx_write_memory,
NULL, /* look_up_symbols */
diff --git a/gdbserver/nto-low.c b/gdbserver/nto-low.c
index 7dce2fa9cb5..2e75225b01e 100644
--- a/gdbserver/nto-low.c
+++ b/gdbserver/nto-low.c
@@ -941,8 +941,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, /* prepare_to_access_memory */
- NULL, /* done_accessing_memory */
nto_read_memory,
nto_write_memory,
NULL, /* nto_look_up_symbols */
diff --git a/gdbserver/target.c b/gdbserver/target.c
index b73c4465f1c..f88e9faf191 100644
--- a/gdbserver/target.c
+++ b/gdbserver/target.c
@@ -57,14 +57,9 @@ prepare_to_access_memory (void)
it. */
prev_general_thread = cs.general_thread;
- if (the_target->prepare_to_access_memory != NULL)
- {
- int res;
-
- res = the_target->prepare_to_access_memory ();
- if (res != 0)
- return res;
- }
+ int res = the_target->pt->prepare_to_access_memory ();
+ if (res != 0)
+ return res;
for_each_thread (prev_general_thread.pid (), [&] (thread_info *thread)
{
@@ -114,8 +109,7 @@ done_accessing_memory (void)
{
client_state &cs = get_client_state ();
- if (the_target->done_accessing_memory != NULL)
- the_target->done_accessing_memory ();
+ the_target->pt->done_accessing_memory ();
/* Restore the previous selected thread. */
cs.general_thread = prev_general_thread;
@@ -402,3 +396,15 @@ process_target::post_create_inferior ()
{
/* Nop. */
}
+
+int
+process_target::prepare_to_access_memory ()
+{
+ return 0;
+}
+
+void
+process_target::done_accessing_memory ()
+{
+ /* Nop. */
+}
diff --git a/gdbserver/target.h b/gdbserver/target.h
index 41f1fc2e27d..16ff5ab6baa 100644
--- a/gdbserver/target.h
+++ b/gdbserver/target.h
@@ -70,23 +70,6 @@ class process_target;
shared code. */
struct process_stratum_target
{
- /* Prepare to read or write memory from the inferior process.
- Targets use this to do what is necessary to get the state of the
- inferior such that it is possible to access memory.
-
- This should generally only be called from client facing routines,
- such as gdb_read_memory/gdb_write_memory, or the GDB breakpoint
- insertion routine.
-
- Like `read_memory' and `write_memory' below, returns 0 on success
- and errno on failure. */
-
- int (*prepare_to_access_memory) (void);
-
- /* Undo the effects of prepare_to_access_memory. */
-
- void (*done_accessing_memory) (void);
-
/* Read memory from the inferior process. This should generally be
called through read_inferior_memory, which handles breakpoint shadowing.
@@ -479,6 +462,21 @@ public:
If REGNO is -1, store all registers; otherwise, store at least REGNO. */
virtual void store_registers (regcache *regcache, int regno) = 0;
+
+ /* Prepare to read or write memory from the inferior process.
+ Targets use this to do what is necessary to get the state of the
+ inferior such that it is possible to access memory.
+
+ This should generally only be called from client facing routines,
+ such as gdb_read_memory/gdb_write_memory, or the GDB breakpoint
+ insertion routine.
+
+ Like `read_memory' and `write_memory' below, returns 0 on success
+ and errno on failure. */
+ virtual int prepare_to_access_memory ();
+
+ /* Undo the effects of prepare_to_access_memory. */
+ virtual void done_accessing_memory ();
};
extern process_stratum_target *the_target;
diff --git a/gdbserver/win32-low.c b/gdbserver/win32-low.c
index 1774c22ca9b..6639401b1ae 100644
--- a/gdbserver/win32-low.c
+++ b/gdbserver/win32-low.c
@@ -1827,8 +1827,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, /* prepare_to_access_memory */
- NULL, /* done_accessing_memory */
win32_read_inferior_memory,
win32_write_inferior_memory,
NULL, /* lookup_symbols */
--
2.17.1
next prev parent reply other threads:[~2020-02-11 9:03 UTC|newest]
Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-11 9:02 [PATCH 00/58] Turn gdbserver's process_stratum_target into a class Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 07/58] gdbserver: turn target op 'mourn' into a method Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 33/58] gdbserver: turn target op 'handle_monitor_command' " Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 24/58] gdbserver: turn target op 'read_offsets' " Tankut Baris Aktemur
2020-02-13 20:29 ` Pedro Alves
2020-02-11 9:03 ` [PATCH 20/58] gdbserver: turn target op '{supports_}stopped_by_sw_breakpoint' " Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 26/58] gdbserver: turn target op 'hostio_last_error' " Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 22/58] gdbserver: turn target op 'supports_hardware_single_step' " Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 48/58] gdbserver: turn btrace-related target ops into methods Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 28/58] gdbserver: turn target op 'qxfer_siginfo' into a method Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 06/58] gdbserver: turn target op 'detach' " Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 12/58] gdbserver: turn target ops 'fetch_registers' and 'store_registers' into methods Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 04/58] gdbserver: turn target op 'attach' into a method Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 21/58] gdbserver: turn target op '{supports_}stopped_by_hw_breakpoint' " Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 03/58] gdbserver: turn target op 'post_create_inferior' " Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 23/58] gdbserver: turn target ops 'stopped_by_watchpoint' and 'stopped_data_address' into methods Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 25/58] gdbserver: turn target op 'get_tls_address' into a method Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 09/58] gdbserver: turn target op 'thread_alive' " Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 37/58] gdbserver: turn target op 'supports_tracepoints' " Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 40/58] gdbserver: turn target op 'get_tib_address' " Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 36/58] gdbserver: turn target op 'process_qsupported' " Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 43/58] gdbserver: turn fast tracepoint target ops into methods Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 32/58] gdbserver: turn target op 'handle_new_gdb_connection' into a method Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 01/58] gdbserver: start turning the target ops vector into a class Tankut Baris Aktemur
2020-02-13 20:26 ` Pedro Alves
2020-02-11 9:03 ` [PATCH 08/58] gdbserver: turn target op 'join' into a method Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 11/58] gdbserver: turn target op 'wait' " Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 46/58] gdbserver: turn target op 'qxfer_libraries_svr4' " Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 18/58] gdbserver: turn target op 'supports_z_point_type' " Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 15/58] gdbserver: turn target op 'look_up_symbols' " Tankut Baris Aktemur
2020-02-13 20:28 ` Pedro Alves
2020-02-11 9:03 ` Tankut Baris Aktemur [this message]
2020-02-11 9:03 ` [PATCH 02/58] gdbserver: turn target op 'create_inferior' " Tankut Baris Aktemur
2020-02-13 20:27 ` Pedro Alves
2020-02-14 11:01 ` Aktemur, Tankut Baris
2020-02-14 13:07 ` Pedro Alves
2020-02-11 9:03 ` [PATCH 45/58] gdbserver: turn target op 'supports_disable_randomization' " Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 27/58] gdbserver: turn target op 'qxfer_osdata' " Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 19/58] gdbserver: turn target ops 'insert_point' and 'remove_point' into methods Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 05/58] gdbserver: turn target op 'kill' into a method Tankut Baris Aktemur
2020-02-11 9:04 ` [PATCH 34/58] gdbserver: turn target op 'core_of_thread' " Tankut Baris Aktemur
2020-02-11 9:04 ` [PATCH 52/58] gdbserver: turn breakpoint kind-related target ops into methods Tankut Baris Aktemur
2020-02-13 20:29 ` Pedro Alves
2020-02-11 9:04 ` [PATCH 39/58] gdbserver: turn target op 'thread_stopped' into a method Tankut Baris Aktemur
2020-02-11 9:04 ` [PATCH 49/58] gdbserver: turn target op 'supports_range_stepping' " Tankut Baris Aktemur
2020-02-11 9:04 ` [PATCH 47/58] gdbserver: turn target op 'supports_agent' " Tankut Baris Aktemur
2020-02-11 9:04 ` [PATCH 14/58] gdbserver: turn target ops 'read_memory' and 'write_memory' into methods Tankut Baris Aktemur
2020-02-11 9:04 ` [PATCH 17/58] gdbserver: turn target op 'read_auxv' into a method Tankut Baris Aktemur
2020-02-11 9:04 ` [PATCH 54/58] gdbserver: turn target op 'supports_software_single_step' " Tankut Baris Aktemur
2020-02-11 9:04 ` [PATCH 56/58] gdbserver: turn target op 'get_ipa_tdesc_idx' " Tankut Baris Aktemur
2020-02-11 9:04 ` [PATCH 53/58] gdbserver: turn target ops 'thread_name' and 'thread_handle' into methods Tankut Baris Aktemur
2020-02-11 9:04 ` [PATCH 42/58] gdbserver: turn target op 'stabilize_threads' into a method Tankut Baris Aktemur
2020-02-11 9:04 ` [PATCH 50/58] gdbserver: turn target op 'pid_to_exec_file' " Tankut Baris Aktemur
2020-02-11 9:04 ` [PATCH 55/58] gdbserver: turn target op 'supports_catch_syscall' " Tankut Baris Aktemur
2020-02-11 9:04 ` [PATCH 31/58] gdbserver: turn target ops 'supports_{fork,vfork,exec}_events' into methods Tankut Baris Aktemur
2020-02-11 9:04 ` [PATCH 57/58] gdbserver: use unique_ptr for 'the_target' Tankut Baris Aktemur
2020-02-11 16:43 ` Christian Biesinger via gdb-patches
2020-02-12 8:32 ` Aktemur, Tankut Baris
2020-02-13 20:31 ` Pedro Alves
2020-02-11 9:04 ` [PATCH 38/58] gdbserver: turn target ops 'read_pc' and 'write_pc' into methods Tankut Baris Aktemur
2020-02-13 20:29 ` Pedro Alves
2020-02-11 9:05 ` [PATCH 58/58] gdbserver: finish turning the target ops vector into a class Tankut Baris Aktemur
2020-02-13 20:31 ` Pedro Alves
2020-02-11 9:05 ` [PATCH 29/58] gdbserver: turn non-stop and async target ops into methods Tankut Baris Aktemur
2020-02-11 9:05 ` [PATCH 30/58] gdbserver: turn target op 'supports_multi_process' into a method Tankut Baris Aktemur
2020-02-11 9:05 ` [PATCH 44/58] gdbserver: turn target op 'emit_ops' " Tankut Baris Aktemur
2020-02-11 9:05 ` [PATCH 10/58] gdbserver: turn target op 'resume' " Tankut Baris Aktemur
2020-02-11 9:05 ` [PATCH 41/58] gdbserver: turn target ops 'pause_all' and 'unpause_all' into methods Tankut Baris Aktemur
2020-02-11 9:05 ` [PATCH 51/58] gdbserver: turn target ops 'multifs_{open, readlink, unlink}' " Tankut Baris Aktemur
2020-02-11 9:05 ` [PATCH 16/58] gdbserver: turn target op 'request_interrupt' into a method Tankut Baris Aktemur
2020-02-11 9:05 ` [PATCH 35/58] gdbserver: turn target op 'read_loadmap' " Tankut Baris Aktemur
2020-02-11 17:41 ` [PATCH 00/58] Turn gdbserver's process_stratum_target into a class Christian Biesinger via gdb-patches
2020-02-12 8:18 ` Aktemur, Tankut Baris
2020-02-12 16:43 ` Christian Biesinger via gdb-patches
2020-02-13 20:26 ` Pedro Alves
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6beedb635f1e185bf62809e19b2803727a7ca593.1581410933.git.tankut.baris.aktemur@intel.com \
--to=tankut.baris.aktemur@intel.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).