From 96a5a1d3780a46b578842d9aeea3e98211dc20ec Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Wed, 27 Sep 2017 19:05:21 +0200 Subject: [PATCH] Complete tdep move to convert_typed_floating Many tdep files need to perform conversions between two floating-point types, usually when accessing FP registers. Most targets now use the convert_typed_floating helper routine to do so. However, a small number still use the old method of converting via a DOUBLEST. Since we want to get rid of DOUBLEST, these targets need to be moved to the new method as well. The main obstacle is that for convert_typed_floating we need an actual *type*, not just a floatformat. In arm-tdep.c, this is very straightforward, since there is already a type using the ARM extended floatformat. For sh-tdep.c and sh64-tdep.c, no such type already exists, so I've added one to the gdbarch_tdep struct as done on other targets. gdb/ChangeLog 2017-09-27 Ulrich Weigand * arm-tdep.c: (convert_from_extended): Remove. (convert_to_extended): Likewise. (arm_extract_return_value): Use convert_typed_floating. (arm_store_return_value): Likewise. * sh-tdep.h (struct gdbarch_tdep): Add sh_littlebyte_bigword_type. * sh-tdep.c: Do not include "floatformat.h". (sh_littlebyte_bigword_type): New function. (sh_register_convert_to_virtual): Use convert_typed_floating. (sh_register_convert_to_raw): Likewise. * sh64-tdep.c: (struct gdbarch_tdep): Add sh_littlebyte_bigword_type. (sh64_littlebyte_bigword_type): New function. (sh64_extract_return_value): Use convert_typed_floating. (sh64_register_convert_to_virtual): Likewise. (sh64_register_convert_to_raw): Likewise. --- gdb/ChangeLog | 18 ++++++++++++++++++ gdb/arm-tdep.c | 45 +++------------------------------------------ gdb/sh-tdep.c | 29 +++++++++++++++++------------ gdb/sh-tdep.h | 2 ++ gdb/sh64-tdep.c | 41 +++++++++++++++++++++-------------------- 5 files changed, 61 insertions(+), 74 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 478ec658be3..f109ffe8639 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,21 @@ +2017-09-27 Ulrich Weigand + + * arm-tdep.c: (convert_from_extended): Remove. + (convert_to_extended): Likewise. + (arm_extract_return_value): Use convert_typed_floating. + (arm_store_return_value): Likewise. + + * sh-tdep.h (struct gdbarch_tdep): Add sh_littlebyte_bigword_type. + * sh-tdep.c: Do not include "floatformat.h". + (sh_littlebyte_bigword_type): New function. + (sh_register_convert_to_virtual): Use convert_typed_floating. + (sh_register_convert_to_raw): Likewise. + * sh64-tdep.c: (struct gdbarch_tdep): Add sh_littlebyte_bigword_type. + (sh64_littlebyte_bigword_type): New function. + (sh64_extract_return_value): Use convert_typed_floating. + (sh64_register_convert_to_virtual): Likewise. + (sh64_register_convert_to_raw): Likewise. + 2017-09-27 Ulrich Weigand * doublest.h (floatformat_from_type): Move to gdbtypes.h. diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index 6b2fff44507..27093217b8d 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -226,11 +226,6 @@ static void show_disassembly_style_sfunc (struct ui_file *, int, struct cmd_list_element *, const char *); -static void convert_from_extended (const struct floatformat *, const void *, - void *, int); -static void convert_to_extended (const struct floatformat *, void *, - const void *, int); - static enum register_status arm_neon_quad_read (struct gdbarch *gdbarch, struct regcache *regcache, int regnum, gdb_byte *buf); @@ -4211,39 +4206,6 @@ arm_register_sim_regno (struct gdbarch *gdbarch, int regnum) internal_error (__FILE__, __LINE__, _("Bad REGNUM %d"), regnum); } -/* NOTE: cagney/2001-08-20: Both convert_from_extended() and - convert_to_extended() use floatformat_arm_ext_littlebyte_bigword. - It is thought that this is is the floating-point register format on - little-endian systems. */ - -static void -convert_from_extended (const struct floatformat *fmt, const void *ptr, - void *dbl, int endianess) -{ - DOUBLEST d; - - if (endianess == BFD_ENDIAN_BIG) - floatformat_to_doublest (&floatformat_arm_ext_big, ptr, &d); - else - floatformat_to_doublest (&floatformat_arm_ext_littlebyte_bigword, - ptr, &d); - floatformat_from_doublest (fmt, &d, dbl); -} - -static void -convert_to_extended (const struct floatformat *fmt, void *dbl, const void *ptr, - int endianess) -{ - DOUBLEST d; - - floatformat_to_doublest (fmt, ptr, &d); - if (endianess == BFD_ENDIAN_BIG) - floatformat_from_doublest (&floatformat_arm_ext_big, &d, dbl); - else - floatformat_from_doublest (&floatformat_arm_ext_littlebyte_bigword, - &d, dbl); -} - /* Given BUF, which is OLD_LEN bytes ending at ENDADDR, expand the buffer to be NEW_LEN bytes ending at ENDADDR. Return NULL if an error occurs. BUF is freed. */ @@ -7948,8 +7910,8 @@ arm_extract_return_value (struct type *type, struct regcache *regs, bfd_byte tmpbuf[FP_REGISTER_SIZE]; regcache_cooked_read (regs, ARM_F0_REGNUM, tmpbuf); - convert_from_extended (floatformat_from_type (type), tmpbuf, - valbuf, gdbarch_byte_order (gdbarch)); + convert_typed_floating (tmpbuf, arm_ext_type (gdbarch), + valbuf, type); } break; @@ -8153,8 +8115,7 @@ arm_store_return_value (struct type *type, struct regcache *regs, { case ARM_FLOAT_FPA: - convert_to_extended (floatformat_from_type (type), buf, valbuf, - gdbarch_byte_order (gdbarch)); + convert_typed_floating (valbuf, type, buf, arm_ext_type (gdbarch)); regcache_cooked_write (regs, ARM_F0_REGNUM, buf); break; diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c index a413daae12d..7d941e62358 100644 --- a/gdb/sh-tdep.c +++ b/gdb/sh-tdep.c @@ -33,7 +33,6 @@ #include "dis-asm.h" #include "inferior.h" #include "arch-utils.h" -#include "floatformat.h" #include "regcache.h" #include "doublest.h" #include "osabi.h" @@ -1552,6 +1551,19 @@ sh_register_reggroup_p (struct gdbarch *gdbarch, int regnum, The other pseudo registers (the FVs) also don't pose a problem because they are stored as 4 individual FP elements. */ +static struct type * +sh_littlebyte_bigword_type (struct gdbarch *gdbarch) +{ + struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + + if (tdep->sh_littlebyte_bigword_type == NULL) + tdep->sh_littlebyte_bigword_type + = arch_float_type (gdbarch, -1, "builtin_type_sh_littlebyte_bigword", + floatformats_ieee_double_littlebyte_bigword); + + return tdep->sh_littlebyte_bigword_type; +} + static void sh_register_convert_to_virtual (struct gdbarch *gdbarch, int regnum, struct type *type, gdb_byte *from, gdb_byte *to) @@ -1564,12 +1576,8 @@ sh_register_convert_to_virtual (struct gdbarch *gdbarch, int regnum, } if (regnum >= DR0_REGNUM && regnum <= DR_LAST_REGNUM) - { - DOUBLEST val; - floatformat_to_doublest (&floatformat_ieee_double_littlebyte_bigword, - from, &val); - store_typed_floating (to, type, val); - } + convert_typed_floating (from, sh_littlebyte_bigword_type (gdbarch), + to, type); else error ("sh_register_convert_to_virtual called with non DR register number"); @@ -1587,11 +1595,8 @@ sh_register_convert_to_raw (struct gdbarch *gdbarch, struct type *type, } if (regnum >= DR0_REGNUM && regnum <= DR_LAST_REGNUM) - { - DOUBLEST val = extract_typed_floating (from, type); - floatformat_from_doublest (&floatformat_ieee_double_littlebyte_bigword, - &val, to); - } + convert_typed_floating (from, type, + to, sh_littlebyte_bigword_type (gdbarch)); else error (_("sh_register_convert_to_raw called with non DR register number")); } diff --git a/gdb/sh-tdep.h b/gdb/sh-tdep.h index d15ef050e07..6e44df854e7 100644 --- a/gdb/sh-tdep.h +++ b/gdb/sh-tdep.h @@ -101,6 +101,8 @@ struct gdbarch_tdep inside the associated core file section. */ struct sh_corefile_regmap *core_fpregmap; int sizeof_fpregset; + /* ISA-specific data types. */ + struct type *sh_littlebyte_bigword_type; }; extern const struct regset sh_corefile_gregset; diff --git a/gdb/sh64-tdep.c b/gdb/sh64-tdep.c index 5aeb235b077..586490b1496 100644 --- a/gdb/sh64-tdep.c +++ b/gdb/sh64-tdep.c @@ -58,8 +58,23 @@ enum sh_abi struct gdbarch_tdep { enum sh_abi sh_abi; + /* ISA-specific data types. */ + struct type *sh_littlebyte_bigword_type; }; +struct type * +sh64_littlebyte_bigword_type (struct gdbarch *gdbarch) +{ + struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + + if (tdep->sh_littlebyte_bigword_type == NULL) + tdep->sh_littlebyte_bigword_type + = arch_float_type (gdbarch, -1, "builtin_type_sh_littlebyte_bigword", + floatformats_ieee_double_littlebyte_bigword); + + return tdep->sh_littlebyte_bigword_type; +} + struct sh64_frame_cache { /* Base address. */ @@ -1240,18 +1255,11 @@ sh64_extract_return_value (struct type *type, struct regcache *regcache, else if (len == 8) { /* return value stored in DR0_REGNUM. */ - DOUBLEST val; gdb_byte buf[8]; - regcache_cooked_read (regcache, DR0_REGNUM, buf); - if (gdbarch_byte_order (gdbarch) == BFD_ENDIAN_LITTLE) - floatformat_to_doublest (&floatformat_ieee_double_littlebyte_bigword, - buf, &val); - else - floatformat_to_doublest (&floatformat_ieee_double_big, - buf, &val); - store_typed_floating (valbuf, type, val); + convert_typed_floating (buf, sh64_littlebyte_bigword_type (gdbarch), + valbuf, type); } } else @@ -1460,12 +1468,8 @@ sh64_register_convert_to_virtual (struct gdbarch *gdbarch, int regnum, && regnum <= DR_LAST_REGNUM) || (regnum >= DR0_C_REGNUM && regnum <= DR_LAST_C_REGNUM)) - { - DOUBLEST val; - floatformat_to_doublest (&floatformat_ieee_double_littlebyte_bigword, - from, &val); - store_typed_floating (to, type, val); - } + convert_typed_floating (from, sh64_littlebyte_bigword_type (gdbarch), + to, type); else error (_("sh64_register_convert_to_virtual " "called with non DR register number")); @@ -1486,11 +1490,8 @@ sh64_register_convert_to_raw (struct gdbarch *gdbarch, struct type *type, && regnum <= DR_LAST_REGNUM) || (regnum >= DR0_C_REGNUM && regnum <= DR_LAST_C_REGNUM)) - { - DOUBLEST val = extract_typed_floating (from, type); - floatformat_from_doublest (&floatformat_ieee_double_littlebyte_bigword, - &val, to); - } + convert_typed_floating (from, type, + to, sh64_littlebyte_bigword_type (gdbarch)); else error (_("sh64_register_convert_to_raw called " "with non DR register number")); -- 2.30.2