From patchwork Mon Apr 28 09:52:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Arnez X-Patchwork-Id: 706 Return-Path: X-Original-To: siddhesh@wilcox.dreamhost.com Delivered-To: siddhesh@wilcox.dreamhost.com Received: from homiemail-mx20.g.dreamhost.com (mx2.sub5.homie.mail.dreamhost.com [208.113.200.128]) by wilcox.dreamhost.com (Postfix) with ESMTP id BBA1C36007C for ; Mon, 28 Apr 2014 02:52:39 -0700 (PDT) Received: by homiemail-mx20.g.dreamhost.com (Postfix, from userid 14314964) id 81035414E351E; Mon, 28 Apr 2014 02:52:39 -0700 (PDT) X-Original-To: gdb@patchwork.siddhesh.in Delivered-To: x14314964@homiemail-mx20.g.dreamhost.com Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by homiemail-mx20.g.dreamhost.com (Postfix) with ESMTPS id 62BE4414D8429 for ; Mon, 28 Apr 2014 02:52:39 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:references:date:in-reply-to :message-id:mime-version:content-type; q=dns; s=default; b=P7YWP DD9tb5rcpnyj4MNqz2keEoTT8jU0+561NnimNoWT9anP7/pHiJ1Wlmt7XsXn182d 3fEh9afqsTXfTWW+C9vzkLbBH2yhExNa+ZGesOq1PP1vv+SAzRbgbXb8+Lu6asV4 1ibEwUu3B1k+9xYmdQU3W7ZDA/5Mr+cAmeZ0z8= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:references:date:in-reply-to :message-id:mime-version:content-type; s=default; bh=U69dcRNSUj9 +cGS6AN2QyV4uSss=; b=t2Ss60+2FGzJXipCONHK2e9tUI1zBsxBeC8vN+v9vRg cRj1q93K4GEIAQDCrkYblYj1xP4gfaMpZSgyVQ7TFf8/MRC2WVZoC56aVCZyP5q6 s5mOtpZVmWZoUMvpxcwTAMXnzy27UbJZA7Wf5JAaDrvV+yWBcZkxUpEEZyNAUtTU = Received: (qmail 3383 invoked by alias); 28 Apr 2014 09:52:37 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 3369 invoked by uid 89); 28 Apr 2014 09:52:36 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.7 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: e06smtp18.uk.ibm.com Received: from e06smtp18.uk.ibm.com (HELO e06smtp18.uk.ibm.com) (195.75.94.114) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Mon, 28 Apr 2014 09:52:35 +0000 Received: from /spool/local by e06smtp18.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 28 Apr 2014 10:52:32 +0100 Received: from d06dlp02.portsmouth.uk.ibm.com (9.149.20.14) by e06smtp18.uk.ibm.com (192.168.101.148) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 28 Apr 2014 10:52:30 +0100 Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id 5EE03219005E for ; Mon, 28 Apr 2014 10:52:22 +0100 (BST) Received: from d06av03.portsmouth.uk.ibm.com (d06av03.portsmouth.uk.ibm.com [9.149.37.213]) by b06cxnps4076.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s3S9qUKK64225522 for ; Mon, 28 Apr 2014 09:52:30 GMT Received: from d06av03.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av03.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s3S9qTCH019846 for ; Mon, 28 Apr 2014 03:52:29 -0600 Received: from br87z6lw.de.ibm.com (dyn-9-152-212-188.boeblingen.de.ibm.com [9.152.212.188]) by d06av03.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id s3S9qS52019818; Mon, 28 Apr 2014 03:52:28 -0600 From: Andreas Arnez To: gdb-patches@sourceware.org Cc: Mark Kettenis Subject: [RFC 10/23] SPARC: Replace regset_alloc() invocations by static regset structures References: <87eh0h6bkq.fsf@br87z6lw.de.ibm.com> Date: Mon, 28 Apr 2014 11:52:28 +0200 In-Reply-To: <87eh0h6bkq.fsf@br87z6lw.de.ibm.com> (Andreas Arnez's message of "Mon, 28 Apr 2014 11:35:33 +0200") Message-ID: <874n1d4w83.fsf@br87z6lw.de.ibm.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) MIME-Version: 1.0 X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14042809-6892-0000-0000-000008992ADE X-IsSubscribed: yes X-DH-Original-To: gdb@patchwork.siddhesh.in gdb/ * sparc-linux-tdep.c (sparc32_linux_gregset) (sparc32_linux_fpregset): New static regset structures. (sparc32_linux_init_abi): Drop dynamic regset allocations. * sparc-tdep.h (struct gdbarch_tdep): Constify 'gregset' and 'fpregset' fields. * sparc64-linux-tdep.c: (sparc64_linux_gregset) (sparc64_linux_fpregset): New static regset structures. (sparc64_linux_init_abi): Drop dynamic regset allocations. * sparc64fbsd-tdep.c (sparc64fbsd_gregset, sparc64fbsd_fpregset): New static regset structures. (sparc64fbsd_init_abi): Drop dynamic regset allocations. * sparc64nbsd-tdep.c (sparc64nbsd_gregset, sparc64nbsd_fpregset): New static regset structures. (sparc64nbsd_init_abi): Drop dynamic regset allocations. * sparc64obsd-tdep.c (sparc64obsd_gregset, sparc64obsd_fpregset): New static regset structures. (sparc64obsd_init_abi): Drop dynamic regset allocations. * sparcnbsd-tdep.c (sparc32nbsd_gregset, sparc32nbsd_fpregset): New static regset structures. (sparc32nbsd_init_abi): Drop dynamic regset allocations. --- gdb/sparc-linux-tdep.c | 20 ++++++++++++++++---- gdb/sparc-tdep.h | 4 ++-- gdb/sparc64-linux-tdep.c | 20 ++++++++++++++++---- gdb/sparc64fbsd-tdep.c | 16 ++++++++++++---- gdb/sparc64nbsd-tdep.c | 14 ++++++++++++-- gdb/sparc64obsd-tdep.c | 15 ++++++++++++--- gdb/sparcnbsd-tdep.c | 14 ++++++++++++-- 7 files changed, 82 insertions(+), 21 deletions(-) diff --git a/gdb/sparc-linux-tdep.c b/gdb/sparc-linux-tdep.c index 4a193e2..fd1fc3d 100644 --- a/gdb/sparc-linux-tdep.c +++ b/gdb/sparc-linux-tdep.c @@ -403,6 +403,20 @@ sparc32_linux_gdb_signal_to_target (struct gdbarch *gdbarch, +static const struct regset sparc32_linux_gregset = + { + NULL, + sparc32_linux_supply_core_gregset, + sparc32_linux_collect_core_gregset + }; + +static const struct regset sparc32_linux_fpregset = + { + NULL, + sparc32_linux_supply_core_fpregset, + sparc32_linux_collect_core_fpregset + }; + static void sparc32_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) { @@ -410,12 +424,10 @@ sparc32_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) linux_init_abi (info, gdbarch); - tdep->gregset = regset_alloc (gdbarch, sparc32_linux_supply_core_gregset, - sparc32_linux_collect_core_gregset); + tdep->gregset = &sparc32_linux_gregset; tdep->sizeof_gregset = 152; - tdep->fpregset = regset_alloc (gdbarch, sparc32_linux_supply_core_fpregset, - sparc32_linux_collect_core_fpregset); + tdep->fpregset = &sparc32_linux_fpregset; tdep->sizeof_fpregset = 396; tramp_frame_prepend_unwinder (gdbarch, &sparc32_linux_sigframe); diff --git a/gdb/sparc-tdep.h b/gdb/sparc-tdep.h index 12c8ef7..13f0bb2 100644 --- a/gdb/sparc-tdep.h +++ b/gdb/sparc-tdep.h @@ -58,9 +58,9 @@ struct gdbarch_tdep int npc_regnum; /* Register sets. */ - struct regset *gregset; + const struct regset *gregset; size_t sizeof_gregset; - struct regset *fpregset; + const struct regset *fpregset; size_t sizeof_fpregset; /* Offset of saved PC in jmp_buf. */ diff --git a/gdb/sparc64-linux-tdep.c b/gdb/sparc64-linux-tdep.c index 6040526..e843eb3 100644 --- a/gdb/sparc64-linux-tdep.c +++ b/gdb/sparc64-linux-tdep.c @@ -280,6 +280,20 @@ sparc64_linux_get_longjmp_target (struct frame_info *frame, CORE_ADDR *pc) +static const struct regset sparc64_linux_gregset = + { + NULL, + sparc64_linux_supply_core_gregset, + sparc64_linux_collect_core_gregset + }; + +static const struct regset sparc64_linux_fpregset = + { + NULL, + sparc64_linux_supply_core_fpregset, + sparc64_linux_collect_core_fpregset + }; + static void sparc64_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) { @@ -287,12 +301,10 @@ sparc64_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) linux_init_abi (info, gdbarch); - tdep->gregset = regset_alloc (gdbarch, sparc64_linux_supply_core_gregset, - sparc64_linux_collect_core_gregset); + tdep->gregset = &sparc64_linux_gregset; tdep->sizeof_gregset = 288; - tdep->fpregset = regset_alloc (gdbarch, sparc64_linux_supply_core_fpregset, - sparc64_linux_collect_core_fpregset); + tdep->fpregset = &sparc64_linux_fpregset; tdep->sizeof_fpregset = 280; tramp_frame_prepend_unwinder (gdbarch, &sparc64_linux_rt_sigframe); diff --git a/gdb/sparc64fbsd-tdep.c b/gdb/sparc64fbsd-tdep.c index 6ca87dc..fde7815 100644 --- a/gdb/sparc64fbsd-tdep.c +++ b/gdb/sparc64fbsd-tdep.c @@ -209,17 +209,25 @@ static const struct frame_unwind sparc64fbsd_sigtramp_frame_unwind = }; +static const struct regset sparc64fbsd_gregset = + { + NULL, sparc64fbsd_supply_gregset, sparc64fbsd_collect_gregset + }; + +static const struct regset sparc64fbsd_fpregset = + { + NULL, sparc64fbsd_supply_fpregset, sparc64fbsd_collect_fpregset + }; + static void sparc64fbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) { struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); - tdep->gregset = regset_alloc (gdbarch, sparc64fbsd_supply_gregset, - sparc64fbsd_collect_gregset); + tdep->gregset = &sparc64fbsd_gregset; tdep->sizeof_gregset = 256; - tdep->fpregset = regset_alloc (gdbarch, sparc64fbsd_supply_fpregset, - sparc64fbsd_collect_fpregset); + tdep->fpregset = &sparc64fbsd_fpregset; tdep->sizeof_fpregset = 272; frame_unwind_append_unwinder (gdbarch, &sparc64fbsd_sigtramp_frame_unwind); diff --git a/gdb/sparc64nbsd-tdep.c b/gdb/sparc64nbsd-tdep.c index fac4c27..b67c762 100644 --- a/gdb/sparc64nbsd-tdep.c +++ b/gdb/sparc64nbsd-tdep.c @@ -237,15 +237,25 @@ static const struct frame_unwind sparc64nbsd_sigcontext_frame_unwind = }; +static const struct regset sparc64nbsd_gregset = + { + NULL, sparc64nbsd_supply_gregset, NULL + }; + +static const struct regset sparc64nbsd_fpregset = + { + NULL, sparc64nbsd_supply_fpregset, NULL + }; + static void sparc64nbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) { struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); - tdep->gregset = regset_alloc (gdbarch, sparc64nbsd_supply_gregset, NULL); + tdep->gregset = &sparc64nbsd_gregset; tdep->sizeof_gregset = 160; - tdep->fpregset = regset_alloc (gdbarch, sparc64nbsd_supply_fpregset, NULL); + tdep->fpregset = &sparc64nbsd_fpregset; tdep->sizeof_fpregset = 272; /* Make sure we can single-step "new" syscalls. */ diff --git a/gdb/sparc64obsd-tdep.c b/gdb/sparc64obsd-tdep.c index 8f94574..8cc04f7 100644 --- a/gdb/sparc64obsd-tdep.c +++ b/gdb/sparc64obsd-tdep.c @@ -403,15 +403,24 @@ sparc64obsd_collect_uthread(const struct regcache *regcache, } +static const struct regset sparc64obsd_gregset = + { + NULL, sparc64obsd_supply_gregset, NULL + }; + +static const struct regset sparc64obsd_fpregset = + { + NULL, sparc64obsd_supply_fpregset, NULL + }; + static void sparc64obsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) { struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); - tdep->gregset = regset_alloc (gdbarch, sparc64obsd_supply_gregset, NULL); + tdep->gregset = &sparc64obsd_gregset; tdep->sizeof_gregset = 288; - - tdep->fpregset = regset_alloc (gdbarch, sparc64obsd_supply_fpregset, NULL); + tdep->fpregset = &sparc64obsd_fpregset; tdep->sizeof_fpregset = 272; /* Make sure we can single-step "new" syscalls. */ diff --git a/gdb/sparcnbsd-tdep.c b/gdb/sparcnbsd-tdep.c index ac94f10..b267842 100644 --- a/gdb/sparcnbsd-tdep.c +++ b/gdb/sparcnbsd-tdep.c @@ -283,6 +283,16 @@ sparcnbsd_step_trap (struct frame_info *frame, unsigned long insn) } +static const struct regset sparc32nbsd_gregset = + { + NULL, sparc32nbsd_supply_gregset, NULL + }; + +static const struct regset sparc32nbsd_fpregset = + { + NULL, sparc32nbsd_supply_fpregset, NULL + }; + static void sparc32nbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) { @@ -292,10 +302,10 @@ sparc32nbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) set_gdbarch_long_double_bit (gdbarch, 64); set_gdbarch_long_double_format (gdbarch, floatformats_ieee_double); - tdep->gregset = regset_alloc (gdbarch, sparc32nbsd_supply_gregset, NULL); + tdep->gregset = &sparc32nbsd_gregset; tdep->sizeof_gregset = 20 * 4; - tdep->fpregset = regset_alloc (gdbarch, sparc32nbsd_supply_fpregset, NULL); + tdep->fpregset = &sparc32nbsd_fpregset; tdep->sizeof_fpregset = 33 * 4; /* Make sure we can single-step "new" syscalls. */