From fbe654c8bc78eb06b6d7ee4fcec64e9e34e7a9ac Mon Sep 17 00:00:00 2001 From: Alan Hayward Date: Tue, 6 Jun 2017 15:45:08 +0100 Subject: [PATCH] Remove uses of MAX_REGISTER_SIZE from alpha-tdep.c gdb/ * alpha-tdep.c (alpha_register_to_value): Use get_frame_register_value. (alpha_value_to_register): Use ALPHA_REGISTER_SIZE. --- gdb/ChangeLog | 6 ++++++ gdb/alpha-tdep.c | 29 ++++++++++++++++++++--------- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5452285d01..319e9c498d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2017-06-06 Alan Hayward + + * alpha-tdep.c (alpha_register_to_value): Use + get_frame_register_value. + (alpha_value_to_register): Use ALPHA_REGISTER_SIZE. + 2017-06-06 Alan Hayward * ia64-tdep.c (IA64_MAX_FP_REGISTER_SIZE) Add. diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c index d7cc0f4974..06ee90cbc7 100644 --- a/gdb/alpha-tdep.c +++ b/gdb/alpha-tdep.c @@ -244,17 +244,26 @@ alpha_register_to_value (struct frame_info *frame, int regnum, int *optimizedp, int *unavailablep) { struct gdbarch *gdbarch = get_frame_arch (frame); - gdb_byte in[MAX_REGISTER_SIZE]; + struct value *value = get_frame_register_value (frame, regnum); - /* Convert to TYPE. */ - if (!get_frame_register_bytes (frame, regnum, 0, - register_size (gdbarch, regnum), - in, optimizedp, unavailablep)) - return 0; + gdb_assert (value != NULL); + *optimizedp = value_optimized_out (value); + *unavailablep = !value_entirely_available (value); + + if (*optimizedp || *unavailablep) + { + release_value (value); + value_free (value); + return 0; + } + + /* Convert to VALTYPE. */ gdb_assert (TYPE_LENGTH (valtype) == 4); - alpha_sts (gdbarch, out, in); - *optimizedp = *unavailablep = 0; + alpha_sts (gdbarch, out, value_contents_all (value)); + + release_value (value); + value_free (value); return 1; } @@ -262,9 +271,11 @@ static void alpha_value_to_register (struct frame_info *frame, int regnum, struct type *valtype, const gdb_byte *in) { - gdb_byte out[MAX_REGISTER_SIZE]; + gdb_byte out[ALPHA_REGISTER_SIZE]; gdb_assert (TYPE_LENGTH (valtype) == 4); + gdb_assert (register_size (get_frame_arch (frame), regnum) + <= ALPHA_REGISTER_SIZE); alpha_lds (get_frame_arch (frame), out, in); put_frame_register (frame, regnum, out);