From patchwork Wed Jun 25 16:48:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Arnez X-Patchwork-Id: 1717 Received: (qmail 27964 invoked by alias); 25 Jun 2014 16:49:20 -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 27916 invoked by uid 89); 25 Jun 2014 16:49:17 -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: e06smtp13.uk.ibm.com Received: from e06smtp13.uk.ibm.com (HELO e06smtp13.uk.ibm.com) (195.75.94.109) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Wed, 25 Jun 2014 16:49:16 +0000 Received: from /spool/local by e06smtp13.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 25 Jun 2014 17:49:13 +0100 Received: from d06dlp02.portsmouth.uk.ibm.com (9.149.20.14) by e06smtp13.uk.ibm.com (192.168.101.143) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 25 Jun 2014 17:49:12 +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 291272190056 for ; Wed, 25 Jun 2014 17:49:00 +0100 (BST) Received: from d06av04.portsmouth.uk.ibm.com (d06av04.portsmouth.uk.ibm.com [9.149.37.216]) by b06cxnps4074.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s5PGnCvm22020304 for ; Wed, 25 Jun 2014 16:49:12 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 s5PGnA7E024880 for ; Wed, 25 Jun 2014 10:49:11 -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 s5PGn9Gr024835; Wed, 25 Jun 2014 10:49:10 -0600 From: Andreas Arnez To: gdb-patches@sourceware.org Cc: Yao Qi , Mark Kettenis Subject: [PATCH v2 02/13] regcache: Add functions suitable for regset_supply/collect. Date: Wed, 25 Jun 2014 18:48:58 +0200 Message-Id: <1403714949-28133-3-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-2966-0000-0000-00000050560D 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_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 | 44 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+) diff --git a/gdb/regcache.c b/gdb/regcache.c index 5ee90b0..78fd962 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,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->regmap; + 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->regmap; + 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..73ee043 100644 --- a/gdb/regcache.h +++ b/gdb/regcache.h @@ -147,6 +147,50 @@ 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 the register's size. Repeat this with consecutive register + numbers up to 'regno+count-1'. + + - If 'regno' is REGCACHE_MAP_SKIP_BYTES: Add 'count' to the current + offset. + + - If count=0: End of the map. */ + +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 '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