From: Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
To: gdb-patches@sourceware.org
Cc: palves@redhat.com
Subject: [PATCH v2 12/58] gdbserver: turn target ops 'fetch_registers' and 'store_registers' into methods
Date: Mon, 17 Feb 2020 16:59:00 -0000 [thread overview]
Message-ID: <a6765eaaff1e959e98dd07db25e23a8299eec530.1581956646.git.tankut.baris.aktemur@intel.com> (raw)
In-Reply-To: <cover.1581956646.git.tankut.baris.aktemur@intel.com>
In-Reply-To: <cover.1581956646.git.tankut.baris.aktemur@intel.com>
gdbserver/ChangeLog:
2020-02-10 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
Turn process_stratum_target's fetch_registers and store_registers
ops into methods of process_target.
* target.h (struct process_stratum_target): Remove the target ops.
(class process_target): Add the target ops.
(fetch_inferior_registers): Update the macro.
(store_inferior_registers): Update the macro.
Update the derived classes and callers below.
* linux-low.cc (linux_target_ops): Update.
(linux_fetch_registers): Turn into ...
(linux_process_target::fetch_registers): ... this.
(linux_store_registers): Turn into ...
(linux_process_target::store_registers): ... this.
* linux-low.h (class linux_process_target): Update.
* lynx-low.cc (lynx_target_ops): Update.
(lynx_fetch_registers): Turn into ...
(lynx_process_target::fetch_registers): ... this.
(lynx_store_registers): Turn into ...
(lynx_process_target::store_registers): ... this.
* lynx-low.h (class lynx_process_target): Update.
* nto-low.cc (nto_target_ops): Update.
(nto_fetch_registers): Turn into ...
(nto_process_target::fetch_registers): ... this.
(nto_store_registers): Turn into ...
(nto_process_target::store_registers): ... this.
* nto-low.h (class nto_process_target): Update.
* win32-low.cc (win32_target_ops): Update.
(win32_fetch_inferior_registers): Turn into ...
(win32_process_target::fetch_registers): ... this.
(win32_store_inferior_registers): Turn into ...
(win32_process_target::store_registers): ... this.
* win32-low.h (class win32_process_target): Update.
---
gdbserver/linux-low.cc | 10 ++++------
gdbserver/linux-low.h | 4 ++++
gdbserver/lynx-low.cc | 14 ++++++--------
gdbserver/lynx-low.h | 4 ++++
gdbserver/nto-low.cc | 10 ++++------
gdbserver/nto-low.h | 4 ++++
gdbserver/target.h | 26 ++++++++++++--------------
gdbserver/win32-low.cc | 10 ++++------
gdbserver/win32-low.h | 4 ++++
9 files changed, 46 insertions(+), 40 deletions(-)
diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc
index 49511125897..7cf7d90fdbc 100644
--- a/gdbserver/linux-low.cc
+++ b/gdbserver/linux-low.cc
@@ -5650,8 +5650,8 @@ usr_store_inferior_registers (const struct regs_info *regs_info,
#endif
-static void
-linux_fetch_registers (struct regcache *regcache, int regno)
+void
+linux_process_target::fetch_registers (regcache *regcache, int regno)
{
int use_regsets;
int all = 0;
@@ -5683,8 +5683,8 @@ linux_fetch_registers (struct regcache *regcache, int regno)
}
}
-static void
-linux_store_registers (struct regcache *regcache, int regno)
+void
+linux_process_target::store_registers (regcache *regcache, int regno)
{
int use_regsets;
int all = 0;
@@ -7359,8 +7359,6 @@ linux_get_hwcap2 (int wordsize)
static linux_process_target the_linux_target;
static process_stratum_target linux_target_ops = {
- linux_fetch_registers,
- linux_store_registers,
linux_prepare_to_access_memory,
linux_done_accessing_memory,
linux_read_memory,
diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h
index d1d89106e50..85b5c8a62d1 100644
--- a/gdbserver/linux-low.h
+++ b/gdbserver/linux-low.h
@@ -291,6 +291,10 @@ public:
ptid_t wait (ptid_t ptid, target_waitstatus *status,
int options) override;
+
+ void fetch_registers (regcache *regcache, int regno) override;
+
+ void store_registers (regcache *regcache, int regno) 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 f38c3110cbd..5c46567f9ed 100644
--- a/gdbserver/lynx-low.cc
+++ b/gdbserver/lynx-low.cc
@@ -581,13 +581,13 @@ lynx_process_target::thread_alive (ptid_t ptid)
/* Implement the fetch_registers target_ops method. */
-static void
-lynx_fetch_registers (struct regcache *regcache, int regno)
+void
+lynx_process_target::fetch_registers (regcache *regcache, int regno)
{
struct lynx_regset_info *regset = lynx_target_regsets;
ptid_t inferior_ptid = ptid_of (current_thread);
- lynx_debug ("lynx_fetch_registers (regno = %d)", regno);
+ lynx_debug ("fetch_registers (regno = %d)", regno);
while (regset->size >= 0)
{
@@ -606,13 +606,13 @@ lynx_fetch_registers (struct regcache *regcache, int regno)
/* Implement the store_registers target_ops method. */
-static void
-lynx_store_registers (struct regcache *regcache, int regno)
+void
+lynx_process_target::store_registers (regcache *regcache, int regno)
{
struct lynx_regset_info *regset = lynx_target_regsets;
ptid_t inferior_ptid = ptid_of (current_thread);
- lynx_debug ("lynx_store_registers (regno = %d)", regno);
+ lynx_debug ("store_registers (regno = %d)", regno);
while (regset->size >= 0)
{
@@ -727,8 +727,6 @@ static lynx_process_target the_lynx_target;
/* The LynxOS target_ops vector. */
static process_stratum_target lynx_target_ops = {
- lynx_fetch_registers,
- lynx_store_registers,
NULL, /* prepare_to_access_memory */
NULL, /* done_accessing_memory */
lynx_read_memory,
diff --git a/gdbserver/lynx-low.h b/gdbserver/lynx-low.h
index 35714713fd2..ea6cf008f5b 100644
--- a/gdbserver/lynx-low.h
+++ b/gdbserver/lynx-low.h
@@ -77,6 +77,10 @@ public:
ptid_t wait (ptid_t ptid, target_waitstatus *status,
int options) override;
+
+ void fetch_registers (regcache *regcache, int regno) override;
+
+ void store_registers (regcache *regcache, int regno) override;
};
/* The inferior's target description. This is a global because the
diff --git a/gdbserver/nto-low.cc b/gdbserver/nto-low.cc
index 6cac6eb4329..a051f36eecc 100644
--- a/gdbserver/nto-low.cc
+++ b/gdbserver/nto-low.cc
@@ -623,8 +623,8 @@ nto_process_target::wait (ptid_t ptid, target_waitstatus *ourstatus,
/* Fetch inferior's registers for currently selected thread (CURRENT_INFERIOR).
If REGNO is -1, fetch all registers, or REGNO register only otherwise. */
-static void
-nto_fetch_registers (struct regcache *regcache, int regno)
+void
+nto_process_target::fetch_registers (regcache *regcache, int regno)
{
int regsize;
procfs_greg greg;
@@ -671,8 +671,8 @@ nto_fetch_registers (struct regcache *regcache, int regno)
/* Store registers for currently selected thread (CURRENT_INFERIOR).
We always store all registers, regardless of REGNO. */
-static void
-nto_store_registers (struct regcache *regcache, int regno)
+void
+nto_process_target::store_registers (regcache *regcache, int regno)
{
procfs_greg greg;
int err;
@@ -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 = {
- nto_fetch_registers,
- nto_store_registers,
NULL, /* prepare_to_access_memory */
NULL, /* done_accessing_memory */
nto_read_memory,
diff --git a/gdbserver/nto-low.h b/gdbserver/nto-low.h
index 94837ab6051..f630360a2f4 100644
--- a/gdbserver/nto-low.h
+++ b/gdbserver/nto-low.h
@@ -67,6 +67,10 @@ public:
ptid_t wait (ptid_t ptid, target_waitstatus *status,
int options) override;
+
+ void fetch_registers (regcache *regcache, int regno) override;
+
+ void store_registers (regcache *regcache, int regno) override;
};
/* The inferior's target description. This is a global because the
diff --git a/gdbserver/target.h b/gdbserver/target.h
index 16daf93440e..e42c7509bb1 100644
--- a/gdbserver/target.h
+++ b/gdbserver/target.h
@@ -70,18 +70,6 @@ class process_target;
shared code. */
struct process_stratum_target
{
- /* Fetch registers from the inferior process.
-
- If REGNO is -1, fetch all registers; otherwise, fetch at least REGNO. */
-
- void (*fetch_registers) (struct regcache *regcache, int regno);
-
- /* Store registers to the inferior process.
-
- If REGNO is -1, store all registers; otherwise, store at least REGNO. */
-
- void (*store_registers) (struct regcache *regcache, int regno);
-
/* 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.
@@ -482,6 +470,16 @@ public:
null_ptid/TARGET_WAITKIND_IGNORE. */
virtual ptid_t wait (ptid_t ptid, target_waitstatus *status,
int options) = 0;
+
+ /* Fetch registers from the inferior process.
+
+ If REGNO is -1, fetch all registers; otherwise, fetch at least REGNO. */
+ virtual void fetch_registers (regcache *regcache, int regno) = 0;
+
+ /* Store registers to the inferior process.
+
+ If REGNO is -1, store all registers; otherwise, store at least REGNO. */
+ virtual void store_registers (regcache *regcache, int regno) = 0;
};
extern process_stratum_target *the_target;
@@ -525,10 +523,10 @@ int kill_inferior (process_info *proc);
the_target->pt->thread_alive (pid)
#define fetch_inferior_registers(regcache, regno) \
- (*the_target->fetch_registers) (regcache, regno)
+ the_target->pt->fetch_registers (regcache, regno)
#define store_inferior_registers(regcache, regno) \
- (*the_target->store_registers) (regcache, regno)
+ the_target->pt->store_registers (regcache, regno)
#define join_inferior(pid) \
the_target->pt->join (pid)
diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc
index e7df444451d..9e4e4c368ca 100644
--- a/gdbserver/win32-low.cc
+++ b/gdbserver/win32-low.cc
@@ -1659,16 +1659,16 @@ win32_process_target::wait (ptid_t ptid, target_waitstatus *ourstatus,
/* Fetch registers from the inferior process.
If REGNO is -1, fetch all registers; otherwise, fetch at least REGNO. */
-static void
-win32_fetch_inferior_registers (struct regcache *regcache, int regno)
+void
+win32_process_target::fetch_registers (regcache *regcache, int regno)
{
child_fetch_inferior_registers (regcache, regno);
}
/* Store registers to the inferior process.
If REGNO is -1, store all registers; otherwise, store at least REGNO. */
-static void
-win32_store_inferior_registers (struct regcache *regcache, int regno)
+void
+win32_process_target::store_registers (regcache *regcache, int regno)
{
child_store_inferior_registers (regcache, regno);
}
@@ -1837,8 +1837,6 @@ win32_sw_breakpoint_from_kind (int kind, int *size)
static win32_process_target the_win32_target;
static process_stratum_target win32_target_ops = {
- win32_fetch_inferior_registers,
- win32_store_inferior_registers,
NULL, /* prepare_to_access_memory */
NULL, /* done_accessing_memory */
win32_read_inferior_memory,
diff --git a/gdbserver/win32-low.h b/gdbserver/win32-low.h
index 9c74ffa9c58..ff3659f6dab 100644
--- a/gdbserver/win32-low.h
+++ b/gdbserver/win32-low.h
@@ -126,6 +126,10 @@ public:
ptid_t wait (ptid_t ptid, target_waitstatus *status,
int options) override;
+
+ void fetch_registers (regcache *regcache, int regno) override;
+
+ void store_registers (regcache *regcache, int regno) override;
};
/* Retrieve the context for this thread, if not already retrieved. */
--
2.17.1
next prev parent reply other threads:[~2020-02-17 16:59 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-17 17:01 [PATCH v2 00/58] Turn gdbserver's process_stratum_target into a class Tankut Baris Aktemur
2020-02-17 16:59 ` [PATCH v2 03/58] gdbserver: turn target op 'post_create_inferior' into a method Tankut Baris Aktemur
2020-02-17 16:59 ` [PATCH v2 09/58] gdbserver: turn target op 'thread_alive' " Tankut Baris Aktemur
2020-02-17 16:59 ` [PATCH v2 15/58] gdbserver: turn target op 'look_up_symbols' " Tankut Baris Aktemur
2020-02-17 16:59 ` [PATCH v2 10/58] gdbserver: turn target op 'resume' " Tankut Baris Aktemur
2020-02-17 16:59 ` [PATCH v2 02/58] gdbserver: turn target op 'create_inferior' " Tankut Baris Aktemur
2020-02-17 16:59 ` [PATCH v2 08/58] gdbserver: turn target op 'join' " Tankut Baris Aktemur
2020-02-17 16:59 ` [PATCH v2 13/58] gdbserver: turn prepare_to_access_memory & done_accessing_memory into methods Tankut Baris Aktemur
2020-02-17 16:59 ` [PATCH v2 27/58] gdbserver: turn target op 'qxfer_osdata' into a method Tankut Baris Aktemur
2020-02-17 16:59 ` Tankut Baris Aktemur [this message]
2020-02-17 16:59 ` [PATCH v2 14/58] gdbserver: turn target ops 'read_memory' and 'write_memory' into methods Tankut Baris Aktemur
2020-02-17 16:59 ` [PATCH v2 16/58] gdbserver: turn target op 'request_interrupt' into a method Tankut Baris Aktemur
2020-02-17 16:59 ` [PATCH v2 05/58] gdbserver: turn target op 'kill' " Tankut Baris Aktemur
2020-02-17 16:59 ` [PATCH v2 07/58] gdbserver: turn target op 'mourn' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 56/58] gdbserver: turn target op 'get_ipa_tdesc_idx' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 35/58] gdbserver: turn target op 'read_loadmap' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 37/58] gdbserver: turn target op 'supports_tracepoints' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 57/58] gdbserver: simply copy the pointer in 'set_target_ops' Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 30/58] gdbserver: turn target op 'supports_multi_process' into a method Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 42/58] gdbserver: turn target op 'stabilize_threads' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 04/58] gdbserver: turn target op 'attach' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 53/58] gdbserver: turn target ops 'thread_name' and 'thread_handle' into methods Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 24/58] gdbserver: turn target op 'read_offsets' into a method Tankut Baris Aktemur
2020-02-19 14:09 ` Pedro Alves
2020-02-17 17:01 ` [PATCH v2 23/58] gdbserver: turn target ops 'stopped_by_watchpoint' and 'stopped_data_address' into methods Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 44/58] gdbserver: turn target op 'emit_ops' into a method Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 43/58] gdbserver: turn fast tracepoint target ops into methods Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 01/58] gdbserver: start turning the target ops vector into a class Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 17/58] gdbserver: turn target op 'read_auxv' into a method Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 47/58] gdbserver: turn target op 'supports_agent' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 21/58] gdbserver: turn target op '{supports_}stopped_by_hw_breakpoint' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 45/58] gdbserver: turn target op 'supports_disable_randomization' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 40/58] gdbserver: turn target op 'get_tib_address' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 28/58] gdbserver: turn target op 'qxfer_siginfo' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 39/58] gdbserver: turn target op 'thread_stopped' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 20/58] gdbserver: turn target op '{supports_}stopped_by_sw_breakpoint' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 55/58] gdbserver: turn target op 'supports_catch_syscall' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 29/58] gdbserver: turn non-stop and async target ops into methods Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 54/58] gdbserver: turn target op 'supports_software_single_step' into a method Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 18/58] gdbserver: turn target op 'supports_z_point_type' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 49/58] gdbserver: turn target op 'supports_range_stepping' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 38/58] gdbserver: turn target ops 'read_pc' and 'write_pc' into methods Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 25/58] gdbserver: turn target op 'get_tls_address' into a method Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 33/58] gdbserver: turn target op 'handle_monitor_command' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 19/58] gdbserver: turn target ops 'insert_point' and 'remove_point' into methods Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 26/58] gdbserver: turn target op 'hostio_last_error' into a method Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 11/58] gdbserver: turn target op 'wait' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 34/58] gdbserver: turn target op 'core_of_thread' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 06/58] gdbserver: turn target op 'detach' " Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 52/58] gdbserver: turn breakpoint kind-related target ops into methods Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 22/58] gdbserver: turn target op 'supports_hardware_single_step' into a method Tankut Baris Aktemur
2020-02-17 17:01 ` [PATCH v2 32/58] gdbserver: turn target op 'handle_new_gdb_connection' " Tankut Baris Aktemur
2020-02-17 17:04 ` [PATCH v2 58/58] gdbserver: finish turning the target ops vector into a class Tankut Baris Aktemur
2020-02-17 17:04 ` [PATCH v2 48/58] gdbserver: turn btrace-related target ops into methods Tankut Baris Aktemur
2020-02-17 17:04 ` [PATCH v2 50/58] gdbserver: turn target op 'pid_to_exec_file' into a method Tankut Baris Aktemur
2020-02-17 17:04 ` [PATCH v2 41/58] gdbserver: turn target ops 'pause_all' and 'unpause_all' into methods Tankut Baris Aktemur
2020-02-17 17:05 ` [PATCH v2 36/58] gdbserver: turn target op 'process_qsupported' into a method Tankut Baris Aktemur
2020-02-17 17:05 ` [PATCH v2 46/58] gdbserver: turn target op 'qxfer_libraries_svr4' " Tankut Baris Aktemur
2020-02-17 17:05 ` [PATCH v2 51/58] gdbserver: turn target ops 'multifs_{open, readlink, unlink}' into methods Tankut Baris Aktemur
2020-02-17 17:05 ` [PATCH v2 31/58] gdbserver: turn target ops 'supports_{fork,vfork,exec}_events' " Tankut Baris Aktemur
2020-02-19 2:46 ` [PATCH v2 00/58] Turn gdbserver's process_stratum_target into a class Simon Marchi
2020-02-20 17:04 ` Tom Tromey
2020-02-19 14:11 ` Pedro Alves
2020-02-20 16:03 ` Aktemur, Tankut Baris
2020-02-20 17:02 ` Tom Tromey
2020-02-21 8:08 ` Aktemur, Tankut Baris
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=a6765eaaff1e959e98dd07db25e23a8299eec530.1581956646.git.tankut.baris.aktemur@intel.com \
--to=tankut.baris.aktemur@intel.com \
--cc=gdb-patches@sourceware.org \
--cc=palves@redhat.com \
/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).