From patchwork Thu Jul 31 11:04:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Arnez X-Patchwork-Id: 2242 Received: (qmail 25439 invoked by alias); 31 Jul 2014 11:04:59 -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 25379 invoked by uid 89); 31 Jul 2014 11:04:56 -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: e06smtp12.uk.ibm.com Received: from e06smtp12.uk.ibm.com (HELO e06smtp12.uk.ibm.com) (195.75.94.108) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Thu, 31 Jul 2014 11:04:55 +0000 Received: from /spool/local by e06smtp12.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 31 Jul 2014 12:04:52 +0100 Received: from d06dlp02.portsmouth.uk.ibm.com (9.149.20.14) by e06smtp12.uk.ibm.com (192.168.101.142) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 31 Jul 2014 12:04:50 +0100 Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id D54802190045 for ; Thu, 31 Jul 2014 12:04:33 +0100 (BST) Received: from d06av01.portsmouth.uk.ibm.com (d06av01.portsmouth.uk.ibm.com [9.149.37.212]) by b06cxnps4074.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s6VB4n3l31260728 for ; Thu, 31 Jul 2014 11:04:49 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 s6VB4mLL016246 for ; Thu, 31 Jul 2014 05:04:48 -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 s6VB4kJo016128 for ; Thu, 31 Jul 2014 05:04:47 -0600 From: Andreas Arnez To: gdb-patches@sourceware.org Subject: [PATCH v3 02/13] regcache: Add functions suitable for regset_supply/collect. Date: Thu, 31 Jul 2014 13:04:35 +0200 Message-Id: <1406804686-9437-3-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-8372-0000-0000-000000B4BA73 X-IsSubscribed: yes 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_transfer_regset): New local function. (regcache_supply_regset, regcache_collect_regset): New functions. * regcache.h (struct regcache_map_entry): New structure. (REGCACHE_MAP_SKIP): New enum value. (regcache_supply_regset, regcache_collect_regset): New prototypes. --- gdb/regcache.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ gdb/regcache.h | 45 ++++++++++++++++++++++++++++++ 2 files changed, 132 insertions(+) diff --git a/gdb/regcache.c b/gdb/regcache.c index 5ee90b0..d5f8e2f 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 @@ -1068,6 +1069,92 @@ regcache_raw_collect (const struct regcache *regcache, int regnum, void *buf) memcpy (buf, regbuf, size); } +/* Transfer a single or all registers belonging to a certain register + set to or from a buffer. This is the main worker function for + regcache_supply_regset and regcache_collect_regset. */ + +static void +regcache_transfer_regset (const struct regset *regset, + const struct regcache *regcache, + struct regcache *out_regcache, + int regnum, const void *in_buf, + void *out_buf, size_t size) +{ + const struct regcache_map_entry *map; + int offs = 0, count; + + for (map = regset->regmap; (count = map->count) != 0; map++) + { + int regno = map->regno; + int slot_size = map->size; + + if (slot_size == 0 && regno != REGCACHE_MAP_SKIP) + slot_size = regcache->descr->sizeof_register[regno]; + + if (regno == REGCACHE_MAP_SKIP + || (regnum != -1 + && (regnum < regno || regnum >= regno + count))) + offs += count * slot_size; + + else if (regnum == -1) + for (; count--; regno++, offs += slot_size) + { + if (offs + slot_size > size) + break; + + if (out_buf) + regcache_raw_collect (regcache, regno, + (gdb_byte *) out_buf + offs); + else + regcache_raw_supply (out_regcache, regno, in_buf + ? (const gdb_byte *) in_buf + offs + : NULL); + } + else + { + /* Transfer a single register and return. */ + offs += (regnum - regno) * slot_size; + if (offs + slot_size > size) + return; + + if (out_buf) + regcache_raw_collect (regcache, regnum, + (gdb_byte *) out_buf + offs); + else + regcache_raw_supply (out_regcache, regnum, in_buf + ? (const gdb_byte *) in_buf + offs + : NULL); + return; + } + } +} + +/* Supply register REGNUM from BUF to REGCACHE, using the register map + in REGSET. If REGNUM is -1, do this for all registers in REGSET. + If BUF is NULL, set the register(s) to "unavailable" status. */ + +void +regcache_supply_regset (const struct regset *regset, + struct regcache *regcache, + int regnum, const void *buf, size_t size) +{ + regcache_transfer_regset (regset, regcache, regcache, regnum, + buf, NULL, size); +} + +/* 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) +{ + regcache_transfer_regset (regset, regcache, NULL, regnum, + NULL, buf, size); +} + /* Special handling for register PC. */ diff --git a/gdb/regcache.h b/gdb/regcache.h index 8423f57..0361f22 100644 --- a/gdb/regcache.h +++ b/gdb/regcache.h @@ -147,6 +147,51 @@ 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. In an array of + 'regcache_map_entry' each element is interpreted like follows: + + - If 'regno' is a register number: Map register 'regno' to the + current offset (starting with 0) and increase the current offset + by 'size' (or the register's size, if 'size' is zero). Repeat + this with consecutive register numbers up to 'regno+count-1'. + + - If 'regno' is REGCACHE_MAP_SKIP: Add 'count*size' to the current + offset. + + - If count=0: End of the map. */ + +struct regcache_map_entry +{ + int count; + int regno; + int size; +}; + +/* Special value for the 'regno' field in the struct above. */ + +enum + { + REGCACHE_MAP_SKIP = -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 'regmap' 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