From patchwork Mon May 26 16:36:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Arnez X-Patchwork-Id: 1158 Received: (qmail 7310 invoked by alias); 26 May 2014 16:37:03 -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 7053 invoked by uid 89); 26 May 2014 16:37:01 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: e06smtp15.uk.ibm.com Received: from e06smtp15.uk.ibm.com (HELO e06smtp15.uk.ibm.com) (195.75.94.111) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Mon, 26 May 2014 16:36:58 +0000 Received: from /spool/local by e06smtp15.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 26 May 2014 17:36:54 +0100 Received: from d06dlp01.portsmouth.uk.ibm.com (9.149.20.13) by e06smtp15.uk.ibm.com (192.168.101.145) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 26 May 2014 17:36:52 +0100 Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id F2FC917D8042 for ; Mon, 26 May 2014 17:38:05 +0100 (BST) Received: from d06av10.portsmouth.uk.ibm.com (d06av10.portsmouth.uk.ibm.com [9.149.37.251]) by b06cxnps3075.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s4QGapCM60620960 for ; Mon, 26 May 2014 16:36:51 GMT Received: from d06av10.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av10.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s4QGapOF021391 for ; Mon, 26 May 2014 10:36:51 -0600 Received: from br87z6lw.ibm.com (sig-9-78-93-212.uk.ibm.com [9.78.93.212]) by d06av10.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id s4QGaniu021342 for ; Mon, 26 May 2014 10:36:51 -0600 From: Andreas Arnez To: gdb-patches@sourceware.org Subject: [PATCH 05/12] FRV Linux: Fill 'collect_regset' in regset structures. Date: Mon, 26 May 2014 18:36:41 +0200 Message-Id: <1401122208-2481-6-git-send-email-arnez@linux.vnet.ibm.com> In-Reply-To: <1401122208-2481-1-git-send-email-arnez@linux.vnet.ibm.com> References: <1401122208-2481-1-git-send-email-arnez@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14052616-0342-0000-0000-000008E9B3C5 X-IsSubscribed: yes gdb/ * frv-linux-tdep.c (FRV_PT_PSR, FRV_PT_ISR, FRV_PT_CCR) (FRV_PT_CCCR, FRV_PT_LR, FRV_PT_LCR, FRV_PT_PC, FRV_PT_GNER0) (FRV_PT_GNER1, FRV_PT_IACC0H, FRV_PT_IACC0L, FRV_PT_GR) (FRV_PT_TBR, FRV_PT_GR, FRV_PT_EXEC_FDPIC_LOADMAP) (FRV_PT_INTERP_FDPIC_LOADMAP): Delete macros. (frv_linux_gregmap, frv_linux_fpregmap): New register maps. (frv_linux_supply_gregset): Replace main logic by call to regcache_supply_regset, but keep clearing gr32-gr63. (frv_linux_supply_fpregset): Delete function. (frv_linux_gregset): Refer to appropriate register map and add regcache_collect_regset as the collect method. (frv_linux_fpregset): Likewise. Also exchange the supply method by regcache_supply_regset. --- gdb/frv-linux-tdep.c | 141 ++++++++++++++++++++------------------------------- 1 file changed, 54 insertions(+), 87 deletions(-) diff --git a/gdb/frv-linux-tdep.c b/gdb/frv-linux-tdep.c index fb163a8..104e6c1 100644 --- a/gdb/frv-linux-tdep.c +++ b/gdb/frv-linux-tdep.c @@ -360,37 +360,52 @@ typedef struct frv_elf_fpreg_t fsr[1]; } frv_elf_fpregset_t; -/* Constants for accessing elements of frv_elf_gregset_t. */ - -#define FRV_PT_PSR 0 -#define FRV_PT_ISR 1 -#define FRV_PT_CCR 2 -#define FRV_PT_CCCR 3 -#define FRV_PT_LR 4 -#define FRV_PT_LCR 5 -#define FRV_PT_PC 6 -#define FRV_PT_GNER0 10 -#define FRV_PT_GNER1 11 -#define FRV_PT_IACC0H 12 -#define FRV_PT_IACC0L 13 - -/* Note: Only 32 of the GRs will be found in the corefile. */ -#define FRV_PT_GR(j) ( 14 + (j)) /* GRj for 0<=j<=63. */ - -#define FRV_PT_TBR FRV_PT_GR(0) /* gr0 is always 0, so TBR is stuffed - there. */ - -/* Technically, the loadmap addresses are not part of `pr_reg' as - found in the elf_prstatus struct. The fields which communicate the - loadmap address appear (by design) immediately after `pr_reg' - though, and the BFD function elf32_frv_grok_prstatus() has been - implemented to include these fields in the register section that it - extracts from the core file. So, for our purposes, they may be - viewed as registers. */ - -#define FRV_PT_EXEC_FDPIC_LOADMAP 46 -#define FRV_PT_INTERP_FDPIC_LOADMAP 47 - +/* Register maps. */ + +static const struct regcache_map_entry frv_linux_gregmap[] = + { + { 1, psr_regnum }, + { 4, REGCACHE_MAP_SKIP_BYTES }, /* isr */ + { 1, ccr_regnum }, + { 1, cccr_regnum }, + { 1, lr_regnum }, + { 1, lcr_regnum }, + { 1, pc_regnum }, + { 4, REGCACHE_MAP_SKIP_BYTES }, /* __status */ + { 4, REGCACHE_MAP_SKIP_BYTES }, /* syscallno */ + { 4, REGCACHE_MAP_SKIP_BYTES }, /* orig_gr8 */ + { 1, gner0_regnum }, + { 1, gner1_regnum }, + { 8, REGCACHE_MAP_SKIP_BYTES }, /* iacc0 */ + { 1, tbr_regnum }, + { 31, first_gpr_regnum + 1 }, /* gr1 ... gr31 */ + + /* Technically, the loadmap addresses are not part of `pr_reg' as + found in the elf_prstatus struct. The fields which communicate + the loadmap address appear (by design) immediately after + `pr_reg' though, and the BFD function elf32_frv_grok_prstatus() + has been implemented to include these fields in the register + section that it extracts from the core file. So, for our + purposes, they may be viewed as registers. */ + + { 1, fdpic_loadmap_exec_regnum }, + { 1, fdpic_loadmap_interp_regnum }, + { 0 } + }; + +static const struct regcache_map_entry frv_linux_fpregmap[] = + { + { 64, first_fpr_regnum }, /* fr0 ... fr63 */ + { 1, fner0_regnum }, + { 1, fner1_regnum }, + { 1, msr0_regnum }, + { 1, msr1_regnum }, + { 8, acc0_regnum }, /* acc0 ... acc7 */ + { 1, accg0123_regnum }, + { 1, accg4567_regnum }, + { 1, fsr0_regnum }, + { 0 } + }; /* Unpack an frv_elf_gregset_t into GDB's register cache. */ @@ -401,7 +416,6 @@ frv_linux_supply_gregset (const struct regset *regset, { int regi; char zerobuf[MAX_REGISTER_SIZE]; - const frv_elf_gregset_t *gregsetp = gregs; memset (zerobuf, 0, MAX_REGISTER_SIZE); @@ -409,72 +423,25 @@ frv_linux_supply_gregset (const struct regset *regset, this slot. */ regcache_raw_supply (regcache, first_gpr_regnum, zerobuf); - for (regi = first_gpr_regnum + 1; regi <= last_gpr_regnum; regi++) - { - if (regi >= first_gpr_regnum + 32) - regcache_raw_supply (regcache, regi, zerobuf); - else - regcache_raw_supply (regcache, regi, - gregsetp->reg[FRV_PT_GR (regi - - first_gpr_regnum)]); - } - - regcache_raw_supply (regcache, pc_regnum, gregsetp->reg[FRV_PT_PC]); - regcache_raw_supply (regcache, psr_regnum, gregsetp->reg[FRV_PT_PSR]); - regcache_raw_supply (regcache, ccr_regnum, gregsetp->reg[FRV_PT_CCR]); - regcache_raw_supply (regcache, cccr_regnum, gregsetp->reg[FRV_PT_CCCR]); - regcache_raw_supply (regcache, lr_regnum, gregsetp->reg[FRV_PT_LR]); - regcache_raw_supply (regcache, lcr_regnum, gregsetp->reg[FRV_PT_LCR]); - regcache_raw_supply (regcache, gner0_regnum, gregsetp->reg[FRV_PT_GNER0]); - regcache_raw_supply (regcache, gner1_regnum, gregsetp->reg[FRV_PT_GNER1]); - regcache_raw_supply (regcache, tbr_regnum, gregsetp->reg[FRV_PT_TBR]); - regcache_raw_supply (regcache, fdpic_loadmap_exec_regnum, - gregsetp->reg[FRV_PT_EXEC_FDPIC_LOADMAP]); - regcache_raw_supply (regcache, fdpic_loadmap_interp_regnum, - gregsetp->reg[FRV_PT_INTERP_FDPIC_LOADMAP]); -} - -/* Unpack an frv_elf_fpregset_t into GDB's register cache. */ - -static void -frv_linux_supply_fpregset (const struct regset *regset, - struct regcache *regcache, - int regnum, const void *gregs, size_t len) -{ - int regi; - const frv_elf_fpregset_t *fpregsetp = gregs; - - for (regi = first_fpr_regnum; regi <= last_fpr_regnum; regi++) - regcache_raw_supply (regcache, regi, - fpregsetp->fr[regi - first_fpr_regnum]); - - regcache_raw_supply (regcache, fner0_regnum, fpregsetp->fner[0]); - regcache_raw_supply (regcache, fner1_regnum, fpregsetp->fner[1]); - - regcache_raw_supply (regcache, msr0_regnum, fpregsetp->msr[0]); - regcache_raw_supply (regcache, msr1_regnum, fpregsetp->msr[1]); + /* Fill gr32, ..., gr63 with zeros. */ + for (regi = first_gpr_regnum + 32; regi <= last_gpr_regnum; regi++) + regcache_raw_supply (regcache, regi, zerobuf); - for (regi = acc0_regnum; regi <= acc7_regnum; regi++) - regcache_raw_supply (regcache, regi, fpregsetp->acc[regi - acc0_regnum]); - - regcache_raw_supply (regcache, accg0123_regnum, fpregsetp->accg); - regcache_raw_supply (regcache, accg4567_regnum, fpregsetp->accg + 4); - - regcache_raw_supply (regcache, fsr0_regnum, fpregsetp->fsr[0]); + regcache_supply_regset (regset, regcache, regnum, gregs, len); } /* FRV Linux kernel register sets. */ static const struct regset frv_linux_gregset = { - NULL, - frv_linux_supply_gregset + frv_linux_gregmap, + frv_linux_supply_gregset, regcache_collect_regset }; static const struct regset frv_linux_fpregset = { - NULL, - frv_linux_supply_fpregset + frv_linux_fpregmap, + regcache_supply_regset, regcache_collect_regset }; static const struct regset *