This is the mail archive of the
gdb-cvs@sourceware.org
mailing list for the GDB project.
[binutils-gdb] Remove MAX_REGISTER_SIZE from regcache.c
- From: Alan Hayward <alahay01 at sourceware dot org>
- To: gdb-cvs at sourceware dot org
- Date: 7 Jun 2017 09:17:51 -0000
- Subject: [binutils-gdb] Remove MAX_REGISTER_SIZE from regcache.c
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=50d6adef3b8509c4e7e37b4b708e0593d43ed347
commit 50d6adef3b8509c4e7e37b4b708e0593d43ed347
Author: Alan Hayward <alan.hayward@arm.com>
Date: Wed Jun 7 10:16:46 2017 +0100
Remove MAX_REGISTER_SIZE from regcache.c
gdb/
* regcache.c (regcache::save): Avoid buffer use.
(regcache::dump): Likewise.
Diff:
---
gdb/ChangeLog | 5 +++++
gdb/regcache.c | 51 ++++++++++++++++++++++++++++++++++++---------------
2 files changed, 41 insertions(+), 15 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e209c14..3190410 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
2017-06-07 Alan Hayward <alan.hayward@arm.com>
+ * regcache.c (regcache::save): Avoid buffer use.
+ (regcache::dump): Likewise.
+
+2017-06-07 Alan Hayward <alan.hayward@arm.com>
+
* sh-tdep.c (sh_pseudo_register_read): Remove
MAX_REGISTER_SIZE.
(sh_pseudo_register_write): Likewise.
diff --git a/gdb/regcache.c b/gdb/regcache.c
index 3798f0a..46f4641 100644
--- a/gdb/regcache.c
+++ b/gdb/regcache.c
@@ -328,7 +328,6 @@ 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
@@ -346,18 +345,14 @@ regcache::save (regcache_cooked_read_ftype *cooked_read,
{
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 (regnum), buf,
- register_size (gdbarch, regnum));
- else
- {
- gdb_assert (status != REG_UNKNOWN);
+ gdb_assert (status != REG_UNKNOWN);
+
+ if (status != REG_VALID)
+ memset (dst_buf, 0, register_size (gdbarch, regnum));
- memset (register_buffer (regnum), 0,
- register_size (gdbarch, regnum));
- }
m_register_status[regnum] = status;
}
}
@@ -1471,7 +1466,6 @@ regcache::dump (ui_file *file, enum regcache_dump_what what_to_dump)
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",
@@ -1597,8 +1591,8 @@ regcache::dump (ui_file *file, enum regcache_dump_what what_to_dump)
fprintf_unfiltered (file, "<unavailable>");
else
{
- raw_read (regnum, buf);
- print_hex_chars (file, buf,
+ raw_update (regnum);
+ print_hex_chars (file, register_buffer (regnum),
m_descr->sizeof_register[regnum],
gdbarch_byte_order (gdbarch));
}
@@ -1611,9 +1605,30 @@ regcache::dump (ui_file *file, enum regcache_dump_what what_to_dump)
fprintf_unfiltered (file, "Cooked value");
else
{
+ const gdb_byte *buf = NULL;
enum register_status status;
+ struct value *value = NULL;
+
+ if (regnum < m_descr->nr_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 = cooked_read (regnum, buf);
if (status == REG_UNKNOWN)
fprintf_unfiltered (file, "<invalid>");
else if (status == REG_UNAVAILABLE)
@@ -1622,6 +1637,12 @@ regcache::dump (ui_file *file, enum regcache_dump_what what_to_dump)
print_hex_chars (file, buf,
m_descr->sizeof_register[regnum],
gdbarch_byte_order (gdbarch));
+
+ if (value != NULL)
+ {
+ release_value (value);
+ value_free (value);
+ }
}
}