From d6522a229d3baf2659c63a65b60947dff58ea200 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Wed, 18 Dec 2013 14:17:35 -0700
Subject: [PATCH] convert to_static_tracepoint_markers_by_strid
Note that this patch reformats the
to_static_tracepoint_markers_by_strid field declaration in struct
target_ops. This was needed because make-target-delegates requires
the opening paren for the parameters to be on the same line as the
method name, and I didn't see an easy way to fix this.
2014-02-19 Tom Tromey <tromey@redhat.com>
* target-delegates.c: Rebuild.
* target.c (update_current_target): Don't inherit or default
to_static_tracepoint_markers_by_strid.
* target.h (struct target_ops)
<to_static_tracepoint_markers_by_strid>: Use
TARGET_DEFAULT_NORETURN.
---
gdb/ChangeLog | 9 +++++++++
gdb/target-delegates.c | 16 ++++++++++++++++
gdb/target.c | 6 +-----
gdb/target.h | 4 ++--
4 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 840e15dea2c..535040c071c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2014-02-19 Tom Tromey <tromey@redhat.com>
+
+ * target-delegates.c: Rebuild.
+ * target.c (update_current_target): Don't inherit or default
+ to_static_tracepoint_markers_by_strid.
+ * target.h (struct target_ops)
+ <to_static_tracepoint_markers_by_strid>: Use
+ TARGET_DEFAULT_NORETURN.
+
2014-02-19 Tom Tromey <tromey@redhat.com>
* target-delegates.c: Rebuild.
diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c
index 2aea8883727..b0ada5cc237 100644
--- a/gdb/target-delegates.c
+++ b/gdb/target-delegates.c
@@ -958,6 +958,19 @@ tdefault_static_tracepoint_marker_at (struct target_ops *self, CORE_ADDR arg1, s
return 0;
}
+static VEC(static_tracepoint_marker_p) *
+delegate_static_tracepoint_markers_by_strid (struct target_ops *self, const char *arg1)
+{
+ self = self->beneath;
+ return self->to_static_tracepoint_markers_by_strid (self, arg1);
+}
+
+static VEC(static_tracepoint_marker_p) *
+tdefault_static_tracepoint_markers_by_strid (struct target_ops *self, const char *arg1)
+{
+ tcomplain ();
+}
+
static int
delegate_supports_btrace (struct target_ops *self)
{
@@ -1136,6 +1149,8 @@ install_delegators (struct target_ops *ops)
ops->to_set_permissions = delegate_set_permissions;
if (ops->to_static_tracepoint_marker_at == NULL)
ops->to_static_tracepoint_marker_at = delegate_static_tracepoint_marker_at;
+ if (ops->to_static_tracepoint_markers_by_strid == NULL)
+ ops->to_static_tracepoint_markers_by_strid = delegate_static_tracepoint_markers_by_strid;
if (ops->to_supports_btrace == NULL)
ops->to_supports_btrace = delegate_supports_btrace;
}
@@ -1224,5 +1239,6 @@ install_dummy_methods (struct target_ops *ops)
ops->to_get_tib_address = tdefault_get_tib_address;
ops->to_set_permissions = tdefault_set_permissions;
ops->to_static_tracepoint_marker_at = tdefault_static_tracepoint_marker_at;
+ ops->to_static_tracepoint_markers_by_strid = tdefault_static_tracepoint_markers_by_strid;
ops->to_supports_btrace = tdefault_supports_btrace;
}
diff --git a/gdb/target.c b/gdb/target.c
index ca7ed5e5a66..cd10f2fbb5d 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -711,7 +711,7 @@ update_current_target (void)
/* Do not inherit to_get_tib_address. */
/* Do not inherit to_set_permissions. */
/* Do not inherit to_static_tracepoint_marker_at. */
- INHERIT (to_static_tracepoint_markers_by_strid, t);
+ /* Do not inherit to_static_tracepoint_markers_by_strid. */
INHERIT (to_traceframe_info, t);
INHERIT (to_use_agent, t);
INHERIT (to_can_use_agent, t);
@@ -750,10 +750,6 @@ update_current_target (void)
(void (*) (struct target_ops *, ptid_t))
target_ignore);
current_target.to_read_description = NULL;
- de_fault (to_static_tracepoint_markers_by_strid,
- (VEC(static_tracepoint_marker_p) * (*) (struct target_ops *,
- const char *))
- tcomplain);
de_fault (to_traceframe_info,
(struct traceframe_info * (*) (struct target_ops *))
return_null);
diff --git a/gdb/target.h b/gdb/target.h
index 0969a82b2d0..457479e1020 100644
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -942,8 +942,8 @@ struct target_ops
/* Return a vector of all tracepoints markers string id ID, or all
markers if ID is NULL. */
- VEC(static_tracepoint_marker_p) *(*to_static_tracepoint_markers_by_strid)
- (struct target_ops *, const char *id);
+ VEC(static_tracepoint_marker_p) *(*to_static_tracepoint_markers_by_strid) (struct target_ops *, const char *id)
+ TARGET_DEFAULT_NORETURN (tcomplain ());
/* Return a traceframe info object describing the current
traceframe's contents. If the target doesn't support