darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

convert to_load

Browse source 
2014-02-19  Tom Tromey  <tromey@redhat.com>

	* target-delegates.c: Rebuild.
	* target.c (update_current_target): Don't inherit or default
	to_load.
	* target.h (struct target_ops) <to_load>: Use
	TARGET_DEFAULT_NORETURN.
This commit is contained in:
Tom Tromey 2013-12-18 10:31:48 -07:00
parent e19e919fea
commit 7634da8766
4 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gdb/ChangeLog
View file

@ -1,3 +1,11 @@
2014-02-19 Tom Tromey <tromey@redhat.com>
* target-delegates.c: Rebuild.
* target.c (update_current_target): Don't inherit or default
to_load.
* target.h (struct target_ops) <to_load>: Use
TARGET_DEFAULT_NORETURN.
2014-02-19 Tom Tromey <tromey@redhat.com> 2014-02-19 Tom Tromey <tromey@redhat.com>
* target-delegates.c: Rebuild. * target-delegates.c: Rebuild.

16
gdb/target-delegates.c
View file

@ -297,6 +297,19 @@ delegate_terminal_info (struct target_ops *self, const char *arg1, int arg2)
self->to_terminal_info (self, arg1, arg2); self->to_terminal_info (self, arg1, arg2);
} }
static void
delegate_load (struct target_ops *self, char *arg1, int arg2)
{
self = self->beneath;
self->to_load (self, arg1, arg2);
}
static void
tdefault_load (struct target_ops *self, char *arg1, int arg2)
{
tcomplain ();
}
static void static void
delegate_rcmd (struct target_ops *self, char *arg1, struct ui_file *arg2) delegate_rcmd (struct target_ops *self, char *arg1, struct ui_file *arg2)
{ {
@ -412,6 +425,8 @@ install_delegators (struct target_ops *ops)
ops->to_terminal_save_ours = delegate_terminal_save_ours; ops->to_terminal_save_ours = delegate_terminal_save_ours;
if (ops->to_terminal_info == NULL) if (ops->to_terminal_info == NULL)
ops->to_terminal_info = delegate_terminal_info; ops->to_terminal_info = delegate_terminal_info;
if (ops->to_load == NULL)
ops->to_load = delegate_load;
if (ops->to_rcmd == NULL) if (ops->to_rcmd == NULL)
ops->to_rcmd = delegate_rcmd; ops->to_rcmd = delegate_rcmd;
if (ops->to_can_async_p == NULL) if (ops->to_can_async_p == NULL)
@ -455,6 +470,7 @@ install_dummy_methods (struct target_ops *ops)
ops->to_terminal_ours = tdefault_terminal_ours; ops->to_terminal_ours = tdefault_terminal_ours;
ops->to_terminal_save_ours = tdefault_terminal_save_ours; ops->to_terminal_save_ours = tdefault_terminal_save_ours;
ops->to_terminal_info = default_terminal_info; ops->to_terminal_info = default_terminal_info;
ops->to_load = tdefault_load;
ops->to_rcmd = default_rcmd; ops->to_rcmd = default_rcmd;
ops->to_can_async_p = find_default_can_async_p; ops->to_can_async_p = find_default_can_async_p;
ops->to_is_async_p = find_default_is_async_p; ops->to_is_async_p = find_default_is_async_p;

5
gdb/target.c
View file

@ -627,7 +627,7 @@ update_current_target (void)
/* Do not inherit to_terminal_save_ours. */ /* Do not inherit to_terminal_save_ours. */
/* Do not inherit to_terminal_info. */ /* Do not inherit to_terminal_info. */
/* Do not inherit to_kill. */ /* Do not inherit to_kill. */
INHERIT (to_load, t); /* Do not inherit to_load. */
/* Do no inherit to_create_inferior. */ /* Do no inherit to_create_inferior. */
INHERIT (to_post_startup_inferior, t); INHERIT (to_post_startup_inferior, t);
INHERIT (to_insert_fork_catchpoint, t); INHERIT (to_insert_fork_catchpoint, t);
@ -734,9 +734,6 @@ update_current_target (void)
(int (*) (CORE_ADDR, gdb_byte *, int, int, (int (*) (CORE_ADDR, gdb_byte *, int, int,
struct mem_attrib *, struct target_ops *)) struct mem_attrib *, struct target_ops *))
nomemory); nomemory);
de_fault (to_load,
(void (*) (struct target_ops *, char *, int))
tcomplain);
de_fault (to_post_startup_inferior, de_fault (to_post_startup_inferior,
(void (*) (struct target_ops *, ptid_t)) (void (*) (struct target_ops *, ptid_t))
target_ignore); target_ignore);

3
gdb/target.h
View file

@ -513,7 +513,8 @@ struct target_ops
void (*to_terminal_info) (struct target_ops *, const char *, int) void (*to_terminal_info) (struct target_ops *, const char *, int)
TARGET_DEFAULT_FUNC (default_terminal_info); TARGET_DEFAULT_FUNC (default_terminal_info);
void (*to_kill) (struct target_ops *); void (*to_kill) (struct target_ops *);
void (*to_load) (struct target_ops *, char *, int); void (*to_load) (struct target_ops *, char *, int)
TARGET_DEFAULT_NORETURN (tcomplain ());
void (*to_create_inferior) (struct target_ops *, void (*to_create_inferior) (struct target_ops *,
char *, char *, char **, int); char *, char *, char **, int);
void (*to_post_startup_inferior) (struct target_ops *, ptid_t); void (*to_post_startup_inferior) (struct target_ops *, ptid_t);