From patchwork Mon Apr 28 09:54:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Arnez X-Patchwork-Id: 708 Return-Path: X-Original-To: siddhesh@wilcox.dreamhost.com Delivered-To: siddhesh@wilcox.dreamhost.com Received: from homiemail-mx22.g.dreamhost.com (mx2.sub5.homie.mail.dreamhost.com [208.113.200.128]) by wilcox.dreamhost.com (Postfix) with ESMTP id 1B53236007C for ; Mon, 28 Apr 2014 02:54:22 -0700 (PDT) Received: by homiemail-mx22.g.dreamhost.com (Postfix, from userid 14314964) id D07504DAD253; Mon, 28 Apr 2014 02:54:21 -0700 (PDT) X-Original-To: gdb@patchwork.siddhesh.in Delivered-To: x14314964@homiemail-mx22.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-mx22.g.dreamhost.com (Postfix) with ESMTPS id AC65C4FB0E6B for ; Mon, 28 Apr 2014 02:54:21 -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:subject:references:date:in-reply-to :message-id:mime-version:content-type; q=dns; s=default; b=QNGFi sTVfirxsnpyHD4DfsUFAMTIy82rSk86DC9x8Xh/26Lm8JfjSg2cjz0nLobCuReIm NMn9Ski7NTMIJ80CCTHDLnf0U9Jqnd1ieSqemt+PU/sck956mjfwOpPWAGQi1Zh3 b4XhuejmDFxC4q4E/Vqx7XwHkWY05W3Wb8zlY8= 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:subject:references:date:in-reply-to :message-id:mime-version:content-type; s=default; bh=cYQHhb0B0Q+ hYyX3+eyuBkwUg58=; b=pE+sr6bAUtnCnxWimMdObbrgXSUJM/udiOOT3s0D/r8 jtsv2mbe4VBOJ23iCaGJ6VmW0ra7gK2Og6AqlUpE0PPE2ttNP64yvF4DJTO9oDKR Zpm5kbDNWHMq3oig1WgGL9Mqwxeg9Qez3XhwGScNqyd2neBDlYJeo2jj4Q6pQvMg = Received: (qmail 6928 invoked by alias); 28 Apr 2014 09:54:19 -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 6916 invoked by uid 89); 28 Apr 2014 09:54:19 -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: 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; Mon, 28 Apr 2014 09:54:18 +0000 Received: from /spool/local by e06smtp11.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 28 Apr 2014 10:54:15 +0100 Received: from d06dlp02.portsmouth.uk.ibm.com (9.149.20.14) by e06smtp11.uk.ibm.com (192.168.101.141) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 28 Apr 2014 10:54:13 +0100 Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id A13962190046 for ; Mon, 28 Apr 2014 10:54:05 +0100 (BST) Received: from d06av05.portsmouth.uk.ibm.com (d06av05.portsmouth.uk.ibm.com [9.149.37.229]) by b06cxnps3074.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s3S9sDNt62324758 for ; Mon, 28 Apr 2014 09:54:13 GMT Received: from d06av05.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av05.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s3S9sDse032764 for ; Mon, 28 Apr 2014 03:54:13 -0600 Received: from br87z6lw.de.ibm.com (dyn-9-152-212-188.boeblingen.de.ibm.com [9.152.212.188]) by d06av05.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id s3S9sCGU032752 for ; Mon, 28 Apr 2014 03:54:12 -0600 From: Andreas Arnez To: gdb-patches@sourceware.org Subject: [RFC 12/23] regcache: Add functions suitable for regset_supply/collect. References: <87eh0h6bkq.fsf@br87z6lw.de.ibm.com> Date: Mon, 28 Apr 2014 11:54:12 +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: <87vbtt3hkr.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-5024-0000-0000-000009A01580 X-IsSubscribed: yes X-DH-Original-To: gdb@patchwork.siddhesh.in These functions are intended to suit all targets that don't require too special logic in their regset supply/collect methods. Having such generic functions helps reducing target-specific complexity. gdb/ * regcache.c: Include "regset.h". (regcache_supply_regset, regcache_collect_regset): New functions. * regcache.h (struct regcache_map_entry): New structure. (REGCACHE_MAP_SKIP_BYTES): New enum value. (regcache_supply_regset, regcache_collect_regset): New prototypes. --- gdb/regcache.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ gdb/regcache.h | 38 +++++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+) diff --git a/gdb/regcache.c b/gdb/regcache.c index 8b588c6..b38031e 100644 --- a/gdb/regcache.c +++ b/gdb/regcache.c @@ -30,6 +30,7 @@ #include "exceptions.h" #include "remote.h" #include "valprint.h" +#include "regset.h" /* * DATA STRUCTURE @@ -1031,6 +1032,71 @@ regcache_raw_collect (const struct regcache *regcache, int regnum, void *buf) memcpy (buf, regbuf, size); } +/* Supply register REGNUM from BUF to REGCACHE, using the register map + in REGSET. If REGNUM is -1, do this for all registers in + REGSET. */ + +void +regcache_supply_regset (const struct regset *regset, + struct regcache *regcache, + int regnum, const void *buf, size_t size) +{ + const struct regcache_map_entry *map = regset->descr; + int offs = 0; + int i, count; + + for (i = 0; (count = map[i].count) != 0; i++) + { + int regno = map[i].regno; + + if (regno == REGCACHE_MAP_SKIP_BYTES) + offs += count; + else + for (; count--; regno++) + { + int new_offs = offs + regcache->descr->sizeof_register[regno]; + + if (new_offs <= size && (regnum == -1 || regnum == regno)) + regcache_raw_supply (regcache, regno, + buf ? (const gdb_byte *) buf + offs + : NULL); + offs = new_offs; + } + } +} + +/* Collect register REGNUM from REGCACHE to BUF, using the register + map in REGSET. If REGNUM is -1, do this for all registers in + REGSET. */ + +void +regcache_collect_regset (const struct regset *regset, + const struct regcache *regcache, + int regnum, void *buf, size_t size) +{ + const struct regcache_map_entry *map = regset->descr; + int offs = 0; + int i, count; + + for (i = 0; (count = map[i].count) != 0; i++) + { + int regno = map[i].regno; + + if (regno == REGCACHE_MAP_SKIP_BYTES) + offs += count; + else + for (; count--; regno++) + { + int new_offs = offs + regcache->descr->sizeof_register[regno]; + + if (new_offs <= size && (regnum == -1 || regnum == regno)) + regcache_raw_collect (regcache, regno, + (gdb_byte *) buf + offs); + offs = new_offs; + } + } +} + /* Special handling for register PC. */ diff --git a/gdb/regcache.h b/gdb/regcache.h index 8423f57..cc2bda8 100644 --- a/gdb/regcache.h +++ b/gdb/regcache.h @@ -147,6 +147,44 @@ extern void regcache_raw_supply (struct regcache *regcache, extern void regcache_raw_collect (const struct regcache *regcache, int regnum, void *buf); +/* Mapping between register numbers and offsets in a buffer, for use + in the '*regset' functions below. The first entry in a map refers + to offset 0, and each entry increases the offset by its size. + Specifying count=N and regno=R is equivalent to N consecutive + entries with count=1 and with regno ranging from R to R+N-1. The + end of the map is marked with a dummy entry having count=0. */ + +struct regcache_map_entry +{ + int count; + int regno; +}; + +/* Special value for the 'regno' field in the struct above. */ + +enum + { + REGCACHE_MAP_SKIP_BYTES = -1, + }; + +/* Transfer a set of registers (as described by REGSET) between + REGCACHE and BUF. If REGNUM == -1, transfer all registers + belonging to the regset, otherwise just the register numbered + REGNUM. The REGSET's 'descr' field must point to an array of + 'struct regcache_map_entry'. + + These functions are suitable for the 'regset_supply' and + 'regset_collect' fields in a regset structure. + */ + +extern void regcache_supply_regset (const struct regset *regset, + struct regcache *regcache, + int regnum, const void *buf, + size_t size); +extern void regcache_collect_regset (const struct regset *regset, + const struct regcache *regcache, + int regnum, void *buf, size_t size); + /* The type of a register. This function is slightly more efficient then its gdbarch vector counterpart since it returns a precomputed