From dcd6917ff721b568fed57e4f24101fa226288ae1 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 18 Dec 2013 14:16:24 -0700 Subject: [PATCH] convert to_set_permissions 2014-02-19 Tom Tromey * target-delegates.c: Rebuild. * target.c (update_current_target): Don't inherit or default to_set_permissions. * target.h (struct target_ops) : Use TARGET_DEFAULT_IGNORE. --- gdb/ChangeLog | 8 ++++++++ gdb/target-delegates.c | 15 +++++++++++++++ gdb/target.c | 5 +---- gdb/target.h | 3 ++- 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 782b46a4b16..51db79ca57a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2014-02-19 Tom Tromey + + * target-delegates.c: Rebuild. + * target.c (update_current_target): Don't inherit or default + to_set_permissions. + * target.h (struct target_ops) : Use + TARGET_DEFAULT_IGNORE. + 2014-02-19 Tom Tromey * target-delegates.c: Rebuild. diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c index ba89740a730..0b0659338dc 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -933,6 +933,18 @@ tdefault_get_tib_address (struct target_ops *self, ptid_t arg1, CORE_ADDR *arg2) tcomplain (); } +static void +delegate_set_permissions (struct target_ops *self) +{ + self = self->beneath; + self->to_set_permissions (self); +} + +static void +tdefault_set_permissions (struct target_ops *self) +{ +} + static int delegate_supports_btrace (struct target_ops *self) { @@ -1107,6 +1119,8 @@ install_delegators (struct target_ops *ops) ops->to_set_trace_notes = delegate_set_trace_notes; if (ops->to_get_tib_address == NULL) ops->to_get_tib_address = delegate_get_tib_address; + if (ops->to_set_permissions == NULL) + ops->to_set_permissions = delegate_set_permissions; if (ops->to_supports_btrace == NULL) ops->to_supports_btrace = delegate_supports_btrace; } @@ -1193,5 +1207,6 @@ install_dummy_methods (struct target_ops *ops) ops->to_set_trace_buffer_size = tdefault_set_trace_buffer_size; ops->to_set_trace_notes = tdefault_set_trace_notes; ops->to_get_tib_address = tdefault_get_tib_address; + ops->to_set_permissions = tdefault_set_permissions; ops->to_supports_btrace = tdefault_supports_btrace; } diff --git a/gdb/target.c b/gdb/target.c index eb6d2bd30fd..25017acf761 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -709,7 +709,7 @@ update_current_target (void) /* Do not inherit to_set_trace_buffer_size. */ /* Do not inherit to_set_trace_notes. */ /* Do not inherit to_get_tib_address. */ - INHERIT (to_set_permissions, t); + /* Do not inherit to_set_permissions. */ INHERIT (to_static_tracepoint_marker_at, t); INHERIT (to_static_tracepoint_markers_by_strid, t); INHERIT (to_traceframe_info, t); @@ -750,9 +750,6 @@ update_current_target (void) (void (*) (struct target_ops *, ptid_t)) target_ignore); current_target.to_read_description = NULL; - de_fault (to_set_permissions, - (void (*) (struct target_ops *)) - target_ignore); de_fault (to_static_tracepoint_marker_at, (int (*) (struct target_ops *, CORE_ADDR, struct static_tracepoint_marker *)) diff --git a/gdb/target.h b/gdb/target.h index 7bc6d32c762..896b563ab9f 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -931,7 +931,8 @@ struct target_ops TARGET_DEFAULT_NORETURN (tcomplain ()); /* Send the new settings of write permission variables. */ - void (*to_set_permissions) (struct target_ops *); + void (*to_set_permissions) (struct target_ops *) + TARGET_DEFAULT_IGNORE (); /* Look for a static tracepoint marker at ADDR, and fill in MARKER with its details. Return 1 on success, 0 on failure. */ -- 2.30.2