From patchwork Fri Sep 12 15:39:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Arnez X-Patchwork-Id: 2792 Received: (qmail 31488 invoked by alias); 12 Sep 2014 15:40:09 -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 31365 invoked by uid 89); 12 Sep 2014 15:40:08 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.4 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: e06smtp11.uk.ibm.com Received: from e06smtp11.uk.ibm.com (HELO e06smtp11.uk.ibm.com) (195.75.94.107) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Fri, 12 Sep 2014 15:40:07 +0000 Received: from /spool/local by e06smtp11.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 12 Sep 2014 16:40:04 +0100 Received: from d06dlp01.portsmouth.uk.ibm.com (9.149.20.13) by e06smtp11.uk.ibm.com (192.168.101.141) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 12 Sep 2014 16:40:02 +0100 Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id 83DD917D805F for ; Fri, 12 Sep 2014 16:42:03 +0100 (BST) Received: from d06av06.portsmouth.uk.ibm.com (d06av06.portsmouth.uk.ibm.com [9.149.37.217]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id s8CFe1Ss38207612 for ; Fri, 12 Sep 2014 15:40:01 GMT Received: from d06av06.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av06.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s8CAcQv3015005 for ; Fri, 12 Sep 2014 06:38:26 -0400 Received: from br87z6lw.boeblingen.de.ibm.com (dyn-9-152-212-196.boeblingen.de.ibm.com [9.152.212.196]) by d06av06.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id s8CAcL6s014757; Fri, 12 Sep 2014 06:38:26 -0400 From: Andreas Arnez To: gdb-patches@sourceware.org Cc: Yao Qi Subject: [PATCH 16/26] NIOS2: Migrate from 'regset_from_core_section' to 'iterate_over_regset_sections' Date: Fri, 12 Sep 2014 17:39:46 +0200 Message-Id: <1410536396-25524-17-git-send-email-arnez@linux.vnet.ibm.com> In-Reply-To: <1410536396-25524-1-git-send-email-arnez@linux.vnet.ibm.com> References: <1410536396-25524-1-git-send-email-arnez@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14091215-5024-0000-0000-00000145DC10 X-IsSubscribed: yes For Nios II GNU/Linux targets, no longer define the gdbarch method 'regset_from_core_section', but the iterator method instead. gdb/ChangeLog: * nios2-linux-tdep.c (NIOS2_GREGS_SIZE): New macro. (nios2_regset_from_core_section): Remove. (nios2_iterate_over_regset_sections): New. (nios2_linux_init_abi): Adjust gdbarch initialization. --- gdb/nios2-linux-tdep.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/gdb/nios2-linux-tdep.c b/gdb/nios2-linux-tdep.c index b9ee922..95098ea 100644 --- a/gdb/nios2-linux-tdep.c +++ b/gdb/nios2-linux-tdep.c @@ -49,6 +49,11 @@ static const int reg_offsets[NIOS2_NUM_REGS] = -1, -1, -1, -1, -1, -1, -1, -1 }; +/* General register set size. Should match sizeof (struct pt_regs) + + sizeof (struct switch_stack) from the NIOS2 Linux kernel patch. */ + +#define NIOS2_GREGS_SIZE (4 * 34) + /* Implement the supply_regset hook for core files. */ static void @@ -97,16 +102,15 @@ static const struct regset nios2_core_regset = nios2_collect_gregset }; -/* Implement the regset_from_core_section gdbarch method. */ +/* Iterate over core file register note sections. */ -static const struct regset * -nios2_regset_from_core_section (struct gdbarch *gdbarch, - const char *sect_name, size_t sect_size) +static void +nios2_iterate_over_regset_sections (struct gdbarch *gdbarch, + iterate_over_regset_sections_cb *cb, + void *cb_data, + const struct regcache *regcache) { - if (strcmp (sect_name, ".reg") == 0) - return &nios2_core_regset; - - return NULL; + cb (".reg", NIOS2_GREGS_SIZE, &nios2_core_regset, NULL, cb_data); } /* Initialize a trad-frame cache corresponding to the tramp-frame. @@ -181,8 +185,8 @@ nios2_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) set_gdbarch_fetch_tls_load_module_address (gdbarch, svr4_fetch_objfile_link_map); /* Core file support. */ - set_gdbarch_regset_from_core_section (gdbarch, - nios2_regset_from_core_section); + set_gdbarch_iterate_over_regset_sections + (gdbarch, nios2_iterate_over_regset_sections); /* Linux signal frame unwinders. */ tramp_frame_prepend_unwinder (gdbarch, &nios2_linux_rt_sigreturn_tramp_frame);