aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorAlan Hayward <alan.hayward@arm.com>2017-06-27 13:10:16 +0100
committerAlan Hayward <alan.hayward@arm.com>2017-06-27 13:10:16 +0100
commita4d1e79aaa4b9d994cd9790fc3b756748dc5571c (patch)
treef86fbaccf7eb1774eb6e012dd545403e6bd97286 /gdb
parent2d68166e8704569eeceb76ac743ea1e7cca2af26 (diff)
downloadgdb-a4d1e79aaa4b9d994cd9790fc3b756748dc5571c.zip
gdb-a4d1e79aaa4b9d994cd9790fc3b756748dc5571c.tar.gz
gdb-a4d1e79aaa4b9d994cd9790fc3b756748dc5571c.tar.bz2
Remove MAX_REGISTER_SIZE from remote-sim.c
gdb/ * remote-sim.c (gdbsim_fetch_register): Use byte_vector. (gdbsim_store_register): Likewise.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/remote-sim.c38
2 files changed, 22 insertions, 21 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2394185..1534468 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2017-06-27 Alan Hayward <alan.hayward@arm.com>
+
+ * remote-sim.c (gdbsim_fetch_register): Use byte_vector.
+ (gdbsim_store_register): Likewise.
+
2017-06-27 Pedro Alves <palves@redhat.com>
* c-exp.y (name_obstack): Now an auto_obstack.
diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c
index fd1bc66..13137ab 100644
--- a/gdb/remote-sim.c
+++ b/gdb/remote-sim.c
@@ -40,6 +40,7 @@
#include "arch-utils.h"
#include "readline/readline.h"
#include "gdbthread.h"
+#include "common/byte-vector.h"
/* Prototypes */
@@ -448,38 +449,31 @@ gdbsim_fetch_register (struct target_ops *ops,
{
/* For moment treat a `does not exist' register the same way
as an ``unavailable'' register. */
- gdb_byte buf[MAX_REGISTER_SIZE];
- int nr_bytes;
-
- memset (buf, 0, MAX_REGISTER_SIZE);
- regcache_raw_supply (regcache, regno, buf);
+ regcache->raw_supply_zeroed (regno);
break;
}
default:
{
static int warn_user = 1;
- gdb_byte buf[MAX_REGISTER_SIZE];
+ int regsize = register_size (gdbarch, regno);
+ gdb::byte_vector buf (regsize, 0);
int nr_bytes;
gdb_assert (regno >= 0 && regno < gdbarch_num_regs (gdbarch));
- memset (buf, 0, MAX_REGISTER_SIZE);
nr_bytes = sim_fetch_register (sim_data->gdbsim_desc,
gdbarch_register_sim_regno
(gdbarch, regno),
- buf,
- register_size (gdbarch, regno));
- if (nr_bytes > 0
- && nr_bytes != register_size (gdbarch, regno) && warn_user)
+ buf.data (), regsize);
+ if (nr_bytes > 0 && nr_bytes != regsize && warn_user)
{
fprintf_unfiltered (gdb_stderr,
"Size of register %s (%d/%d) "
"incorrect (%d instead of %d))",
gdbarch_register_name (gdbarch, regno),
regno,
- gdbarch_register_sim_regno
- (gdbarch, regno),
- nr_bytes, register_size (gdbarch, regno));
+ gdbarch_register_sim_regno (gdbarch, regno),
+ nr_bytes, regsize);
warn_user = 0;
}
/* FIXME: cagney/2002-05-27: Should check `nr_bytes == 0'
@@ -487,13 +481,13 @@ gdbsim_fetch_register (struct target_ops *ops,
which registers are fetchable. */
/* Else if (nr_bytes < 0): an old simulator, that doesn't
think to return the register size. Just assume all is ok. */
- regcache_raw_supply (regcache, regno, buf);
+ regcache->raw_supply (regno, buf.data ());
if (remote_debug)
{
fprintf_unfiltered (gdb_stdlog,
"gdbsim_fetch_register: %d", regno);
/* FIXME: We could print something more intelligible. */
- dump_mem (buf, register_size (gdbarch, regno));
+ dump_mem (buf.data (), regsize);
}
break;
}
@@ -518,15 +512,17 @@ gdbsim_store_register (struct target_ops *ops,
}
else if (gdbarch_register_sim_regno (gdbarch, regno) >= 0)
{
- gdb_byte tmp[MAX_REGISTER_SIZE];
+ int regsize = register_size (gdbarch, regno);
+ gdb::byte_vector tmp (regsize);
int nr_bytes;
- regcache_cooked_read (regcache, regno, tmp);
+ regcache->cooked_read (regno, tmp.data ());
nr_bytes = sim_store_register (sim_data->gdbsim_desc,
gdbarch_register_sim_regno
(gdbarch, regno),
- tmp, register_size (gdbarch, regno));
- if (nr_bytes > 0 && nr_bytes != register_size (gdbarch, regno))
+ tmp.data (), regsize);
+
+ if (nr_bytes > 0 && nr_bytes != regsize)
internal_error (__FILE__, __LINE__,
_("Register size different to expected"));
if (nr_bytes < 0)
@@ -540,7 +536,7 @@ gdbsim_store_register (struct target_ops *ops,
{
fprintf_unfiltered (gdb_stdlog, "gdbsim_store_register: %d", regno);
/* FIXME: We could print something more intelligible. */
- dump_mem (tmp, register_size (gdbarch, regno));
+ dump_mem (tmp.data (), regsize);
}
}
}