From e98cf0cd4f099c07016d50b136713559d21755b2 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 17 Dec 2013 21:32:29 -0700 Subject: [PATCH] Add target_ops argument to to_remove_vfork_catchpoint 2014-02-19 Tom Tromey * target.h (struct target_ops) : Add argument. (target_remove_vfork_catchpoint): Add argument. * target.c (debug_to_remove_vfork_catchpoint): Add argument. (update_current_target): Update. * linux-nat.c (linux_child_remove_vfork_catchpoint): Add 'self' argument. --- gdb/ChangeLog | 10 ++++++++++ gdb/linux-nat.c | 2 +- gdb/target.c | 6 +++--- gdb/target.h | 4 ++-- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b0fc6b1a30..f9ab94b5c3 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2014-02-19 Tom Tromey + + * target.h (struct target_ops) : Add + argument. + (target_remove_vfork_catchpoint): Add argument. + * target.c (debug_to_remove_vfork_catchpoint): Add argument. + (update_current_target): Update. + * linux-nat.c (linux_child_remove_vfork_catchpoint): Add 'self' + argument. + 2014-02-19 Tom Tromey * target.h (struct target_ops) : Add diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c index e5144a73c8..fa862f6720 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c @@ -714,7 +714,7 @@ linux_child_insert_vfork_catchpoint (struct target_ops *self, int pid) } static int -linux_child_remove_vfork_catchpoint (int pid) +linux_child_remove_vfork_catchpoint (struct target_ops *self, int pid) { return 0; } diff --git a/gdb/target.c b/gdb/target.c index 0726f27423..edc3b970fb 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -801,7 +801,7 @@ update_current_target (void) (int (*) (struct target_ops *, int)) return_one); de_fault (to_remove_vfork_catchpoint, - (int (*) (int)) + (int (*) (struct target_ops *, int)) return_one); de_fault (to_insert_exec_catchpoint, (int (*) (int)) @@ -4905,11 +4905,11 @@ debug_to_insert_vfork_catchpoint (struct target_ops *self, int pid) } static int -debug_to_remove_vfork_catchpoint (int pid) +debug_to_remove_vfork_catchpoint (struct target_ops *self, int pid) { int retval; - retval = debug_target.to_remove_vfork_catchpoint (pid); + retval = debug_target.to_remove_vfork_catchpoint (&debug_target, pid); fprintf_unfiltered (gdb_stdlog, "target_remove_vfork_catchpoint (%d) = %d\n", pid, retval); diff --git a/gdb/target.h b/gdb/target.h index ff907b96f1..0717e1a0b6 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -501,7 +501,7 @@ struct target_ops int (*to_insert_fork_catchpoint) (struct target_ops *, int); int (*to_remove_fork_catchpoint) (struct target_ops *, int); int (*to_insert_vfork_catchpoint) (struct target_ops *, int); - int (*to_remove_vfork_catchpoint) (int); + int (*to_remove_vfork_catchpoint) (struct target_ops *, int); int (*to_follow_fork) (struct target_ops *, int, int); int (*to_insert_exec_catchpoint) (int); int (*to_remove_exec_catchpoint) (int); @@ -1315,7 +1315,7 @@ void target_create_inferior (char *exec_file, char *args, (*current_target.to_insert_vfork_catchpoint) (¤t_target, pid) #define target_remove_vfork_catchpoint(pid) \ - (*current_target.to_remove_vfork_catchpoint) (pid) + (*current_target.to_remove_vfork_catchpoint) (¤t_target, pid) /* If the inferior forks or vforks, this function will be called at the next resume in order to perform any bookkeeping and fiddling -- 2.34.1