From 758e29d2cd0242b72a05515a701cfdcb73794864 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 17 Dec 2013 21:32:54 -0700 Subject: [PATCH] Add target_ops argument to to_remove_exec_catchpoint 2014-02-19 Tom Tromey * target.h (struct target_ops) : Add argument. (target_remove_exec_catchpoint): Add argument. * target.c (debug_to_remove_exec_catchpoint): Add argument. (update_current_target): Update. * linux-nat.c (linux_child_remove_exec_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 c2bb891e463..bcf582aaf85 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_exec_catchpoint): Add argument. + * target.c (debug_to_remove_exec_catchpoint): Add argument. + (update_current_target): Update. + * linux-nat.c (linux_child_remove_exec_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 1a37ec5552a..c158f32a9fc 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c @@ -726,7 +726,7 @@ linux_child_insert_exec_catchpoint (struct target_ops *self, int pid) } static int -linux_child_remove_exec_catchpoint (int pid) +linux_child_remove_exec_catchpoint (struct target_ops *self, int pid) { return 0; } diff --git a/gdb/target.c b/gdb/target.c index 0b10f39a867..72ab8f3fa0a 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -807,7 +807,7 @@ update_current_target (void) (int (*) (struct target_ops *, int)) return_one); de_fault (to_remove_exec_catchpoint, - (int (*) (int)) + (int (*) (struct target_ops *, int)) return_one); de_fault (to_set_syscall_catchpoint, (int (*) (int, int, int, int, int *)) @@ -4931,11 +4931,11 @@ debug_to_insert_exec_catchpoint (struct target_ops *self, int pid) } static int -debug_to_remove_exec_catchpoint (int pid) +debug_to_remove_exec_catchpoint (struct target_ops *self, int pid) { int retval; - retval = debug_target.to_remove_exec_catchpoint (pid); + retval = debug_target.to_remove_exec_catchpoint (&debug_target, pid); fprintf_unfiltered (gdb_stdlog, "target_remove_exec_catchpoint (%d) = %d\n", pid, retval); diff --git a/gdb/target.h b/gdb/target.h index e1925638437..e500e92335b 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -504,7 +504,7 @@ struct target_ops int (*to_remove_vfork_catchpoint) (struct target_ops *, int); int (*to_follow_fork) (struct target_ops *, int, int); int (*to_insert_exec_catchpoint) (struct target_ops *, int); - int (*to_remove_exec_catchpoint) (int); + int (*to_remove_exec_catchpoint) (struct target_ops *, int); int (*to_set_syscall_catchpoint) (int, int, int, int, int *); int (*to_has_exited) (int, int, int *); void (*to_mourn_inferior) (struct target_ops *); @@ -1336,7 +1336,7 @@ int target_follow_fork (int follow_child, int detach_fork); (*current_target.to_insert_exec_catchpoint) (¤t_target, pid) #define target_remove_exec_catchpoint(pid) \ - (*current_target.to_remove_exec_catchpoint) (pid) + (*current_target.to_remove_exec_catchpoint) (¤t_target, pid) /* Syscall catch. -- 2.30.2