espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-25 04:49:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

MSP430: ld: Update output section tail when shuffling ".either" sections

Browse Source 
The MSP430 linker shuffles input sections with names beginning with
".either" between the upper and lower memory regions, to try to avoid
one region overflowing when there is space in the other region.

However, when an ".either" input section attached to the tail of an
output section was moved to a different output section in the other
region, that tail wasn't being updated to the new section at the end
of the original output section.

This caused a bug where a shuffled section could end up in the
middle of another section in the output executable, resulting in
corrupted code or data.

When changing the output section of an input section attached to the
tail of its output section, that tail is now updated to point to
the new input section at the end of the section list.

ld/ChangeLog:

2020-08-06  Jozef Lawrynowicz  <jozef.l@mittosystems.com>

	* emultempl/msp430.em (change_output_section): Update the tail
	of the output section statement list when moving the original
	tail to a different output section.
	(eval_upper_either_sections): Don't move sections from the upper
	region to the lower region unless the upper region is
	overflowing.
This commit is contained in:
Jozef Lawrynowicz
2020-08-05 12:55:07 +01:00
parent b5582ab72f
commit 1a9f72a7a8
2 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ld/ChangeLog
View File

@ -1,3 +1,12 @@
2020-08-06 Jozef Lawrynowicz <jozef.l@mittosystems.com>
* emultempl/msp430.em (change_output_section): Update the tail
of the output section statement list when moving the original
tail to a different output section.
(eval_upper_either_sections): Don't move sections from the upper
region to the lower region unless the upper region is
overflowing.
2020-08-03 Alan Modra <amodra@gmail.com> 2020-08-03 Alan Modra <amodra@gmail.com>
* ldlex.l (yy_create_string_buffer): Use xmalloc rather than malloc. * ldlex.l (yy_create_string_buffer): Use xmalloc rather than malloc.

32
ld/emultempl/msp430.em
View File

@ -339,9 +339,10 @@ fi
fragment <<EOF fragment <<EOF
static bfd_boolean static bfd_boolean
change_output_section (lang_statement_union_type ** head, change_output_section (lang_statement_union_type **head,
asection *s, asection *s,
lang_output_section_statement_type * new_output_section) lang_output_section_statement_type *new_os,
lang_output_section_statement_type *old_os)
{ {
asection *is; asection *is;
lang_statement_union_type * prev = NULL; lang_statement_union_type * prev = NULL;
@ -356,20 +357,27 @@ change_output_section (lang_statement_union_type ** head,
is = curr->input_section.section; is = curr->input_section.section;
if (is == s) if (is == s)
{ {
lang_statement_list_type *old_list
= (lang_statement_list_type *) &old_os->children;
s->output_section = NULL; s->output_section = NULL;
lang_add_section (& (new_output_section->children), s, NULL, lang_add_section (&new_os->children, s, NULL, new_os);
new_output_section);
/* Remove the section from the old output section. */ /* Remove the section from the old output section. */
if (prev == NULL) if (prev == NULL)
*head = curr->header.next; *head = curr->header.next;
else else
prev->header.next = curr->header.next; prev->header.next = curr->header.next;
/* If the input section we just moved is the tail of the old
output section, then we also need to adjust that tail. */
if (old_list->tail == (lang_statement_union_type **) curr)
old_list->tail = (lang_statement_union_type **) prev;
return TRUE; return TRUE;
} }
break; break;
case lang_wild_statement_enum: case lang_wild_statement_enum:
if (change_output_section (&(curr->wild_statement.children.head), if (change_output_section (&(curr->wild_statement.children.head),
s, new_output_section)) s, new_os, old_os))
return TRUE; return TRUE;
break; break;
default: default:
@ -606,11 +614,15 @@ eval_upper_either_sections (bfd *abfd ATTRIBUTE_UNUSED,
upper_size = &upper_size_ram; upper_size = &upper_size_ram;
} }
/* Move sections in the upper region that would fit in the lower /* If the upper region is overflowing, try moving sections to the lower
region to the lower region. */ region.
if (*lower_size + s->size < lower->region->length) Note that there isn't any general benefit to using lower memory over upper
memory, so we only move sections around with the goal of making the program
fit. */
if (*upper_size > upper->region->length
&& *lower_size + s->size < lower->region->length)
{ {
if (change_output_section (&(upper->children.head), s, lower)) if (change_output_section (&(upper->children.head), s, lower, upper))
{ {
*upper_size -= s->size; *upper_size -= s->size;
*lower_size += s->size; *lower_size += s->size;
@ -700,7 +712,7 @@ eval_lower_either_sections (bfd *abfd ATTRIBUTE_UNUSED,
} }
/* Move sections that cause the lower region to overflow to the upper region. */ /* Move sections that cause the lower region to overflow to the upper region. */
if (*lower_size + s->size > output_sec->region->length) if (*lower_size + s->size > output_sec->region->length)
change_output_section (&(output_sec->children.head), s, upper); change_output_section (&(output_sec->children.head), s, upper, output_sec);
else else
*lower_size += s->size; *lower_size += s->size;
end: end: