From patchwork Mon Apr 28 09:58:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Arnez X-Patchwork-Id: 713 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 D229D36007C for ; Mon, 28 Apr 2014 02:58:10 -0700 (PDT) Received: by homiemail-mx20.g.dreamhost.com (Postfix, from userid 14314964) id 974B4414E3538; Mon, 28 Apr 2014 02:58:10 -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 73DEC414E3585 for ; Mon, 28 Apr 2014 02:58:10 -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=DC55o w+Pp5RU8pIktaazxIDu4D5xDHW3WmbwynoWhm0P4ltfbbrz/WBgd71n+nkRXMsJg lJqpz0yEauDnrxFnDI7E2Rxeeyagrvz5Ki7/PDVPBDd5pxv/c6xCXPw1oiU1GrXY xrsjDSBJiz94YIPzVmsSJ9EXmgSiqvRDy2vbYM= 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=ZBsnisSHXrY EkL/A8xtUwar5uaI=; b=B11/0H/WE6jZ1Du7sLufkA3iqO4V53l8a5zPtQY0lld 5OTMrX55iGjKseCUbgetJlzXuHRYTlzYvCDWEosX/ggjpcdlparejSdH3V6EHJKU ctdUhpSOlPgVAHeFX1rscBVsoUcoRE4dgo13eS7jonikV9kuafARU9tGMJR+0NTQ = Received: (qmail 13339 invoked by alias); 28 Apr 2014 09:58:08 -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 13326 invoked by uid 89); 28 Apr 2014 09:58:08 -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: e06smtp17.uk.ibm.com Received: from e06smtp17.uk.ibm.com (HELO e06smtp17.uk.ibm.com) (195.75.94.113) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Mon, 28 Apr 2014 09:58:07 +0000 Received: from /spool/local by e06smtp17.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 28 Apr 2014 10:58:04 +0100 Received: from d06dlp02.portsmouth.uk.ibm.com (9.149.20.14) by e06smtp17.uk.ibm.com (192.168.101.147) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 28 Apr 2014 10:58:02 +0100 Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id 503BB219005F for ; Mon, 28 Apr 2014 10:57:54 +0100 (BST) Received: from d06av08.portsmouth.uk.ibm.com (d06av08.portsmouth.uk.ibm.com [9.149.37.249]) by b06cxnps4075.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s3S9w2Lt60489894 for ; Mon, 28 Apr 2014 09:58:02 GMT Received: from d06av08.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av08.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s3S9w1pH026602 for ; Mon, 28 Apr 2014 03:58:01 -0600 Received: from br87z6lw.de.ibm.com (dyn-9-152-212-188.boeblingen.de.ibm.com [9.152.212.188]) by d06av08.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id s3S9w1ck026592; Mon, 28 Apr 2014 03:58:01 -0600 From: Andreas Arnez To: gdb-patches@sourceware.org Cc: Randolph Chung Subject: [RFC 17/23] HPPA Linux: Fill 'collect_regset' in regset structures References: <87eh0h6bkq.fsf@br87z6lw.de.ibm.com> Date: Mon, 28 Apr 2014 11:58:01 +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: <87a9b53hee.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-0542-0000-0000-000008CC6CFF X-IsSubscribed: yes X-DH-Original-To: gdb@patchwork.siddhesh.in 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 *