From 7e35c012fb79ca35105f0d1b299014adef61be88 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 18 Dec 2013 14:47:06 -0700 Subject: [PATCH] convert to_get_section_table 2014-02-19 Tom Tromey * target-delegates.c: Rebuild. * target.c (target_get_section_table): Unconditionally delegate. * target.h (struct target_ops) : Use TARGET_DEFAULT_RETURN. --- gdb/ChangeLog | 7 +++++++ gdb/target-delegates.c | 16 ++++++++++++++++ gdb/target.c | 8 +------- gdb/target.h | 3 ++- 4 files changed, 26 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2512cbc63b1..c9b20179449 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2014-02-19 Tom Tromey + + * target-delegates.c: Rebuild. + * target.c (target_get_section_table): Unconditionally delegate. + * 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 fe827faa598..03e00300eb4 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -630,6 +630,19 @@ tdefault_log_command (struct target_ops *self, const char *arg1) { } +static struct target_section_table * +delegate_get_section_table (struct target_ops *self) +{ + self = self->beneath; + return self->to_get_section_table (self); +} + +static struct target_section_table * +tdefault_get_section_table (struct target_ops *self) +{ + return 0; +} + static int delegate_can_async_p (struct target_ops *self) { @@ -1319,6 +1332,8 @@ install_delegators (struct target_ops *ops) ops->to_pid_to_exec_file = delegate_pid_to_exec_file; if (ops->to_log_command == NULL) ops->to_log_command = delegate_log_command; + if (ops->to_get_section_table == NULL) + ops->to_get_section_table = delegate_get_section_table; if (ops->to_can_async_p == NULL) ops->to_can_async_p = delegate_can_async_p; if (ops->to_is_async_p == NULL) @@ -1474,6 +1489,7 @@ install_dummy_methods (struct target_ops *ops) ops->to_rcmd = default_rcmd; ops->to_pid_to_exec_file = tdefault_pid_to_exec_file; ops->to_log_command = tdefault_log_command; + ops->to_get_section_table = tdefault_get_section_table; ops->to_can_async_p = find_default_can_async_p; ops->to_is_async_p = find_default_is_async_p; ops->to_async = tdefault_async; diff --git a/gdb/target.c b/gdb/target.c index 53a8e2b1943..a6398610ab0 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -1088,16 +1088,10 @@ done: struct target_section_table * target_get_section_table (struct target_ops *target) { - struct target_ops *t; - if (targetdebug) fprintf_unfiltered (gdb_stdlog, "target_get_section_table ()\n"); - for (t = target; t != NULL; t = t->beneath) - if (t->to_get_section_table != NULL) - return (*t->to_get_section_table) (t); - - return NULL; + return (*target->to_get_section_table) (target); } /* Find a section containing ADDR. */ diff --git a/gdb/target.h b/gdb/target.h index 29d210a0689..38046eb86e4 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -576,7 +576,8 @@ struct target_ops TARGET_DEFAULT_RETURN (0); void (*to_log_command) (struct target_ops *, const char *) TARGET_DEFAULT_IGNORE (); - struct target_section_table *(*to_get_section_table) (struct target_ops *); + struct target_section_table *(*to_get_section_table) (struct target_ops *) + TARGET_DEFAULT_RETURN (0); enum strata to_stratum; int (*to_has_all_memory) (struct target_ops *); int (*to_has_memory) (struct target_ops *); -- 2.30.2