From: Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
To: gdb-patches@sourceware.org
Subject: [PATCH 19/58] gdbserver: turn target ops 'insert_point' and 'remove_point' into methods
Date: Tue, 11 Feb 2020 09:03:00 -0000 [thread overview]
Message-ID: <b84d1a344c8cd70c152eeb5fa5ebe36259e7b13e.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 insert_point and remove_point 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::insert_point): Define.
(process_target::remove_point): Define.
Update the derived structs and callers below.
* mem-break.c (set_raw_breakpoint_at): Update.
(delete_raw_breakpoint): Update.
(uninsert_raw_breakpoint): Update.
(reinsert_raw_breakpoint): Update.
* linux-low.c (linux_target_ops): Update.
(linux_insert_point): Turn into ...
(linux_process_target::insert_point): ... this.
(linux_remove_point): Turn into ...
(linux_process_target::remove_point): ... this.
* linux-low.h (class linux_process_target): Update.
* lynx-low.c (lynx_target_ops): Update.
* nto-low.c (nto_target_ops): Update.
(nto_insert_point): Turn into ...
(nto_process_target::insert_point): ... this.
(nto_remove_point): Turn into ...
(nto_process_target::remove_point): ... this.
* nto-low.h (class nto_process_target): Update.
* win32-low.c (win32_target_ops): Update.
(win32_insert_point): Turn into ...
(win32_process_target::insert_point): ... this.
(win32_remove_point): Turn into ...
(win32_process_target::remove_point): ... this.
* win32-low.h (class win32_process_target): Update.
---
gdbserver/linux-low.c | 14 ++++++--------
gdbserver/linux-low.h | 6 ++++++
gdbserver/lynx-low.c | 2 --
gdbserver/mem-break.c | 10 +++++-----
gdbserver/nto-low.c | 14 ++++++--------
gdbserver/nto-low.h | 6 ++++++
gdbserver/target.c | 14 ++++++++++++++
gdbserver/target.h | 16 ++++++++--------
gdbserver/win32-low.c | 14 ++++++--------
gdbserver/win32-low.h | 6 ++++++
10 files changed, 63 insertions(+), 39 deletions(-)
diff --git a/gdbserver/linux-low.c b/gdbserver/linux-low.c
index da03b8c3b03..9427b9bdeb9 100644
--- a/gdbserver/linux-low.c
+++ b/gdbserver/linux-low.c
@@ -5964,9 +5964,9 @@ linux_process_target::supports_z_point_type (char z_type)
&& the_low_target.supports_z_point_type (z_type));
}
-static int
-linux_insert_point (enum raw_bkpt_type type, CORE_ADDR addr,
- int size, struct raw_breakpoint *bp)
+int
+linux_process_target::insert_point (enum raw_bkpt_type type, CORE_ADDR addr,
+ int size, raw_breakpoint *bp)
{
if (type == raw_bkpt_type_sw)
return insert_memory_breakpoint (bp);
@@ -5977,9 +5977,9 @@ linux_insert_point (enum raw_bkpt_type type, CORE_ADDR addr,
return 1;
}
-static int
-linux_remove_point (enum raw_bkpt_type type, CORE_ADDR addr,
- int size, struct raw_breakpoint *bp)
+int
+linux_process_target::remove_point (enum raw_bkpt_type type, CORE_ADDR addr,
+ int size, raw_breakpoint *bp)
{
if (type == raw_bkpt_type_sw)
return remove_memory_breakpoint (bp);
@@ -7376,8 +7376,6 @@ linux_get_hwcap2 (int wordsize)
static linux_process_target the_linux_target;
static process_stratum_target linux_target_ops = {
- linux_insert_point,
- linux_remove_point,
linux_stopped_by_sw_breakpoint,
linux_supports_stopped_by_sw_breakpoint,
linux_stopped_by_hw_breakpoint,
diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h
index c51027bb0dc..0887c932d6c 100644
--- a/gdbserver/linux-low.h
+++ b/gdbserver/linux-low.h
@@ -315,6 +315,12 @@ public:
unsigned int len) override;
bool supports_z_point_type (char z_type) override;
+
+ int insert_point (enum raw_bkpt_type type, CORE_ADDR addr,
+ int size, raw_breakpoint *bp) override;
+
+ int remove_point (enum raw_bkpt_type type, CORE_ADDR addr,
+ int size, raw_breakpoint *bp) 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 4be6e841d44..60748ae03db 100644
--- a/gdbserver/lynx-low.c
+++ b/gdbserver/lynx-low.c
@@ -729,8 +729,6 @@ static lynx_process_target the_lynx_target;
/* The LynxOS target_ops vector. */
static process_stratum_target lynx_target_ops = {
- NULL, /* insert_point */
- NULL, /* remove_point */
NULL, /* stopped_by_sw_breakpoint */
NULL, /* supports_stopped_by_sw_breakpoint */
NULL, /* stopped_by_hw_breakpoint */
diff --git a/gdbserver/mem-break.c b/gdbserver/mem-break.c
index b00e9fca353..682b3bc1832 100644
--- a/gdbserver/mem-break.c
+++ b/gdbserver/mem-break.c
@@ -460,7 +460,7 @@ set_raw_breakpoint_at (enum raw_bkpt_type type, CORE_ADDR where, int kind,
if (!bp->inserted)
{
- *err = the_target->insert_point (bp->raw_type, bp->pc, bp->kind, bp);
+ *err = the_target->pt->insert_point (bp->raw_type, bp->pc, bp->kind, bp);
if (*err != 0)
{
if (debug_threads)
@@ -890,8 +890,8 @@ delete_raw_breakpoint (struct process_info *proc, struct raw_breakpoint *todel)
*bp_link = bp->next;
- ret = the_target->remove_point (bp->raw_type, bp->pc, bp->kind,
- bp);
+ ret = the_target->pt->remove_point (bp->raw_type, bp->pc,
+ bp->kind, bp);
if (ret != 0)
{
/* Something went wrong, relink the breakpoint. */
@@ -1532,7 +1532,7 @@ uninsert_raw_breakpoint (struct raw_breakpoint *bp)
bp->inserted = 0;
- err = the_target->remove_point (bp->raw_type, bp->pc, bp->kind, bp);
+ err = the_target->pt->remove_point (bp->raw_type, bp->pc, bp->kind, bp);
if (err != 0)
{
bp->inserted = 1;
@@ -1621,7 +1621,7 @@ reinsert_raw_breakpoint (struct raw_breakpoint *bp)
if (bp->inserted)
return;
- err = the_target->insert_point (bp->raw_type, bp->pc, bp->kind, bp);
+ err = the_target->pt->insert_point (bp->raw_type, bp->pc, bp->kind, bp);
if (err == 0)
bp->inserted = 1;
else if (debug_threads)
diff --git a/gdbserver/nto-low.c b/gdbserver/nto-low.c
index 132d57bfe79..c554d91ceea 100644
--- a/gdbserver/nto-low.c
+++ b/gdbserver/nto-low.c
@@ -807,9 +807,9 @@ nto_process_target::supports_z_point_type (char z_type)
/* Insert {break/watch}point at address ADDR. SIZE is not used. */
-static int
-nto_insert_point (enum raw_bkpt_type type, CORE_ADDR addr,
- int size, struct raw_breakpoint *bp)
+int
+nto_process_target::insert_point (enum raw_bkpt_type type, CORE_ADDR addr,
+ int size, raw_breakpoint *bp)
{
int wtype = _DEBUG_BREAK_HW; /* Always request HW. */
@@ -839,9 +839,9 @@ nto_insert_point (enum raw_bkpt_type type, CORE_ADDR addr,
/* Remove {break/watch}point at address ADDR. SIZE is not used. */
-static int
-nto_remove_point (enum raw_bkpt_type type, CORE_ADDR addr,
- int size, struct raw_breakpoint *bp)
+int
+nto_process_target::remove_point (enum raw_bkpt_type type, CORE_ADDR addr,
+ int size, raw_breakpoint *bp)
{
int wtype = _DEBUG_BREAK_HW; /* Always request HW. */
@@ -950,8 +950,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_insert_point,
- nto_remove_point,
NULL, /* stopped_by_sw_breakpoint */
NULL, /* supports_stopped_by_sw_breakpoint */
NULL, /* stopped_by_hw_breakpoint */
diff --git a/gdbserver/nto-low.h b/gdbserver/nto-low.h
index d99d5d7acc7..a51477789e7 100644
--- a/gdbserver/nto-low.h
+++ b/gdbserver/nto-low.h
@@ -85,6 +85,12 @@ public:
unsigned int len) override;
bool supports_z_point_type (char z_type) override;
+
+ int insert_point (enum raw_bkpt_type type, CORE_ADDR addr,
+ int size, raw_breakpoint *bp) override;
+
+ int remove_point (enum raw_bkpt_type type, CORE_ADDR addr,
+ int size, raw_breakpoint *bp) override;
};
/* The inferior's target description. This is a global because the
diff --git a/gdbserver/target.c b/gdbserver/target.c
index 22339622e09..fd443efd61e 100644
--- a/gdbserver/target.c
+++ b/gdbserver/target.c
@@ -433,3 +433,17 @@ process_target::supports_z_point_type (char z_type)
{
return false;
}
+
+int
+process_target::insert_point (enum raw_bkpt_type type, CORE_ADDR addr,
+ int size, raw_breakpoint *bp)
+{
+ return 1;
+}
+
+int
+process_target::remove_point (enum raw_bkpt_type type, CORE_ADDR addr,
+ int size, raw_breakpoint *bp)
+{
+ return 1;
+}
diff --git a/gdbserver/target.h b/gdbserver/target.h
index 383a848fcb9..966741f21ed 100644
--- a/gdbserver/target.h
+++ b/gdbserver/target.h
@@ -70,14 +70,6 @@ class process_target;
shared code. */
struct process_stratum_target
{
- /* Insert and remove a break or watchpoint.
- Returns 0 on success, -1 on failure and 1 on unsupported. */
-
- int (*insert_point) (enum raw_bkpt_type type, CORE_ADDR addr,
- int size, struct raw_breakpoint *bp);
- int (*remove_point) (enum raw_bkpt_type type, CORE_ADDR addr,
- int size, struct raw_breakpoint *bp);
-
/* Returns 1 if the target stopped because it executed a software
breakpoint instruction, 0 otherwise. */
int (*stopped_by_sw_breakpoint) (void);
@@ -476,6 +468,14 @@ public:
'4' - access watchpoint
*/
virtual bool supports_z_point_type (char z_type);
+
+ /* Insert and remove a break or watchpoint.
+ Returns 0 on success, -1 on failure and 1 on unsupported. */
+ virtual int insert_point (enum raw_bkpt_type type, CORE_ADDR addr,
+ int size, raw_breakpoint *bp);
+
+ virtual int remove_point (enum raw_bkpt_type type, CORE_ADDR addr,
+ int size, raw_breakpoint *bp);
};
extern process_stratum_target *the_target;
diff --git a/gdbserver/win32-low.c b/gdbserver/win32-low.c
index 74b70659465..9f705507e96 100644
--- a/gdbserver/win32-low.c
+++ b/gdbserver/win32-low.c
@@ -262,9 +262,9 @@ win32_process_target::supports_z_point_type (char z_type)
&& the_low_target.supports_z_point_type (z_type));
}
-static int
-win32_insert_point (enum raw_bkpt_type type, CORE_ADDR addr,
- int size, struct raw_breakpoint *bp)
+int
+win32_process_target::insert_point (enum raw_bkpt_type type, CORE_ADDR addr,
+ int size, raw_breakpoint *bp)
{
if (the_low_target.insert_point != NULL)
return the_low_target.insert_point (type, addr, size, bp);
@@ -273,9 +273,9 @@ win32_insert_point (enum raw_bkpt_type type, CORE_ADDR addr,
return 1;
}
-static int
-win32_remove_point (enum raw_bkpt_type type, CORE_ADDR addr,
- int size, struct raw_breakpoint *bp)
+int
+win32_process_target::remove_point (enum raw_bkpt_type type, CORE_ADDR addr,
+ int size, raw_breakpoint *bp)
{
if (the_low_target.remove_point != NULL)
return the_low_target.remove_point (type, addr, size, bp);
@@ -1828,8 +1828,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_insert_point,
- win32_remove_point,
NULL, /* stopped_by_sw_breakpoint */
NULL, /* supports_stopped_by_sw_breakpoint */
NULL, /* stopped_by_hw_breakpoint */
diff --git a/gdbserver/win32-low.h b/gdbserver/win32-low.h
index f40dfb48822..39c4a4ce917 100644
--- a/gdbserver/win32-low.h
+++ b/gdbserver/win32-low.h
@@ -139,6 +139,12 @@ public:
void request_interrupt () override;
bool supports_z_point_type (char z_type) override;
+
+ int insert_point (enum raw_bkpt_type type, CORE_ADDR addr,
+ int size, raw_breakpoint *bp) override;
+
+ int remove_point (enum raw_bkpt_type type, CORE_ADDR addr,
+ int size, raw_breakpoint *bp) override;
};
/* Retrieve the context for this thread, if not already retrieved. */
--
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 40/58] gdbserver: turn target op 'get_tib_address' into a method 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 32/58] gdbserver: turn target op 'handle_new_gdb_connection' " 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 43/58] gdbserver: turn fast tracepoint target ops into methods Tankut Baris Aktemur
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 46/58] gdbserver: turn target op 'qxfer_libraries_svr4' " 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 18/58] gdbserver: turn target op 'supports_z_point_type' " Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 13/58] gdbserver: turn prepare_to_access_memory & done_accessing_memory into methods Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 15/58] gdbserver: turn target op 'look_up_symbols' into a method Tankut Baris Aktemur
2020-02-13 20:28 ` Pedro Alves
2020-02-11 9:03 ` [PATCH 27/58] gdbserver: turn target op 'qxfer_osdata' " Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 05/58] gdbserver: turn target op 'kill' " Tankut Baris Aktemur
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 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 07/58] gdbserver: turn target op 'mourn' " Tankut Baris Aktemur
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 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 26/58] gdbserver: turn target op 'hostio_last_error' into a method 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 28/58] gdbserver: turn target op 'qxfer_siginfo' " 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 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:04 ` [PATCH 53/58] gdbserver: turn target ops 'thread_name' and 'thread_handle' into methods Tankut Baris Aktemur
2020-02-11 9:04 ` [PATCH 56/58] gdbserver: turn target op 'get_ipa_tdesc_idx' into a method Tankut Baris Aktemur
2020-02-11 9:04 ` [PATCH 42/58] gdbserver: turn target op 'stabilize_threads' " 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 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:04 ` [PATCH 31/58] gdbserver: turn target ops 'supports_{fork,vfork,exec}_events' " Tankut Baris Aktemur
2020-02-11 9:04 ` [PATCH 52/58] gdbserver: turn breakpoint kind-related target ops " Tankut Baris Aktemur
2020-02-13 20:29 ` Pedro Alves
2020-02-11 9:04 ` [PATCH 34/58] gdbserver: turn target op 'core_of_thread' into a method Tankut Baris Aktemur
2020-02-11 9:04 ` [PATCH 39/58] gdbserver: turn target op 'thread_stopped' " 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: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 16/58] gdbserver: turn target op 'request_interrupt' into a method Tankut Baris Aktemur
2020-02-11 9:05 ` [PATCH 51/58] gdbserver: turn target ops 'multifs_{open, readlink, unlink}' into methods Tankut Baris Aktemur
2020-02-11 9:05 ` [PATCH 35/58] gdbserver: turn target op 'read_loadmap' into a method Tankut Baris Aktemur
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 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=b84d1a344c8cd70c152eeb5fa5ebe36259e7b13e.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).