yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure that sorting does not change section order

Browse Source 
Symbol files may contain multiple sections with the same name.
Section addresses specified by add-symbol-file are assigned to the
corresponding BFD sections in addr_info_make_relative using sorted
indexes of both vectors.  Since the sort algorithm is not inherently
stable, the comparison function uses sectindex to maintain the
original order.  However, add_symbol_file_command uses zero for all
sections, so if the user specifies multiple sections with the same
name, they will be assigned randomly to symbol file sections with
the same name.

gdb/ChangeLog:
2018-06-28  Petr Tesarik  <ptesarik@suse.cz>

	* symfile.c (add_symbol_file_command): Make sure that sections
This commit is contained in:
Petr Tesarik 2018-06-28 08:32:27 +02:00
parent ed6dfe517e
commit d81a3eaff3
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2018-06-28 Petr Tesarik <ptesarik@suse.cz>
* symfile.c (add_symbol_file_command): Make sure that sections
with the same name are sorted in the same order.
2018-06-28 Petr Tesarik <ptesarik@suse.cz>
* symfile.c (add_symbol_file_command, _initialize_symfile): Do not

11
gdb/symfile.c
View File

@ -908,6 +908,9 @@ init_entry_point_info (struct objfile *objfile)
into an offset from the section VMA's as it appears in the object
file, and then call the file's sym_offsets function to convert this
into a format-specific offset table --- a `struct section_offsets'.
The sectindex field is used to control the ordering of sections
with the same name. Upon return, it is updated to contain the
correspondig BFD section index, or -1 if the section was not found.
ADD_FLAGS encodes verbosity level, whether this is main symbol or
an extra symbol file such as dynamically loaded code, and wether
@ -2184,8 +2187,12 @@ add_symbol_file_command (const char *args, int from_tty)
addr = parse_and_eval_address (val);
/* Here we store the section offsets in the order they were
entered on the command line. */
section_addrs.emplace_back (addr, sec, 0);
entered on the command line. Every array element is
assigned an ascending section index to preserve the above
order over an unstable sorting algorithm. This dummy
index is not used for any other purpose.
*/
section_addrs.emplace_back (addr, sec, section_addrs.size ());
printf_unfiltered ("\t%s_addr = %s\n", sec,
paddress (gdbarch, addr));

4
gdb/symfile.h
View File

@ -61,7 +61,9 @@ struct other_sections
CORE_ADDR addr;
std::string name;
/* SECTINDEX must be valid for associated BFD or set to -1. */
/* SECTINDEX must be valid for associated BFD or set to -1.
See syms_from_objfile_1 for an exception to this rule.
*/
int sectindex;
};