diff options
| author | Tom Tromey <tromey@adacore.com> | 2020-09-17 14:11:38 -0600 |
|---|---|---|
| committer | Tom Tromey <tromey@adacore.com> | 2020-09-17 14:28:06 -0600 |
| commit | c1e1314d00fda5625f1a87b915fd83a61c253993 (patch) | |
| tree | 62affcd614124eec0c51db5223b0ea7f797a17d1 /gdb/s390-tdep.c | |
| parent | 0363df3db7d3f5edd3a349ab7720eca83f460545 (diff) | |
| download | gdb-c1e1314d00fda5625f1a87b915fd83a61c253993.zip gdb-c1e1314d00fda5625f1a87b915fd83a61c253993.tar.gz gdb-c1e1314d00fda5625f1a87b915fd83a61c253993.tar.bz2 | |
Change management of tdesc_arch_data
While working on something else, I noticed that tdesc_data_cleanup
took a void* parameter. Looking more into this, I found that
tdesc_use_registers expected a transfer of ownership.
I think it's better to express this sort of thing via the type system,
when possible. This patch changes tdesc_data_alloc to return a unique
pointer, changes tdesc_use_registers to accept an rvalue reference,
and then adapts all the users.
Note that a deleter structure is introduced to avoid having to move
tdesc_arch_data to the header file.
2020-09-17 Tom Tromey <tromey@adacore.com>
* tic6x-tdep.c (tic6x_gdbarch_init): Update.
* target-descriptions.h (struct tdesc_arch_data_deleter): New.
(tdesc_arch_data_up): New typedef.
(tdesc_use_registers, tdesc_data_alloc): Update.
(tdesc_data_cleanup): Don't declare.
* target-descriptions.c (tdesc_data_alloc): Return a
tdesc_arch_data_up.
(tdesc_arch_data_deleter::operator()): Rename from
tdesc_data_cleanup. Change argument type.
(tdesc_use_registers): Change early_data to an rvalue reference.
(tdesc_use_registers): Don't use delete.
* sparc-tdep.c (sparc32_gdbarch_init): Update.
* s390-tdep.c (s390_gdbarch_init): Update.
* rx-tdep.c (rx_gdbarch_init): Update.
* rs6000-tdep.c (rs6000_gdbarch_init): Update.
* riscv-tdep.c (riscv_gdbarch_init): Update.
* or1k-tdep.c (or1k_gdbarch_init): Update.
* nios2-tdep.c (nios2_gdbarch_init): Update.
* nds32-tdep.c (nds32_gdbarch_init): Update.
* mips-tdep.c (mips_gdbarch_init): Update.
* microblaze-tdep.c (microblaze_gdbarch_init): Update.
* m68k-tdep.c (m68k_gdbarch_init): Update.
* i386-tdep.c (i386_gdbarch_init): Update.
* arm-tdep.c (arm_gdbarch_init): Update.
* arc-tdep.c (arc_tdesc_init): Update.
(arc_gdbarch_init): Update.
* aarch64-tdep.c (aarch64_gdbarch_init): Update.
Diffstat (limited to 'gdb/s390-tdep.c')
| -rw-r--r-- | gdb/s390-tdep.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c index b95c8c1..4d3644e 100644 --- a/gdb/s390-tdep.c +++ b/gdb/s390-tdep.c @@ -7022,8 +7022,8 @@ s390_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) struct gdbarch_tdep *tdep = s390_gdbarch_tdep_alloc (); struct gdbarch *gdbarch = gdbarch_alloc (&info, tdep); - struct tdesc_arch_data *tdesc_data = tdesc_data_alloc (); - info.tdesc_data = tdesc_data; + tdesc_arch_data_up tdesc_data = tdesc_data_alloc (); + info.tdesc_data = tdesc_data.get (); set_gdbarch_believe_pcc_promotion (gdbarch, 0); set_gdbarch_char_signed (gdbarch, 0); @@ -7149,9 +7149,8 @@ s390_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) tdep->tdesc = tdesc; /* Check any target description for validity. */ - if (!s390_tdesc_valid (tdep, tdesc_data)) + if (!s390_tdesc_valid (tdep, tdesc_data.get ())) { - tdesc_data_cleanup (tdesc_data); xfree (tdep); gdbarch_free (gdbarch); return NULL; @@ -7182,13 +7181,12 @@ s390_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) if (tmp->vector_abi != tdep->vector_abi) continue; - tdesc_data_cleanup (tdesc_data); xfree (tdep); gdbarch_free (gdbarch); return arches->gdbarch; } - tdesc_use_registers (gdbarch, tdep->tdesc, tdesc_data); + tdesc_use_registers (gdbarch, tdep->tdesc, std::move (tdesc_data)); set_gdbarch_register_name (gdbarch, s390_register_name); /* Assign pseudo register numbers. */ |