X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fregcache.c;h=2dfe8eaf5feb13b23bebbd8323c2fb6bd00d34da;hb=cd9629e1df1a280c19e1daaf6c1195afbab0aca9;hp=051bd4855ddab58a592483920eca2b8594c7ccbf;hpb=502fe83eb549476fac09ec62c7fd66447791ba2a;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/regcache.c b/gdb/regcache.c index 051bd4855d..2dfe8eaf5f 100644 --- a/gdb/regcache.c +++ b/gdb/regcache.c @@ -1,6 +1,6 @@ /* Cache and manage the values of registers for GDB, the GNU debugger. - Copyright (C) 1986-2018 Free Software Foundation, Inc. + Copyright (C) 1986-2020 Free Software Foundation, Inc. This file is part of GDB. @@ -19,7 +19,9 @@ #include "defs.h" #include "inferior.h" +#include "gdbthread.h" #include "target.h" +#include "test-target.h" #include "gdbarch.h" #include "gdbcmd.h" #include "regcache.h" @@ -85,8 +87,7 @@ init_regcache_descr (struct gdbarch *gdbarch) /* 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 = gdbarch_num_regs (gdbarch) - + gdbarch_num_pseudo_regs (gdbarch); + descr->nr_cooked_registers = gdbarch_num_cooked_regs (gdbarch); /* Fill in a table of register types. */ descr->register_type @@ -162,14 +163,12 @@ register_size (struct gdbarch *gdbarch, int regnum) struct regcache_descr *descr = regcache_descr (gdbarch); int size; - gdb_assert (regnum >= 0 - && regnum < (gdbarch_num_regs (gdbarch) - + gdbarch_num_pseudo_regs (gdbarch))); + gdb_assert (regnum >= 0 && regnum < gdbarch_num_cooked_regs (gdbarch)); size = descr->sizeof_register[regnum]; return size; } -/* See common/common-regcache.h. */ +/* See gdbsupport/common-regcache.h. */ int regcache_register_size (const struct regcache *regcache, int n) @@ -185,35 +184,33 @@ reg_buffer::reg_buffer (gdbarch *gdbarch, bool has_pseudo) if (has_pseudo) { - m_registers = XCNEWVEC (gdb_byte, m_descr->sizeof_cooked_registers); - m_register_status = XCNEWVEC (signed char, - m_descr->nr_cooked_registers); + m_registers.reset (new gdb_byte[m_descr->sizeof_cooked_registers] ()); + m_register_status.reset + (new register_status[m_descr->nr_cooked_registers] ()); } else { - m_registers = XCNEWVEC (gdb_byte, m_descr->sizeof_raw_registers); - m_register_status = XCNEWVEC (signed char, gdbarch_num_regs (gdbarch)); + m_registers.reset (new gdb_byte[m_descr->sizeof_raw_registers] ()); + m_register_status.reset + (new register_status[gdbarch_num_regs (gdbarch)] ()); } } -regcache::regcache (gdbarch *gdbarch, const address_space *aspace_) +regcache::regcache (process_stratum_target *target, gdbarch *gdbarch, + const address_space *aspace_) /* The register buffers. A read/write register cache can only hold [0 .. gdbarch_num_regs). */ - : detached_regcache (gdbarch, false), m_aspace (aspace_) + : detached_regcache (gdbarch, false), m_aspace (aspace_), m_target (target) { 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 (regnum, buf); -} - -readonly_detached_regcache::readonly_detached_regcache (const regcache &src) - : readonly_detached_regcache (src.arch (), do_cooked_read, (void *) &src) +readonly_detached_regcache::readonly_detached_regcache (regcache &src) + : readonly_detached_regcache (src.arch (), + [&src] (int regnum, gdb_byte *buf) + { + return src.cooked_read (regnum, buf); + }) { } @@ -223,48 +220,16 @@ reg_buffer::arch () const return m_descr->gdbarch; } -/* Cleanup class for invalidating a register. */ - -class regcache_invalidator -{ -public: - - regcache_invalidator (struct regcache *regcache, int regnum) - : m_regcache (regcache), - m_regnum (regnum) - { - } - - ~regcache_invalidator () - { - if (m_regcache != nullptr) - regcache_invalidate (m_regcache, m_regnum); - } - - DISABLE_COPY_AND_ASSIGN (regcache_invalidator); - - void release () - { - m_regcache = nullptr; - } - -private: - - struct regcache *m_regcache; - int m_regnum; -}; - /* Return a pointer to register REGNUM's buffer cache. */ gdb_byte * reg_buffer::register_buffer (int regnum) const { - return m_registers + m_descr->register_offset[regnum]; + return m_registers.get () + m_descr->register_offset[regnum]; } void -reg_buffer::save (regcache_cooked_read_ftype *cooked_read, - void *src) +reg_buffer::save (register_read_ftype cooked_read) { struct gdbarch *gdbarch = m_descr->gdbarch; int regnum; @@ -272,8 +237,8 @@ reg_buffer::save (regcache_cooked_read_ftype *cooked_read, /* It should have pseudo registers. */ gdb_assert (m_has_pseudo); /* Clear the dest. */ - memset (m_registers, 0, m_descr->sizeof_cooked_registers); - memset (m_register_status, 0, m_descr->nr_cooked_registers); + memset (m_registers.get (), 0, m_descr->sizeof_cooked_registers); + memset (m_register_status.get (), REG_UNKNOWN, 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 @@ -283,7 +248,7 @@ reg_buffer::save (regcache_cooked_read_ftype *cooked_read, if (gdbarch_register_reggroup_p (gdbarch, regnum, save_reggroup)) { gdb_byte *dst_buf = register_buffer (regnum); - enum register_status status = cooked_read (src, regnum, dst_buf); + enum register_status status = cooked_read (regnum, dst_buf); gdb_assert (status != REG_UNKNOWN); @@ -320,23 +285,18 @@ regcache::restore (readonly_detached_regcache *src) } } +/* See gdbsupport/common-regcache.h. */ + enum register_status reg_buffer::get_register_status (int regnum) const { assert_regnum (regnum); - return (enum register_status) m_register_status[regnum]; -} - -void -regcache_invalidate (struct regcache *regcache, int regnum) -{ - gdb_assert (regcache != NULL); - regcache->invalidate (regnum); + return m_register_status[regnum]; } void -detached_regcache::invalidate (int regnum) +reg_buffer::invalidate (int regnum) { assert_regnum (regnum); m_register_status[regnum] = REG_UNKNOWN; @@ -361,14 +321,19 @@ reg_buffer::assert_regnum (int regnum) const std::forward_list regcache::current_regcache; struct regcache * -get_thread_arch_aspace_regcache (ptid_t ptid, struct gdbarch *gdbarch, +get_thread_arch_aspace_regcache (process_stratum_target *target, + ptid_t ptid, struct gdbarch *gdbarch, struct address_space *aspace) { + gdb_assert (target != nullptr); + for (const auto ®cache : regcache::current_regcache) - if (ptid_equal (regcache->ptid (), ptid) && regcache->arch () == gdbarch) + if (regcache->target () == target + && regcache->ptid () == ptid + && regcache->arch () == gdbarch) return regcache; - regcache *new_regcache = new regcache (gdbarch, aspace); + regcache *new_regcache = new regcache (target, gdbarch, aspace); regcache::current_regcache.push_front (new_regcache); new_regcache->set_ptid (ptid); @@ -377,40 +342,65 @@ get_thread_arch_aspace_regcache (ptid_t ptid, struct gdbarch *gdbarch, } struct regcache * -get_thread_arch_regcache (ptid_t ptid, struct gdbarch *gdbarch) +get_thread_arch_regcache (process_stratum_target *target, ptid_t ptid, + struct gdbarch *gdbarch) { + scoped_restore_current_inferior restore_current_inferior; + set_current_inferior (find_inferior_ptid (target, ptid)); address_space *aspace = target_thread_address_space (ptid); - return get_thread_arch_aspace_regcache (ptid, gdbarch, aspace); + return get_thread_arch_aspace_regcache (target, ptid, gdbarch, aspace); } +static process_stratum_target *current_thread_target; static ptid_t current_thread_ptid; static struct gdbarch *current_thread_arch; struct regcache * -get_thread_regcache (ptid_t ptid) +get_thread_regcache (process_stratum_target *target, ptid_t ptid) { - if (!current_thread_arch || !ptid_equal (current_thread_ptid, ptid)) + if (!current_thread_arch + || target != current_thread_target + || current_thread_ptid != ptid) { + gdb_assert (ptid != null_ptid); + current_thread_ptid = ptid; + current_thread_target = target; + + scoped_restore_current_inferior restore_current_inferior; + set_current_inferior (find_inferior_ptid (target, ptid)); current_thread_arch = target_thread_architecture (ptid); } - return get_thread_arch_regcache (ptid, current_thread_arch); + return get_thread_arch_regcache (target, ptid, current_thread_arch); +} + +/* See regcache.h. */ + +struct regcache * +get_thread_regcache (thread_info *thread) +{ + return get_thread_regcache (thread->inf->process_target (), + thread->ptid); } struct regcache * get_current_regcache (void) { - return get_thread_regcache (inferior_ptid); + return get_thread_regcache (inferior_thread ()); } -/* See common/common-regcache.h. */ +/* See gdbsupport/common-regcache.h. */ struct regcache * get_thread_regcache_for_ptid (ptid_t ptid) { - return get_thread_regcache (ptid); + /* This function doesn't take a process_stratum_target parameter + because it's a gdbsupport/ routine implemented by both gdb and + gdbserver. It always refers to a ptid of the current target. */ + process_stratum_target *proc_target = current_inferior ()->process_target (); + return get_thread_regcache (proc_target, ptid); } /* Observer for the target_changed event. */ @@ -428,7 +418,7 @@ regcache::regcache_thread_ptid_changed (ptid_t old_ptid, ptid_t new_ptid) { for (auto ®cache : regcache::current_regcache) { - if (ptid_equal (regcache->ptid (), old_ptid)) + if (regcache->ptid () == old_ptid) regcache->set_ptid (new_ptid); } } @@ -445,29 +435,34 @@ regcache::regcache_thread_ptid_changed (ptid_t old_ptid, ptid_t new_ptid) Indicate that registers may have changed, so invalidate the cache. */ void -registers_changed_ptid (ptid_t ptid) +registers_changed_ptid (process_stratum_target *target, ptid_t ptid) { for (auto oit = regcache::current_regcache.before_begin (), it = std::next (oit); it != regcache::current_regcache.end (); ) { - if (ptid_match ((*it)->ptid (), ptid)) + struct regcache *regcache = *it; + if ((target == nullptr || regcache->target () == target) + && regcache->ptid ().matches (ptid)) { - delete *it; + delete regcache; it = regcache::current_regcache.erase_after (oit); } else oit = it++; } - if (ptid_match (current_thread_ptid, ptid)) + if ((target == nullptr || current_thread_target == target) + && current_thread_ptid.matches (ptid)) { + current_thread_target = NULL; current_thread_ptid = null_ptid; current_thread_arch = NULL; } - if (ptid_match (inferior_ptid, ptid)) + if ((target == nullptr || current_inferior ()->process_target () == target) + && inferior_ptid.matches (ptid)) { /* We just deleted the regcache of the current thread. Need to forget about any frames we have cached, too. */ @@ -475,17 +470,18 @@ registers_changed_ptid (ptid_t ptid) } } +/* See regcache.h. */ + +void +registers_changed_thread (thread_info *thread) +{ + registers_changed_ptid (thread->inf->process_target (), thread->ptid); +} + 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 - areas allocated by low level target code which may build up - during lengthy interactions between gdb and the target before - gdb gives control to the user (ie watchpoints). */ - alloca (0); + registers_changed_ptid (nullptr, minus_one_ptid); } void @@ -522,7 +518,7 @@ readable_regcache::raw_read (int regnum, gdb_byte *buf) memcpy (buf, register_buffer (regnum), m_descr->sizeof_register[regnum]); - return (enum register_status) m_register_status[regnum]; + return m_register_status[regnum]; } enum register_status @@ -616,7 +612,7 @@ readable_regcache::cooked_read (int regnum, gdb_byte *buf) else memset (buf, 0, m_descr->sizeof_register[regnum]); - return (enum register_status) m_register_status[regnum]; + return m_register_status[regnum]; } else if (gdbarch_pseudo_register_read_value_p (m_descr->gdbarch)) { @@ -645,12 +641,6 @@ readable_regcache::cooked_read (int regnum, gdb_byte *buf) regnum, buf); } -struct value * -regcache_cooked_read_value (struct regcache *regcache, int regnum) -{ - return regcache->cooked_read_value (regnum); -} - struct value * readable_regcache::cooked_read_value (int regnum) { @@ -769,7 +759,8 @@ regcache::raw_write (int regnum, const gdb_byte *buf) /* Invalidate the register after it is written, in case of a failure. */ - regcache_invalidator invalidator (this, regnum); + auto invalidator + = make_scope_exit ([&] { this->invalidate (regnum); }); target_store_registers (this, regnum); @@ -778,13 +769,6 @@ regcache::raw_write (int regnum, const gdb_byte *buf) 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) { @@ -797,88 +781,155 @@ regcache::cooked_write (int regnum, const gdb_byte *buf) regnum, buf); } -/* Perform a partial register transfer using a read, modify, write - operation. */ +/* See regcache.h. */ enum register_status -readable_regcache::read_part (int regnum, int offset, int len, void *in, - bool is_raw) +readable_regcache::read_part (int regnum, int offset, int len, + gdb_byte *out, bool is_raw) { - struct gdbarch *gdbarch = arch (); - gdb_byte *reg = (gdb_byte *) alloca (register_size (gdbarch, regnum)); + int reg_size = register_size (arch (), regnum); + + gdb_assert (out != NULL); + gdb_assert (offset >= 0 && offset <= reg_size); + gdb_assert (len >= 0 && offset + len <= reg_size); + + if (offset == 0 && len == 0) + { + /* Nothing to do. */ + return REG_VALID; + } + + if (offset == 0 && len == reg_size) + { + /* Read the full register. */ + return (is_raw) ? raw_read (regnum, out) : cooked_read (regnum, out); + } - gdb_assert (in != NULL); - 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) ... */ enum register_status status; + gdb_byte *reg = (gdb_byte *) alloca (reg_size); - if (is_raw) - status = raw_read (regnum, reg); - else - status = cooked_read (regnum, reg); + /* Read full register to buffer. */ + status = (is_raw) ? raw_read (regnum, reg) : cooked_read (regnum, reg); if (status != REG_VALID) return status; - /* ... modify ... */ - memcpy (in, reg + offset, len); - + /* Copy out. */ + memcpy (out, reg + offset, len); return REG_VALID; } +/* See regcache.h. */ + +void +reg_buffer::raw_collect_part (int regnum, int offset, int len, + gdb_byte *out) const +{ + int reg_size = register_size (arch (), regnum); + + gdb_assert (out != nullptr); + gdb_assert (offset >= 0 && offset <= reg_size); + gdb_assert (len >= 0 && offset + len <= reg_size); + + if (offset == 0 && len == 0) + { + /* Nothing to do. */ + return; + } + + if (offset == 0 && len == reg_size) + { + /* Collect the full register. */ + return raw_collect (regnum, out); + } + + /* Read to buffer, then write out. */ + gdb_byte *reg = (gdb_byte *) alloca (reg_size); + raw_collect (regnum, reg); + memcpy (out, reg + offset, len); +} + +/* See regcache.h. */ + enum register_status regcache::write_part (int regnum, int offset, int len, - const void *out, bool is_raw) + const gdb_byte *in, bool is_raw) { - struct gdbarch *gdbarch = arch (); - gdb_byte *reg = (gdb_byte *) alloca (register_size (gdbarch, regnum)); + int reg_size = register_size (arch (), regnum); - gdb_assert (out != NULL); - 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 (offset > 0 - || offset + len < m_descr->sizeof_register[regnum]) + gdb_assert (in != NULL); + gdb_assert (offset >= 0 && offset <= reg_size); + gdb_assert (len >= 0 && offset + len <= reg_size); + + if (offset == 0 && len == 0) { - enum register_status status; + /* Nothing to do. */ + return REG_VALID; + } - if (is_raw) - status = raw_read (regnum, reg); - else - status = cooked_read (regnum, reg); - if (status != REG_VALID) - return status; + if (offset == 0 && len == reg_size) + { + /* Write the full register. */ + (is_raw) ? raw_write (regnum, in) : cooked_write (regnum, in); + return REG_VALID; } - memcpy (reg + offset, out, len); - /* ... write (when needed). */ - if (is_raw) - raw_write (regnum, reg); - else - cooked_write (regnum, reg); + enum register_status status; + gdb_byte *reg = (gdb_byte *) alloca (reg_size); + /* Read existing register to buffer. */ + status = (is_raw) ? raw_read (regnum, reg) : cooked_read (regnum, reg); + if (status != REG_VALID) + return status; + + /* Update buffer, then write back to regcache. */ + memcpy (reg + offset, in, len); + is_raw ? raw_write (regnum, reg) : cooked_write (regnum, reg); return REG_VALID; } +/* See regcache.h. */ + +void +reg_buffer::raw_supply_part (int regnum, int offset, int len, + const gdb_byte *in) +{ + int reg_size = register_size (arch (), regnum); + + gdb_assert (in != nullptr); + gdb_assert (offset >= 0 && offset <= reg_size); + gdb_assert (len >= 0 && offset + len <= reg_size); + + if (offset == 0 && len == 0) + { + /* Nothing to do. */ + return; + } + + if (offset == 0 && len == reg_size) + { + /* Supply the full register. */ + return raw_supply (regnum, in); + } + + gdb_byte *reg = (gdb_byte *) alloca (reg_size); + + /* Read existing value to buffer. */ + raw_collect (regnum, reg); + + /* Write to buffer, then write out. */ + memcpy (reg + offset, in, len); + raw_supply (regnum, reg); +} + enum register_status -readable_regcache::raw_read_part (int regnum, int offset, int len, gdb_byte *buf) +readable_regcache::raw_read_part (int regnum, int offset, int len, + gdb_byte *buf) { assert_regnum (regnum); return read_part (regnum, offset, len, buf, true); } -void -regcache_raw_write_part (struct regcache *regcache, int regnum, - int offset, int len, const gdb_byte *buf) -{ - regcache->raw_write_part (regnum, offset, len, buf); -} +/* See regcache.h. */ void regcache::raw_write_part (int regnum, int offset, int len, @@ -888,13 +939,7 @@ regcache::raw_write_part (int regnum, int offset, int len, write_part (regnum, offset, len, buf, true); } -enum register_status -regcache_cooked_read_part (struct regcache *regcache, int regnum, - int offset, int len, gdb_byte *buf) -{ - return regcache->cooked_read_part (regnum, offset, len, buf); -} - +/* See regcache.h. */ enum register_status readable_regcache::cooked_read_part (int regnum, int offset, int len, @@ -904,12 +949,7 @@ readable_regcache::cooked_read_part (int regnum, int offset, int len, return read_part (regnum, offset, len, buf, false); } -void -regcache_cooked_write_part (struct regcache *regcache, int regnum, - int offset, int len, const gdb_byte *buf) -{ - regcache->cooked_write_part (regnum, offset, len, buf); -} +/* See regcache.h. */ void regcache::cooked_write_part (int regnum, int offset, int len, @@ -919,17 +959,10 @@ regcache::cooked_write_part (int regnum, int offset, int len, write_part (regnum, offset, len, 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); -} +/* See gdbsupport/common-regcache.h. */ void -detached_regcache::raw_supply (int regnum, const void *buf) +reg_buffer::raw_supply (int regnum, const void *buf) { void *regbuf; size_t size; @@ -954,15 +987,11 @@ detached_regcache::raw_supply (int regnum, const void *buf) } } -/* 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. */ +/* See regcache.h. */ void -detached_regcache::raw_supply_integer (int regnum, const gdb_byte *addr, - int addr_len, bool is_signed) +reg_buffer::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; @@ -978,12 +1007,10 @@ detached_regcache::raw_supply_integer (int regnum, const gdb_byte *addr, 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). */ +/* See regcache.h. */ void -detached_regcache::raw_supply_zeroed (int regnum) +reg_buffer::raw_supply_zeroed (int regnum) { void *regbuf; size_t size; @@ -997,17 +1024,10 @@ detached_regcache::raw_supply_zeroed (int regnum) m_register_status[regnum] = REG_VALID; } -/* Collect register REGNUM from REGCACHE and store its contents in BUF. */ +/* See gdbsupport/common-regcache.h. */ 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 +reg_buffer::raw_collect (int regnum, void *buf) const { const void *regbuf; size_t size; @@ -1020,19 +1040,11 @@ regcache::raw_collect (int regnum, void *buf) const memcpy (buf, regbuf, size); } -/* Transfer a single or all registers belonging to a certain register - set to or from a buffer. This is the main worker function for - regcache_supply_regset and regcache_collect_regset. */ - -/* 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. */ +/* See regcache.h. */ void -regcache::raw_collect_integer (int regnum, gdb_byte *addr, int addr_len, - bool is_signed) const +reg_buffer::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; @@ -1047,11 +1059,43 @@ regcache::raw_collect_integer (int regnum, gdb_byte *addr, int addr_len, byte_order); } +/* See regcache.h. */ + +void +regcache::transfer_regset_register (struct regcache *out_regcache, int regnum, + const gdb_byte *in_buf, gdb_byte *out_buf, + int slot_size, int offs) const +{ + struct gdbarch *gdbarch = arch (); + int reg_size = std::min (register_size (gdbarch, regnum), slot_size); + + /* Use part versions and reg_size to prevent possible buffer overflows when + accessing the regcache. */ + + if (out_buf != nullptr) + { + raw_collect_part (regnum, 0, reg_size, out_buf + offs); + + /* Ensure any additional space is cleared. */ + if (slot_size > reg_size) + memset (out_buf + offs + reg_size, 0, slot_size - reg_size); + } + else if (in_buf != nullptr) + out_regcache->raw_supply_part (regnum, 0, reg_size, in_buf + offs); + else + { + /* Invalidate the register. */ + out_regcache->raw_supply (regnum, nullptr); + } +} + +/* See regcache.h. */ + 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 + int regnum, const gdb_byte *in_buf, + gdb_byte *out_buf, size_t size) const { const struct regcache_map_entry *map; int offs = 0, count; @@ -1077,12 +1121,8 @@ regcache::transfer_regset (const struct regset *regset, 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); + transfer_regset_register (out_regcache, regno, in_buf, out_buf, + slot_size, offs); } else { @@ -1091,12 +1131,8 @@ regcache::transfer_regset (const struct regset *regset, 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); + transfer_regset_register (out_regcache, regnum, in_buf, out_buf, + slot_size, offs); return; } } @@ -1111,14 +1147,14 @@ regcache_supply_regset (const struct regset *regset, struct regcache *regcache, int regnum, const void *buf, size_t size) { - regcache->supply_regset (regset, regnum, buf, size); + regcache->supply_regset (regset, regnum, (const gdb_byte *) 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); + transfer_regset (regset, this, regnum, (const gdb_byte *) buf, nullptr, size); } /* Collect register REGNUM from REGCACHE to BUF, using the register @@ -1130,16 +1166,30 @@ 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); + regcache->collect_regset (regset, regnum, (gdb_byte *) 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); + transfer_regset (regset, nullptr, regnum, nullptr, (gdb_byte *) buf, size); } +/* See gdbsupport/common-regcache.h. */ + +bool +reg_buffer::raw_compare (int regnum, const void *buf, int offset) const +{ + gdb_assert (buf != NULL); + assert_regnum (regnum); + + const char *regbuf = (const char *) register_buffer (regnum); + size_t size = m_descr->sizeof_register[regnum]; + gdb_assert (size >= offset); + + return (memcmp (buf, regbuf + offset, size - offset) == 0); +} /* Special handling for register PC. */ @@ -1250,8 +1300,7 @@ register_dump::dump (ui_file *file) long register_offset = 0; gdb_assert (descr->nr_cooked_registers - == (gdbarch_num_regs (m_gdbarch) - + gdbarch_num_pseudo_regs (m_gdbarch))); + == gdbarch_num_cooked_regs (m_gdbarch)); for (regnum = -1; regnum < descr->nr_cooked_registers; regnum++) { @@ -1359,9 +1408,8 @@ register_dump::dump (ui_file *file) } #if GDB_SELF_TEST -#include "selftest.h" +#include "gdbsupport/selftest.h" #include "selftest-arch.h" -#include "gdbthread.h" #include "target-float.h" namespace selftests { @@ -1380,6 +1428,21 @@ public: } }; +/* Wrapper around get_thread_arch_aspace_regcache that does some self checks. */ + +static void +test_get_thread_arch_aspace_regcache (process_stratum_target *target, + ptid_t ptid, struct gdbarch *gdbarch, + address_space *aspace) +{ + struct regcache *regcache + = get_thread_arch_aspace_regcache (target, ptid, gdbarch, aspace); + SELF_CHECK (regcache != NULL); + SELF_CHECK (regcache->target () == target); + SELF_CHECK (regcache->ptid () == ptid); + SELF_CHECK (regcache->aspace () == aspace); +} + static void current_regcache_test (void) { @@ -1388,47 +1451,61 @@ current_regcache_test (void) 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); + test_target_ops test_target1; + test_target_ops test_target2; - SELF_CHECK (regcache != NULL); - SELF_CHECK (regcache->ptid () == ptid1); + /* Get regcache from (target1,ptid1), a new regcache is added to + current_regcache. */ + test_get_thread_arch_aspace_regcache (&test_target1, ptid1, + target_gdbarch (), + NULL); SELF_CHECK (regcache_access::current_regcache_size () == 1); - /* Get regcache from ptid2, a new regcache is added to + /* Get regcache from (target1,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); + test_get_thread_arch_aspace_regcache (&test_target1, ptid2, + target_gdbarch (), + NULL); SELF_CHECK (regcache_access::current_regcache_size () == 2); - /* Get regcache from ptid3, a new regcache is added to + /* Get regcache from (target1,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); + test_get_thread_arch_aspace_regcache (&test_target1, ptid3, + target_gdbarch (), + NULL); SELF_CHECK (regcache_access::current_regcache_size () == 3); - /* Get regcache from ptid2 again, nothing is added to + /* Get regcache from (target1,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); + test_get_thread_arch_aspace_regcache (&test_target1, ptid2, + target_gdbarch (), + NULL); 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); + /* Get regcache from (target2,ptid2), a new regcache is added to + current_regcache, since this time we're using a differen + target. */ + test_get_thread_arch_aspace_regcache (&test_target2, ptid2, + target_gdbarch (), + NULL); + SELF_CHECK (regcache_access::current_regcache_size () == 4); + + /* Mark that (target1,ptid2) changed. The regcache of (target1, + ptid2) should be removed from current_regcache. */ + registers_changed_ptid (&test_target1, ptid2); + SELF_CHECK (regcache_access::current_regcache_size () == 3); + + /* Get the regcache from (target2,ptid2) again, confirming the + registers_changed_ptid call above did not delete it. */ + test_get_thread_arch_aspace_regcache (&test_target2, ptid2, + target_gdbarch (), + NULL); + SELF_CHECK (regcache_access::current_regcache_size () == 3); + + /* Confirm that marking all regcaches of all targets as changed + clears current_regcache. */ + registers_changed_ptid (nullptr, minus_one_ptid); + SELF_CHECK (regcache_access::current_regcache_size () == 0); } class target_ops_no_register : public test_target_ops @@ -1489,8 +1566,9 @@ target_ops_no_register::xfer_partial (enum target_object object, class readwrite_regcache : public regcache { public: - readwrite_regcache (struct gdbarch *gdbarch) - : regcache (gdbarch, nullptr) + readwrite_regcache (process_stratum_target *target, + struct gdbarch *gdbarch) + : regcache (target, gdbarch, nullptr) {} }; @@ -1502,7 +1580,7 @@ cooked_read_test (struct gdbarch *gdbarch) { /* Error out if debugging something, because we're going to push the test target, which would pop any existing target. */ - if (target_stack->to_stratum >= process_stratum) + if (current_top_target ()->stratum () >= process_stratum) error (_("target already pushed")); /* Create a mock environment. An inferior with a thread, with a @@ -1515,9 +1593,7 @@ cooked_read_test (struct gdbarch *gdbarch) mock_inferior.gdbarch = gdbarch; mock_inferior.aspace = &mock_aspace; thread_info mock_thread (&mock_inferior, mock_ptid); - - scoped_restore restore_thread_list - = make_scoped_restore (&thread_list, &mock_thread); + mock_inferior.thread_map[mock_ptid] = &mock_thread; /* Add the mock inferior to the inferior list so that look ups by target+ptid can find it. */ @@ -1548,19 +1624,21 @@ cooked_read_test (struct gdbarch *gdbarch) /* Test that read one raw register from regcache_no_target will go to the target layer. */ - int regnum; /* Find a raw register which size isn't zero. */ - for (regnum = 0; regnum < gdbarch_num_regs (gdbarch); regnum++) + int nonzero_regnum; + for (nonzero_regnum = 0; + nonzero_regnum < gdbarch_num_regs (gdbarch); + nonzero_regnum++) { - if (register_size (gdbarch, regnum) != 0) + if (register_size (gdbarch, nonzero_regnum) != 0) break; } - readwrite_regcache readwrite (gdbarch); - gdb::def_vector buf (register_size (gdbarch, regnum)); + readwrite_regcache readwrite (&mock_target, gdbarch); + gdb::def_vector buf (register_size (gdbarch, nonzero_regnum)); - readwrite.raw_read (regnum, buf.data ()); + readwrite.raw_read (nonzero_regnum, buf.data ()); /* raw_read calls target_fetch_registers. */ SELF_CHECK (mock_target.fetch_registers_called > 0); @@ -1574,23 +1652,19 @@ cooked_read_test (struct gdbarch *gdbarch) mock_target.reset (); /* Then, read all raw and pseudo registers, and don't expect calling to_{fetch,store}_registers. */ - for (int regnum = 0; - regnum < gdbarch_num_regs (gdbarch) + gdbarch_num_pseudo_regs (gdbarch); - regnum++) + for (int regnum = 0; regnum < gdbarch_num_cooked_regs (gdbarch); regnum++) { if (register_size (gdbarch, regnum) == 0) continue; - gdb::def_vector buf (register_size (gdbarch, regnum)); + gdb::def_vector inner_buf (register_size (gdbarch, regnum)); - SELF_CHECK (REG_VALID == readwrite.cooked_read (regnum, buf.data ())); + SELF_CHECK (REG_VALID == readwrite.cooked_read (regnum, + inner_buf.data ())); SELF_CHECK (mock_target.fetch_registers_called == 0); SELF_CHECK (mock_target.store_registers_called == 0); - - /* Some SPU pseudo registers are got via TARGET_OBJECT_SPU. */ - if (gdbarch_bfd_arch_info (gdbarch)->arch != bfd_arch_spu) - SELF_CHECK (mock_target.xfer_partial_called == 0); + SELF_CHECK (mock_target.xfer_partial_called == 0); mock_target.reset (); } @@ -1601,16 +1675,14 @@ cooked_read_test (struct gdbarch *gdbarch) readonly regcache. */ mock_target.reset (); - for (int regnum = 0; - regnum < gdbarch_num_regs (gdbarch) + gdbarch_num_pseudo_regs (gdbarch); - regnum++) + for (int regnum = 0; regnum < gdbarch_num_cooked_regs (gdbarch); regnum++) { if (register_size (gdbarch, regnum) == 0) continue; - gdb::def_vector buf (register_size (gdbarch, regnum)); + gdb::def_vector inner_buf (register_size (gdbarch, regnum)); enum register_status status = readonly.cooked_read (regnum, - buf.data ()); + inner_buf.data ()); if (regnum < gdbarch_num_regs (gdbarch)) { @@ -1623,7 +1695,7 @@ cooked_read_test (struct gdbarch *gdbarch) || bfd_arch == bfd_arch_mips || bfd_arch == bfd_arch_v850_rh850 || bfd_arch == bfd_arch_tic6x || bfd_arch == bfd_arch_mn10300 || bfd_arch == bfd_arch_rl78 || bfd_arch == bfd_arch_score - || bfd_arch == bfd_arch_riscv) + || bfd_arch == bfd_arch_riscv || bfd_arch == bfd_arch_csky) { /* Raw registers. If raw registers are not in save_reggroup, their status are unknown. */ @@ -1676,7 +1748,7 @@ cooked_write_test (struct gdbarch *gdbarch) { /* Error out if debugging something, because we're going to push the test target, which would pop any existing target. */ - if (target_stack->to_stratum >= process_stratum) + if (current_top_target ()->stratum () >= process_stratum) error (_("target already pushed")); /* Create a mock environment. A process_stratum target pushed. */ @@ -1696,10 +1768,9 @@ cooked_write_test (struct gdbarch *gdbarch) } } pop_targets; - readwrite_regcache readwrite (gdbarch); + readwrite_regcache readwrite (&mock_target, gdbarch); - const int num_regs = (gdbarch_num_regs (gdbarch) - + gdbarch_num_pseudo_regs (gdbarch)); + const int num_regs = gdbarch_num_cooked_regs (gdbarch); for (auto regnum = 0; regnum < num_regs; regnum++) { @@ -1709,16 +1780,12 @@ cooked_write_test (struct gdbarch *gdbarch) auto bfd_arch = gdbarch_bfd_arch_info (gdbarch)->arch; - if ((bfd_arch == bfd_arch_sparc - /* SPARC64_CWP_REGNUM, SPARC64_PSTATE_REGNUM, - SPARC64_ASI_REGNUM and SPARC64_CCR_REGNUM are hard to test. */ - && gdbarch_ptr_bit (gdbarch) == 64 - && (regnum >= gdbarch_num_regs (gdbarch) - && regnum <= gdbarch_num_regs (gdbarch) + 4)) - || (bfd_arch == bfd_arch_spu - /* SPU pseudo registers except SPU_SP_REGNUM are got by - TARGET_OBJECT_SPU. */ - && regnum >= gdbarch_num_regs (gdbarch) && regnum != 130)) + if (bfd_arch == bfd_arch_sparc + /* SPARC64_CWP_REGNUM, SPARC64_PSTATE_REGNUM, + SPARC64_ASI_REGNUM and SPARC64_CCR_REGNUM are hard to test. */ + && gdbarch_ptr_bit (gdbarch) == 64 + && (regnum >= gdbarch_num_regs (gdbarch) + && regnum <= gdbarch_num_regs (gdbarch) + 4)) continue; std::vector expected (register_size (gdbarch, regnum), 0); @@ -1798,7 +1865,7 @@ _initialize_regcache (void) (regcache::regcache_thread_ptid_changed); add_com ("flushregs", class_maintenance, reg_flush_command, - _("Force gdb to flush its register cache (maintainer command)")); + _("Force gdb to flush its register cache (maintainer command).")); #if GDB_SELF_TEST selftests::register_test ("current_regcache", selftests::current_regcache_test);