From patchwork Wed Jun 25 16:49:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Arnez X-Patchwork-Id: 1721 Received: (qmail 28509 invoked by alias); 25 Jun 2014 16:49:24 -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 28320 invoked by uid 89); 25 Jun 2014 16:49:22 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.3 required=5.0 tests=AWL, BAYES_00, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: e06smtp10.uk.ibm.com Received: from e06smtp10.uk.ibm.com (HELO e06smtp10.uk.ibm.com) (195.75.94.106) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Wed, 25 Jun 2014 16:49:20 +0000 Received: from /spool/local by e06smtp10.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 25 Jun 2014 17:49:16 +0100 Received: from d06dlp01.portsmouth.uk.ibm.com (9.149.20.13) by e06smtp10.uk.ibm.com (192.168.101.140) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 25 Jun 2014 17:49:15 +0100 Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id A373317D8059 for ; Wed, 25 Jun 2014 17:50:42 +0100 (BST) Received: from d06av04.portsmouth.uk.ibm.com (d06av04.portsmouth.uk.ibm.com [9.149.37.216]) by b06cxnps3074.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s5PGnEFl28704986 for ; Wed, 25 Jun 2014 16:49:14 GMT Received: from d06av04.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av04.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s5PGnD9D024952 for ; Wed, 25 Jun 2014 10:49:14 -0600 Received: from br87z6lw.boeblingen.de.ibm.com (dyn-9-152-212-196.boeblingen.de.ibm.com [9.152.212.196]) by d06av04.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id s5PGn9Gw024835; Wed, 25 Jun 2014 10:49:12 -0600 From: Andreas Arnez To: gdb-patches@sourceware.org Cc: Randolph Chung Subject: [PATCH v2 07/13] HPPA Linux: Fill 'collect_regset' in regset structures. Date: Wed, 25 Jun 2014 18:49:03 +0200 Message-Id: <1403714949-28133-8-git-send-email-arnez@linux.vnet.ibm.com> In-Reply-To: <1403714949-28133-1-git-send-email-arnez@linux.vnet.ibm.com> References: <1403714949-28133-1-git-send-email-arnez@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14062516-4966-0000-0000-000000806F42 X-IsSubscribed: yes gdb/ * hppa-linux-tdep.c (greg_map): Rename to... (hppa_linux_gregmap): ... this. Also convert to regcache_map_entry format. (hppa_linux_supply_regset): Delete function. (hppa_linux_supply_fpregset): Delete function. Move logic to... (hppa_linux_fpregmap): ... this new register map. (hppa_linux_regset, hppa_linux_fpregset): Refer to appropriate register map, replace supply method by regcache_supply_regset, and add collect method regcache_collect_regset. --- gdb/hppa-linux-tdep.c | 101 +++++++++++++++++--------------------------------- 1 file changed, 34 insertions(+), 67 deletions(-) diff --git a/gdb/hppa-linux-tdep.c b/gdb/hppa-linux-tdep.c index 7a765a2..af57e6c 100644 --- a/gdb/hppa-linux-tdep.c +++ b/gdb/hppa-linux-tdep.c @@ -423,84 +423,51 @@ hppa_linux_find_global_pointer (struct gdbarch *gdbarch, * cr10, cr15 */ -#define GR_REGNUM(_n) (HPPA_R0_REGNUM+_n) -#define TR_REGNUM(_n) (HPPA_TR0_REGNUM+_n) -static const int greg_map[] = +static const struct regcache_map_entry hppa_linux_gregmap[] = { - GR_REGNUM(0), GR_REGNUM(1), GR_REGNUM(2), GR_REGNUM(3), - GR_REGNUM(4), GR_REGNUM(5), GR_REGNUM(6), GR_REGNUM(7), - GR_REGNUM(8), GR_REGNUM(9), GR_REGNUM(10), GR_REGNUM(11), - GR_REGNUM(12), GR_REGNUM(13), GR_REGNUM(14), GR_REGNUM(15), - GR_REGNUM(16), GR_REGNUM(17), GR_REGNUM(18), GR_REGNUM(19), - GR_REGNUM(20), GR_REGNUM(21), GR_REGNUM(22), GR_REGNUM(23), - GR_REGNUM(24), GR_REGNUM(25), GR_REGNUM(26), GR_REGNUM(27), - GR_REGNUM(28), GR_REGNUM(29), GR_REGNUM(30), GR_REGNUM(31), - - HPPA_SR4_REGNUM+1, HPPA_SR4_REGNUM+2, HPPA_SR4_REGNUM+3, HPPA_SR4_REGNUM+4, - HPPA_SR4_REGNUM, HPPA_SR4_REGNUM+5, HPPA_SR4_REGNUM+6, HPPA_SR4_REGNUM+7, - - HPPA_PCOQ_HEAD_REGNUM, HPPA_PCOQ_TAIL_REGNUM, - HPPA_PCSQ_HEAD_REGNUM, HPPA_PCSQ_TAIL_REGNUM, - - HPPA_SAR_REGNUM, HPPA_IIR_REGNUM, HPPA_ISR_REGNUM, HPPA_IOR_REGNUM, - HPPA_IPSW_REGNUM, HPPA_RCR_REGNUM, - - TR_REGNUM(0), TR_REGNUM(1), TR_REGNUM(2), TR_REGNUM(3), - TR_REGNUM(4), TR_REGNUM(5), TR_REGNUM(6), TR_REGNUM(7), - - HPPA_PID0_REGNUM, HPPA_PID1_REGNUM, HPPA_PID2_REGNUM, HPPA_PID3_REGNUM, - HPPA_CCR_REGNUM, HPPA_EIEM_REGNUM, + { 32, HPPA_R0_REGNUM }, + { 1, HPPA_SR4_REGNUM+1 }, + { 1, HPPA_SR4_REGNUM+2 }, + { 1, HPPA_SR4_REGNUM+3 }, + { 1, HPPA_SR4_REGNUM+4 }, + { 1, HPPA_SR4_REGNUM }, + { 1, HPPA_SR4_REGNUM+5 }, + { 1, HPPA_SR4_REGNUM+6 }, + { 1, HPPA_SR4_REGNUM+7 }, + { 1, HPPA_PCOQ_HEAD_REGNUM }, + { 1, HPPA_PCOQ_TAIL_REGNUM }, + { 1, HPPA_PCSQ_HEAD_REGNUM }, + { 1, HPPA_PCSQ_TAIL_REGNUM }, + { 1, HPPA_SAR_REGNUM }, + { 1, HPPA_IIR_REGNUM }, + { 1, HPPA_ISR_REGNUM }, + { 1, HPPA_IOR_REGNUM }, + { 1, HPPA_IPSW_REGNUM }, + { 1, HPPA_RCR_REGNUM }, + { 8, HPPA_TR0_REGNUM }, + { 4, HPPA_PID0_REGNUM }, + { 1, HPPA_CCR_REGNUM }, + { 1, HPPA_EIEM_REGNUM }, + { 0 } }; -static void -hppa_linux_supply_regset (const struct regset *regset, - struct regcache *regcache, - int regnum, const void *regs, size_t len) -{ - struct gdbarch *arch = get_regcache_arch (regcache); - struct gdbarch_tdep *tdep = gdbarch_tdep (arch); - const char *buf = regs; - int i, offset; - - offset = 0; - for (i = 0; i < ARRAY_SIZE (greg_map); i++) - { - if (regnum == greg_map[i] || regnum == -1) - regcache_raw_supply (regcache, greg_map[i], buf + offset); - - offset += tdep->bytes_per_address; - } -} - -static void -hppa_linux_supply_fpregset (const struct regset *regset, - struct regcache *regcache, - int regnum, const void *regs, size_t len) -{ - const char *buf = regs; - int i, offset; - - offset = 0; - for (i = 0; i < 64; i++) - { - if (regnum == HPPA_FP0_REGNUM + i || regnum == -1) - regcache_raw_supply (regcache, HPPA_FP0_REGNUM + i, - buf + offset); - offset += 4; - } -} +static const struct regcache_map_entry hppa_linux_fpregmap[] = + { + { 64, HPPA_FP0_REGNUM }, + { 0 } + }; /* HPPA Linux kernel register set. */ static const struct regset hppa_linux_regset = { - NULL, - hppa_linux_supply_regset + hppa_linux_gregmap, + regcache_supply_regset, regcache_collect_regset }; static const struct regset hppa_linux_fpregset = { - NULL, - hppa_linux_supply_fpregset + hppa_linux_fpregmap, + regcache_supply_regset, regcache_collect_regset }; static const struct regset *