OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

convert to_kill

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

	* target-delegates.c: Rebuild.
	* target.c (target_kill): Unconditionally delegate.
	* target.h (struct target_ops) <to_kill>: Use
	TARGET_DEFAULT_NORETURN.
This commit is contained in:
Tom Tromey 2013-12-18 14:35:15 -07:00
parent 6c7e5e5cdc
commit 423a48075e
4 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gdb/ChangeLog
View File

@ -1,3 +1,10 @@
2014-02-19 Tom Tromey <tromey@redhat.com>
* target-delegates.c: Rebuild.
* target.c (target_kill): Unconditionally delegate.
* target.h (struct target_ops) <to_kill>: Use
TARGET_DEFAULT_NORETURN.
2014-02-19 Tom Tromey <tromey@redhat.com>
* target-delegates.c: Rebuild.

16
gdb/target-delegates.c
View File

@ -361,6 +361,19 @@ delegate_terminal_info (struct target_ops *self, const char *arg1, int arg2)
self->to_terminal_info (self, arg1, arg2);
}
static void
delegate_kill (struct target_ops *self)
{
self = self->beneath;
self->to_kill (self);
}
static void
tdefault_kill (struct target_ops *self)
{
noprocess ();
}
static void
delegate_load (struct target_ops *self, char *arg1, int arg2)
{
@ -1203,6 +1216,8 @@ install_delegators (struct target_ops *ops)
ops->to_terminal_save_ours = delegate_terminal_save_ours;
if (ops->to_terminal_info == NULL)
ops->to_terminal_info = delegate_terminal_info;
if (ops->to_kill == NULL)
ops->to_kill = delegate_kill;
if (ops->to_load == NULL)
ops->to_load = delegate_load;
if (ops->to_post_startup_inferior == NULL)
@ -1367,6 +1382,7 @@ install_dummy_methods (struct target_ops *ops)
ops->to_terminal_ours = tdefault_terminal_ours;
ops->to_terminal_save_ours = tdefault_terminal_save_ours;
ops->to_terminal_info = default_terminal_info;
ops->to_kill = tdefault_kill;
ops->to_load = tdefault_load;
ops->to_post_startup_inferior = tdefault_post_startup_inferior;
ops->to_insert_fork_catchpoint = tdefault_insert_fork_catchpoint;

15
gdb/target.c
View File

@ -452,19 +452,10 @@ target_ignore (void)
void
target_kill (void)
{
struct target_ops *t;
if (targetdebug)
fprintf_unfiltered (gdb_stdlog, "target_kill ()\n");
for (t = current_target.beneath; t != NULL; t = t->beneath)
if (t->to_kill != NULL)
{
if (targetdebug)
fprintf_unfiltered (gdb_stdlog, "target_kill ()\n");
t->to_kill (t);
return;
}
noprocess ();
current_target.to_kill (&current_target);
}
void

3
gdb/target.h
View File

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