From da82bd6b65af8f3cec02621435331983b27d93a0 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 17 Dec 2013 21:33:31 -0700 Subject: [PATCH] Add target_ops argument to to_can_run 2014-02-19 Tom Tromey * windows-nat.c (windows_can_run): Add 'self' argument. * target.h (struct target_ops) : Add argument. (target_can_run): Add argument. * target.c (debug_to_can_run): Add argument. (update_current_target): Update. * nto-procfs.c (procfs_can_run): Add 'self' argument. * inf-child.c (inf_child_can_run): Add 'self' argument. * go32-nat.c (go32_can_run): Add 'self' argument. --- gdb/ChangeLog | 11 +++++++++++ gdb/go32-nat.c | 2 +- gdb/inf-child.c | 2 +- gdb/nto-procfs.c | 4 ++-- gdb/target.c | 7 ++++--- gdb/target.h | 4 ++-- gdb/windows-nat.c | 2 +- 7 files changed, 22 insertions(+), 10 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 30db237d084..1cbdfe6f1ba 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,14 @@ +2014-02-19 Tom Tromey + + * windows-nat.c (windows_can_run): Add 'self' argument. + * target.h (struct target_ops) : Add argument. + (target_can_run): Add argument. + * target.c (debug_to_can_run): Add argument. + (update_current_target): Update. + * nto-procfs.c (procfs_can_run): Add 'self' argument. + * inf-child.c (inf_child_can_run): Add 'self' argument. + * go32-nat.c (go32_can_run): Add 'self' argument. + 2014-02-19 Tom Tromey * target.h (struct target_ops) : Add argument. diff --git a/gdb/go32-nat.c b/gdb/go32-nat.c index 75f6a3ed125..2e91b129c26 100644 --- a/gdb/go32-nat.c +++ b/gdb/go32-nat.c @@ -737,7 +737,7 @@ go32_mourn_inferior (struct target_ops *ops) } static int -go32_can_run (void) +go32_can_run (struct target_ops *self) { return 1; } diff --git a/gdb/inf-child.c b/gdb/inf-child.c index 7726470912b..37fac4b412b 100644 --- a/gdb/inf-child.c +++ b/gdb/inf-child.c @@ -128,7 +128,7 @@ inf_child_follow_fork (struct target_ops *ops, int follow_child, } static int -inf_child_can_run (void) +inf_child_can_run (struct target_ops *self) { return 1; } diff --git a/gdb/nto-procfs.c b/gdb/nto-procfs.c index 0a7ed55f752..e86511c4630 100644 --- a/gdb/nto-procfs.c +++ b/gdb/nto-procfs.c @@ -57,7 +57,7 @@ static procfs_run run; static void procfs_open (char *, int); -static int procfs_can_run (void); +static int procfs_can_run (struct target_ops *self); static int procfs_xfer_memory (CORE_ADDR, gdb_byte *, int, int, struct mem_attrib *attrib, @@ -609,7 +609,7 @@ procfs_files_info (struct target_ops *ignore) /* Mark our target-struct as eligible for stray "run" and "attach" commands. */ static int -procfs_can_run (void) +procfs_can_run (struct target_ops *self) { return 1; } diff --git a/gdb/target.c b/gdb/target.c index ff614618181..cfe9ee74a60 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -144,7 +144,7 @@ static void debug_to_terminal_ours (struct target_ops *self); static void debug_to_load (struct target_ops *self, char *, int); -static int debug_to_can_run (void); +static int debug_to_can_run (struct target_ops *self); static void debug_to_stop (ptid_t); @@ -816,6 +816,7 @@ update_current_target (void) (int (*) (struct target_ops *, int, int, int *)) return_zero); de_fault (to_can_run, + (int (*) (struct target_ops *)) return_zero); de_fault (to_extra_thread_info, (char *(*) (struct thread_info *)) @@ -4959,11 +4960,11 @@ debug_to_has_exited (struct target_ops *self, } static int -debug_to_can_run (void) +debug_to_can_run (struct target_ops *self) { int retval; - retval = debug_target.to_can_run (); + retval = debug_target.to_can_run (&debug_target); fprintf_unfiltered (gdb_stdlog, "target_can_run () = %d\n", retval); diff --git a/gdb/target.h b/gdb/target.h index 8d73472fa11..71546a12906 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -509,7 +509,7 @@ struct target_ops int, int, int, int, int *); int (*to_has_exited) (struct target_ops *, int, int, int *); void (*to_mourn_inferior) (struct target_ops *); - int (*to_can_run) (void); + int (*to_can_run) (struct target_ops *); /* Documentation of this routine is provided with the corresponding target_* macro. */ @@ -1383,7 +1383,7 @@ void target_mourn_inferior (void); /* Does target have enough data to do a run or attach command? */ #define target_can_run(t) \ - ((t)->to_can_run) () + ((t)->to_can_run) (t) /* Set list of signals to be handled in the target. diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index 8dcc410c52c..9c1fdb0f31c 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -2475,7 +2475,7 @@ windows_prepare_to_store (struct target_ops *self, struct regcache *regcache) } static int -windows_can_run (void) +windows_can_run (struct target_ops *self) { return 1; } -- 2.30.2