yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

convert to_attach

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

	* target-delegates.c: Rebuild.
	* target.c (init_dummy_target): Don't initialize to_attach.
	(target_attach): Unconditionally delegate.
	* target.h (struct target_ops) <to_attach>: Use
	TARGET_DEFAULT_FUNC.
This commit is contained in:
Tom Tromey 2013-12-13 14:16:57 -07:00
parent 09da0d0ae7
commit e9a2920092
4 changed files with 24 additions and 18 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 (init_dummy_target): Don't initialize to_attach.
(target_attach): Unconditionally delegate.
* target.h (struct target_ops) <to_attach>: Use
TARGET_DEFAULT_FUNC.
2014-02-19 Tom Tromey <tromey@redhat.com>
* target-delegates.c: Rebuild.

10
gdb/target-delegates.c
View File

@ -3,6 +3,13 @@
/* To regenerate this file, run:*/
/* make-target-delegates target.h > target-delegates.c */
static void
delegate_attach (struct target_ops *self, char *arg1, int arg2)
{
self = self->beneath;
self->to_attach (self, arg1, arg2);
}
static void
delegate_detach (struct target_ops *self, const char *arg1, int arg2)
{
@ -150,6 +157,8 @@ tdefault_supports_btrace (struct target_ops *self)
static void
install_delegators (struct target_ops *ops)
{
if (ops->to_attach == NULL)
ops->to_attach = delegate_attach;
if (ops->to_detach == NULL)
ops->to_detach = delegate_detach;
if (ops->to_resume == NULL)
@ -181,6 +190,7 @@ install_delegators (struct target_ops *ops)
static void
install_dummy_methods (struct target_ops *ops)
{
ops->to_attach = find_default_attach;
ops->to_detach = tdefault_detach;
ops->to_resume = tdefault_resume;
ops->to_wait = tdefault_wait;

21
gdb/target.c
View File

@ -3806,7 +3806,6 @@ init_dummy_target (void)
dummy_target.to_shortname = "None";
dummy_target.to_longname = "None";
dummy_target.to_doc = "";
dummy_target.to_attach = find_default_attach;
dummy_target.to_create_inferior = find_default_create_inferior;
dummy_target.to_supports_non_stop = find_default_supports_non_stop;
dummy_target.to_supports_disable_randomization
@ -3853,22 +3852,10 @@ target_close (struct target_ops *targ)
void
target_attach (char *args, int from_tty)
{
struct target_ops *t;
for (t = current_target.beneath; t != NULL; t = t->beneath)
{
if (t->to_attach != NULL)
{
t->to_attach (t, args, from_tty);
if (targetdebug)
fprintf_unfiltered (gdb_stdlog, "target_attach (%s, %d)\n",
args, from_tty);
return;
}
}
internal_error (__FILE__, __LINE__,
_("could not find a target to attach"));
current_target.to_attach (&current_target, args, from_tty);
if (targetdebug)
fprintf_unfiltered (gdb_stdlog, "target_attach (%s, %d)\n",
args, from_tty);
}
int

3
gdb/target.h
View File

@ -403,7 +403,8 @@ struct target_ops
to xfree everything (including the "struct target_ops"). */
void (*to_xclose) (struct target_ops *targ);
void (*to_close) (struct target_ops *);
void (*to_attach) (struct target_ops *ops, char *, int);
void (*to_attach) (struct target_ops *ops, char *, int)
TARGET_DEFAULT_FUNC (find_default_attach);
void (*to_post_attach) (struct target_ops *, int);
void (*to_detach) (struct target_ops *ops, const char *, int)
TARGET_DEFAULT_IGNORE ();