From 830ca33050cbad40e2d57ac9843033048e0160ca Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 18 Dec 2013 10:51:10 -0700 Subject: [PATCH] convert to_pid_to_exec_file 2014-02-19 Tom Tromey * target-delegates.c: Rebuild. * target.c (update_current_target): Don't inherit or default to_pid_to_exec_file. * target.h (struct target_ops) : Use TARGET_DEFAULT_RETURN. --- gdb/ChangeLog | 8 ++++++++ gdb/target-delegates.c | 16 ++++++++++++++++ gdb/target.c | 5 +---- gdb/target.h | 3 ++- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3a5b4d7f4ea..626ec0c5756 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2014-02-19 Tom Tromey + + * target-delegates.c: Rebuild. + * target.c (update_current_target): Don't inherit or default + to_pid_to_exec_file. + * 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 6658ee9b894..871e417eaa7 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -459,6 +459,19 @@ delegate_rcmd (struct target_ops *self, char *arg1, struct ui_file *arg2) self->to_rcmd (self, arg1, arg2); } +static char * +delegate_pid_to_exec_file (struct target_ops *self, int arg1) +{ + self = self->beneath; + return self->to_pid_to_exec_file (self, arg1); +} + +static char * +tdefault_pid_to_exec_file (struct target_ops *self, int arg1) +{ + return 0; +} + static int delegate_can_async_p (struct target_ops *self) { @@ -593,6 +606,8 @@ install_delegators (struct target_ops *ops) ops->to_thread_name = delegate_thread_name; if (ops->to_rcmd == NULL) ops->to_rcmd = delegate_rcmd; + if (ops->to_pid_to_exec_file == NULL) + ops->to_pid_to_exec_file = delegate_pid_to_exec_file; if (ops->to_can_async_p == NULL) ops->to_can_async_p = delegate_can_async_p; if (ops->to_is_async_p == NULL) @@ -647,6 +662,7 @@ install_dummy_methods (struct target_ops *ops) ops->to_extra_thread_info = tdefault_extra_thread_info; ops->to_thread_name = tdefault_thread_name; ops->to_rcmd = default_rcmd; + ops->to_pid_to_exec_file = tdefault_pid_to_exec_file; 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 3797090f9b4..a357cba57cf 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -649,7 +649,7 @@ update_current_target (void) INHERIT (to_stop, t); /* Do not inherit to_xfer_partial. */ /* Do not inherit to_rcmd. */ - INHERIT (to_pid_to_exec_file, t); + /* Do not inherit to_pid_to_exec_file. */ INHERIT (to_log_command, t); INHERIT (to_stratum, t); /* Do not inherit to_has_all_memory. */ @@ -738,9 +738,6 @@ update_current_target (void) de_fault (to_stop, (void (*) (struct target_ops *, ptid_t)) target_ignore); - de_fault (to_pid_to_exec_file, - (char *(*) (struct target_ops *, int)) - return_null); de_fault (to_thread_architecture, default_thread_architecture); current_target.to_read_description = NULL; diff --git a/gdb/target.h b/gdb/target.h index 73075ae9946..e4cd63df241 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -559,7 +559,8 @@ struct target_ops void (*to_rcmd) (struct target_ops *, char *command, struct ui_file *output) TARGET_DEFAULT_FUNC (default_rcmd); - char *(*to_pid_to_exec_file) (struct target_ops *, int pid); + char *(*to_pid_to_exec_file) (struct target_ops *, int pid) + TARGET_DEFAULT_RETURN (0); void (*to_log_command) (struct target_ops *, const char *); struct target_section_table *(*to_get_section_table) (struct target_ops *); enum strata to_stratum; -- 2.30.2