[PATCH 30/30] Eliminate target_check_pending_interrupt

Pedro Alves
2016-03-18T19:19:13Z

This is no longer called anywhere.

gdb/ChangeLog:
yyyy-mm-dd Pedro Alves <palves@redhat.com>

* target.c (target_check_pending_interrupt): Delete.
* target.h (struct target_ops) <to_check_pending_interrupt>:
Remove method.
(target_check_pending_interrupt): Remove declaration.
* target-delegates.c: Regenerate.
---
gdb/target-delegates.c | 26 --------------------------
gdb/target.c | 8 --------
gdb/target.h | 10 ----------
3 files changed, 44 deletions(-)

diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c
index 640803a..03aa2cc 100644
--- a/gdb/target-delegates.c
+++ b/gdb/target-delegates.c
@@ -1625,28 +1625,6 @@ debug_pass_ctrlc (struct target_ops *self)
}

static void
-delegate_check_pending_interrupt (struct target_ops *self)
-{
- self = self->beneath;
- self->to_check_pending_interrupt (self);
-}
-
-static void
-tdefault_check_pending_interrupt (struct target_ops *self)
-{
-}
-
-static void
-debug_check_pending_interrupt (struct target_ops *self)
-{
- fprintf_unfiltered (gdb_stdlog, "-> %s->to_check_pending_interrupt (...)\n", debug_target.to_shortname);
- debug_target.to_check_pending_interrupt (&debug_target);
- fprintf_unfiltered (gdb_stdlog, "<- %s->to_check_pending_interrupt (", debug_target.to_shortname);
- target_debug_print_struct_target_ops_p (&debug_target);
- fputs_unfiltered (")\n", gdb_stdlog);
-}
-
-static void
delegate_rcmd (struct target_ops *self, const char *arg1, struct ui_file *arg2)
{
self = self->beneath;
@@ -4213,8 +4191,6 @@ install_delegators (struct target_ops *ops)
ops->to_interrupt = delegate_interrupt;
if (ops->to_pass_ctrlc == NULL)
ops->to_pass_ctrlc = delegate_pass_ctrlc;
- if (ops->to_check_pending_interrupt == NULL)
- ops->to_check_pending_interrupt = delegate_check_pending_interrupt;
if (ops->to_rcmd == NULL)
ops->to_rcmd = delegate_rcmd;
if (ops->to_pid_to_exec_file == NULL)
@@ -4462,7 +4438,6 @@ install_dummy_methods (struct target_ops *ops)
ops->to_stop = tdefault_stop;
ops->to_interrupt = tdefault_interrupt;
ops->to_pass_ctrlc = default_target_pass_ctrlc;
- ops->to_check_pending_interrupt = tdefault_check_pending_interrupt;
ops->to_rcmd = default_rcmd;
ops->to_pid_to_exec_file = tdefault_pid_to_exec_file;
ops->to_log_command = tdefault_log_command;
@@ -4619,7 +4594,6 @@ init_debug_target (struct target_ops *ops)
ops->to_stop = debug_stop;
ops->to_interrupt = debug_interrupt;
ops->to_pass_ctrlc = debug_pass_ctrlc;
- ops->to_check_pending_interrupt = debug_check_pending_interrupt;
ops->to_rcmd = debug_rcmd;
ops->to_pid_to_exec_file = debug_pid_to_exec_file;
ops->to_log_command = debug_log_command;
diff --git a/gdb/target.c b/gdb/target.c
index d580983..a9744c4 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -3378,14 +3378,6 @@ default_target_pass_ctrlc (struct target_ops *ops)
target_interrupt (inferior_ptid);
}

-/* See target.h. */
-
-void
-target_check_pending_interrupt (void)
-{
- (*current_target.to_check_pending_interrupt) (&current_target);
-}
-
/* See target/target.h. */

void
diff --git a/gdb/target.h b/gdb/target.h
index 00625fec..6b5b6e0 100644
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -647,8 +647,6 @@ struct target_ops
TARGET_DEFAULT_IGNORE ();
void (*to_pass_ctrlc) (struct target_ops *)
TARGET_DEFAULT_FUNC (default_target_pass_ctrlc);
- void (*to_check_pending_interrupt) (struct target_ops *)
- TARGET_DEFAULT_IGNORE ();
void (*to_rcmd) (struct target_ops *,
const char *command, struct ui_file *output)
TARGET_DEFAULT_FUNC (default_rcmd);
@@ -1729,14 +1727,6 @@ extern void target_pass_ctrlc (void);
target_interrupt. */
extern void default_target_pass_ctrlc (struct target_ops *ops);

-/* Some targets install their own SIGINT handler while the target is
- running. This method is called from the QUIT macro to give such
- targets a chance to process a Ctrl-C. The target may e.g., choose
- to interrupt the (potentially) long running operation, or give up
- waiting and disconnect. */
-
-extern void target_check_pending_interrupt (void);
-
/* Send the specified COMMAND to the target's monitor
(shell,interpreter) for execution. The result of the query is
placed in OUTBUF. */
--
2.5.0