From patchwork Thu Jul 31 11:04:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Arnez X-Patchwork-Id: 2250 Received: (qmail 25880 invoked by alias); 31 Jul 2014 11:05:04 -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 25663 invoked by uid 89); 31 Jul 2014 11:05:02 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: e06smtp14.uk.ibm.com Received: from e06smtp14.uk.ibm.com (HELO e06smtp14.uk.ibm.com) (195.75.94.110) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Thu, 31 Jul 2014 11:05:01 +0000 Received: from /spool/local by e06smtp14.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 31 Jul 2014 12:04:58 +0100 Received: from d06dlp02.portsmouth.uk.ibm.com (9.149.20.14) by e06smtp14.uk.ibm.com (192.168.101.144) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 31 Jul 2014 12:04:55 +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 37E222190045 for ; Thu, 31 Jul 2014 12:04:39 +0100 (BST) Received: from d06av01.portsmouth.uk.ibm.com (d06av01.portsmouth.uk.ibm.com [9.149.37.212]) by b06cxnps4076.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s6VB4sB834210024 for ; Thu, 31 Jul 2014 11:04:54 GMT Received: from d06av01.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av01.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s6VB4sOF016522 for ; Thu, 31 Jul 2014 05:04:54 -0600 Received: from br87z6lw.boeblingen.de.ibm.com (dyn-9-152-212-196.boeblingen.de.ibm.com [9.152.212.196]) by d06av01.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id s6VB4kJx016128; Thu, 31 Jul 2014 05:04:54 -0600 From: Andreas Arnez To: gdb-patches@sourceware.org Cc: Jiong Wang Subject: [PATCH v3 11/13] TILEGX Linux: Fill 'collect_regset' in regset structure. Date: Thu, 31 Jul 2014 13:04:44 +0200 Message-Id: <1406804686-9437-12-git-send-email-arnez@linux.vnet.ibm.com> In-Reply-To: <1406804686-9437-1-git-send-email-arnez@linux.vnet.ibm.com> References: <1406804686-9437-1-git-send-email-arnez@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14073111-1948-0000-0000-000000B0F126 X-IsSubscribed: yes gdb/ * tilegx-linux-tdep.c (tilegx_linux_supply_regset): Delete function. Move logic to... (tilegx_linux_regmap): ... this new register map. (tilegx_linux_regset): Refer to register map, replace supply method by regcache_supply_regset, and add collect method. * tilegx-tdep.h (enum tilegx_regnum): New enum value TILEGX_FIRST_EASY_REGNUM. --- gdb/tilegx-linux-tdep.c | 34 +++++++++++----------------------- gdb/tilegx-tdep.h | 1 + 2 files changed, 12 insertions(+), 23 deletions(-) diff --git a/gdb/tilegx-linux-tdep.c b/gdb/tilegx-linux-tdep.c index 98b03db..184d00c 100644 --- a/gdb/tilegx-linux-tdep.c +++ b/gdb/tilegx-linux-tdep.c @@ -73,34 +73,22 @@ static const struct tramp_frame tilegx_linux_rt_sigframe = tilegx_linux_sigframe_init }; -/* Supply raw registers from REGCACHE to REGS. */ +/* Register map; must match struct pt_regs in "ptrace.h". */ -static void -tilegx_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); - const char *ptr = regs; - int i; - - /* This logic must match that of struct pt_regs in "ptrace.h". */ - for (i = 0; i < TILEGX_NUM_EASY_REGS + 2; i++, ptr += tilegx_reg_size) - { - int gri = (i < TILEGX_NUM_EASY_REGS) - ? i : (i == TILEGX_NUM_EASY_REGS) - ? TILEGX_PC_REGNUM : TILEGX_FAULTNUM_REGNUM; - - if (regnum == gri || regnum == -1) - regcache_raw_supply (regcache, gri, ptr); - } -} +static const struct regcache_map_entry tilegx_linux_regmap[] = + { + { TILEGX_NUM_EASY_REGS, TILEGX_FIRST_EASY_REGNUM, 8 }, + { 1, TILEGX_PC_REGNUM, 8 }, + { 1, TILEGX_FAULTNUM_REGNUM, 8 }, + { 0 } + }; /* TILE-Gx Linux kernel register set. */ + static const struct regset tilegx_linux_regset = { - NULL, - tilegx_linux_supply_regset + tilegx_linux_regmap, + regcache_supply_regset, regcache_collect_regset }; static const struct regset * diff --git a/gdb/tilegx-tdep.h b/gdb/tilegx-tdep.h index e24655c..864c798 100644 --- a/gdb/tilegx-tdep.h +++ b/gdb/tilegx-tdep.h @@ -31,6 +31,7 @@ enum tilegx_regnum { TILEGX_R0_REGNUM, + TILEGX_FIRST_EASY_REGNUM = TILEGX_R0_REGNUM, TILEGX_R1_REGNUM, TILEGX_R2_REGNUM, TILEGX_R3_REGNUM,