From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17212 invoked by alias); 6 Feb 2014 20:56:20 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 17093 invoked by uid 89); 6 Feb 2014 20:56:18 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-3.2 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 06 Feb 2014 20:56:18 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s16KuBln016313 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 6 Feb 2014 15:56:14 -0500 Received: from barimba.redhat.com (ovpn-113-148.phx2.redhat.com [10.3.113.148]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s16KtfZv013306; Thu, 6 Feb 2014 15:56:11 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFC v2 36/38] convert to_decr_pc_after_break Date: Thu, 06 Feb 2014 20:56:00 -0000 Message-Id: <1391720136-2121-37-git-send-email-tromey@redhat.com> In-Reply-To: <1391720136-2121-1-git-send-email-tromey@redhat.com> References: <1391720136-2121-1-git-send-email-tromey@redhat.com> X-SW-Source: 2014-02/txt/msg00154.txt.bz2 This converts to_decr_pc_after_break to the new style of delegation, removing forward_target_decr_pc_after_break. 2014-02-06 Tom Tromey * record-btrace.c (record_btrace_decr_pc_after_break): Delegate directly. * target-delegates.c: Rebuild. * target.h (struct target_ops) : Use TARGET_DEFAULT_FUNC. * target.c (default_target_decr_pc_after_break): Rename from forward_target_decr_pc_after_break. Simplify. (target_decr_pc_after_break): Rely on delegation. --- gdb/ChangeLog | 11 +++++++++++ gdb/record-btrace.c | 2 +- gdb/target-delegates.c | 10 ++++++++++ gdb/target.c | 15 +++++++-------- gdb/target.h | 3 ++- 5 files changed, 31 insertions(+), 10 deletions(-) diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c index 44882ad..c4872eb 100644 --- a/gdb/record-btrace.c +++ b/gdb/record-btrace.c @@ -1732,7 +1732,7 @@ record_btrace_decr_pc_after_break (struct target_ops *ops, if (record_btrace_is_replaying (ops)) return 0; - return forward_target_decr_pc_after_break (ops->beneath, gdbarch); + return ops->beneath->to_decr_pc_after_break (ops->beneath, gdbarch); } /* The to_find_new_threads method of target record-btrace. */ diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c index 78e3c0d..d9c68cd 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -1572,6 +1572,13 @@ tdefault_augmented_libraries_svr4_read (struct target_ops *self) return 0; } +static CORE_ADDR +delegate_decr_pc_after_break (struct target_ops *self, struct gdbarch *arg1) +{ + self = self->beneath; + return self->to_decr_pc_after_break (self, arg1); +} + static void install_delegators (struct target_ops *ops) { @@ -1837,6 +1844,8 @@ install_delegators (struct target_ops *ops) ops->to_call_history_range = delegate_call_history_range; if (ops->to_augmented_libraries_svr4_read == NULL) ops->to_augmented_libraries_svr4_read = delegate_augmented_libraries_svr4_read; + if (ops->to_decr_pc_after_break == NULL) + ops->to_decr_pc_after_break = delegate_decr_pc_after_break; } static void @@ -1973,4 +1982,5 @@ install_dummy_methods (struct target_ops *ops) ops->to_call_history_from = tdefault_call_history_from; ops->to_call_history_range = tdefault_call_history_range; ops->to_augmented_libraries_svr4_read = tdefault_augmented_libraries_svr4_read; + ops->to_decr_pc_after_break = default_target_decr_pc_after_break; } diff --git a/gdb/target.c b/gdb/target.c index bded196..72d5a09 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -108,6 +108,9 @@ static int find_default_is_async_p (struct target_ops *ignore); static enum exec_direction_kind default_execution_direction (struct target_ops *self); +static CORE_ADDR default_target_decr_pc_after_break (struct target_ops *ops, + struct gdbarch *gdbarch); + #include "target-delegates.c" static void init_dummy_target (void); @@ -3781,16 +3784,12 @@ target_get_tailcall_unwinder (void) return NULL; } -/* See target.h. */ +/* Default implementation of to_decr_pc_after_break. */ -CORE_ADDR -forward_target_decr_pc_after_break (struct target_ops *ops, +static CORE_ADDR +default_target_decr_pc_after_break (struct target_ops *ops, struct gdbarch *gdbarch) { - for (; ops != NULL; ops = ops->beneath) - if (ops->to_decr_pc_after_break != NULL) - return ops->to_decr_pc_after_break (ops, gdbarch); - return gdbarch_decr_pc_after_break (gdbarch); } @@ -3799,7 +3798,7 @@ forward_target_decr_pc_after_break (struct target_ops *ops, CORE_ADDR target_decr_pc_after_break (struct gdbarch *gdbarch) { - return forward_target_decr_pc_after_break (current_target.beneath, gdbarch); + return current_target.to_decr_pc_after_break (¤t_target, gdbarch); } static int diff --git a/gdb/target.h b/gdb/target.h index 09fe10e..c988a01 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -1104,7 +1104,8 @@ struct target_ops after executing a breakpoint instruction. Defaults to gdbarch_decr_pc_after_break (GDBARCH). */ CORE_ADDR (*to_decr_pc_after_break) (struct target_ops *ops, - struct gdbarch *gdbarch); + struct gdbarch *gdbarch) + TARGET_DEFAULT_FUNC (default_target_decr_pc_after_break); int to_magic; /* Need sub-structure for target machine related rather than comm related? -- 1.8.1.4