From 0dd5cbc56307afaf6a366a8e78ef25cf9cefe514 Mon Sep 17 00:00:00 2001 From: Alan Hayward Date: Fri, 23 Jun 2017 10:21:39 +0100 Subject: [PATCH] Add XTENSA_MAX_REGISTER_SIZE gdb/ * xtensa-tdep.c (XTENSA_MAX_REGISTER_SIZE): Add. (xtensa_register_write_masked): Use XTENSA_MAX_REGISTER_SIZE. (xtensa_register_read_masked): Likewise. --- gdb/ChangeLog | 6 ++++++ gdb/xtensa-tdep.c | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 95010fc6129..bbbd5fb19cb 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2017-06-23 Alan Hayward + + * xtensa-tdep.c (XTENSA_MAX_REGISTER_SIZE): Add. + (xtensa_register_write_masked): Use XTENSA_MAX_REGISTER_SIZE. + (xtensa_register_read_masked): Likewise. + 2017-06-22 Sergio Durigan Junior * common/environ.c (gdb_environ::unset): Update comment. diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c index f9e858473a4..f875f20d32b 100644 --- a/gdb/xtensa-tdep.c +++ b/gdb/xtensa-tdep.c @@ -120,6 +120,9 @@ static unsigned int xtensa_debug_level = 0; #define PS_WOE (1<<18) #define PS_EXC (1<<4) +/* Big enough to hold the size of the largest register in bytes. */ +#define XTENSA_MAX_REGISTER_SIZE 64 + static int windowing_enabled (struct gdbarch *gdbarch, unsigned int ps) { @@ -370,7 +373,7 @@ static void xtensa_register_write_masked (struct regcache *regcache, xtensa_register_t *reg, const gdb_byte *buffer) { - unsigned int value[(MAX_REGISTER_SIZE + 3) / 4]; + unsigned int value[(XTENSA_MAX_REGISTER_SIZE + 3) / 4]; const xtensa_mask_t *mask = reg->mask; int shift = 0; /* Shift for next mask (mod 32). */ @@ -454,7 +457,7 @@ static enum register_status xtensa_register_read_masked (struct regcache *regcache, xtensa_register_t *reg, gdb_byte *buffer) { - unsigned int value[(MAX_REGISTER_SIZE + 3) / 4]; + unsigned int value[(XTENSA_MAX_REGISTER_SIZE + 3) / 4]; const xtensa_mask_t *mask = reg->mask; int shift = 0; -- 2.30.2