This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH 06/11] MIPS: Replace regset_alloc() invocations by static regset structures.
- From: Andreas Arnez <arnez at linux dot vnet dot ibm dot com>
- To: gdb-patches at sourceware dot org
- Date: Thu, 15 May 2014 17:49:30 +0200
- Subject: [PATCH 06/11] MIPS: Replace regset_alloc() invocations by static regset structures.
- Authentication-results: sourceware.org; auth=none
- References: <1400168975-3145-1-git-send-email-arnez at linux dot vnet dot ibm dot com>
After removal of the regset_alloc invocations, the appropriate tdep
fields become obsolete and are thus removed.
gdb/
* mips-linux-tdep.c (mips_linux_gregset, mips64_linux_gregset)
(mips_linux_fpregset, mips64_linux_fpregset): New static regset
structures.
(mips_linux_regset_from_core_section): Remove dynamic regset
allocations.
* mips-tdep.h (struct gdbarch_tdep): Remove fields 'gregset',
'gregset64', 'fpregset', and 'fpregset64'.
* mips-tdep.c (mips_gdbarch_init): Remove initialization of
deleted tdep fields.
---
gdb/mips-linux-tdep.c | 53 +++++++++++++++++++++++----------------------------
gdb/mips-tdep.c | 4 ----
gdb/mips-tdep.h | 8 --------
3 files changed, 24 insertions(+), 41 deletions(-)
diff --git a/gdb/mips-linux-tdep.c b/gdb/mips-linux-tdep.c
index 61bea6c..a975db6 100644
--- a/gdb/mips-linux-tdep.c
+++ b/gdb/mips-linux-tdep.c
@@ -618,11 +618,30 @@ mips64_fill_fpregset_wrapper (const struct regset *regset,
mips64_fill_fpregset (regcache, (mips64_elf_fpregset_t *)gregs, regnum);
}
+static const struct regset mips_linux_gregset =
+ {
+ NULL, mips_supply_gregset_wrapper, mips_fill_gregset_wrapper
+ };
+
+static const struct regset mips64_linux_gregset =
+ {
+ NULL, mips64_supply_gregset_wrapper, mips64_fill_gregset_wrapper
+ };
+
+static const struct regset mips_linux_fpregset =
+ {
+ NULL, mips_supply_fpregset_wrapper, mips_fill_fpregset_wrapper
+ };
+
+static const struct regset mips64_linux_fpregset =
+ {
+ NULL, mips64_supply_fpregset_wrapper, mips64_fill_fpregset_wrapper
+ };
+
static const struct regset *
mips_linux_regset_from_core_section (struct gdbarch *gdbarch,
const char *sect_name, size_t sect_size)
{
- struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
mips_elf_gregset_t gregset;
mips_elf_fpregset_t fpregset;
mips64_elf_gregset_t gregset64;
@@ -631,21 +650,9 @@ mips_linux_regset_from_core_section (struct gdbarch *gdbarch,
if (strcmp (sect_name, ".reg") == 0)
{
if (sect_size == sizeof (gregset))
- {
- if (tdep->gregset == NULL)
- tdep->gregset = regset_alloc (gdbarch,
- mips_supply_gregset_wrapper,
- mips_fill_gregset_wrapper);
- return tdep->gregset;
- }
+ return &mips_linux_gregset;
else if (sect_size == sizeof (gregset64))
- {
- if (tdep->gregset64 == NULL)
- tdep->gregset64 = regset_alloc (gdbarch,
- mips64_supply_gregset_wrapper,
- mips64_fill_gregset_wrapper);
- return tdep->gregset64;
- }
+ return &mips64_linux_gregset;
else
{
warning (_("wrong size gregset struct in core file"));
@@ -654,21 +661,9 @@ mips_linux_regset_from_core_section (struct gdbarch *gdbarch,
else if (strcmp (sect_name, ".reg2") == 0)
{
if (sect_size == sizeof (fpregset))
- {
- if (tdep->fpregset == NULL)
- tdep->fpregset = regset_alloc (gdbarch,
- mips_supply_fpregset_wrapper,
- mips_fill_fpregset_wrapper);
- return tdep->fpregset;
- }
+ return &mips_linux_fpregset;
else if (sect_size == sizeof (fpregset64))
- {
- if (tdep->fpregset64 == NULL)
- tdep->fpregset64 = regset_alloc (gdbarch,
- mips64_supply_fpregset_wrapper,
- mips64_fill_fpregset_wrapper);
- return tdep->fpregset64;
- }
+ return &mips64_linux_fpregset;
else
{
warning (_("wrong size fpregset struct in core file"));
diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index 606b150..c3e8e77 100644
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -8327,10 +8327,6 @@ mips_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
tdep->mips_fpu_type = fpu_type;
tdep->register_size_valid_p = 0;
tdep->register_size = 0;
- tdep->gregset = NULL;
- tdep->gregset64 = NULL;
- tdep->fpregset = NULL;
- tdep->fpregset64 = NULL;
if (info.target_desc)
{
diff --git a/gdb/mips-tdep.h b/gdb/mips-tdep.h
index 31e9601..ba29952 100644
--- a/gdb/mips-tdep.h
+++ b/gdb/mips-tdep.h
@@ -109,14 +109,6 @@ struct gdbarch_tdep
int register_size_valid_p;
int register_size;
- /* General-purpose registers. */
- struct regset *gregset;
- struct regset *gregset64;
-
- /* Floating-point registers. */
- struct regset *fpregset;
- struct regset *fpregset64;
-
/* Return the expected next PC if FRAME is stopped at a syscall
instruction. */
CORE_ADDR (*syscall_next_pc) (struct frame_info *frame);
--
1.8.4.2