From 95c3375e4733e676f9fb6f2229061151d139fcb6 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 18 Dec 2013 10:44:57 -0700 Subject: [PATCH] convert to_remove_vfork_catchpoint 2014-02-19 Tom Tromey * target-delegates.c: Rebuild. * target.c (update_current_target): Don't inherit or default to_remove_vfork_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 15d3279915..79fcf8f6da 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2014-02-19 Tom Tromey + + * target-delegates.c: Rebuild. + * target.c (update_current_target): Don't inherit or default + to_remove_vfork_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 f77c0610df..c3a090b990 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -361,6 +361,19 @@ tdefault_insert_vfork_catchpoint (struct target_ops *self, int arg1) return 1; } +static int +delegate_remove_vfork_catchpoint (struct target_ops *self, int arg1) +{ + self = self->beneath; + return self->to_remove_vfork_catchpoint (self, arg1); +} + +static int +tdefault_remove_vfork_catchpoint (struct target_ops *self, int arg1) +{ + return 1; +} + static void delegate_rcmd (struct target_ops *self, char *arg1, struct ui_file *arg2) { @@ -486,6 +499,8 @@ install_delegators (struct target_ops *ops) ops->to_remove_fork_catchpoint = delegate_remove_fork_catchpoint; if (ops->to_insert_vfork_catchpoint == NULL) ops->to_insert_vfork_catchpoint = delegate_insert_vfork_catchpoint; + if (ops->to_remove_vfork_catchpoint == NULL) + ops->to_remove_vfork_catchpoint = delegate_remove_vfork_catchpoint; if (ops->to_rcmd == NULL) ops->to_rcmd = delegate_rcmd; if (ops->to_can_async_p == NULL) @@ -534,6 +549,7 @@ install_dummy_methods (struct target_ops *ops) ops->to_insert_fork_catchpoint = tdefault_insert_fork_catchpoint; ops->to_remove_fork_catchpoint = tdefault_remove_fork_catchpoint; ops->to_insert_vfork_catchpoint = tdefault_insert_vfork_catchpoint; + ops->to_remove_vfork_catchpoint = tdefault_remove_vfork_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 a434909d6e..2a5f2ae836 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -633,7 +633,7 @@ update_current_target (void) /* Do not inherit to_insert_fork_catchpoint. */ /* Do not inherit to_remove_fork_catchpoint. */ /* Do not inherit to_insert_vfork_catchpoint. */ - INHERIT (to_remove_vfork_catchpoint, t); + /* Do not inherit to_remove_vfork_catchpoint. */ /* Do not inherit to_follow_fork. */ INHERIT (to_insert_exec_catchpoint, t); INHERIT (to_remove_exec_catchpoint, t); @@ -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_vfork_catchpoint, - (int (*) (struct target_ops *, int)) - return_one); de_fault (to_insert_exec_catchpoint, (int (*) (struct target_ops *, int)) return_one); diff --git a/gdb/target.h b/gdb/target.h index b270c414e5..8f10b829e2 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -525,7 +525,8 @@ struct target_ops TARGET_DEFAULT_RETURN (1); int (*to_insert_vfork_catchpoint) (struct target_ops *, int) TARGET_DEFAULT_RETURN (1); - int (*to_remove_vfork_catchpoint) (struct target_ops *, int); + int (*to_remove_vfork_catchpoint) (struct target_ops *, int) + TARGET_DEFAULT_RETURN (1); int (*to_follow_fork) (struct target_ops *, int, int); int (*to_insert_exec_catchpoint) (struct target_ops *, int); int (*to_remove_exec_catchpoint) (struct target_ops *, int); -- 2.34.1