clean up resize_section_table
Commit Message
Hi.
This patch is a simple cleanup to resize_section_table.
Some callers do a two-step dance to clear the table,
this replaces that with a new function that does what it says.
Plus the argument "num_added" was a bit confusing so I renamed it.
Regression tested on amd64-linux.
[There's still a gdb segv caught by corefile.exp, but that's
a different patch.]
2014-06-02 Doug Evans <dje@google.com>
* exec.c (exec_close_1): Call clear_section_table instead of
resize_section_table.
(clear_section_table): New function.
(resize_section_table): Make static. Rename arg num_added to
adjustment.
* exec.h (clear_section_table): Declare.
(resize_section_table): Delete.
* progspace.c (release_program_space): Call clear_section_table
instead of resize_section_table.
Comments
On 06/03/2014 01:00 AM, Doug Evans wrote:
> Hi.
>
> This patch is a simple cleanup to resize_section_table.
> Some callers do a two-step dance to clear the table,
> this replaces that with a new function that does what it says.
>
> Plus the argument "num_added" was a bit confusing so I renamed it.
>
> Regression tested on amd64-linux.
Looks good to me.
Thanks,
On Tue, Jun 3, 2014 at 9:59 AM, Pedro Alves <palves@redhat.com> wrote:
> On 06/03/2014 01:00 AM, Doug Evans wrote:
>> Hi.
>>
>> This patch is a simple cleanup to resize_section_table.
>> Some callers do a two-step dance to clear the table,
>> this replaces that with a new function that does what it says.
>>
>> Plus the argument "num_added" was a bit confusing so I renamed it.
>>
>> Regression tested on amd64-linux.
>
> Looks good to me.
Committed.
Thanks.
@@ -125,12 +125,7 @@ exec_close_1 (struct target_ops *self)
ALL_PSPACES (ss)
{
set_current_program_space (ss);
-
- /* Delete all target sections. */
- resize_section_table
- (current_target_sections,
- -resize_section_table (current_target_sections, 0));
-
+ clear_section_table (current_target_sections);
exec_close ();
}
@@ -366,15 +361,29 @@ add_to_section_table (bfd *abfd, struct bfd_section *asect,
(*table_pp)++;
}
-int
-resize_section_table (struct target_section_table *table, int num_added)
+/* See exec.h. */
+
+void
+clear_section_table (struct target_section_table *table)
+{
+ xfree (table->sections);
+ table->sections = table->sections_end = NULL;
+}
+
+/* Resize section table TABLE by ADJUSTMENT.
+ ADJUSTMENT may be negative, in which case the caller must have already
+ removed the sections being deleted.
+ Returns the old size. */
+
+static int
+resize_section_table (struct target_section_table *table, int adjustment)
{
int old_count;
int new_count;
old_count = table->sections_end - table->sections;
- new_count = num_added + old_count;
+ new_count = adjustment + old_count;
if (new_count)
{
@@ -383,10 +392,7 @@ resize_section_table (struct target_section_table *table, int num_added)
table->sections_end = table->sections + new_count;
}
else
- {
- xfree (table->sections);
- table->sections = table->sections_end = NULL;
- }
+ clear_section_table (table);
return old_count;
}
@@ -41,10 +41,9 @@ extern struct target_ops exec_ops;
extern int build_section_table (struct bfd *, struct target_section **,
struct target_section **);
-/* Resize the section table held by TABLE, by NUM_ADDED. Returns the
- old size. */
+/* Remove all entries from TABLE. */
-extern int resize_section_table (struct target_section_table *, int);
+extern void clear_section_table (struct target_section_table *table);
/* Read from mappable read-only sections of BFD executable files.
Return TARGET_XFER_OK, if read is successful. Return
@@ -160,8 +160,7 @@ release_program_space (struct program_space *pspace)
free_all_objfiles ();
if (!gdbarch_has_shared_address_space (target_gdbarch ()))
free_address_space (pspace->aspace);
- resize_section_table (&pspace->target_sections,
- -resize_section_table (&pspace->target_sections, 0));
+ clear_section_table (&pspace->target_sections);
clear_program_space_solib_cache (pspace);
/* Discard any data modules have associated with the PSPACE. */
program_space_free_data (pspace);