From 6a9fa05147d8d42c57efc441641a3e3c2fd96057 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 18 Dec 2013 10:46:38 -0700 Subject: [PATCH] convert to_set_syscall_catchpoint 2014-02-19 Tom Tromey * target-delegates.c: Rebuild. * target.c (update_current_target): Don't inherit or default to_set_syscall_catchpoint. (return_one): Remove. * target.h (struct target_ops) : Use TARGET_DEFAULT_RETURN. --- gdb/ChangeLog | 9 +++++++++ gdb/target-delegates.c | 16 ++++++++++++++++ gdb/target.c | 13 +------------ gdb/target.h | 3 ++- 4 files changed, 28 insertions(+), 13 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c7e61765f5..8896259c05 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2014-02-19 Tom Tromey + + * target-delegates.c: Rebuild. + * target.c (update_current_target): Don't inherit or default + to_set_syscall_catchpoint. + (return_one): Remove. + * 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 f78656950e..7bbc02d154 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -400,6 +400,19 @@ tdefault_remove_exec_catchpoint (struct target_ops *self, int arg1) return 1; } +static int +delegate_set_syscall_catchpoint (struct target_ops *self, int arg1, int arg2, int arg3, int arg4, int *arg5) +{ + self = self->beneath; + return self->to_set_syscall_catchpoint (self, arg1, arg2, arg3, arg4, arg5); +} + +static int +tdefault_set_syscall_catchpoint (struct target_ops *self, int arg1, int arg2, int arg3, int arg4, int *arg5) +{ + return 1; +} + static void delegate_rcmd (struct target_ops *self, char *arg1, struct ui_file *arg2) { @@ -531,6 +544,8 @@ install_delegators (struct target_ops *ops) 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_set_syscall_catchpoint == NULL) + ops->to_set_syscall_catchpoint = delegate_set_syscall_catchpoint; if (ops->to_rcmd == NULL) ops->to_rcmd = delegate_rcmd; if (ops->to_can_async_p == NULL) @@ -582,6 +597,7 @@ install_dummy_methods (struct target_ops *ops) 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_set_syscall_catchpoint = tdefault_set_syscall_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 4185871f73..f07522d619 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -63,8 +63,6 @@ static int nomemory (CORE_ADDR, char *, int, int, struct target_ops *); static int return_zero (void); -static int return_one (void); - static int return_minus_one (void); static void *return_null (void); @@ -637,7 +635,7 @@ update_current_target (void) /* Do not inherit to_follow_fork. */ /* Do not inherit to_insert_exec_catchpoint. */ /* Do not inherit to_remove_exec_catchpoint. */ - INHERIT (to_set_syscall_catchpoint, t); + /* Do not inherit to_set_syscall_catchpoint. */ INHERIT (to_has_exited, t); /* Do not inherit to_mourn_inferior. */ INHERIT (to_can_run, t); @@ -734,9 +732,6 @@ update_current_target (void) (int (*) (CORE_ADDR, gdb_byte *, int, int, struct mem_attrib *, struct target_ops *)) nomemory); - de_fault (to_set_syscall_catchpoint, - (int (*) (struct target_ops *, int, int, int, int, int *)) - return_one); de_fault (to_has_exited, (int (*) (struct target_ops *, int, int, int *)) return_zero); @@ -3590,12 +3585,6 @@ return_zero (void) return 0; } -static int -return_one (void) -{ - return 1; -} - static int return_minus_one (void) { diff --git a/gdb/target.h b/gdb/target.h index 436827e94f..331050108e 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -533,7 +533,8 @@ struct target_ops 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, int, int, int, int *) + TARGET_DEFAULT_RETURN (1); int (*to_has_exited) (struct target_ops *, int, int, int *); void (*to_mourn_inferior) (struct target_ops *); int (*to_can_run) (struct target_ops *);