aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2013-12-18 10:48:36 -0700
committerTom Tromey <tromey@redhat.com>2014-02-19 07:47:28 -0700
commit4a7e6dda8a9288579b5d8ac98b036187e7f76fea (patch)
tree94066042c1541b23087fca58b922fa1554909e14
parent0db88c1ddcd5524c2839650474b9750018b272f4 (diff)
downloadgdb-4a7e6dda8a9288579b5d8ac98b036187e7f76fea.zip
gdb-4a7e6dda8a9288579b5d8ac98b036187e7f76fea.tar.gz
gdb-4a7e6dda8a9288579b5d8ac98b036187e7f76fea.tar.bz2
convert to_extra_thread_info
2014-02-19 Tom Tromey <tromey@redhat.com> * target-delegates.c: Rebuild. * target.c (update_current_target): Don't inherit or default to_extra_thread_info. * target.h (struct target_ops) <to_extra_thread_info>: Use TARGET_DEFAULT_RETURN.
-rw-r--r--gdb/ChangeLog8
-rw-r--r--gdb/target-delegates.c16
-rw-r--r--gdb/target.c5
-rw-r--r--gdb/target.h3
4 files changed, 27 insertions, 5 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index feb6013..a4ccc9c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -2,6 +2,14 @@
* target-delegates.c: Rebuild.
* target.c (update_current_target): Don't inherit or default
+ to_extra_thread_info.
+ * target.h (struct target_ops) <to_extra_thread_info>: Use
+ TARGET_DEFAULT_RETURN.
+
+2014-02-19 Tom Tromey <tromey@redhat.com>
+
+ * target-delegates.c: Rebuild.
+ * target.c (update_current_target): Don't inherit or default
to_has_exited.
* target.h (struct target_ops) <to_has_exited>: Use
TARGET_DEFAULT_RETURN..
diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c
index 9a6120c..a6643d1 100644
--- a/gdb/target-delegates.c
+++ b/gdb/target-delegates.c
@@ -426,6 +426,19 @@ tdefault_has_exited (struct target_ops *self, int arg1, int arg2, int *arg3)
return 0;
}
+static char *
+delegate_extra_thread_info (struct target_ops *self, struct thread_info *arg1)
+{
+ self = self->beneath;
+ return self->to_extra_thread_info (self, arg1);
+}
+
+static char *
+tdefault_extra_thread_info (struct target_ops *self, struct thread_info *arg1)
+{
+ return 0;
+}
+
static void
delegate_rcmd (struct target_ops *self, char *arg1, struct ui_file *arg2)
{
@@ -561,6 +574,8 @@ install_delegators (struct target_ops *ops)
ops->to_set_syscall_catchpoint = delegate_set_syscall_catchpoint;
if (ops->to_has_exited == NULL)
ops->to_has_exited = delegate_has_exited;
+ if (ops->to_extra_thread_info == NULL)
+ ops->to_extra_thread_info = delegate_extra_thread_info;
if (ops->to_rcmd == NULL)
ops->to_rcmd = delegate_rcmd;
if (ops->to_can_async_p == NULL)
@@ -614,6 +629,7 @@ install_dummy_methods (struct target_ops *ops)
ops->to_remove_exec_catchpoint = tdefault_remove_exec_catchpoint;
ops->to_set_syscall_catchpoint = tdefault_set_syscall_catchpoint;
ops->to_has_exited = tdefault_has_exited;
+ ops->to_extra_thread_info = tdefault_extra_thread_info;
ops->to_rcmd = default_rcmd;
ops->to_can_async_p = find_default_can_async_p;
ops->to_is_async_p = find_default_is_async_p;
diff --git a/gdb/target.c b/gdb/target.c
index 9c5f756..d721451 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -644,7 +644,7 @@ update_current_target (void)
/* Do not inherit to_thread_alive. */
/* Do not inherit to_find_new_threads. */
/* Do not inherit to_pid_to_str. */
- INHERIT (to_extra_thread_info, t);
+ /* Do not inherit to_extra_thread_info. */
INHERIT (to_thread_name, t);
INHERIT (to_stop, t);
/* Do not inherit to_xfer_partial. */
@@ -735,9 +735,6 @@ update_current_target (void)
de_fault (to_can_run,
(int (*) (struct target_ops *))
return_zero);
- de_fault (to_extra_thread_info,
- (char *(*) (struct target_ops *, struct thread_info *))
- return_null);
de_fault (to_thread_name,
(char *(*) (struct target_ops *, struct thread_info *))
return_null);
diff --git a/gdb/target.h b/gdb/target.h
index 43b3733..342a99f 100644
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -551,7 +551,8 @@ struct target_ops
int (*to_thread_alive) (struct target_ops *, ptid_t ptid);
void (*to_find_new_threads) (struct target_ops *);
char *(*to_pid_to_str) (struct target_ops *, ptid_t);
- char *(*to_extra_thread_info) (struct target_ops *, struct thread_info *);
+ char *(*to_extra_thread_info) (struct target_ops *, struct thread_info *)
+ TARGET_DEFAULT_RETURN (0);
char *(*to_thread_name) (struct target_ops *, struct thread_info *);
void (*to_stop) (struct target_ops *, ptid_t);
void (*to_rcmd) (struct target_ops *,