/* Cache and manage the values of registers for GDB, the GNU debugger.
- Copyright (C) 1986, 1987, 1989, 1991, 1994, 1995, 1996, 1998, 2000, 2001,
- 2002, 2004, 2007 Free Software Foundation, Inc.
+ Copyright (C) 1986-2017 Free Software Foundation, Inc.
This file is part of GDB.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
#include "inferior.h"
#include "gdbcmd.h"
#include "regcache.h"
#include "reggroups.h"
-#include "gdb_assert.h"
-#include "gdb_string.h"
-#include "gdbcmd.h" /* For maintenanceprintlist. */
#include "observer.h"
+#include "remote.h"
+#include "valprint.h"
+#include "regset.h"
/*
* DATA STRUCTURE
*/
/* Per-architecture object describing the layout of a register cache.
- Computed once when the architecture is created */
+ Computed once when the architecture is created. */
struct gdbarch_data *regcache_descr_handle;
cache. */
int nr_raw_registers;
long sizeof_raw_registers;
- long sizeof_raw_register_valid_p;
+ long sizeof_raw_register_status;
/* The cooked register space. Each cooked register in the range
[0..NR_RAW_REGISTERS) is direct-mapped onto the corresponding raw
gdbarch_pseudo_register_read and gdbarch_pseudo_register_write. */
int nr_cooked_registers;
long sizeof_cooked_registers;
- long sizeof_cooked_register_valid_p;
+ long sizeof_cooked_register_status;
- /* Offset and size (in 8 bit bytes), of reach register in the
+ /* Offset and size (in 8 bit bytes), of each register in the
register cache. All registers (including those in the range
- [NR_RAW_REGISTERS .. NR_COOKED_REGISTERS) are given an offset.
- Assigning all registers an offset makes it possible to keep
- legacy code, such as that found in read_register_bytes() and
- write_register_bytes() working. */
+ [NR_RAW_REGISTERS .. NR_COOKED_REGISTERS) are given an
+ offset. */
long *register_offset;
long *sizeof_register;
/* Total size of the register space. The raw registers are mapped
directly onto the raw register cache while the pseudo's are
either mapped onto raw-registers or memory. */
- descr->nr_cooked_registers = NUM_REGS + NUM_PSEUDO_REGS;
- descr->sizeof_cooked_register_valid_p = NUM_REGS + NUM_PSEUDO_REGS;
+ descr->nr_cooked_registers = gdbarch_num_regs (gdbarch)
+ + gdbarch_num_pseudo_regs (gdbarch);
+ descr->sizeof_cooked_register_status
+ = gdbarch_num_regs (gdbarch) + gdbarch_num_pseudo_regs (gdbarch);
/* Fill in a table of register types. */
descr->register_type
- = GDBARCH_OBSTACK_CALLOC (gdbarch, descr->nr_cooked_registers, struct type *);
+ = GDBARCH_OBSTACK_CALLOC (gdbarch, descr->nr_cooked_registers,
+ struct type *);
for (i = 0; i < descr->nr_cooked_registers; i++)
descr->register_type[i] = gdbarch_register_type (gdbarch, i);
/* Construct a strictly RAW register cache. Don't allow pseudo's
into the register cache. */
- descr->nr_raw_registers = NUM_REGS;
-
- /* FIXME: cagney/2002-08-13: Overallocate the register_valid_p
- array. This pretects GDB from erant code that accesses elements
- of the global register_valid_p[] array in the range [NUM_REGS
- .. NUM_REGS + NUM_PSEUDO_REGS). */
- descr->sizeof_raw_register_valid_p = descr->sizeof_cooked_register_valid_p;
+ descr->nr_raw_registers = gdbarch_num_regs (gdbarch);
+ descr->sizeof_raw_register_status = gdbarch_num_regs (gdbarch);
/* Lay out the register cache.
{
long offset = 0;
+
descr->sizeof_register
= GDBARCH_OBSTACK_CALLOC (gdbarch, descr->nr_cooked_registers, long);
descr->register_offset
= GDBARCH_OBSTACK_CALLOC (gdbarch, descr->nr_cooked_registers, long);
- for (i = 0; i < descr->nr_cooked_registers; i++)
+ for (i = 0; i < descr->nr_raw_registers; i++)
{
descr->sizeof_register[i] = TYPE_LENGTH (descr->register_type[i]);
descr->register_offset[i] = offset;
offset += descr->sizeof_register[i];
gdb_assert (MAX_REGISTER_SIZE >= descr->sizeof_register[i]);
}
- /* Set the real size of the register cache buffer. */
+ /* Set the real size of the raw register cache buffer. */
+ descr->sizeof_raw_registers = offset;
+
+ for (; i < descr->nr_cooked_registers; i++)
+ {
+ descr->sizeof_register[i] = TYPE_LENGTH (descr->register_type[i]);
+ descr->register_offset[i] = offset;
+ offset += descr->sizeof_register[i];
+ gdb_assert (MAX_REGISTER_SIZE >= descr->sizeof_register[i]);
+ }
+ /* Set the real size of the readonly register cache buffer. */
descr->sizeof_cooked_registers = offset;
}
- /* FIXME: cagney/2002-05-22: Should only need to allocate space for
- the raw registers. Unfortunately some code still accesses the
- register array directly using the global registers[]. Until that
- code has been purged, play safe and over allocating the register
- buffer. Ulgh! */
- descr->sizeof_raw_registers = descr->sizeof_cooked_registers;
-
return descr;
}
static struct regcache_descr *
regcache_descr (struct gdbarch *gdbarch)
{
- return gdbarch_data (gdbarch, regcache_descr_handle);
+ return (struct regcache_descr *) gdbarch_data (gdbarch,
+ regcache_descr_handle);
}
/* Utility functions returning useful register attributes stored in
register_type (struct gdbarch *gdbarch, int regnum)
{
struct regcache_descr *descr = regcache_descr (gdbarch);
+
gdb_assert (regnum >= 0 && regnum < descr->nr_cooked_registers);
return descr->register_type[regnum];
}
{
struct regcache_descr *descr = regcache_descr (gdbarch);
int size;
- gdb_assert (regnum >= 0 && regnum < (NUM_REGS + NUM_PSEUDO_REGS));
+
+ gdb_assert (regnum >= 0
+ && regnum < (gdbarch_num_regs (gdbarch)
+ + gdbarch_num_pseudo_regs (gdbarch)));
size = descr->sizeof_register[regnum];
return size;
}
-/* The register cache for storing raw register values. */
+/* See common/common-regcache.h. */
-struct regcache
+int
+regcache_register_size (const struct regcache *regcache, int n)
{
- struct regcache_descr *descr;
- /* The register buffers. A read-only register cache can hold the
- full [0 .. NUM_REGS + NUM_PSEUDO_REGS) while a read/write
- register cache can only hold [0 .. NUM_REGS). */
- gdb_byte *registers;
- /* Register cache status:
- register_valid_p[REG] == 0 if REG value is not in the cache
- > 0 if REG value is in the cache
- < 0 if REG value is permanently unavailable */
- signed char *register_valid_p;
- /* Is this a read-only cache? A read-only cache is used for saving
- the target's register state (e.g, across an inferior function
- call or just before forcing a function return). A read-only
- cache can only be updated via the methods regcache_dup() and
- regcache_cpy(). The actual contents are determined by the
- reggroup_save and reggroup_restore methods. */
- int readonly_p;
-};
+ return register_size (get_regcache_arch (regcache), n);
+}
-struct regcache *
-regcache_xmalloc (struct gdbarch *gdbarch)
+regcache::regcache (gdbarch *gdbarch, address_space *aspace_,
+ bool readonly_p_)
+ : m_aspace (aspace_), m_readonly_p (readonly_p_)
{
- struct regcache_descr *descr;
- struct regcache *regcache;
gdb_assert (gdbarch != NULL);
- descr = regcache_descr (gdbarch);
- regcache = XMALLOC (struct regcache);
- regcache->descr = descr;
- regcache->registers
- = XCALLOC (descr->sizeof_raw_registers, gdb_byte);
- regcache->register_valid_p
- = XCALLOC (descr->sizeof_raw_register_valid_p, gdb_byte);
- regcache->readonly_p = 1;
- return regcache;
+ m_descr = regcache_descr (gdbarch);
+
+ if (m_readonly_p)
+ {
+ m_registers = XCNEWVEC (gdb_byte, m_descr->sizeof_cooked_registers);
+ m_register_status = XCNEWVEC (signed char,
+ m_descr->sizeof_cooked_register_status);
+ }
+ else
+ {
+ m_registers = XCNEWVEC (gdb_byte, m_descr->sizeof_raw_registers);
+ m_register_status = XCNEWVEC (signed char,
+ m_descr->sizeof_raw_register_status);
+ }
+ m_ptid = minus_one_ptid;
+}
+
+static enum register_status
+do_cooked_read (void *src, int regnum, gdb_byte *buf)
+{
+ struct regcache *regcache = (struct regcache *) src;
+
+ return regcache_cooked_read (regcache, regnum, buf);
+}
+
+regcache::regcache (readonly_t, const regcache &src)
+ : regcache (src.arch (), src.aspace (), true)
+{
+ gdb_assert (!src.m_readonly_p);
+ save (do_cooked_read, (void *) &src);
+}
+
+gdbarch *
+regcache::arch () const
+{
+ return m_descr->gdbarch;
+}
+
+/* See regcache.h. */
+
+ptid_t
+regcache_get_ptid (const struct regcache *regcache)
+{
+ gdb_assert (!ptid_equal (regcache->ptid (), minus_one_ptid));
+
+ return regcache->ptid ();
+}
+
+struct regcache *
+regcache_xmalloc (struct gdbarch *gdbarch, struct address_space *aspace)
+{
+ return new regcache (gdbarch, aspace);
}
void
{
if (regcache == NULL)
return;
- xfree (regcache->registers);
- xfree (regcache->register_valid_p);
- xfree (regcache);
+
+ delete regcache;
}
static void
do_regcache_xfree (void *data)
{
- regcache_xfree (data);
+ regcache_xfree ((struct regcache *) data);
}
struct cleanup *
return make_cleanup (do_regcache_xfree, regcache);
}
+/* Cleanup routines for invalidating a register. */
+
+struct register_to_invalidate
+{
+ struct regcache *regcache;
+ int regnum;
+};
+
+static void
+do_regcache_invalidate (void *data)
+{
+ struct register_to_invalidate *reg = (struct register_to_invalidate *) data;
+
+ regcache_invalidate (reg->regcache, reg->regnum);
+}
+
+static struct cleanup *
+make_cleanup_regcache_invalidate (struct regcache *regcache, int regnum)
+{
+ struct register_to_invalidate* reg = XNEW (struct register_to_invalidate);
+
+ reg->regcache = regcache;
+ reg->regnum = regnum;
+ return make_cleanup_dtor (do_regcache_invalidate, (void *) reg, xfree);
+}
+
/* Return REGCACHE's architecture. */
struct gdbarch *
get_regcache_arch (const struct regcache *regcache)
{
- return regcache->descr->gdbarch;
+ return regcache->arch ();
+}
+
+struct address_space *
+get_regcache_aspace (const struct regcache *regcache)
+{
+ return regcache->aspace ();
}
/* Return a pointer to register REGNUM's buffer cache. */
-static gdb_byte *
-register_buffer (const struct regcache *regcache, int regnum)
+gdb_byte *
+regcache::register_buffer (int regnum) const
{
- return regcache->registers + regcache->descr->register_offset[regnum];
+ return m_registers + m_descr->register_offset[regnum];
}
void
-regcache_save (struct regcache *dst, regcache_cooked_read_ftype *cooked_read,
- void *src)
+regcache_save (struct regcache *regcache,
+ regcache_cooked_read_ftype *cooked_read, void *src)
{
- struct gdbarch *gdbarch = dst->descr->gdbarch;
+ regcache->save (cooked_read, src);
+}
+
+void
+regcache::save (regcache_cooked_read_ftype *cooked_read,
+ void *src)
+{
+ struct gdbarch *gdbarch = m_descr->gdbarch;
gdb_byte buf[MAX_REGISTER_SIZE];
int regnum;
+
/* The DST should be `read-only', if it wasn't then the save would
end up trying to write the register values back out to the
target. */
- gdb_assert (dst->readonly_p);
+ gdb_assert (m_readonly_p);
/* Clear the dest. */
- memset (dst->registers, 0, dst->descr->sizeof_cooked_registers);
- memset (dst->register_valid_p, 0, dst->descr->sizeof_cooked_register_valid_p);
+ memset (m_registers, 0, m_descr->sizeof_cooked_registers);
+ memset (m_register_status, 0, m_descr->sizeof_cooked_register_status);
/* Copy over any registers (identified by their membership in the
- save_reggroup) and mark them as valid. The full [0 .. NUM_REGS +
- NUM_PSEUDO_REGS) range is checked since some architectures need
+ save_reggroup) and mark them as valid. The full [0 .. gdbarch_num_regs +
+ gdbarch_num_pseudo_regs) range is checked since some architectures need
to save/restore `cooked' registers that live in memory. */
- for (regnum = 0; regnum < dst->descr->nr_cooked_registers; regnum++)
+ for (regnum = 0; regnum < m_descr->nr_cooked_registers; regnum++)
{
if (gdbarch_register_reggroup_p (gdbarch, regnum, save_reggroup))
{
- int valid = cooked_read (src, regnum, buf);
- if (valid)
+ enum register_status status = cooked_read (src, regnum, buf);
+
+ if (status == REG_VALID)
+ memcpy (register_buffer (regnum), buf,
+ register_size (gdbarch, regnum));
+ else
{
- memcpy (register_buffer (dst, regnum), buf,
+ gdb_assert (status != REG_UNKNOWN);
+
+ memset (register_buffer (regnum), 0,
register_size (gdbarch, regnum));
- dst->register_valid_p[regnum] = 1;
}
+ m_register_status[regnum] = status;
}
}
}
void
-regcache_restore (struct regcache *dst,
- regcache_cooked_read_ftype *cooked_read,
- void *cooked_read_context)
+regcache::restore (struct regcache *src)
{
- struct gdbarch *gdbarch = dst->descr->gdbarch;
- gdb_byte buf[MAX_REGISTER_SIZE];
+ struct gdbarch *gdbarch = m_descr->gdbarch;
int regnum;
+
/* The dst had better not be read-only. If it is, the `restore'
doesn't make much sense. */
- gdb_assert (!dst->readonly_p);
+ gdb_assert (!m_readonly_p);
+ gdb_assert (src->m_readonly_p);
/* Copy over any registers, being careful to only restore those that
- were both saved and need to be restored. The full [0 .. NUM_REGS
- + NUM_PSEUDO_REGS) range is checked since some architectures need
+ were both saved and need to be restored. The full [0 .. gdbarch_num_regs
+ + gdbarch_num_pseudo_regs) range is checked since some architectures need
to save/restore `cooked' registers that live in memory. */
- for (regnum = 0; regnum < dst->descr->nr_cooked_registers; regnum++)
+ for (regnum = 0; regnum < m_descr->nr_cooked_registers; regnum++)
{
if (gdbarch_register_reggroup_p (gdbarch, regnum, restore_reggroup))
{
- int valid = cooked_read (cooked_read_context, regnum, buf);
- if (valid)
- regcache_cooked_write (dst, regnum, buf);
+ if (src->m_register_status[regnum] == REG_VALID)
+ cooked_write (regnum, src->register_buffer (regnum));
}
}
}
-static int
-do_cooked_read (void *src, int regnum, gdb_byte *buf)
-{
- struct regcache *regcache = src;
- if (!regcache->register_valid_p[regnum] && regcache->readonly_p)
- /* Don't even think about fetching a register from a read-only
- cache when the register isn't yet valid. There isn't a target
- from which the register value can be fetched. */
- return 0;
- regcache_cooked_read (regcache, regnum, buf);
- return 1;
-}
-
-
void
regcache_cpy (struct regcache *dst, struct regcache *src)
{
- int i;
- gdb_byte *buf;
gdb_assert (src != NULL && dst != NULL);
- gdb_assert (src->descr->gdbarch == dst->descr->gdbarch);
+ gdb_assert (src->m_descr->gdbarch == dst->m_descr->gdbarch);
gdb_assert (src != dst);
- gdb_assert (src->readonly_p || dst->readonly_p);
- if (!src->readonly_p)
+ gdb_assert (src->m_readonly_p || dst->m_readonly_p);
+
+ if (!src->m_readonly_p)
regcache_save (dst, do_cooked_read, src);
- else if (!dst->readonly_p)
- regcache_restore (dst, do_cooked_read, src);
+ else if (!dst->m_readonly_p)
+ dst->restore (src);
else
- regcache_cpy_no_passthrough (dst, src);
+ dst->cpy_no_passthrough (src);
}
+/* Copy/duplicate the contents of a register cache. Unlike regcache_cpy,
+ which is pass-through, this does not go through to the target.
+ Only values values already in the cache are transferred. The SRC and DST
+ buffers must not overlap. */
+
void
-regcache_cpy_no_passthrough (struct regcache *dst, struct regcache *src)
+regcache::cpy_no_passthrough (struct regcache *src)
{
- int i;
- gdb_assert (src != NULL && dst != NULL);
- gdb_assert (src->descr->gdbarch == dst->descr->gdbarch);
+ gdb_assert (src != NULL);
+ gdb_assert (src->m_descr->gdbarch == m_descr->gdbarch);
/* NOTE: cagney/2002-05-17: Don't let the caller do a no-passthrough
- move of data into the current_regcache(). Doing this would be
- silly - it would mean that valid_p would be completely invalid. */
- gdb_assert (dst != current_regcache);
- memcpy (dst->registers, src->registers, dst->descr->sizeof_raw_registers);
- memcpy (dst->register_valid_p, src->register_valid_p,
- dst->descr->sizeof_raw_register_valid_p);
+ move of data into a thread's regcache. Doing this would be silly
+ - it would mean that regcache->register_status would be
+ completely invalid. */
+ gdb_assert (m_readonly_p && src->m_readonly_p);
+
+ memcpy (m_registers, src->m_registers,
+ m_descr->sizeof_cooked_registers);
+ memcpy (m_register_status, src->m_register_status,
+ m_descr->sizeof_cooked_register_status);
}
struct regcache *
regcache_dup (struct regcache *src)
{
- struct regcache *newbuf;
- gdb_assert (current_regcache != NULL);
- newbuf = regcache_xmalloc (src->descr->gdbarch);
- regcache_cpy (newbuf, src);
- return newbuf;
+ return new regcache (regcache::readonly, *src);
}
-struct regcache *
-regcache_dup_no_passthrough (struct regcache *src)
+enum register_status
+regcache_register_status (const struct regcache *regcache, int regnum)
{
- struct regcache *newbuf;
- gdb_assert (current_regcache != NULL);
- newbuf = regcache_xmalloc (src->descr->gdbarch);
- regcache_cpy_no_passthrough (newbuf, src);
- return newbuf;
+ gdb_assert (regcache != NULL);
+ return regcache->get_register_status (regnum);
}
-int
-regcache_valid_p (const struct regcache *regcache, int regnum)
+enum register_status
+regcache::get_register_status (int regnum) const
{
- gdb_assert (regcache != NULL);
gdb_assert (regnum >= 0);
- if (regcache->readonly_p)
- gdb_assert (regnum < regcache->descr->nr_cooked_registers);
+ if (m_readonly_p)
+ gdb_assert (regnum < m_descr->nr_cooked_registers);
else
- gdb_assert (regnum < regcache->descr->nr_raw_registers);
+ gdb_assert (regnum < m_descr->nr_raw_registers);
+
+ return (enum register_status) m_register_status[regnum];
+}
+
+void
+regcache_invalidate (struct regcache *regcache, int regnum)
+{
+ gdb_assert (regcache != NULL);
+ regcache->invalidate (regnum);
+}
- return regcache->register_valid_p[regnum];
+void
+regcache::invalidate (int regnum)
+{
+ gdb_assert (regnum >= 0);
+ gdb_assert (!m_readonly_p);
+ gdb_assert (regnum < m_descr->nr_raw_registers);
+ m_register_status[regnum] = REG_UNKNOWN;
}
/* Global structure containing the current regcache. */
-/* FIXME: cagney/2002-05-11: The two global arrays registers[] and
- deprecated_register_valid[] currently point into this structure. */
-struct regcache *current_regcache;
/* NOTE: this is a write-through cache. There is no "dirty" bit for
recording if the register values have been changed (eg. by the
user). Therefore all registers must be written back to the
target when appropriate. */
-/* The thread/process associated with the current set of registers. */
+struct regcache_list
+{
+ struct regcache *regcache;
+ struct regcache_list *next;
+};
+
+static struct regcache_list *current_regcache;
-static ptid_t registers_ptid;
+struct regcache *
+get_thread_arch_aspace_regcache (ptid_t ptid, struct gdbarch *gdbarch,
+ struct address_space *aspace)
+{
+ struct regcache_list *list;
+ struct regcache *new_regcache;
-/*
- * FUNCTIONS:
- */
+ for (list = current_regcache; list; list = list->next)
+ if (ptid_equal (list->regcache->ptid (), ptid)
+ && get_regcache_arch (list->regcache) == gdbarch)
+ return list->regcache;
-/* REGISTER_CACHED()
+ new_regcache = new regcache (gdbarch, aspace, false);
+ new_regcache->set_ptid (ptid);
- Returns 0 if the value is not in the cache (needs fetch).
- >0 if the value is in the cache.
- <0 if the value is permanently unavailable (don't ask again). */
+ list = XNEW (struct regcache_list);
+ list->regcache = new_regcache;
+ list->next = current_regcache;
+ current_regcache = list;
-int
-register_cached (int regnum)
+ return new_regcache;
+}
+
+struct regcache *
+get_thread_arch_regcache (ptid_t ptid, struct gdbarch *gdbarch)
{
- return current_regcache->register_valid_p[regnum];
+ struct address_space *aspace;
+
+ /* For the benefit of "maint print registers" & co when debugging an
+ executable, allow dumping the regcache even when there is no
+ thread selected (target_thread_address_space internal-errors if
+ no address space is found). Note that normal user commands will
+ fail higher up on the call stack due to no
+ target_has_registers. */
+ aspace = (ptid_equal (null_ptid, ptid)
+ ? NULL
+ : target_thread_address_space (ptid));
+
+ return get_thread_arch_aspace_regcache (ptid, gdbarch, aspace);
}
-/* Record that REGNUM's value is cached if STATE is >0, uncached but
- fetchable if STATE is 0, and uncached and unfetchable if STATE is <0. */
+static ptid_t current_thread_ptid;
+static struct gdbarch *current_thread_arch;
-void
-set_register_cached (int regnum, int state)
+struct regcache *
+get_thread_regcache (ptid_t ptid)
{
- gdb_assert (regnum >= 0);
- gdb_assert (regnum < current_regcache->descr->nr_raw_registers);
- current_regcache->register_valid_p[regnum] = state;
+ if (!current_thread_arch || !ptid_equal (current_thread_ptid, ptid))
+ {
+ current_thread_ptid = ptid;
+ current_thread_arch = target_thread_architecture (ptid);
+ }
+
+ return get_thread_arch_regcache (ptid, current_thread_arch);
+}
+
+struct regcache *
+get_current_regcache (void)
+{
+ return get_thread_regcache (inferior_ptid);
+}
+
+/* See common/common-regcache.h. */
+
+struct regcache *
+get_thread_regcache_for_ptid (ptid_t ptid)
+{
+ return get_thread_regcache (ptid);
}
/* Observer for the target_changed event. */
-void
+static void
regcache_observer_target_changed (struct target_ops *target)
{
registers_changed ();
}
+/* Update global variables old ptids to hold NEW_PTID if they were
+ holding OLD_PTID. */
+static void
+regcache_thread_ptid_changed (ptid_t old_ptid, ptid_t new_ptid)
+{
+ struct regcache_list *list;
+
+ for (list = current_regcache; list; list = list->next)
+ if (ptid_equal (list->regcache->ptid (), old_ptid))
+ list->regcache->set_ptid (new_ptid);
+}
+
/* Low level examining and depositing of registers.
The caller is responsible for making sure that the inferior is
Indicate that registers may have changed, so invalidate the cache. */
void
-registers_changed (void)
+registers_changed_ptid (ptid_t ptid)
{
- int i;
+ struct regcache_list *list, **list_link;
+
+ list = current_regcache;
+ list_link = ¤t_regcache;
+ while (list)
+ {
+ if (ptid_match (list->regcache->ptid (), ptid))
+ {
+ struct regcache_list *dead = list;
+
+ *list_link = list->next;
+ regcache_xfree (list->regcache);
+ list = *list_link;
+ xfree (dead);
+ continue;
+ }
+
+ list_link = &list->next;
+ list = *list_link;
+ }
- registers_ptid = pid_to_ptid (-1);
+ if (ptid_match (current_thread_ptid, ptid))
+ {
+ current_thread_ptid = null_ptid;
+ current_thread_arch = NULL;
+ }
+
+ if (ptid_match (inferior_ptid, ptid))
+ {
+ /* We just deleted the regcache of the current thread. Need to
+ forget about any frames we have cached, too. */
+ reinit_frame_cache ();
+ }
+}
+
+void
+registers_changed (void)
+{
+ registers_changed_ptid (minus_one_ptid);
/* Force cleanup of any alloca areas if using C alloca instead of
a builtin alloca. This particular call is used to clean up
during lengthy interactions between gdb and the target before
gdb gives control to the user (ie watchpoints). */
alloca (0);
-
- for (i = 0; i < current_regcache->descr->nr_raw_registers; i++)
- set_register_cached (i, 0);
}
-/* DEPRECATED_REGISTERS_FETCHED ()
-
- Indicate that all registers have been fetched, so mark them all valid. */
-
-/* FIXME: cagney/2001-12-04: This function is DEPRECATED. The target
- code was blatting the registers[] array and then calling this.
- Since targets should only be using regcache_raw_supply() the need for
- this function/hack is eliminated. */
-
void
-deprecated_registers_fetched (void)
+regcache_raw_update (struct regcache *regcache, int regnum)
{
- int i;
+ gdb_assert (regcache != NULL);
- for (i = 0; i < NUM_REGS; i++)
- set_register_cached (i, 1);
- /* Do not assume that the pseudo-regs have also been fetched.
- Fetching all real regs NEVER accounts for pseudo-regs. */
+ regcache->raw_update (regnum);
}
void
-regcache_raw_read (struct regcache *regcache, int regnum, gdb_byte *buf)
+regcache::raw_update (int regnum)
{
- gdb_assert (regcache != NULL && buf != NULL);
- gdb_assert (regnum >= 0 && regnum < regcache->descr->nr_raw_registers);
+ gdb_assert (regnum >= 0 && regnum < m_descr->nr_raw_registers);
+
/* Make certain that the register cache is up-to-date with respect
to the current thread. This switching shouldn't be necessary
only there is still only one target side register cache. Sigh!
On the bright side, at least there is a regcache object. */
- if (!regcache->readonly_p)
+
+ if (!m_readonly_p && get_register_status (regnum) == REG_UNKNOWN)
{
- gdb_assert (regcache == current_regcache);
- if (! ptid_equal (registers_ptid, inferior_ptid))
- {
- registers_changed ();
- registers_ptid = inferior_ptid;
- }
- if (!register_cached (regnum))
- target_fetch_registers (regnum);
-#if 0
- /* FIXME: cagney/2004-08-07: At present a number of targets
- forget (or didn't know that they needed) to set this leading to
- panics. Also is the problem that targets need to indicate
- that a register is in one of the possible states: valid,
- undefined, unknown. The last of which isn't yet
- possible. */
- gdb_assert (register_cached (regnum));
-#endif
+ target_fetch_registers (this, regnum);
+
+ /* A number of targets can't access the whole set of raw
+ registers (because the debug API provides no means to get at
+ them). */
+ if (m_register_status[regnum] == REG_UNKNOWN)
+ m_register_status[regnum] = REG_UNAVAILABLE;
}
- /* Copy the value directly into the register cache. */
- memcpy (buf, register_buffer (regcache, regnum),
- regcache->descr->sizeof_register[regnum]);
}
-void
+enum register_status
+regcache_raw_read (struct regcache *regcache, int regnum, gdb_byte *buf)
+{
+ return regcache->raw_read (regnum, buf);
+}
+
+enum register_status
+regcache::raw_read (int regnum, gdb_byte *buf)
+{
+ gdb_assert (buf != NULL);
+ raw_update (regnum);
+
+ if (m_register_status[regnum] != REG_VALID)
+ memset (buf, 0, m_descr->sizeof_register[regnum]);
+ else
+ memcpy (buf, register_buffer (regnum),
+ m_descr->sizeof_register[regnum]);
+
+ return (enum register_status) m_register_status[regnum];
+}
+
+enum register_status
regcache_raw_read_signed (struct regcache *regcache, int regnum, LONGEST *val)
{
- gdb_byte *buf;
gdb_assert (regcache != NULL);
- gdb_assert (regnum >= 0 && regnum < regcache->descr->nr_raw_registers);
- buf = alloca (regcache->descr->sizeof_register[regnum]);
- regcache_raw_read (regcache, regnum, buf);
- (*val) = extract_signed_integer (buf,
- regcache->descr->sizeof_register[regnum]);
+ return regcache->raw_read_signed (regnum, val);
}
-void
+enum register_status
+regcache::raw_read_signed (int regnum, LONGEST *val)
+{
+ gdb_byte *buf;
+ enum register_status status;
+
+ gdb_assert (regnum >= 0 && regnum < m_descr->nr_raw_registers);
+ buf = (gdb_byte *) alloca (m_descr->sizeof_register[regnum]);
+ status = raw_read (regnum, buf);
+ if (status == REG_VALID)
+ *val = extract_signed_integer
+ (buf, m_descr->sizeof_register[regnum],
+ gdbarch_byte_order (m_descr->gdbarch));
+ else
+ *val = 0;
+ return status;
+}
+
+enum register_status
regcache_raw_read_unsigned (struct regcache *regcache, int regnum,
ULONGEST *val)
{
- gdb_byte *buf;
gdb_assert (regcache != NULL);
- gdb_assert (regnum >= 0 && regnum < regcache->descr->nr_raw_registers);
- buf = alloca (regcache->descr->sizeof_register[regnum]);
- regcache_raw_read (regcache, regnum, buf);
- (*val) = extract_unsigned_integer (buf,
- regcache->descr->sizeof_register[regnum]);
+ return regcache->raw_read_unsigned (regnum, val);
+}
+
+
+enum register_status
+regcache::raw_read_unsigned (int regnum, ULONGEST *val)
+{
+ gdb_byte *buf;
+ enum register_status status;
+
+ gdb_assert (regnum >= 0 && regnum < m_descr->nr_raw_registers);
+ buf = (gdb_byte *) alloca (m_descr->sizeof_register[regnum]);
+ status = raw_read (regnum, buf);
+ if (status == REG_VALID)
+ *val = extract_unsigned_integer
+ (buf, m_descr->sizeof_register[regnum],
+ gdbarch_byte_order (m_descr->gdbarch));
+ else
+ *val = 0;
+ return status;
}
void
regcache_raw_write_signed (struct regcache *regcache, int regnum, LONGEST val)
{
- void *buf;
gdb_assert (regcache != NULL);
- gdb_assert (regnum >=0 && regnum < regcache->descr->nr_raw_registers);
- buf = alloca (regcache->descr->sizeof_register[regnum]);
- store_signed_integer (buf, regcache->descr->sizeof_register[regnum], val);
- regcache_raw_write (regcache, regnum, buf);
+ regcache->raw_write_signed (regnum, val);
+}
+
+void
+regcache::raw_write_signed (int regnum, LONGEST val)
+{
+ gdb_byte *buf;
+
+ gdb_assert (regnum >=0 && regnum < m_descr->nr_raw_registers);
+ buf = (gdb_byte *) alloca (m_descr->sizeof_register[regnum]);
+ store_signed_integer (buf, m_descr->sizeof_register[regnum],
+ gdbarch_byte_order (m_descr->gdbarch), val);
+ raw_write (regnum, buf);
}
void
regcache_raw_write_unsigned (struct regcache *regcache, int regnum,
ULONGEST val)
{
- void *buf;
gdb_assert (regcache != NULL);
- gdb_assert (regnum >=0 && regnum < regcache->descr->nr_raw_registers);
- buf = alloca (regcache->descr->sizeof_register[regnum]);
- store_unsigned_integer (buf, regcache->descr->sizeof_register[regnum], val);
- regcache_raw_write (regcache, regnum, buf);
+ regcache->raw_write_unsigned (regnum, val);
}
void
+regcache::raw_write_unsigned (int regnum, ULONGEST val)
+{
+ gdb_byte *buf;
+
+ gdb_assert (regnum >=0 && regnum < m_descr->nr_raw_registers);
+ buf = (gdb_byte *) alloca (m_descr->sizeof_register[regnum]);
+ store_unsigned_integer (buf, m_descr->sizeof_register[regnum],
+ gdbarch_byte_order (m_descr->gdbarch), val);
+ raw_write (regnum, buf);
+}
+
+LONGEST
+regcache_raw_get_signed (struct regcache *regcache, int regnum)
+{
+ LONGEST value;
+ enum register_status status;
+
+ status = regcache_raw_read_signed (regcache, regnum, &value);
+ if (status == REG_UNAVAILABLE)
+ throw_error (NOT_AVAILABLE_ERROR,
+ _("Register %d is not available"), regnum);
+ return value;
+}
+
+enum register_status
regcache_cooked_read (struct regcache *regcache, int regnum, gdb_byte *buf)
+{
+ return regcache->cooked_read (regnum, buf);
+}
+
+enum register_status
+regcache::cooked_read (int regnum, gdb_byte *buf)
{
gdb_assert (regnum >= 0);
- gdb_assert (regnum < regcache->descr->nr_cooked_registers);
- if (regnum < regcache->descr->nr_raw_registers)
- regcache_raw_read (regcache, regnum, buf);
- else if (regcache->readonly_p
- && regnum < regcache->descr->nr_cooked_registers
- && regcache->register_valid_p[regnum])
- /* Read-only register cache, perhaps the cooked value was cached? */
- memcpy (buf, register_buffer (regcache, regnum),
- regcache->descr->sizeof_register[regnum]);
+ gdb_assert (regnum < m_descr->nr_cooked_registers);
+ if (regnum < m_descr->nr_raw_registers)
+ return raw_read (regnum, buf);
+ else if (m_readonly_p
+ && m_register_status[regnum] != REG_UNKNOWN)
+ {
+ /* Read-only register cache, perhaps the cooked value was
+ cached? */
+ if (m_register_status[regnum] == REG_VALID)
+ memcpy (buf, register_buffer (regnum),
+ m_descr->sizeof_register[regnum]);
+ else
+ memset (buf, 0, m_descr->sizeof_register[regnum]);
+
+ return (enum register_status) m_register_status[regnum];
+ }
+ else if (gdbarch_pseudo_register_read_value_p (m_descr->gdbarch))
+ {
+ struct value *mark, *computed;
+ enum register_status result = REG_VALID;
+
+ mark = value_mark ();
+
+ computed = gdbarch_pseudo_register_read_value (m_descr->gdbarch,
+ this, regnum);
+ if (value_entirely_available (computed))
+ memcpy (buf, value_contents_raw (computed),
+ m_descr->sizeof_register[regnum]);
+ else
+ {
+ memset (buf, 0, m_descr->sizeof_register[regnum]);
+ result = REG_UNAVAILABLE;
+ }
+
+ value_free_to_mark (mark);
+
+ return result;
+ }
else
- gdbarch_pseudo_register_read (regcache->descr->gdbarch, regcache,
- regnum, buf);
+ return gdbarch_pseudo_register_read (m_descr->gdbarch, this,
+ regnum, buf);
}
-void
+struct value *
+regcache_cooked_read_value (struct regcache *regcache, int regnum)
+{
+ return regcache->cooked_read_value (regnum);
+}
+
+struct value *
+regcache::cooked_read_value (int regnum)
+{
+ gdb_assert (regnum >= 0);
+ gdb_assert (regnum < m_descr->nr_cooked_registers);
+
+ if (regnum < m_descr->nr_raw_registers
+ || (m_readonly_p && m_register_status[regnum] != REG_UNKNOWN)
+ || !gdbarch_pseudo_register_read_value_p (m_descr->gdbarch))
+ {
+ struct value *result;
+
+ result = allocate_value (register_type (m_descr->gdbarch, regnum));
+ VALUE_LVAL (result) = lval_register;
+ VALUE_REGNUM (result) = regnum;
+
+ /* It is more efficient in general to do this delegation in this
+ direction than in the other one, even though the value-based
+ API is preferred. */
+ if (cooked_read (regnum,
+ value_contents_raw (result)) == REG_UNAVAILABLE)
+ mark_value_bytes_unavailable (result, 0,
+ TYPE_LENGTH (value_type (result)));
+
+ return result;
+ }
+ else
+ return gdbarch_pseudo_register_read_value (m_descr->gdbarch,
+ this, regnum);
+}
+
+enum register_status
regcache_cooked_read_signed (struct regcache *regcache, int regnum,
LONGEST *val)
{
- gdb_byte *buf;
gdb_assert (regcache != NULL);
- gdb_assert (regnum >= 0 && regnum < regcache->descr->nr_cooked_registers);
- buf = alloca (regcache->descr->sizeof_register[regnum]);
- regcache_cooked_read (regcache, regnum, buf);
- (*val) = extract_signed_integer (buf,
- regcache->descr->sizeof_register[regnum]);
+ return regcache->cooked_read_signed (regnum, val);
}
-void
+enum register_status
+regcache::cooked_read_signed (int regnum, LONGEST *val)
+{
+ enum register_status status;
+ gdb_byte *buf;
+
+ gdb_assert (regnum >= 0 && regnum < m_descr->nr_cooked_registers);
+ buf = (gdb_byte *) alloca (m_descr->sizeof_register[regnum]);
+ status = cooked_read (regnum, buf);
+ if (status == REG_VALID)
+ *val = extract_signed_integer
+ (buf, m_descr->sizeof_register[regnum],
+ gdbarch_byte_order (m_descr->gdbarch));
+ else
+ *val = 0;
+ return status;
+}
+
+enum register_status
regcache_cooked_read_unsigned (struct regcache *regcache, int regnum,
ULONGEST *val)
{
- gdb_byte *buf;
gdb_assert (regcache != NULL);
- gdb_assert (regnum >= 0 && regnum < regcache->descr->nr_cooked_registers);
- buf = alloca (regcache->descr->sizeof_register[regnum]);
- regcache_cooked_read (regcache, regnum, buf);
- (*val) = extract_unsigned_integer (buf,
- regcache->descr->sizeof_register[regnum]);
+ return regcache->cooked_read_unsigned (regnum, val);
+}
+
+enum register_status
+regcache::cooked_read_unsigned (int regnum, ULONGEST *val)
+{
+ enum register_status status;
+ gdb_byte *buf;
+
+ gdb_assert (regnum >= 0 && regnum < m_descr->nr_cooked_registers);
+ buf = (gdb_byte *) alloca (m_descr->sizeof_register[regnum]);
+ status = cooked_read (regnum, buf);
+ if (status == REG_VALID)
+ *val = extract_unsigned_integer
+ (buf, m_descr->sizeof_register[regnum],
+ gdbarch_byte_order (m_descr->gdbarch));
+ else
+ *val = 0;
+ return status;
}
void
regcache_cooked_write_signed (struct regcache *regcache, int regnum,
LONGEST val)
{
- void *buf;
gdb_assert (regcache != NULL);
- gdb_assert (regnum >=0 && regnum < regcache->descr->nr_cooked_registers);
- buf = alloca (regcache->descr->sizeof_register[regnum]);
- store_signed_integer (buf, regcache->descr->sizeof_register[regnum], val);
- regcache_cooked_write (regcache, regnum, buf);
+ regcache->cooked_write_signed (regnum, val);
+}
+
+void
+regcache::cooked_write_signed (int regnum, LONGEST val)
+{
+ gdb_byte *buf;
+
+ gdb_assert (regnum >=0 && regnum < m_descr->nr_cooked_registers);
+ buf = (gdb_byte *) alloca (m_descr->sizeof_register[regnum]);
+ store_signed_integer (buf, m_descr->sizeof_register[regnum],
+ gdbarch_byte_order (m_descr->gdbarch), val);
+ cooked_write (regnum, buf);
}
void
regcache_cooked_write_unsigned (struct regcache *regcache, int regnum,
ULONGEST val)
{
- void *buf;
gdb_assert (regcache != NULL);
- gdb_assert (regnum >=0 && regnum < regcache->descr->nr_cooked_registers);
- buf = alloca (regcache->descr->sizeof_register[regnum]);
- store_unsigned_integer (buf, regcache->descr->sizeof_register[regnum], val);
- regcache_cooked_write (regcache, regnum, buf);
+ regcache->cooked_write_unsigned (regnum, val);
+}
+
+void
+regcache::cooked_write_unsigned (int regnum, ULONGEST val)
+{
+ gdb_byte *buf;
+
+ gdb_assert (regnum >=0 && regnum < m_descr->nr_cooked_registers);
+ buf = (gdb_byte *) alloca (m_descr->sizeof_register[regnum]);
+ store_unsigned_integer (buf, m_descr->sizeof_register[regnum],
+ gdbarch_byte_order (m_descr->gdbarch), val);
+ cooked_write (regnum, buf);
+}
+
+/* See regcache.h. */
+
+void
+regcache_raw_set_cached_value (struct regcache *regcache, int regnum,
+ const gdb_byte *buf)
+{
+ regcache->raw_set_cached_value (regnum, buf);
+}
+
+void
+regcache::raw_set_cached_value (int regnum, const gdb_byte *buf)
+{
+ memcpy (register_buffer (regnum), buf,
+ m_descr->sizeof_register[regnum]);
+ m_register_status[regnum] = REG_VALID;
}
void
const gdb_byte *buf)
{
gdb_assert (regcache != NULL && buf != NULL);
- gdb_assert (regnum >= 0 && regnum < regcache->descr->nr_raw_registers);
- gdb_assert (!regcache->readonly_p);
+ regcache->raw_write (regnum, buf);
+}
+
+void
+regcache::raw_write (int regnum, const gdb_byte *buf)
+{
+ struct cleanup *old_chain;
+
+ gdb_assert (buf != NULL);
+ gdb_assert (regnum >= 0 && regnum < m_descr->nr_raw_registers);
+ gdb_assert (!m_readonly_p);
/* On the sparc, writing %g0 is a no-op, so we don't even want to
change the registers array if something writes to this register. */
- if (CANNOT_STORE_REGISTER (regnum))
+ if (gdbarch_cannot_store_register (arch (), regnum))
return;
- /* Make certain that the correct cache is selected. */
- gdb_assert (regcache == current_regcache);
- if (! ptid_equal (registers_ptid, inferior_ptid))
- {
- registers_changed ();
- registers_ptid = inferior_ptid;
- }
-
/* If we have a valid copy of the register, and new value == old
- value, then don't bother doing the actual store. */
- if (regcache_valid_p (regcache, regnum)
- && (memcmp (register_buffer (regcache, regnum), buf,
- regcache->descr->sizeof_register[regnum]) == 0))
+ value, then don't bother doing the actual store. */
+ if (get_register_status (regnum) == REG_VALID
+ && (memcmp (register_buffer (regnum), buf,
+ m_descr->sizeof_register[regnum]) == 0))
return;
- target_prepare_to_store ();
- memcpy (register_buffer (regcache, regnum), buf,
- regcache->descr->sizeof_register[regnum]);
- regcache->register_valid_p[regnum] = 1;
- target_store_registers (regnum);
+ target_prepare_to_store (this);
+ raw_set_cached_value (regnum, buf);
+
+ /* Register a cleanup function for invalidating the register after it is
+ written, in case of a failure. */
+ old_chain = make_cleanup_regcache_invalidate (this, regnum);
+
+ target_store_registers (this, regnum);
+
+ /* The target did not throw an error so we can discard invalidating the
+ register and restore the cleanup chain to what it was. */
+ discard_cleanups (old_chain);
}
void
regcache_cooked_write (struct regcache *regcache, int regnum,
const gdb_byte *buf)
+{
+ regcache->cooked_write (regnum, buf);
+}
+
+void
+regcache::cooked_write (int regnum, const gdb_byte *buf)
{
gdb_assert (regnum >= 0);
- gdb_assert (regnum < regcache->descr->nr_cooked_registers);
- if (regnum < regcache->descr->nr_raw_registers)
- regcache_raw_write (regcache, regnum, buf);
+ gdb_assert (regnum < m_descr->nr_cooked_registers);
+ if (regnum < m_descr->nr_raw_registers)
+ raw_write (regnum, buf);
else
- gdbarch_pseudo_register_write (regcache->descr->gdbarch, regcache,
+ gdbarch_pseudo_register_write (m_descr->gdbarch, this,
regnum, buf);
}
typedef void (regcache_write_ftype) (struct regcache *regcache, int regnum,
const void *buf);
-static void
-regcache_xfer_part (struct regcache *regcache, int regnum,
- int offset, int len, void *in, const void *out,
- void (*read) (struct regcache *regcache, int regnum,
- gdb_byte *buf),
- void (*write) (struct regcache *regcache, int regnum,
- const gdb_byte *buf))
-{
- struct regcache_descr *descr = regcache->descr;
- gdb_byte reg[MAX_REGISTER_SIZE];
- gdb_assert (offset >= 0 && offset <= descr->sizeof_register[regnum]);
- gdb_assert (len >= 0 && offset + len <= descr->sizeof_register[regnum]);
+enum register_status
+regcache::xfer_part (int regnum, int offset, int len, void *in,
+ const void *out,
+ enum register_status (*read) (struct regcache *regcache,
+ int regnum,
+ gdb_byte *buf),
+ void (*write) (struct regcache *regcache, int regnum,
+ const gdb_byte *buf))
+{
+ struct gdbarch *gdbarch = arch ();
+ gdb_byte *reg = (gdb_byte *) alloca (register_size (gdbarch, regnum));
+
+ gdb_assert (offset >= 0 && offset <= m_descr->sizeof_register[regnum]);
+ gdb_assert (len >= 0 && offset + len <= m_descr->sizeof_register[regnum]);
/* Something to do? */
if (offset + len == 0)
- return;
- /* Read (when needed) ... */
+ return REG_VALID;
+ /* Read (when needed) ... */
if (in != NULL
|| offset > 0
- || offset + len < descr->sizeof_register[regnum])
+ || offset + len < m_descr->sizeof_register[regnum])
{
+ enum register_status status;
+
gdb_assert (read != NULL);
- read (regcache, regnum, reg);
+ status = read (this, regnum, reg);
+ if (status != REG_VALID)
+ return status;
}
- /* ... modify ... */
+ /* ... modify ... */
if (in != NULL)
memcpy (in, reg + offset, len);
if (out != NULL)
if (out != NULL)
{
gdb_assert (write != NULL);
- write (regcache, regnum, reg);
+ write (this, regnum, reg);
}
+
+ return REG_VALID;
}
-void
+enum register_status
regcache_raw_read_part (struct regcache *regcache, int regnum,
int offset, int len, gdb_byte *buf)
{
- struct regcache_descr *descr = regcache->descr;
- gdb_assert (regnum >= 0 && regnum < descr->nr_raw_registers);
- regcache_xfer_part (regcache, regnum, offset, len, buf, NULL,
- regcache_raw_read, regcache_raw_write);
+ return regcache->raw_read_part (regnum, offset, len, buf);
+}
+
+enum register_status
+regcache::raw_read_part (int regnum, int offset, int len, gdb_byte *buf)
+{
+ gdb_assert (regnum >= 0 && regnum < m_descr->nr_raw_registers);
+ return xfer_part (regnum, offset, len, buf, NULL,
+ regcache_raw_read, regcache_raw_write);
}
void
regcache_raw_write_part (struct regcache *regcache, int regnum,
int offset, int len, const gdb_byte *buf)
{
- struct regcache_descr *descr = regcache->descr;
- gdb_assert (regnum >= 0 && regnum < descr->nr_raw_registers);
- regcache_xfer_part (regcache, regnum, offset, len, NULL, buf,
- regcache_raw_read, regcache_raw_write);
+ regcache->raw_write_part (regnum, offset, len, buf);
}
void
+regcache::raw_write_part (int regnum, int offset, int len,
+ const gdb_byte *buf)
+{
+ gdb_assert (regnum >= 0 && regnum < m_descr->nr_raw_registers);
+ xfer_part (regnum, offset, len, NULL, buf, regcache_raw_read,
+ regcache_raw_write);
+}
+
+enum register_status
regcache_cooked_read_part (struct regcache *regcache, int regnum,
int offset, int len, gdb_byte *buf)
{
- struct regcache_descr *descr = regcache->descr;
- gdb_assert (regnum >= 0 && regnum < descr->nr_cooked_registers);
- regcache_xfer_part (regcache, regnum, offset, len, buf, NULL,
- regcache_cooked_read, regcache_cooked_write);
+ return regcache->cooked_read_part (regnum, offset, len, buf);
+}
+
+
+enum register_status
+regcache::cooked_read_part (int regnum, int offset, int len, gdb_byte *buf)
+{
+ gdb_assert (regnum >= 0 && regnum < m_descr->nr_cooked_registers);
+ return xfer_part (regnum, offset, len, buf, NULL,
+ regcache_cooked_read, regcache_cooked_write);
}
void
regcache_cooked_write_part (struct regcache *regcache, int regnum,
int offset, int len, const gdb_byte *buf)
{
- struct regcache_descr *descr = regcache->descr;
- gdb_assert (regnum >= 0 && regnum < descr->nr_cooked_registers);
- regcache_xfer_part (regcache, regnum, offset, len, NULL, buf,
- regcache_cooked_read, regcache_cooked_write);
+ regcache->cooked_write_part (regnum, offset, len, buf);
}
-/* Hack to keep code that view the register buffer as raw bytes
- working. */
-
-int
-register_offset_hack (struct gdbarch *gdbarch, int regnum)
+void
+regcache::cooked_write_part (int regnum, int offset, int len,
+ const gdb_byte *buf)
{
- struct regcache_descr *descr = regcache_descr (gdbarch);
- gdb_assert (regnum >= 0 && regnum < descr->nr_cooked_registers);
- return descr->register_offset[regnum];
+ gdb_assert (regnum >= 0 && regnum < m_descr->nr_cooked_registers);
+ xfer_part (regnum, offset, len, NULL, buf,
+ regcache_cooked_read, regcache_cooked_write);
}
-/* Return the contents of register REGNUM as an unsigned integer. */
+/* Supply register REGNUM, whose contents are stored in BUF, to REGCACHE. */
-ULONGEST
-read_register (int regnum)
+void
+regcache_raw_supply (struct regcache *regcache, int regnum, const void *buf)
{
- gdb_byte *buf = alloca (register_size (current_gdbarch, regnum));
- gdb_assert (current_regcache != NULL);
- gdb_assert (current_regcache->descr->gdbarch == current_gdbarch);
- regcache_cooked_read (current_regcache, regnum, buf);
- return (extract_unsigned_integer (buf, register_size (current_gdbarch, regnum)));
+ gdb_assert (regcache != NULL);
+ regcache->raw_supply (regnum, buf);
}
-ULONGEST
-read_register_pid (int regnum, ptid_t ptid)
+void
+regcache::raw_supply (int regnum, const void *buf)
{
- ptid_t save_ptid;
- int save_pid;
- CORE_ADDR retval;
+ void *regbuf;
+ size_t size;
+
+ gdb_assert (regnum >= 0 && regnum < m_descr->nr_raw_registers);
+ gdb_assert (!m_readonly_p);
+
+ regbuf = register_buffer (regnum);
+ size = m_descr->sizeof_register[regnum];
- if (ptid_equal (ptid, inferior_ptid))
- return read_register (regnum);
+ if (buf)
+ {
+ memcpy (regbuf, buf, size);
+ m_register_status[regnum] = REG_VALID;
+ }
+ else
+ {
+ /* This memset not strictly necessary, but better than garbage
+ in case the register value manages to escape somewhere (due
+ to a bug, no less). */
+ memset (regbuf, 0, size);
+ m_register_status[regnum] = REG_UNAVAILABLE;
+ }
+}
- save_ptid = inferior_ptid;
+/* Supply register REGNUM with zeroed value to REGCACHE. This is not the same
+ as calling raw_supply with NULL (which will set the state to
+ unavailable). */
- inferior_ptid = ptid;
+void
+regcache::raw_supply_zeroed (int regnum)
+{
+ void *regbuf;
+ size_t size;
- retval = read_register (regnum);
+ gdb_assert (regnum >= 0 && regnum < m_descr->nr_raw_registers);
+ gdb_assert (!m_readonly_p);
- inferior_ptid = save_ptid;
+ regbuf = register_buffer (regnum);
+ size = m_descr->sizeof_register[regnum];
- return retval;
+ memset (regbuf, 0, size);
+ m_register_status[regnum] = REG_VALID;
}
-/* Store VALUE into the raw contents of register number REGNUM. */
+/* Collect register REGNUM from REGCACHE and store its contents in BUF. */
void
-write_register (int regnum, LONGEST val)
+regcache_raw_collect (const struct regcache *regcache, int regnum, void *buf)
{
- void *buf;
- int size;
- size = register_size (current_gdbarch, regnum);
- buf = alloca (size);
- store_signed_integer (buf, size, (LONGEST) val);
- gdb_assert (current_regcache != NULL);
- gdb_assert (current_regcache->descr->gdbarch == current_gdbarch);
- regcache_cooked_write (current_regcache, regnum, buf);
+ gdb_assert (regcache != NULL && buf != NULL);
+ regcache->raw_collect (regnum, buf);
}
void
-write_register_pid (int regnum, CORE_ADDR val, ptid_t ptid)
+regcache::raw_collect (int regnum, void *buf) const
{
- ptid_t save_ptid;
-
- if (ptid_equal (ptid, inferior_ptid))
- {
- write_register (regnum, val);
- return;
- }
-
- save_ptid = inferior_ptid;
-
- inferior_ptid = ptid;
+ const void *regbuf;
+ size_t size;
- write_register (regnum, val);
+ gdb_assert (buf != NULL);
+ gdb_assert (regnum >= 0 && regnum < m_descr->nr_raw_registers);
- inferior_ptid = save_ptid;
+ regbuf = register_buffer (regnum);
+ size = m_descr->sizeof_register[regnum];
+ memcpy (buf, regbuf, size);
}
-/* Supply register REGNUM, whose contents are stored in BUF, to REGCACHE. */
+/* 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. */
void
-regcache_raw_supply (struct regcache *regcache, int regnum, const void *buf)
+regcache::transfer_regset (const struct regset *regset,
+ struct regcache *out_regcache,
+ int regnum, const void *in_buf,
+ void *out_buf, size_t size) const
{
- void *regbuf;
- size_t size;
-
- gdb_assert (regcache != NULL);
- gdb_assert (regnum >= 0 && regnum < regcache->descr->nr_raw_registers);
- gdb_assert (!regcache->readonly_p);
+ const struct regcache_map_entry *map;
+ int offs = 0, count;
- /* FIXME: kettenis/20030828: It shouldn't be necessary to handle
- CURRENT_REGCACHE specially here. */
- if (regcache == current_regcache
- && !ptid_equal (registers_ptid, inferior_ptid))
+ for (map = (const struct regcache_map_entry *) regset->regmap;
+ (count = map->count) != 0;
+ map++)
{
- registers_changed ();
- registers_ptid = inferior_ptid;
- }
+ int regno = map->regno;
+ int slot_size = map->size;
- regbuf = register_buffer (regcache, regnum);
- size = regcache->descr->sizeof_register[regnum];
+ if (slot_size == 0 && regno != REGCACHE_MAP_SKIP)
+ slot_size = m_descr->sizeof_register[regno];
- if (buf)
- memcpy (regbuf, buf, size);
- else
- memset (regbuf, 0, size);
+ if (regno == REGCACHE_MAP_SKIP
+ || (regnum != -1
+ && (regnum < regno || regnum >= regno + count)))
+ offs += count * slot_size;
- /* Mark the register as cached. */
- regcache->register_valid_p[regnum] = 1;
+ else if (regnum == -1)
+ for (; count--; regno++, offs += slot_size)
+ {
+ if (offs + slot_size > size)
+ break;
+
+ if (out_buf)
+ raw_collect (regno, (gdb_byte *) out_buf + offs);
+ else
+ out_regcache->raw_supply (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)
+ raw_collect (regnum, (gdb_byte *) out_buf + offs);
+ else
+ out_regcache->raw_supply (regnum, in_buf
+ ? (const gdb_byte *) in_buf + offs
+ : NULL);
+ return;
+ }
+ }
}
-/* Collect register REGNUM from REGCACHE and store its contents in BUF. */
+/* 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_raw_collect (const struct regcache *regcache, int regnum, void *buf)
+regcache_supply_regset (const struct regset *regset,
+ struct regcache *regcache,
+ int regnum, const void *buf, size_t size)
{
- const void *regbuf;
- size_t size;
-
- gdb_assert (regcache != NULL && buf != NULL);
- gdb_assert (regnum >= 0 && regnum < regcache->descr->nr_raw_registers);
+ regcache->supply_regset (regset, regnum, buf, size);
+}
- regbuf = register_buffer (regcache, regnum);
- size = regcache->descr->sizeof_register[regnum];
- memcpy (buf, regbuf, size);
+void
+regcache::supply_regset (const struct regset *regset,
+ int regnum, const void *buf, size_t size)
+{
+ transfer_regset (regset, this, 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. */
-/* read_pc, write_pc, read_sp, etc. Special handling for registers
- PC, SP, and FP. */
+void
+regcache_collect_regset (const struct regset *regset,
+ const struct regcache *regcache,
+ int regnum, void *buf, size_t size)
+{
+ regcache->collect_regset (regset, regnum, buf, size);
+}
+
+void
+regcache::collect_regset (const struct regset *regset,
+ int regnum, void *buf, size_t size) const
+{
+ transfer_regset (regset, NULL, regnum, NULL, buf, size);
+}
-/* NOTE: cagney/2001-02-18: The functions read_pc_pid(), read_pc() and
- read_sp(), will eventually be replaced by per-frame methods.
- Instead of relying on the global INFERIOR_PTID, they will use the
- contextual information provided by the FRAME. These functions do
- not belong in the register cache. */
-/* NOTE: cagney/2003-06-07: The functions generic_target_write_pc(),
- write_pc_pid() and write_pc(), all need to be replaced by something
- that does not rely on global state. But what? */
+/* Special handling for register PC. */
CORE_ADDR
-read_pc_pid (ptid_t ptid)
+regcache_read_pc (struct regcache *regcache)
{
- ptid_t saved_inferior_ptid;
- CORE_ADDR pc_val;
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
- /* In case ptid != inferior_ptid. */
- saved_inferior_ptid = inferior_ptid;
- inferior_ptid = ptid;
+ CORE_ADDR pc_val;
- if (TARGET_READ_PC_P ())
- pc_val = TARGET_READ_PC (ptid);
+ if (gdbarch_read_pc_p (gdbarch))
+ pc_val = gdbarch_read_pc (gdbarch, regcache);
/* Else use per-frame method on get_current_frame. */
- else if (PC_REGNUM >= 0)
+ else if (gdbarch_pc_regnum (gdbarch) >= 0)
{
- CORE_ADDR raw_val = read_register_pid (PC_REGNUM, ptid);
- pc_val = ADDR_BITS_REMOVE (raw_val);
- }
- else
- internal_error (__FILE__, __LINE__, _("read_pc_pid: Unable to find PC"));
+ ULONGEST raw_val;
- inferior_ptid = saved_inferior_ptid;
- return pc_val;
-}
+ if (regcache_cooked_read_unsigned (regcache,
+ gdbarch_pc_regnum (gdbarch),
+ &raw_val) == REG_UNAVAILABLE)
+ throw_error (NOT_AVAILABLE_ERROR, _("PC register is not available"));
-CORE_ADDR
-read_pc (void)
-{
- return read_pc_pid (inferior_ptid);
-}
-
-void
-generic_target_write_pc (CORE_ADDR pc, ptid_t ptid)
-{
- if (PC_REGNUM >= 0)
- write_register_pid (PC_REGNUM, pc, ptid);
+ pc_val = gdbarch_addr_bits_remove (gdbarch, raw_val);
+ }
else
internal_error (__FILE__, __LINE__,
- _("generic_target_write_pc"));
+ _("regcache_read_pc: Unable to find PC"));
+ return pc_val;
}
void
-write_pc_pid (CORE_ADDR pc, ptid_t ptid)
+regcache_write_pc (struct regcache *regcache, CORE_ADDR pc)
{
- ptid_t saved_inferior_ptid;
-
- /* In case ptid != inferior_ptid. */
- saved_inferior_ptid = inferior_ptid;
- inferior_ptid = ptid;
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
- TARGET_WRITE_PC (pc, ptid);
+ if (gdbarch_write_pc_p (gdbarch))
+ gdbarch_write_pc (gdbarch, regcache, pc);
+ else if (gdbarch_pc_regnum (gdbarch) >= 0)
+ regcache_cooked_write_unsigned (regcache,
+ gdbarch_pc_regnum (gdbarch), pc);
+ else
+ internal_error (__FILE__, __LINE__,
+ _("regcache_write_pc: Unable to update PC"));
- inferior_ptid = saved_inferior_ptid;
+ /* Writing the PC (for instance, from "load") invalidates the
+ current frame. */
+ reinit_frame_cache ();
}
void
-write_pc (CORE_ADDR pc)
+regcache::debug_print_register (const char *func, int regno)
{
- write_pc_pid (pc, inferior_ptid);
-}
+ struct gdbarch *gdbarch = arch ();
-/* Cope with strage ways of getting to the stack and frame pointers */
+ fprintf_unfiltered (gdb_stdlog, "%s ", func);
+ if (regno >= 0 && regno < gdbarch_num_regs (gdbarch)
+ && gdbarch_register_name (gdbarch, regno) != NULL
+ && gdbarch_register_name (gdbarch, regno)[0] != '\0')
+ fprintf_unfiltered (gdb_stdlog, "(%s)",
+ gdbarch_register_name (gdbarch, regno));
+ else
+ fprintf_unfiltered (gdb_stdlog, "(%d)", regno);
+ if (regno >= 0 && regno < gdbarch_num_regs (gdbarch))
+ {
+ enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
+ int size = register_size (gdbarch, regno);
+ gdb_byte *buf = register_buffer (regno);
-CORE_ADDR
-read_sp (void)
-{
- if (TARGET_READ_SP_P ())
- return TARGET_READ_SP ();
- else if (gdbarch_unwind_sp_p (current_gdbarch))
- return get_frame_sp (get_current_frame ());
- else if (SP_REGNUM >= 0)
- /* Try SP_REGNUM last: this makes all sorts of [wrong] assumptions
- about the architecture so put it at the end. */
- return read_register (SP_REGNUM);
- internal_error (__FILE__, __LINE__, _("read_sp: Unable to find SP"));
+ fprintf_unfiltered (gdb_stdlog, " = ");
+ for (int i = 0; i < size; i++)
+ {
+ fprintf_unfiltered (gdb_stdlog, "%02x", buf[i]);
+ }
+ if (size <= sizeof (LONGEST))
+ {
+ ULONGEST val = extract_unsigned_integer (buf, size, byte_order);
+
+ fprintf_unfiltered (gdb_stdlog, " %s %s",
+ core_addr_to_string_nz (val), plongest (val));
+ }
+ }
+ fprintf_unfiltered (gdb_stdlog, "\n");
}
static void
printf_filtered (_("Register cache flushed.\n"));
}
-static void
-build_regcache (void)
-{
- current_regcache = regcache_xmalloc (current_gdbarch);
- current_regcache->readonly_p = 0;
-}
-
-static void
-dump_endian_bytes (struct ui_file *file, enum bfd_endian endian,
- const unsigned char *buf, long len)
-{
- int i;
- switch (endian)
- {
- case BFD_ENDIAN_BIG:
- for (i = 0; i < len; i++)
- fprintf_unfiltered (file, "%02x", buf[i]);
- break;
- case BFD_ENDIAN_LITTLE:
- for (i = len - 1; i >= 0; i--)
- fprintf_unfiltered (file, "%02x", buf[i]);
- break;
- default:
- internal_error (__FILE__, __LINE__, _("Bad switch"));
- }
-}
-
-enum regcache_dump_what
-{
- regcache_dump_none, regcache_dump_raw, regcache_dump_cooked, regcache_dump_groups
-};
-
-static void
-regcache_dump (struct regcache *regcache, struct ui_file *file,
- enum regcache_dump_what what_to_dump)
+void
+regcache::dump (ui_file *file, enum regcache_dump_what what_to_dump)
{
struct cleanup *cleanups = make_cleanup (null_cleanup, NULL);
- struct gdbarch *gdbarch = regcache->descr->gdbarch;
+ struct gdbarch *gdbarch = m_descr->gdbarch;
int regnum;
int footnote_nr = 0;
int footnote_register_size = 0;
int footnote_register_offset = 0;
int footnote_register_type_name_null = 0;
long register_offset = 0;
- unsigned char buf[MAX_REGISTER_SIZE];
+ gdb_byte buf[MAX_REGISTER_SIZE];
#if 0
fprintf_unfiltered (file, "nr_raw_registers %d\n",
- regcache->descr->nr_raw_registers);
+ m_descr->nr_raw_registers);
fprintf_unfiltered (file, "nr_cooked_registers %d\n",
- regcache->descr->nr_cooked_registers);
+ m_descr->nr_cooked_registers);
fprintf_unfiltered (file, "sizeof_raw_registers %ld\n",
- regcache->descr->sizeof_raw_registers);
- fprintf_unfiltered (file, "sizeof_raw_register_valid_p %ld\n",
- regcache->descr->sizeof_raw_register_valid_p);
- fprintf_unfiltered (file, "NUM_REGS %d\n", NUM_REGS);
- fprintf_unfiltered (file, "NUM_PSEUDO_REGS %d\n", NUM_PSEUDO_REGS);
+ m_descr->sizeof_raw_registers);
+ fprintf_unfiltered (file, "sizeof_raw_register_status %ld\n",
+ m_descr->sizeof_raw_register_status);
+ fprintf_unfiltered (file, "gdbarch_num_regs %d\n",
+ gdbarch_num_regs (gdbarch));
+ fprintf_unfiltered (file, "gdbarch_num_pseudo_regs %d\n",
+ gdbarch_num_pseudo_regs (gdbarch));
#endif
- gdb_assert (regcache->descr->nr_cooked_registers
- == (NUM_REGS + NUM_PSEUDO_REGS));
+ gdb_assert (m_descr->nr_cooked_registers
+ == (gdbarch_num_regs (gdbarch)
+ + gdbarch_num_pseudo_regs (gdbarch)));
- for (regnum = -1; regnum < regcache->descr->nr_cooked_registers; regnum++)
+ for (regnum = -1; regnum < m_descr->nr_cooked_registers; regnum++)
{
/* Name. */
if (regnum < 0)
fprintf_unfiltered (file, " %-10s", "Name");
else
{
- const char *p = REGISTER_NAME (regnum);
+ const char *p = gdbarch_register_name (gdbarch, regnum);
+
if (p == NULL)
p = "";
else if (p[0] == '\0')
/* Relative number. */
if (regnum < 0)
fprintf_unfiltered (file, " %4s", "Rel");
- else if (regnum < NUM_REGS)
+ else if (regnum < gdbarch_num_regs (gdbarch))
fprintf_unfiltered (file, " %4d", regnum);
else
- fprintf_unfiltered (file, " %4d", (regnum - NUM_REGS));
+ fprintf_unfiltered (file, " %4d",
+ (regnum - gdbarch_num_regs (gdbarch)));
/* Offset. */
if (regnum < 0)
else
{
fprintf_unfiltered (file, " %6ld",
- regcache->descr->register_offset[regnum]);
- if (register_offset != regcache->descr->register_offset[regnum]
+ m_descr->register_offset[regnum]);
+ if (register_offset != m_descr->register_offset[regnum]
|| (regnum > 0
- && (regcache->descr->register_offset[regnum]
- != (regcache->descr->register_offset[regnum - 1]
- + regcache->descr->sizeof_register[regnum - 1])))
+ && (m_descr->register_offset[regnum]
+ != (m_descr->register_offset[regnum - 1]
+ + m_descr->sizeof_register[regnum - 1])))
)
{
if (!footnote_register_offset)
}
else
fprintf_unfiltered (file, " ");
- register_offset = (regcache->descr->register_offset[regnum]
- + regcache->descr->sizeof_register[regnum]);
+ register_offset = (m_descr->register_offset[regnum]
+ + m_descr->sizeof_register[regnum]);
}
/* Size. */
if (regnum < 0)
fprintf_unfiltered (file, " %5s ", "Size");
else
- fprintf_unfiltered (file, " %5ld",
- regcache->descr->sizeof_register[regnum]);
+ fprintf_unfiltered (file, " %5ld", m_descr->sizeof_register[regnum]);
/* Type. */
{
const char *t;
+
if (regnum < 0)
t = "Type";
else
{
static const char blt[] = "builtin_type";
- t = TYPE_NAME (register_type (regcache->descr->gdbarch, regnum));
+
+ t = TYPE_NAME (register_type (arch (), regnum));
if (t == NULL)
{
char *n;
+
if (!footnote_register_type_name_null)
footnote_register_type_name_null = ++footnote_nr;
n = xstrprintf ("*%d", footnote_register_type_name_null);
t = n;
}
/* Chop a leading builtin_type. */
- if (strncmp (t, blt, strlen (blt)) == 0)
+ if (startswith (t, blt))
t += strlen (blt);
}
fprintf_unfiltered (file, " %-15s", t);
{
if (regnum < 0)
fprintf_unfiltered (file, "Raw value");
- else if (regnum >= regcache->descr->nr_raw_registers)
+ else if (regnum >= m_descr->nr_raw_registers)
fprintf_unfiltered (file, "<cooked>");
- else if (!regcache_valid_p (regcache, regnum))
+ else if (get_register_status (regnum) == REG_UNKNOWN)
fprintf_unfiltered (file, "<invalid>");
+ else if (get_register_status (regnum) == REG_UNAVAILABLE)
+ fprintf_unfiltered (file, "<unavailable>");
else
{
- regcache_raw_read (regcache, regnum, buf);
- fprintf_unfiltered (file, "0x");
- dump_endian_bytes (file, TARGET_BYTE_ORDER, buf,
- regcache->descr->sizeof_register[regnum]);
+ raw_read (regnum, buf);
+ print_hex_chars (file, buf,
+ m_descr->sizeof_register[regnum],
+ gdbarch_byte_order (gdbarch));
}
}
fprintf_unfiltered (file, "Cooked value");
else
{
- regcache_cooked_read (regcache, regnum, buf);
- fprintf_unfiltered (file, "0x");
- dump_endian_bytes (file, TARGET_BYTE_ORDER, buf,
- regcache->descr->sizeof_register[regnum]);
+ enum register_status status;
+
+ status = cooked_read (regnum, buf);
+ if (status == REG_UNKNOWN)
+ fprintf_unfiltered (file, "<invalid>");
+ else if (status == REG_UNAVAILABLE)
+ fprintf_unfiltered (file, "<unavailable>");
+ else
+ print_hex_chars (file, buf,
+ m_descr->sizeof_register[regnum],
+ gdbarch_byte_order (gdbarch));
}
}
{
const char *sep = "";
struct reggroup *group;
+
for (group = reggroup_next (gdbarch, NULL);
group != NULL;
group = reggroup_next (gdbarch, group))
{
if (gdbarch_register_reggroup_p (gdbarch, regnum, group))
{
- fprintf_unfiltered (file, "%s%s", sep, reggroup_name (group));
+ fprintf_unfiltered (file,
+ "%s%s", sep, reggroup_name (group));
sep = ",";
}
}
}
}
+ /* Remote packet configuration. */
+ if (what_to_dump == regcache_dump_remote)
+ {
+ if (regnum < 0)
+ {
+ fprintf_unfiltered (file, "Rmt Nr g/G Offset");
+ }
+ else if (regnum < m_descr->nr_raw_registers)
+ {
+ int pnum, poffset;
+
+ if (remote_register_number_and_offset (arch (), regnum,
+ &pnum, &poffset))
+ fprintf_unfiltered (file, "%7d %11d", pnum, poffset);
+ }
+ }
+
fprintf_unfiltered (file, "\n");
}
regcache_print (char *args, enum regcache_dump_what what_to_dump)
{
if (args == NULL)
- regcache_dump (current_regcache, gdb_stdout, what_to_dump);
+ get_current_regcache ()->dump (gdb_stdout, what_to_dump);
else
{
- struct ui_file *file = gdb_fopen (args, "w");
- if (file == NULL)
+ stdio_file file;
+
+ if (!file.open (args, "w"))
perror_with_name (_("maintenance print architecture"));
- regcache_dump (current_regcache, file, what_to_dump);
- ui_file_delete (file);
+ get_current_regcache ()->dump (&file, what_to_dump);
}
}
regcache_print (args, regcache_dump_groups);
}
+static void
+maintenance_print_remote_registers (char *args, int from_tty)
+{
+ regcache_print (args, regcache_dump_remote);
+}
+
+#if GDB_SELF_TEST
+#include "selftest.h"
+
+namespace selftests {
+
+/* Return the number of elements in current_regcache. */
+
+static size_t
+current_regcache_size ()
+{
+ size_t i = 0;
+ for (auto list = current_regcache; list; list = list->next)
+ i++;
+
+ return i;
+}
+
+static void
+current_regcache_test (void)
+{
+ /* It is empty at the start. */
+ SELF_CHECK (current_regcache_size () == 0);
+
+ ptid_t ptid1 (1), ptid2 (2), ptid3 (3);
+
+ /* Get regcache from ptid1, a new regcache is added to
+ current_regcache. */
+ regcache *regcache = get_thread_arch_aspace_regcache (ptid1,
+ target_gdbarch (),
+ NULL);
+
+ SELF_CHECK (regcache != NULL);
+ SELF_CHECK (regcache->ptid () == ptid1);
+ SELF_CHECK (current_regcache_size () == 1);
+
+ /* Get regcache from ptid2, a new regcache is added to
+ current_regcache. */
+ regcache = get_thread_arch_aspace_regcache (ptid2,
+ target_gdbarch (),
+ NULL);
+ SELF_CHECK (regcache != NULL);
+ SELF_CHECK (regcache->ptid () == ptid2);
+ SELF_CHECK (current_regcache_size () == 2);
+
+ /* Get regcache from ptid3, a new regcache is added to
+ current_regcache. */
+ regcache = get_thread_arch_aspace_regcache (ptid3,
+ target_gdbarch (),
+ NULL);
+ SELF_CHECK (regcache != NULL);
+ SELF_CHECK (regcache->ptid () == ptid3);
+ SELF_CHECK (current_regcache_size () == 3);
+
+ /* Get regcache from ptid2 again, nothing is added to
+ current_regcache. */
+ regcache = get_thread_arch_aspace_regcache (ptid2,
+ target_gdbarch (),
+ NULL);
+ SELF_CHECK (regcache != NULL);
+ SELF_CHECK (regcache->ptid () == ptid2);
+ SELF_CHECK (current_regcache_size () == 3);
+
+ /* Mark ptid2 is changed, so regcache of ptid2 should be removed from
+ current_regcache. */
+ registers_changed_ptid (ptid2);
+ SELF_CHECK (current_regcache_size () == 2);
+}
+
+} // namespace selftests
+#endif /* GDB_SELF_TEST */
+
extern initialize_file_ftype _initialize_regcache; /* -Wmissing-prototype */
void
_initialize_regcache (void)
{
- regcache_descr_handle = gdbarch_data_register_post_init (init_regcache_descr);
- DEPRECATED_REGISTER_GDBARCH_SWAP (current_regcache);
- deprecated_register_gdbarch_swap (NULL, 0, build_regcache);
+ regcache_descr_handle
+ = gdbarch_data_register_post_init (init_regcache_descr);
observer_attach_target_changed (regcache_observer_target_changed);
+ observer_attach_thread_ptid_changed (regcache_thread_ptid_changed);
add_com ("flushregs", class_maintenance, reg_flush_command,
_("Force gdb to flush its register cache (maintainer command)"));
- /* Initialize the thread/process associated with the current set of
- registers. For now, -1 is special, and means `no current process'. */
- registers_ptid = pid_to_ptid (-1);
-
- add_cmd ("registers", class_maintenance, maintenance_print_registers, _("\
-Print the internal register configuration.\n\
-Takes an optional file parameter."), &maintenanceprintlist);
+ add_cmd ("registers", class_maintenance, maintenance_print_registers,
+ _("Print the internal register configuration.\n"
+ "Takes an optional file parameter."), &maintenanceprintlist);
add_cmd ("raw-registers", class_maintenance,
- maintenance_print_raw_registers, _("\
-Print the internal register configuration including raw values.\n\
-Takes an optional file parameter."), &maintenanceprintlist);
+ maintenance_print_raw_registers,
+ _("Print the internal register configuration "
+ "including raw values.\n"
+ "Takes an optional file parameter."), &maintenanceprintlist);
add_cmd ("cooked-registers", class_maintenance,
- maintenance_print_cooked_registers, _("\
-Print the internal register configuration including cooked values.\n\
-Takes an optional file parameter."), &maintenanceprintlist);
+ maintenance_print_cooked_registers,
+ _("Print the internal register configuration "
+ "including cooked values.\n"
+ "Takes an optional file parameter."), &maintenanceprintlist);
add_cmd ("register-groups", class_maintenance,
- maintenance_print_register_groups, _("\
-Print the internal register configuration including each register's group.\n\
+ maintenance_print_register_groups,
+ _("Print the internal register configuration "
+ "including each register's group.\n"
+ "Takes an optional file parameter."),
+ &maintenanceprintlist);
+ add_cmd ("remote-registers", class_maintenance,
+ maintenance_print_remote_registers, _("\
+Print the internal register configuration including each register's\n\
+remote register number and buffer offset in the g/G packets.\n\
Takes an optional file parameter."),
&maintenanceprintlist);
-
+#if GDB_SELF_TEST
+ register_self_test (selftests::current_regcache_test);
+#endif
}
projects / deliverable / binutils-gdb.git / blobdiff