From cda0f38c9e2092b84e9b44a9da7f7c6ef79a2332 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 18 Dec 2013 10:46:02 -0700 Subject: [PATCH] convert to_remove_exec_catchpoint 2014-02-19 Tom Tromey * target-delegates.c: Rebuild. * target.c (update_current_target): Don't inherit or default to_insert_exec_catchpoint. * target.h (struct target_ops) : Use TARGET_DEFAULT_RETURN. --- gdb/ChangeLog | 8 ++++++++ gdb/target-delegates.c | 16 ++++++++++++++++ gdb/target.c | 5 +---- gdb/target.h | 3 ++- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0107969ea1a..c7e61765f5d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -6,6 +6,14 @@ * target.h (struct target_ops) : Use TARGET_DEFAULT_RETURN. +2014-01-08 Tom Tromey + + * target-delegates.c: Rebuild. + * target.c (update_current_target): Don't inherit or default + to_insert_exec_catchpoint. + * target.h (struct target_ops) : Use + TARGET_DEFAULT_RETURN. + 2014-02-19 Tom Tromey * target-delegates.c: Rebuild. diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c index 20f5c5c9479..f78656950eb 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -387,6 +387,19 @@ tdefault_insert_exec_catchpoint (struct target_ops *self, int arg1) return 1; } +static int +delegate_remove_exec_catchpoint (struct target_ops *self, int arg1) +{ + self = self->beneath; + return self->to_remove_exec_catchpoint (self, arg1); +} + +static int +tdefault_remove_exec_catchpoint (struct target_ops *self, int arg1) +{ + return 1; +} + static void delegate_rcmd (struct target_ops *self, char *arg1, struct ui_file *arg2) { @@ -516,6 +529,8 @@ install_delegators (struct target_ops *ops) ops->to_remove_vfork_catchpoint = delegate_remove_vfork_catchpoint; if (ops->to_insert_exec_catchpoint == NULL) ops->to_insert_exec_catchpoint = delegate_insert_exec_catchpoint; + if (ops->to_remove_exec_catchpoint == NULL) + ops->to_remove_exec_catchpoint = delegate_remove_exec_catchpoint; if (ops->to_rcmd == NULL) ops->to_rcmd = delegate_rcmd; if (ops->to_can_async_p == NULL) @@ -566,6 +581,7 @@ install_dummy_methods (struct target_ops *ops) ops->to_insert_vfork_catchpoint = tdefault_insert_vfork_catchpoint; ops->to_remove_vfork_catchpoint = tdefault_remove_vfork_catchpoint; ops->to_insert_exec_catchpoint = tdefault_insert_exec_catchpoint; + ops->to_remove_exec_catchpoint = tdefault_remove_exec_catchpoint; ops->to_rcmd = default_rcmd; ops->to_can_async_p = find_default_can_async_p; ops->to_is_async_p = find_default_is_async_p; diff --git a/gdb/target.c b/gdb/target.c index 783ed752d4f..4185871f73f 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -636,7 +636,7 @@ update_current_target (void) /* Do not inherit to_remove_vfork_catchpoint. */ /* Do not inherit to_follow_fork. */ /* Do not inherit to_insert_exec_catchpoint. */ - INHERIT (to_remove_exec_catchpoint, t); + /* Do not inherit to_remove_exec_catchpoint. */ INHERIT (to_set_syscall_catchpoint, t); INHERIT (to_has_exited, t); /* Do not inherit to_mourn_inferior. */ @@ -734,9 +734,6 @@ update_current_target (void) (int (*) (CORE_ADDR, gdb_byte *, int, int, struct mem_attrib *, struct target_ops *)) nomemory); - de_fault (to_remove_exec_catchpoint, - (int (*) (struct target_ops *, int)) - return_one); de_fault (to_set_syscall_catchpoint, (int (*) (struct target_ops *, int, int, int, int, int *)) return_one); diff --git a/gdb/target.h b/gdb/target.h index cfec2a14a3d..436827e94fa 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -530,7 +530,8 @@ struct target_ops int (*to_follow_fork) (struct target_ops *, int, int); int (*to_insert_exec_catchpoint) (struct target_ops *, int) TARGET_DEFAULT_RETURN (1); - int (*to_remove_exec_catchpoint) (struct target_ops *, int); + int (*to_remove_exec_catchpoint) (struct target_ops *, int) + TARGET_DEFAULT_RETURN (1); int (*to_set_syscall_catchpoint) (struct target_ops *, int, int, int, int, int *); int (*to_has_exited) (struct target_ops *, int, int, int *); -- 2.39.5