#include "remote.h"
#include "valprint.h"
#include "regset.h"
+#include <forward_list>
/*
* DATA STRUCTURE
redundant information - if the PC is constructed from two
registers then those registers and not the PC lives in the raw
cache. */
- int nr_raw_registers;
long sizeof_raw_registers;
- 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_status;
/* Offset and size (in 8 bit bytes), of each register in the
register cache. All registers (including those in the range
either mapped onto raw-registers or memory. */
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
/* Construct a strictly RAW register cache. Don't allow pseudo's
into the register cache. */
- descr->nr_raw_registers = gdbarch_num_regs (gdbarch);
- descr->sizeof_raw_register_status = gdbarch_num_regs (gdbarch);
/* Lay out the register cache.
= 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_raw_registers; i++)
+ for (i = 0; i < gdbarch_num_regs (gdbarch); i++)
{
descr->sizeof_register[i] = TYPE_LENGTH (descr->register_type[i]);
descr->register_offset[i] = offset;
int
regcache_register_size (const struct regcache *regcache, int n)
{
- return register_size (get_regcache_arch (regcache), n);
+ return register_size (regcache->arch (), n);
}
-/* The register cache for storing raw register values. */
-
-struct regcache
+regcache::regcache (gdbarch *gdbarch, const address_space *aspace_,
+ bool readonly_p_)
+ : m_aspace (aspace_), m_readonly_p (readonly_p_)
{
-public:
- regcache (gdbarch *gdbarch, address_space *aspace_)
- : regcache (gdbarch, aspace_, true)
- {}
-
- ~regcache ()
- {
- xfree (registers);
- xfree (register_status);
- }
-
- struct regcache_descr *descr;
-
- /* The address space of this register cache (for registers where it
- makes sense, like PC or SP). */
- struct address_space *aspace;
-
- /* The register buffers. A read-only register cache can hold the
- full [0 .. gdbarch_num_regs + gdbarch_num_pseudo_regs) while a read/write
- register cache can only hold [0 .. gdbarch_num_regs). */
- gdb_byte *registers;
- /* Register cache status. */
- signed char *register_status;
- /* 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. */
- bool readonly_p;
- /* If this is a read-write cache, which thread's registers is
- it connected to? */
- ptid_t ptid;
-
-private:
- regcache (gdbarch *gdbarch, address_space *aspace_, bool readonly_p_)
- : aspace (aspace_), readonly_p (readonly_p_)
- {
- gdb_assert (gdbarch != NULL);
- descr = regcache_descr (gdbarch);
+ gdb_assert (gdbarch != NULL);
+ m_descr = regcache_descr (gdbarch);
- if (readonly_p)
+ if (m_readonly_p)
{
- registers = XCNEWVEC (gdb_byte, descr->sizeof_cooked_registers);
- register_status = XCNEWVEC (signed char,
- descr->sizeof_cooked_register_status);
+ m_registers = XCNEWVEC (gdb_byte, m_descr->sizeof_cooked_registers);
+ m_register_status = XCNEWVEC (signed char,
+ m_descr->nr_cooked_registers);
}
else
{
- registers = XCNEWVEC (gdb_byte, descr->sizeof_raw_registers);
- register_status = XCNEWVEC (signed char,
- descr->sizeof_raw_register_status);
+ m_registers = XCNEWVEC (gdb_byte, m_descr->sizeof_raw_registers);
+ m_register_status = XCNEWVEC (signed char, gdbarch_num_regs (gdbarch));
}
- ptid = minus_one_ptid;
- }
-
- friend regcache *
- get_thread_arch_aspace_regcache (ptid_t ptid, gdbarch *gdbarch,
- address_space *aspace);
-};
-
-/* See regcache.h. */
+ m_ptid = minus_one_ptid;
+}
-ptid_t
-regcache_get_ptid (const struct regcache *regcache)
+static enum register_status
+do_cooked_read (void *src, int regnum, gdb_byte *buf)
{
- gdb_assert (!ptid_equal (regcache->ptid, minus_one_ptid));
+ struct regcache *regcache = (struct regcache *) src;
- return regcache->ptid;
+ return regcache_cooked_read (regcache, regnum, buf);
}
-struct regcache *
-regcache_xmalloc (struct gdbarch *gdbarch, struct address_space *aspace)
+regcache::regcache (readonly_t, const regcache &src)
+ : regcache (src.arch (), nullptr, true)
{
- return new regcache (gdbarch, aspace);
+ gdb_assert (!src.m_readonly_p);
+ save (do_cooked_read, (void *) &src);
}
-void
-regcache_xfree (struct regcache *regcache)
+gdbarch *
+regcache::arch () const
{
- if (regcache == NULL)
- return;
-
- delete regcache;
+ return m_descr->gdbarch;
}
-static void
-do_regcache_xfree (void *data)
-{
- regcache_xfree ((struct regcache *) data);
-}
+/* See regcache.h. */
-struct cleanup *
-make_cleanup_regcache_xfree (struct regcache *regcache)
+ptid_t
+regcache_get_ptid (const struct regcache *regcache)
{
- return make_cleanup (do_regcache_xfree, regcache);
+ gdb_assert (!ptid_equal (regcache->ptid (), minus_one_ptid));
+
+ return regcache->ptid ();
}
-/* Cleanup routines for invalidating a register. */
+/* Cleanup class for invalidating a register. */
-struct register_to_invalidate
+class regcache_invalidator
{
- struct regcache *regcache;
- int regnum;
-};
+public:
-static void
-do_regcache_invalidate (void *data)
-{
- struct register_to_invalidate *reg = (struct register_to_invalidate *) data;
+ regcache_invalidator (struct regcache *regcache, int regnum)
+ : m_regcache (regcache),
+ m_regnum (regnum)
+ {
+ }
- regcache_invalidate (reg->regcache, reg->regnum);
-}
+ ~regcache_invalidator ()
+ {
+ if (m_regcache != nullptr)
+ regcache_invalidate (m_regcache, m_regnum);
+ }
-static struct cleanup *
-make_cleanup_regcache_invalidate (struct regcache *regcache, int regnum)
-{
- struct register_to_invalidate* reg = XNEW (struct register_to_invalidate);
+ DISABLE_COPY_AND_ASSIGN (regcache_invalidator);
- reg->regcache = regcache;
- reg->regnum = regnum;
- return make_cleanup_dtor (do_regcache_invalidate, (void *) reg, xfree);
-}
+ void release ()
+ {
+ m_regcache = nullptr;
+ }
-/* Return REGCACHE's architecture. */
+private:
-struct gdbarch *
-get_regcache_arch (const struct regcache *regcache)
-{
- return regcache->descr->gdbarch;
-}
+ struct regcache *m_regcache;
+ int m_regnum;
+};
+
+/* Return a pointer to register REGNUM's buffer cache. */
-struct address_space *
-get_regcache_aspace (const struct regcache *regcache)
+gdb_byte *
+regcache::register_buffer (int regnum) const
{
- return regcache->aspace;
+ return m_registers + m_descr->register_offset[regnum];
}
-/* Return a pointer to register REGNUM's buffer cache. */
-
-static gdb_byte *
-register_buffer (const struct regcache *regcache, int regnum)
+void
+regcache_save (struct regcache *regcache,
+ regcache_cooked_read_ftype *cooked_read, void *src)
{
- return regcache->registers + regcache->descr->register_offset[regnum];
+ regcache->save (cooked_read, src);
}
void
-regcache_save (struct regcache *dst, regcache_cooked_read_ftype *cooked_read,
- void *src)
+regcache::save (regcache_cooked_read_ftype *cooked_read,
+ void *src)
{
- struct gdbarch *gdbarch = dst->descr->gdbarch;
- gdb_byte buf[MAX_REGISTER_SIZE];
+ struct gdbarch *gdbarch = m_descr->gdbarch;
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_status, 0,
- dst->descr->sizeof_cooked_register_status);
+ memset (m_registers, 0, m_descr->sizeof_cooked_registers);
+ memset (m_register_status, 0, m_descr->nr_cooked_registers);
/* Copy over any registers (identified by their membership in the
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))
{
- enum register_status status = cooked_read (src, regnum, buf);
+ gdb_byte *dst_buf = register_buffer (regnum);
+ enum register_status status = cooked_read (src, regnum, dst_buf);
- if (status == REG_VALID)
- memcpy (register_buffer (dst, regnum), buf,
- register_size (gdbarch, regnum));
- else
- {
- gdb_assert (status != REG_UNKNOWN);
+ gdb_assert (status != REG_UNKNOWN);
- memset (register_buffer (dst, regnum), 0,
- register_size (gdbarch, regnum));
- }
- dst->register_status[regnum] = status;
+ if (status != REG_VALID)
+ memset (dst_buf, 0, register_size (gdbarch, regnum));
+
+ m_register_status[regnum] = status;
}
}
}
-static void
-regcache_restore (struct regcache *dst, struct regcache *src)
+void
+regcache::restore (struct regcache *src)
{
- struct gdbarch *gdbarch = dst->descr->gdbarch;
+ 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 (src->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 .. 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))
{
- if (src->register_status[regnum] == REG_VALID)
- regcache_cooked_write (dst, regnum, register_buffer (src, regnum));
+ if (src->m_register_status[regnum] == REG_VALID)
+ cooked_write (regnum, src->register_buffer (regnum));
}
}
}
-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);
-}
-
-static void regcache_cpy_no_passthrough (struct regcache *dst,
- struct regcache *src);
-
void
regcache_cpy (struct regcache *dst, struct regcache *src)
{
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);
+ gdb_assert (src->m_readonly_p && !dst->m_readonly_p);
- if (!src->readonly_p)
- regcache_save (dst, do_cooked_read, src);
- else if (!dst->readonly_p)
- regcache_restore (dst, src);
- else
- regcache_cpy_no_passthrough (dst, 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. */
-
-static void
-regcache_cpy_no_passthrough (struct regcache *dst, struct regcache *src)
-{
- gdb_assert (src != NULL && dst != NULL);
- gdb_assert (src->descr->gdbarch == dst->descr->gdbarch);
- /* NOTE: cagney/2002-05-17: Don't let the caller do a no-passthrough
- 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 (dst->readonly_p && src->readonly_p);
-
- memcpy (dst->registers, src->registers,
- dst->descr->sizeof_cooked_registers);
- memcpy (dst->register_status, src->register_status,
- dst->descr->sizeof_cooked_register_status);
+ dst->restore (src);
}
struct regcache *
regcache_dup (struct regcache *src)
{
- struct regcache *newbuf;
-
- newbuf = regcache_xmalloc (src->descr->gdbarch, get_regcache_aspace (src));
- regcache_cpy (newbuf, src);
- return newbuf;
+ return new regcache (regcache::readonly, *src);
}
enum register_status
regcache_register_status (const struct regcache *regcache, int regnum)
{
gdb_assert (regcache != NULL);
+ return regcache->get_register_status (regnum);
+}
+
+enum register_status
+regcache::get_register_status (int regnum) const
+{
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 < num_raw_registers ());
- return (enum register_status) regcache->register_status[regnum];
+ return (enum register_status) m_register_status[regnum];
}
void
regcache_invalidate (struct regcache *regcache, int regnum)
{
gdb_assert (regcache != NULL);
- gdb_assert (regnum >= 0);
- gdb_assert (!regcache->readonly_p);
- gdb_assert (regnum < regcache->descr->nr_raw_registers);
- regcache->register_status[regnum] = REG_UNKNOWN;
+ regcache->invalidate (regnum);
}
+void
+regcache::invalidate (int regnum)
+{
+ gdb_assert (!m_readonly_p);
+ assert_regnum (regnum);
+ m_register_status[regnum] = REG_UNKNOWN;
+}
+
+void
+regcache::assert_regnum (int regnum) const
+{
+ gdb_assert (regnum >= 0 && regnum < gdbarch_num_regs (arch ()));
+}
/* Global structure containing the current regcache. */
recording if the register values have been changed (eg. by the
user). Therefore all registers must be written back to the
target when appropriate. */
-
-struct regcache_list
-{
- struct regcache *regcache;
- struct regcache_list *next;
-};
-
-static struct regcache_list *current_regcache;
+std::forward_list<regcache *> regcache::current_regcache;
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;
+ for (const auto ®cache : regcache::current_regcache)
+ if (ptid_equal (regcache->ptid (), ptid) && regcache->arch () == gdbarch)
+ return regcache;
- for (list = current_regcache; list; list = list->next)
- if (ptid_equal (list->regcache->ptid, ptid)
- && get_regcache_arch (list->regcache) == gdbarch)
- return list->regcache;
+ regcache *new_regcache = new regcache (gdbarch, aspace, false);
- new_regcache = new regcache (gdbarch, aspace, false);
- new_regcache->ptid = ptid;
-
- list = XNEW (struct regcache_list);
- list->regcache = new_regcache;
- list->next = current_regcache;
- current_regcache = list;
+ regcache::current_regcache.push_front (new_regcache);
+ new_regcache->set_ptid (ptid);
return new_regcache;
}
struct regcache *
get_thread_arch_regcache (ptid_t ptid, struct gdbarch *gdbarch)
{
- 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));
+ address_space *aspace = target_thread_address_space (ptid);
return get_thread_arch_aspace_regcache (ptid, gdbarch, aspace);
}
/* 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)
+void
+regcache::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->ptid = new_ptid;
+ for (auto ®cache : regcache::current_regcache)
+ {
+ if (ptid_equal (regcache->ptid (), old_ptid))
+ regcache->set_ptid (new_ptid);
+ }
}
/* Low level examining and depositing of registers.
void
registers_changed_ptid (ptid_t ptid)
{
- struct regcache_list *list, **list_link;
-
- list = current_regcache;
- list_link = ¤t_regcache;
- while (list)
+ for (auto oit = regcache::current_regcache.before_begin (),
+ it = std::next (oit);
+ it != regcache::current_regcache.end ();
+ )
{
- if (ptid_match (list->regcache->ptid, ptid))
+ if (ptid_match ((*it)->ptid (), ptid))
{
- struct regcache_list *dead = list;
-
- *list_link = list->next;
- regcache_xfree (list->regcache);
- list = *list_link;
- xfree (dead);
- continue;
+ delete *it;
+ it = regcache::current_regcache.erase_after (oit);
}
-
- list_link = &list->next;
- list = *list_link;
+ else
+ oit = it++;
}
if (ptid_match (current_thread_ptid, ptid))
regcache_raw_update (struct regcache *regcache, int regnum)
{
gdb_assert (regcache != NULL);
- gdb_assert (regnum >= 0 && regnum < regcache->descr->nr_raw_registers);
+
+ regcache->raw_update (regnum);
+}
+
+void
+regcache::raw_update (int regnum)
+{
+ assert_regnum (regnum);
/* 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
- && regcache_register_status (regcache, regnum) == REG_UNKNOWN)
+ if (!m_readonly_p && get_register_status (regnum) == REG_UNKNOWN)
{
- target_fetch_registers (regcache, regnum);
+ 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 (regcache->register_status[regnum] == REG_UNKNOWN)
- regcache->register_status[regnum] = REG_UNAVAILABLE;
+ if (m_register_status[regnum] == REG_UNKNOWN)
+ m_register_status[regnum] = REG_UNAVAILABLE;
}
}
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);
- regcache_raw_update (regcache, regnum);
+ raw_update (regnum);
- if (regcache->register_status[regnum] != REG_VALID)
- memset (buf, 0, regcache->descr->sizeof_register[regnum]);
+ if (m_register_status[regnum] != REG_VALID)
+ memset (buf, 0, m_descr->sizeof_register[regnum]);
else
- memcpy (buf, register_buffer (regcache, regnum),
- regcache->descr->sizeof_register[regnum]);
+ memcpy (buf, register_buffer (regnum),
+ m_descr->sizeof_register[regnum]);
- return (enum register_status) regcache->register_status[regnum];
+ return (enum register_status) m_register_status[regnum];
}
enum register_status
regcache_raw_read_signed (struct regcache *regcache, int regnum, LONGEST *val)
+{
+ gdb_assert (regcache != NULL);
+ return regcache->raw_read (regnum, val);
+}
+
+template<typename T, typename>
+enum register_status
+regcache::raw_read (int regnum, T *val)
{
gdb_byte *buf;
enum register_status status;
- gdb_assert (regcache != NULL);
- gdb_assert (regnum >= 0 && regnum < regcache->descr->nr_raw_registers);
- buf = (gdb_byte *) alloca (regcache->descr->sizeof_register[regnum]);
- status = regcache_raw_read (regcache, regnum, buf);
+ assert_regnum (regnum);
+ buf = (gdb_byte *) alloca (m_descr->sizeof_register[regnum]);
+ status = raw_read (regnum, buf);
if (status == REG_VALID)
- *val = extract_signed_integer
- (buf, regcache->descr->sizeof_register[regnum],
- gdbarch_byte_order (regcache->descr->gdbarch));
+ *val = extract_integer<T> (buf,
+ m_descr->sizeof_register[regnum],
+ gdbarch_byte_order (m_descr->gdbarch));
else
*val = 0;
return status;
regcache_raw_read_unsigned (struct regcache *regcache, int regnum,
ULONGEST *val)
{
- gdb_byte *buf;
- enum register_status status;
-
gdb_assert (regcache != NULL);
- gdb_assert (regnum >= 0 && regnum < regcache->descr->nr_raw_registers);
- buf = (gdb_byte *) alloca (regcache->descr->sizeof_register[regnum]);
- status = regcache_raw_read (regcache, regnum, buf);
- if (status == REG_VALID)
- *val = extract_unsigned_integer
- (buf, regcache->descr->sizeof_register[regnum],
- gdbarch_byte_order (regcache->descr->gdbarch));
- else
- *val = 0;
- return status;
+ return regcache->raw_read (regnum, val);
}
void
regcache_raw_write_signed (struct regcache *regcache, int regnum, LONGEST val)
+{
+ gdb_assert (regcache != NULL);
+ regcache->raw_write (regnum, val);
+}
+
+template<typename T, typename>
+void
+regcache::raw_write (int regnum, T val)
{
gdb_byte *buf;
- gdb_assert (regcache != NULL);
- gdb_assert (regnum >=0 && regnum < regcache->descr->nr_raw_registers);
- buf = (gdb_byte *) alloca (regcache->descr->sizeof_register[regnum]);
- store_signed_integer (buf, regcache->descr->sizeof_register[regnum],
- gdbarch_byte_order (regcache->descr->gdbarch), val);
- regcache_raw_write (regcache, regnum, buf);
+ assert_regnum (regnum);
+ buf = (gdb_byte *) alloca (m_descr->sizeof_register[regnum]);
+ store_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)
{
- gdb_byte *buf;
-
gdb_assert (regcache != NULL);
- gdb_assert (regnum >=0 && regnum < regcache->descr->nr_raw_registers);
- buf = (gdb_byte *) alloca (regcache->descr->sizeof_register[regnum]);
- store_unsigned_integer (buf, regcache->descr->sizeof_register[regnum],
- gdbarch_byte_order (regcache->descr->gdbarch), val);
- regcache_raw_write (regcache, regnum, buf);
+ regcache->raw_write (regnum, val);
}
LONGEST
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)
- return regcache_raw_read (regcache, regnum, buf);
- else if (regcache->readonly_p
- && regcache->register_status[regnum] != REG_UNKNOWN)
+ gdb_assert (regnum < m_descr->nr_cooked_registers);
+ if (regnum < num_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 (regcache->register_status[regnum] == REG_VALID)
- memcpy (buf, register_buffer (regcache, regnum),
- regcache->descr->sizeof_register[regnum]);
+ if (m_register_status[regnum] == REG_VALID)
+ memcpy (buf, register_buffer (regnum),
+ m_descr->sizeof_register[regnum]);
else
- memset (buf, 0, regcache->descr->sizeof_register[regnum]);
+ memset (buf, 0, m_descr->sizeof_register[regnum]);
- return (enum register_status) regcache->register_status[regnum];
+ return (enum register_status) m_register_status[regnum];
}
- else if (gdbarch_pseudo_register_read_value_p (regcache->descr->gdbarch))
+ 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 (regcache->descr->gdbarch,
- regcache, regnum);
+ computed = gdbarch_pseudo_register_read_value (m_descr->gdbarch,
+ this, regnum);
if (value_entirely_available (computed))
memcpy (buf, value_contents_raw (computed),
- regcache->descr->sizeof_register[regnum]);
+ m_descr->sizeof_register[regnum]);
else
{
- memset (buf, 0, regcache->descr->sizeof_register[regnum]);
+ memset (buf, 0, m_descr->sizeof_register[regnum]);
result = REG_UNAVAILABLE;
}
return result;
}
else
- return gdbarch_pseudo_register_read (regcache->descr->gdbarch, regcache,
+ return gdbarch_pseudo_register_read (m_descr->gdbarch, this,
regnum, buf);
}
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 < regcache->descr->nr_cooked_registers);
+ gdb_assert (regnum < m_descr->nr_cooked_registers);
- if (regnum < regcache->descr->nr_raw_registers
- || (regcache->readonly_p
- && regcache->register_status[regnum] != REG_UNKNOWN)
- || !gdbarch_pseudo_register_read_value_p (regcache->descr->gdbarch))
+ if (regnum < num_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 (regcache->descr->gdbarch,
- regnum));
+ 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 (regcache_cooked_read (regcache, regnum,
- value_contents_raw (result)) == REG_UNAVAILABLE)
+ 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 (regcache->descr->gdbarch,
- regcache, regnum);
+ 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_assert (regcache != NULL);
+ return regcache->cooked_read (regnum, val);
+}
+
+template<typename T, typename>
+enum register_status
+regcache::cooked_read (int regnum, T *val)
{
enum register_status status;
gdb_byte *buf;
- gdb_assert (regcache != NULL);
- gdb_assert (regnum >= 0 && regnum < regcache->descr->nr_cooked_registers);
- buf = (gdb_byte *) alloca (regcache->descr->sizeof_register[regnum]);
- status = regcache_cooked_read (regcache, regnum, 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, regcache->descr->sizeof_register[regnum],
- gdbarch_byte_order (regcache->descr->gdbarch));
+ *val = extract_integer<T> (buf, m_descr->sizeof_register[regnum],
+ gdbarch_byte_order (m_descr->gdbarch));
else
*val = 0;
return status;
regcache_cooked_read_unsigned (struct regcache *regcache, int regnum,
ULONGEST *val)
{
- enum register_status status;
- gdb_byte *buf;
-
gdb_assert (regcache != NULL);
- gdb_assert (regnum >= 0 && regnum < regcache->descr->nr_cooked_registers);
- buf = (gdb_byte *) alloca (regcache->descr->sizeof_register[regnum]);
- status = regcache_cooked_read (regcache, regnum, buf);
- if (status == REG_VALID)
- *val = extract_unsigned_integer
- (buf, regcache->descr->sizeof_register[regnum],
- gdbarch_byte_order (regcache->descr->gdbarch));
- else
- *val = 0;
- return status;
+ return regcache->cooked_read (regnum, val);
}
void
regcache_cooked_write_signed (struct regcache *regcache, int regnum,
LONGEST val)
+{
+ gdb_assert (regcache != NULL);
+ regcache->cooked_write (regnum, val);
+}
+
+template<typename T, typename>
+void
+regcache::cooked_write (int regnum, T val)
{
gdb_byte *buf;
- gdb_assert (regcache != NULL);
- gdb_assert (regnum >=0 && regnum < regcache->descr->nr_cooked_registers);
- buf = (gdb_byte *) alloca (regcache->descr->sizeof_register[regnum]);
- store_signed_integer (buf, regcache->descr->sizeof_register[regnum],
- gdbarch_byte_order (regcache->descr->gdbarch), val);
- regcache_cooked_write (regcache, regnum, buf);
+ gdb_assert (regnum >=0 && regnum < m_descr->nr_cooked_registers);
+ buf = (gdb_byte *) alloca (m_descr->sizeof_register[regnum]);
+ store_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)
{
- gdb_byte *buf;
-
gdb_assert (regcache != NULL);
- gdb_assert (regnum >=0 && regnum < regcache->descr->nr_cooked_registers);
- buf = (gdb_byte *) alloca (regcache->descr->sizeof_register[regnum]);
- store_unsigned_integer (buf, regcache->descr->sizeof_register[regnum],
- gdbarch_byte_order (regcache->descr->gdbarch), val);
- regcache_cooked_write (regcache, regnum, buf);
+ regcache->cooked_write (regnum, val);
}
/* See regcache.h. */
regcache_raw_set_cached_value (struct regcache *regcache, int regnum,
const gdb_byte *buf)
{
- memcpy (register_buffer (regcache, regnum), buf,
- regcache->descr->sizeof_register[regnum]);
- regcache->register_status[regnum] = REG_VALID;
+ 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
regcache_raw_write (struct regcache *regcache, int regnum,
const gdb_byte *buf)
{
- struct cleanup *old_chain;
-
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)
+{
+
+ gdb_assert (buf != NULL);
+ assert_regnum (regnum);
+ 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 (gdbarch_cannot_store_register (get_regcache_arch (regcache), regnum))
+ if (gdbarch_cannot_store_register (arch (), regnum))
return;
/* If we have a valid copy of the register, and new value == old
value, then don't bother doing the actual store. */
- if (regcache_register_status (regcache, regnum) == REG_VALID
- && (memcmp (register_buffer (regcache, regnum), buf,
- regcache->descr->sizeof_register[regnum]) == 0))
+ if (get_register_status (regnum) == REG_VALID
+ && (memcmp (register_buffer (regnum), buf,
+ m_descr->sizeof_register[regnum]) == 0))
return;
- target_prepare_to_store (regcache);
- regcache_raw_set_cached_value (regcache, regnum, buf);
+ 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 (regcache, regnum);
+ /* Invalidate the register after it is written, in case of a
+ failure. */
+ regcache_invalidator invalidator (this, regnum);
- target_store_registers (regcache, 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);
+ /* The target did not throw an error so we can discard invalidating
+ the register. */
+ invalidator.release ();
}
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 < num_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 enum register_status
-regcache_xfer_part (struct regcache *regcache, 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 regcache_descr *descr = regcache->descr;
- struct gdbarch *gdbarch = get_regcache_arch (regcache);
+enum register_status
+regcache::xfer_part (int regnum, int offset, int len, void *in,
+ const void *out, bool is_raw)
+{
+ struct gdbarch *gdbarch = arch ();
gdb_byte *reg = (gdb_byte *) alloca (register_size (gdbarch, regnum));
- gdb_assert (offset >= 0 && offset <= descr->sizeof_register[regnum]);
- gdb_assert (len >= 0 && offset + len <= descr->sizeof_register[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 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);
- status = read (regcache, regnum, reg);
+ if (is_raw)
+ status = raw_read (regnum, reg);
+ else
+ status = cooked_read (regnum, reg);
if (status != REG_VALID)
return status;
}
/* ... write (when needed). */
if (out != NULL)
{
- gdb_assert (write != NULL);
- write (regcache, regnum, reg);
+ if (is_raw)
+ raw_write (regnum, reg);
+ else
+ cooked_write (regnum, reg);
}
return REG_VALID;
regcache_raw_read_part (struct regcache *regcache, int regnum,
int offset, int len, gdb_byte *buf)
{
- struct regcache_descr *descr = regcache->descr;
+ return regcache->raw_read_part (regnum, offset, len, buf);
+}
- gdb_assert (regnum >= 0 && regnum < descr->nr_raw_registers);
- return regcache_xfer_part (regcache, regnum, offset, len, buf, NULL,
- regcache_raw_read, regcache_raw_write);
+enum register_status
+regcache::raw_read_part (int regnum, int offset, int len, gdb_byte *buf)
+{
+ assert_regnum (regnum);
+ return xfer_part (regnum, offset, len, buf, NULL, true);
}
void
regcache_raw_write_part (struct regcache *regcache, int regnum,
int offset, int len, const gdb_byte *buf)
{
- struct regcache_descr *descr = regcache->descr;
+ regcache->raw_write_part (regnum, offset, len, buf);
+}
- gdb_assert (regnum >= 0 && regnum < descr->nr_raw_registers);
- regcache_xfer_part (regcache, regnum, offset, len, NULL, buf,
- regcache_raw_read, regcache_raw_write);
+void
+regcache::raw_write_part (int regnum, int offset, int len,
+ const gdb_byte *buf)
+{
+ assert_regnum (regnum);
+ xfer_part (regnum, offset, len, NULL, buf, true);
}
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;
+ return regcache->cooked_read_part (regnum, offset, len, buf);
+}
- gdb_assert (regnum >= 0 && regnum < descr->nr_cooked_registers);
- return regcache_xfer_part (regcache, regnum, offset, len, buf, NULL,
- regcache_cooked_read, regcache_cooked_write);
+
+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, false);
}
void
regcache_cooked_write_part (struct regcache *regcache, int regnum,
int offset, int len, const gdb_byte *buf)
{
- struct regcache_descr *descr = regcache->descr;
+ regcache->cooked_write_part (regnum, offset, len, buf);
+}
- gdb_assert (regnum >= 0 && regnum < descr->nr_cooked_registers);
- regcache_xfer_part (regcache, regnum, offset, len, NULL, buf,
- regcache_cooked_read, regcache_cooked_write);
+void
+regcache::cooked_write_part (int regnum, int offset, int len,
+ const gdb_byte *buf)
+{
+ gdb_assert (regnum >= 0 && regnum < m_descr->nr_cooked_registers);
+ xfer_part (regnum, offset, len, NULL, buf, false);
}
/* Supply register REGNUM, whose contents are stored in BUF, to REGCACHE. */
void
regcache_raw_supply (struct regcache *regcache, int regnum, const void *buf)
+{
+ gdb_assert (regcache != NULL);
+ regcache->raw_supply (regnum, buf);
+}
+
+void
+regcache::raw_supply (int regnum, const void *buf)
{
void *regbuf;
size_t size;
- gdb_assert (regcache != NULL);
- gdb_assert (regnum >= 0 && regnum < regcache->descr->nr_raw_registers);
- gdb_assert (!regcache->readonly_p);
+ assert_regnum (regnum);
+ gdb_assert (!m_readonly_p);
- regbuf = register_buffer (regcache, regnum);
- size = regcache->descr->sizeof_register[regnum];
+ regbuf = register_buffer (regnum);
+ size = m_descr->sizeof_register[regnum];
if (buf)
{
memcpy (regbuf, buf, size);
- regcache->register_status[regnum] = REG_VALID;
+ m_register_status[regnum] = REG_VALID;
}
else
{
in case the register value manages to escape somewhere (due
to a bug, no less). */
memset (regbuf, 0, size);
- regcache->register_status[regnum] = REG_UNAVAILABLE;
+ m_register_status[regnum] = REG_UNAVAILABLE;
}
}
+/* Supply register REGNUM to REGCACHE. Value to supply is an integer stored at
+ address ADDR, in target endian, with length ADDR_LEN and sign IS_SIGNED. If
+ the register size is greater than ADDR_LEN, then the integer will be sign or
+ zero extended. If the register size is smaller than the integer, then the
+ most significant bytes of the integer will be truncated. */
+
+void
+regcache::raw_supply_integer (int regnum, const gdb_byte *addr, int addr_len,
+ bool is_signed)
+{
+ enum bfd_endian byte_order = gdbarch_byte_order (m_descr->gdbarch);
+ gdb_byte *regbuf;
+ size_t regsize;
+
+ assert_regnum (regnum);
+ gdb_assert (!m_readonly_p);
+
+ regbuf = register_buffer (regnum);
+ regsize = m_descr->sizeof_register[regnum];
+
+ copy_integer_to_size (regbuf, regsize, addr, addr_len, is_signed,
+ byte_order);
+ m_register_status[regnum] = REG_VALID;
+}
+
+/* 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). */
+
+void
+regcache::raw_supply_zeroed (int regnum)
+{
+ void *regbuf;
+ size_t size;
+
+ assert_regnum (regnum);
+ gdb_assert (!m_readonly_p);
+
+ regbuf = register_buffer (regnum);
+ size = m_descr->sizeof_register[regnum];
+
+ memset (regbuf, 0, size);
+ m_register_status[regnum] = REG_VALID;
+}
+
/* Collect register REGNUM from REGCACHE and store its contents in BUF. */
void
regcache_raw_collect (const struct regcache *regcache, int regnum, void *buf)
+{
+ gdb_assert (regcache != NULL && buf != NULL);
+ regcache->raw_collect (regnum, buf);
+}
+
+void
+regcache::raw_collect (int regnum, void *buf) const
{
const void *regbuf;
size_t size;
- gdb_assert (regcache != NULL && buf != NULL);
- gdb_assert (regnum >= 0 && regnum < regcache->descr->nr_raw_registers);
+ gdb_assert (buf != NULL);
+ assert_regnum (regnum);
- regbuf = register_buffer (regcache, regnum);
- size = regcache->descr->sizeof_register[regnum];
+ regbuf = register_buffer (regnum);
+ size = m_descr->sizeof_register[regnum];
memcpy (buf, regbuf, size);
}
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)
+/* Collect register REGNUM from REGCACHE. Store collected value as an integer
+ at address ADDR, in target endian, with length ADDR_LEN and sign IS_SIGNED.
+ If ADDR_LEN is greater than the register size, then the integer will be sign
+ or zero extended. If ADDR_LEN is smaller than the register size, then the
+ most significant bytes of the integer will be truncated. */
+
+void
+regcache::raw_collect_integer (int regnum, gdb_byte *addr, int addr_len,
+ bool is_signed) const
+{
+ enum bfd_endian byte_order = gdbarch_byte_order (m_descr->gdbarch);
+ const gdb_byte *regbuf;
+ size_t regsize;
+
+ assert_regnum (regnum);
+
+ regbuf = register_buffer (regnum);
+ regsize = m_descr->sizeof_register[regnum];
+
+ copy_integer_to_size (addr, addr_len, regbuf, regsize, is_signed,
+ byte_order);
+}
+
+void
+regcache::transfer_regset (const struct regset *regset,
+ struct regcache *out_regcache,
+ int regnum, const void *in_buf,
+ void *out_buf, size_t size) const
{
const struct regcache_map_entry *map;
int offs = 0, count;
int slot_size = map->size;
if (slot_size == 0 && regno != REGCACHE_MAP_SKIP)
- slot_size = regcache->descr->sizeof_register[regno];
+ slot_size = m_descr->sizeof_register[regno];
if (regno == REGCACHE_MAP_SKIP
|| (regnum != -1
break;
if (out_buf)
- regcache_raw_collect (regcache, regno,
- (gdb_byte *) out_buf + offs);
+ raw_collect (regno, (gdb_byte *) out_buf + offs);
else
- regcache_raw_supply (out_regcache, regno, in_buf
- ? (const gdb_byte *) in_buf + offs
- : NULL);
+ out_regcache->raw_supply (regno, in_buf
+ ? (const gdb_byte *) in_buf + offs
+ : NULL);
}
else
{
return;
if (out_buf)
- regcache_raw_collect (regcache, regnum,
- (gdb_byte *) out_buf + offs);
+ raw_collect (regnum, (gdb_byte *) out_buf + offs);
else
- regcache_raw_supply (out_regcache, regnum, in_buf
- ? (const gdb_byte *) in_buf + offs
- : NULL);
+ out_regcache->raw_supply (regnum, in_buf
+ ? (const gdb_byte *) in_buf + offs
+ : NULL);
return;
}
}
struct regcache *regcache,
int regnum, const void *buf, size_t size)
{
- regcache_transfer_regset (regset, regcache, regcache, regnum,
- buf, NULL, size);
+ regcache->supply_regset (regset, regnum, buf, 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
const struct regcache *regcache,
int regnum, void *buf, size_t size)
{
- regcache_transfer_regset (regset, regcache, NULL, regnum,
- NULL, buf, 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);
}
CORE_ADDR
regcache_read_pc (struct regcache *regcache)
{
- struct gdbarch *gdbarch = get_regcache_arch (regcache);
+ struct gdbarch *gdbarch = regcache->arch ();
CORE_ADDR pc_val;
void
regcache_write_pc (struct regcache *regcache, CORE_ADDR pc)
{
- struct gdbarch *gdbarch = get_regcache_arch (regcache);
+ struct gdbarch *gdbarch = regcache->arch ();
if (gdbarch_write_pc_p (gdbarch))
gdbarch_write_pc (gdbarch, regcache, pc);
reinit_frame_cache ();
}
+int
+regcache::num_raw_registers () const
+{
+ return gdbarch_num_regs (arch ());
+}
+
void
-regcache_debug_print_register (const char *func, struct regcache *regcache,
- int regno)
+regcache::debug_print_register (const char *func, int regno)
{
- struct gdbarch *gdbarch = get_regcache_arch (regcache);
+ struct gdbarch *gdbarch = arch ();
fprintf_unfiltered (gdb_stdlog, "%s ", func);
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 (regcache, regno);
+ gdb_byte *buf = register_buffer (regno);
fprintf_unfiltered (gdb_stdlog, " = ");
for (int i = 0; i < size; i++)
}
static void
-reg_flush_command (char *command, int from_tty)
+reg_flush_command (const char *command, int from_tty)
{
/* Force-flush the register cache. */
registers_changed ();
printf_filtered (_("Register cache flushed.\n"));
}
-enum regcache_dump_what
-{
- regcache_dump_none, regcache_dump_raw,
- regcache_dump_cooked, regcache_dump_groups,
- regcache_dump_remote
-};
-
-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;
- gdb_byte buf[MAX_REGISTER_SIZE];
-
-#if 0
- fprintf_unfiltered (file, "nr_raw_registers %d\n",
- regcache->descr->nr_raw_registers);
- fprintf_unfiltered (file, "nr_cooked_registers %d\n",
- regcache->descr->nr_cooked_registers);
- fprintf_unfiltered (file, "sizeof_raw_registers %ld\n",
- regcache->descr->sizeof_raw_registers);
- fprintf_unfiltered (file, "sizeof_raw_register_status %ld\n",
- regcache->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
+ 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)
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;
+ std::string name_holder;
if (regnum < 0)
t = "Type";
{
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);
- make_cleanup (xfree, n);
- t = n;
+ name_holder = string_printf ("*%d",
+ footnote_register_type_name_null);
+ t = name_holder.c_str ();
}
/* Chop a leading builtin_type. */
if (startswith (t, blt))
{
if (regnum < 0)
fprintf_unfiltered (file, "Raw value");
- else if (regnum >= regcache->descr->nr_raw_registers)
+ else if (regnum >= num_raw_registers ())
fprintf_unfiltered (file, "<cooked>");
- else if (regcache_register_status (regcache, regnum) == REG_UNKNOWN)
+ else if (get_register_status (regnum) == REG_UNKNOWN)
fprintf_unfiltered (file, "<invalid>");
- else if (regcache_register_status (regcache, regnum) == REG_UNAVAILABLE)
+ else if (get_register_status (regnum) == REG_UNAVAILABLE)
fprintf_unfiltered (file, "<unavailable>");
else
{
- regcache_raw_read (regcache, regnum, buf);
- print_hex_chars (file, buf,
- regcache->descr->sizeof_register[regnum],
- gdbarch_byte_order (gdbarch));
+ raw_update (regnum);
+ print_hex_chars (file, register_buffer (regnum),
+ m_descr->sizeof_register[regnum],
+ gdbarch_byte_order (gdbarch), true);
}
}
fprintf_unfiltered (file, "Cooked value");
else
{
+ const gdb_byte *buf = NULL;
enum register_status status;
+ struct value *value = NULL;
+
+ if (regnum < num_raw_registers ())
+ {
+ raw_update (regnum);
+ status = get_register_status (regnum);
+ buf = register_buffer (regnum);
+ }
+ else
+ {
+ value = cooked_read_value (regnum);
+
+ if (!value_optimized_out (value)
+ && value_entirely_available (value))
+ {
+ status = REG_VALID;
+ buf = value_contents_all (value);
+ }
+ else
+ status = REG_UNAVAILABLE;
+ }
- status = regcache_cooked_read (regcache, 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,
- regcache->descr->sizeof_register[regnum],
- gdbarch_byte_order (gdbarch));
+ m_descr->sizeof_register[regnum],
+ gdbarch_byte_order (gdbarch), true);
+
+ if (value != NULL)
+ {
+ release_value (value);
+ value_free (value);
+ }
}
}
{
fprintf_unfiltered (file, "Rmt Nr g/G Offset");
}
- else if (regnum < regcache->descr->nr_raw_registers)
+ else if (regnum < num_raw_registers ())
{
int pnum, poffset;
- if (remote_register_number_and_offset (get_regcache_arch (regcache), regnum,
+ if (remote_register_number_and_offset (arch (), regnum,
&pnum, &poffset))
fprintf_unfiltered (file, "%7d %11d", pnum, poffset);
}
fprintf_unfiltered (file,
"*%d: Register type's name NULL.\n",
footnote_register_type_name_null);
- do_cleanups (cleanups);
}
static void
-regcache_print (char *args, enum regcache_dump_what what_to_dump)
+regcache_print (const char *args, enum regcache_dump_what what_to_dump)
{
+ /* Where to send output. */
+ stdio_file file;
+ ui_file *out;
+
if (args == NULL)
- regcache_dump (get_current_regcache (), gdb_stdout, what_to_dump);
+ out = gdb_stdout;
else
{
- stdio_file file;
-
if (!file.open (args, "w"))
perror_with_name (_("maintenance print architecture"));
- regcache_dump (get_current_regcache (), &file, what_to_dump);
+ out = &file;
+ }
+
+ if (target_has_registers)
+ get_current_regcache ()->dump (out, what_to_dump);
+ else
+ {
+ /* For the benefit of "maint print registers" & co when
+ debugging an executable, allow dumping a regcache even when
+ there is no thread selected / no registers. */
+ regcache dummy_regs (target_gdbarch ());
+ dummy_regs.dump (out, what_to_dump);
}
}
static void
-maintenance_print_registers (char *args, int from_tty)
+maintenance_print_registers (const char *args, int from_tty)
{
regcache_print (args, regcache_dump_none);
}
static void
-maintenance_print_raw_registers (char *args, int from_tty)
+maintenance_print_raw_registers (const char *args, int from_tty)
{
regcache_print (args, regcache_dump_raw);
}
static void
-maintenance_print_cooked_registers (char *args, int from_tty)
+maintenance_print_cooked_registers (const char *args, int from_tty)
{
regcache_print (args, regcache_dump_cooked);
}
static void
-maintenance_print_register_groups (char *args, int from_tty)
+maintenance_print_register_groups (const char *args, int from_tty)
{
regcache_print (args, regcache_dump_groups);
}
static void
-maintenance_print_remote_registers (char *args, int from_tty)
+maintenance_print_remote_registers (const char *args, int from_tty)
{
regcache_print (args, regcache_dump_remote);
}
-extern initialize_file_ftype _initialize_regcache; /* -Wmissing-prototype */
+#if GDB_SELF_TEST
+#include "selftest.h"
+
+namespace selftests {
+
+class regcache_access : public regcache
+{
+public:
+
+ /* Return the number of elements in current_regcache. */
+
+ static size_t
+ current_regcache_size ()
+ {
+ return std::distance (regcache::current_regcache.begin (),
+ regcache::current_regcache.end ());
+ }
+};
+
+static void
+current_regcache_test (void)
+{
+ /* It is empty at the start. */
+ SELF_CHECK (regcache_access::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 (regcache_access::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 (regcache_access::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 (regcache_access::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 (regcache_access::current_regcache_size () == 3);
+
+ /* Mark ptid2 is changed, so regcache of ptid2 should be removed from
+ current_regcache. */
+ registers_changed_ptid (ptid2);
+ SELF_CHECK (regcache_access::current_regcache_size () == 2);
+}
+
+} // namespace selftests
+#endif /* GDB_SELF_TEST */
void
_initialize_regcache (void)
= 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);
+ observer_attach_thread_ptid_changed (regcache::regcache_thread_ptid_changed);
add_com ("flushregs", class_maintenance, reg_flush_command,
_("Force gdb to flush its register cache (maintainer command)"));
Takes an optional file parameter."),
&maintenanceprintlist);
+#if GDB_SELF_TEST
+ selftests::register_test ("current_regcache", selftests::current_regcache_test);
+#endif
}
projects / deliverable / binutils-gdb.git / blobdiff