From 4a8a33c843681410eeba4e05aa749abda8a8341b Mon Sep 17 00:00:00 2001 From: Alan Hayward Date: Wed, 7 Jun 2017 10:06:10 +0100 Subject: [PATCH] Remove MAX_REGISTER_SIZE from sh(64)-tdep.c gdb/ * sh-tdep.c (sh_pseudo_register_read): Remove MAX_REGISTER_SIZE. (sh_pseudo_register_write): Likewise. * sh64-tdep.c (sh64_pseudo_register_read): Likewise. (sh64_pseudo_register_write): Likewise. --- gdb/ChangeLog | 8 ++++++++ gdb/sh-tdep.c | 6 ++++-- gdb/sh64-tdep.c | 46 +++++++++++++++++++++------------------------- 3 files changed, 33 insertions(+), 27 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d60c937..e209c14 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,13 @@ 2017-06-07 Alan Hayward + * sh-tdep.c (sh_pseudo_register_read): Remove + MAX_REGISTER_SIZE. + (sh_pseudo_register_write): Likewise. + * sh64-tdep.c (sh64_pseudo_register_read): Likewise. + (sh64_pseudo_register_write): Likewise + +2017-06-07 Alan Hayward + * aarch64-tdep.c (aarch64_store_return_value): Use V_REGISTER_SIZE. (aarch64_pseudo_read_value): Likewise. diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c index 2c2b268..a87547d 100644 --- a/gdb/sh-tdep.c +++ b/gdb/sh-tdep.c @@ -1648,13 +1648,14 @@ sh_pseudo_register_read (struct gdbarch *gdbarch, struct regcache *regcache, int reg_nr, gdb_byte *buffer) { int base_regnum; - gdb_byte temp_buffer[MAX_REGISTER_SIZE]; enum register_status status; if (reg_nr == PSEUDO_BANK_REGNUM) return regcache_raw_read (regcache, BANK_REGNUM, buffer); else if (reg_nr >= DR0_REGNUM && reg_nr <= DR_LAST_REGNUM) { + /* Enough space for two float registers. */ + gdb_byte temp_buffer[4 * 2]; base_regnum = dr_reg_base_num (gdbarch, reg_nr); /* Build the value in the provided buffer. */ @@ -1687,7 +1688,6 @@ sh_pseudo_register_write (struct gdbarch *gdbarch, struct regcache *regcache, int reg_nr, const gdb_byte *buffer) { int base_regnum, portion; - gdb_byte temp_buffer[MAX_REGISTER_SIZE]; if (reg_nr == PSEUDO_BANK_REGNUM) { @@ -1703,6 +1703,8 @@ sh_pseudo_register_write (struct gdbarch *gdbarch, struct regcache *regcache, } else if (reg_nr >= DR0_REGNUM && reg_nr <= DR_LAST_REGNUM) { + /* Enough space for two float registers. */ + gdb_byte temp_buffer[4 * 2]; base_regnum = dr_reg_base_num (gdbarch, reg_nr); /* We must pay attention to the endiannes. */ diff --git a/gdb/sh64-tdep.c b/gdb/sh64-tdep.c index 06ae04e..4eb8947 100644 --- a/gdb/sh64-tdep.c +++ b/gdb/sh64-tdep.c @@ -1528,12 +1528,12 @@ sh64_pseudo_register_read (struct gdbarch *gdbarch, struct regcache *regcache, enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); int base_regnum; int offset = 0; - gdb_byte temp_buffer[MAX_REGISTER_SIZE]; enum register_status status; if (reg_nr >= DR0_REGNUM && reg_nr <= DR_LAST_REGNUM) { + gdb_byte temp_buffer[8]; base_regnum = sh64_dr_reg_base_num (gdbarch, reg_nr); /* Build the value in the provided buffer. */ @@ -1580,6 +1580,7 @@ sh64_pseudo_register_read (struct gdbarch *gdbarch, struct regcache *regcache, else if (reg_nr >= R0_C_REGNUM && reg_nr <= T_C_REGNUM) { + gdb_byte temp_buffer[8]; base_regnum = sh64_compact_reg_base_num (gdbarch, reg_nr); /* Build the value in the provided buffer. */ @@ -1607,6 +1608,7 @@ sh64_pseudo_register_read (struct gdbarch *gdbarch, struct regcache *regcache, else if (reg_nr >= DR0_C_REGNUM && reg_nr <= DR_LAST_C_REGNUM) { + gdb_byte temp_buffer[8]; base_regnum = sh64_compact_reg_base_num (gdbarch, reg_nr); /* DR_C regs are double precision registers obtained by @@ -1639,8 +1641,8 @@ sh64_pseudo_register_read (struct gdbarch *gdbarch, struct regcache *regcache, { int fpscr_base_regnum; int sr_base_regnum; - unsigned int fpscr_value; - unsigned int sr_value; + ULONGEST fpscr_value; + ULONGEST sr_value; unsigned int fpscr_c_value; unsigned int fpscr_c_part1_value; unsigned int fpscr_c_part2_value; @@ -1662,18 +1664,14 @@ sh64_pseudo_register_read (struct gdbarch *gdbarch, struct regcache *regcache, 21-31 reserved */ /* *INDENT-ON* */ - /* Get FPSCR into a local buffer. */ - status = regcache_raw_read (regcache, fpscr_base_regnum, temp_buffer); + /* Get FPSCR as an int. */ + status = regcache->raw_read_unsigned (fpscr_base_regnum, &fpscr_value); if (status != REG_VALID) return status; - /* Get value as an int. */ - fpscr_value = extract_unsigned_integer (temp_buffer, 4, byte_order); - /* Get SR into a local buffer */ - status = regcache_raw_read (regcache, sr_base_regnum, temp_buffer); + /* Get SR as an int. */ + status = regcache->raw_read_unsigned (sr_base_regnum, &sr_value); if (status != REG_VALID) return status; - /* Get value as an int. */ - sr_value = extract_unsigned_integer (temp_buffer, 4, byte_order); /* Build the new value. */ fpscr_c_part1_value = fpscr_value & 0x3fffd; fpscr_c_part2_value = (sr_value & 0x7000) << 6; @@ -1704,11 +1702,11 @@ sh64_pseudo_register_write (struct gdbarch *gdbarch, struct regcache *regcache, enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); int base_regnum, portion; int offset; - gdb_byte temp_buffer[MAX_REGISTER_SIZE]; if (reg_nr >= DR0_REGNUM && reg_nr <= DR_LAST_REGNUM) { + gdb_byte temp_buffer[8]; base_regnum = sh64_dr_reg_base_num (gdbarch, reg_nr); /* We must pay attention to the endianness. */ sh64_register_convert_to_raw (gdbarch, register_type (gdbarch, reg_nr), @@ -1752,6 +1750,7 @@ sh64_pseudo_register_write (struct gdbarch *gdbarch, struct regcache *regcache, else if (reg_nr >= R0_C_REGNUM && reg_nr <= T_C_REGNUM) { + gdb_byte temp_buffer[8]; base_regnum = sh64_compact_reg_base_num (gdbarch, reg_nr); /* reg_nr is 32 bit here, and base_regnum is 64 bits. */ if (gdbarch_byte_order (gdbarch) == BFD_ENDIAN_BIG) @@ -1779,6 +1778,7 @@ sh64_pseudo_register_write (struct gdbarch *gdbarch, struct regcache *regcache, else if (reg_nr >= DR0_C_REGNUM && reg_nr <= DR_LAST_C_REGNUM) { + gdb_byte temp_buffer[8]; base_regnum = sh64_compact_reg_base_num (gdbarch, reg_nr); for (portion = 0; portion < 2; portion++) { @@ -1813,10 +1813,10 @@ sh64_pseudo_register_write (struct gdbarch *gdbarch, struct regcache *regcache, { int fpscr_base_regnum; int sr_base_regnum; - unsigned int fpscr_value; - unsigned int sr_value; - unsigned int old_fpscr_value; - unsigned int old_sr_value; + ULONGEST fpscr_value; + ULONGEST sr_value; + ULONGEST old_fpscr_value; + ULONGEST old_sr_value; unsigned int fpscr_c_value; unsigned int fpscr_mask; unsigned int sr_mask; @@ -1847,19 +1847,15 @@ sh64_pseudo_register_write (struct gdbarch *gdbarch, struct regcache *regcache, fpscr_value = fpscr_c_value & fpscr_mask; sr_value = (fpscr_value & sr_mask) >> 6; - regcache_raw_read (regcache, fpscr_base_regnum, temp_buffer); - old_fpscr_value = extract_unsigned_integer (temp_buffer, 4, byte_order); + regcache->raw_read_unsigned (fpscr_base_regnum, &old_fpscr_value); old_fpscr_value &= 0xfffc0002; fpscr_value |= old_fpscr_value; - store_unsigned_integer (temp_buffer, 4, byte_order, fpscr_value); - regcache_raw_write (regcache, fpscr_base_regnum, temp_buffer); - - regcache_raw_read (regcache, sr_base_regnum, temp_buffer); - old_sr_value = extract_unsigned_integer (temp_buffer, 4, byte_order); + regcache->raw_write_unsigned (fpscr_base_regnum, fpscr_value); + + regcache->raw_read_unsigned (sr_base_regnum, &old_sr_value); old_sr_value &= 0xffff8fff; sr_value |= old_sr_value; - store_unsigned_integer (temp_buffer, 4, byte_order, sr_value); - regcache_raw_write (regcache, sr_base_regnum, temp_buffer); + regcache->raw_write_unsigned (sr_base_regnum, sr_value); } else if (reg_nr == FPUL_C_REGNUM) -- 2.7.4