[RFC,04/23] ARM: Replace regset_alloc() invocations by static regset structures
Commit Message
After removal of the regset_alloc invocations, the appropriate tdep
fields become obsolete and are thus removed.
gdb/
* arm-linux-tdep.c (arm_linux_gregset, arm_linux_fpregset)
(arm_linux_vfpregset): New static regset structures.
(arm_linux_regset_from_core_section): Remove dynamic allocation of
regset structures.
* arm-tdep.h (struct gdbarch_tdep): Remove 'gregset', 'fpregset',
and 'vfpregset' fields.
---
gdb/arm-linux-tdep.c | 38 ++++++++++++++++++--------------------
gdb/arm-tdep.h | 3 ---
2 files changed, 18 insertions(+), 23 deletions(-)
@@ -686,6 +686,21 @@ arm_linux_collect_vfp (const struct regset *regset,
regs + (regno - ARM_D0_REGNUM) * 8);
}
+static const struct regset arm_linux_gregset =
+ {
+ NULL, arm_linux_supply_gregset, arm_linux_collect_gregset
+ };
+
+static const struct regset arm_linux_fpregset =
+ {
+ NULL, arm_linux_supply_nwfpe, arm_linux_collect_nwfpe
+ };
+
+static const struct regset arm_linux_vfpregset =
+ {
+ NULL, arm_linux_supply_vfp, arm_linux_collect_vfp
+ };
+
/* Return the appropriate register set for the core section identified
by SECT_NAME and SECT_SIZE. */
@@ -693,34 +708,17 @@ static const struct regset *
arm_linux_regset_from_core_section (struct gdbarch *gdbarch,
const char *sect_name, size_t sect_size)
{
- struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
-
if (strcmp (sect_name, ".reg") == 0
&& sect_size == ARM_LINUX_SIZEOF_GREGSET)
- {
- if (tdep->gregset == NULL)
- tdep->gregset = regset_alloc (gdbarch, arm_linux_supply_gregset,
- arm_linux_collect_gregset);
- return tdep->gregset;
- }
+ return &arm_linux_gregset;
if (strcmp (sect_name, ".reg2") == 0
&& sect_size == ARM_LINUX_SIZEOF_NWFPE)
- {
- if (tdep->fpregset == NULL)
- tdep->fpregset = regset_alloc (gdbarch, arm_linux_supply_nwfpe,
- arm_linux_collect_nwfpe);
- return tdep->fpregset;
- }
+ return &arm_linux_fpregset;
if (strcmp (sect_name, ".reg-arm-vfp") == 0
&& sect_size == ARM_LINUX_SIZEOF_VFP)
- {
- if (tdep->vfpregset == NULL)
- tdep->vfpregset = regset_alloc (gdbarch, arm_linux_supply_vfp,
- arm_linux_collect_vfp);
- return tdep->vfpregset;
- }
+ return &arm_linux_vfpregset;
return NULL;
}
@@ -193,9 +193,6 @@ struct gdbarch_tdep
/* Convention for returning structures. */
enum struct_return struct_return;
- /* Cached core file helpers. */
- struct regset *gregset, *fpregset, *vfpregset;
-
/* ISA-specific data types. */
struct type *arm_ext_type;
struct type *neon_double_type;