Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

* symfile.h (struct symfile_segment_data): Doc fixes.

Browse Source 
* symfile.c (symfile_map_offsets_to_segments): Doc fixes.
Assert that we were passed some loaded segment addresses,
and that sections' segment numbers are valid.
Simplify offset calculation.
* remote.c (get_offsets): Clarify selection of relocate-by-segment
strategy, and set num_segments correctly.  Delete redundant
assignments to do_sections.
This commit is contained in:
Jim Blandy
2007-09-24 21:48:29 +00:00
parent 3227663267
commit 28c32713ac
4 changed files with 65 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
gdb/remote.c
View File

@@ -2103,28 +2103,24 @@ get_offsets (void)
do_segments = (data != NULL);
do_sections = num_segments == 0;
/* Text= and Data= specify offsets for the text and data sections,
but symfile_map_offsets_to_segments expects base addresses
instead of offsets. If we have two segments, we can still
try to relocate the whole segments instead of just ".text"
and ".data". */
if (num_segments == 0)
if (num_segments > 0)
{
do_sections = 1;
if (data == NULL || data->num_segments != 2)
do_segments = 0;
else
{
segments[0] = data->segment_bases[0] + text_addr;
segments[1] = data->segment_bases[1] + data_addr;
}
}
else
{
do_sections = 0;
segments[0] = text_addr;
segments[1] = data_addr;
}
/* If we have two segments, we can still try to relocate everything
by assuming that the .text and .data offsets apply to the whole
text and data segments. Convert the offsets given in the packet
to base addresses for symfile_map_offsets_to_segments. */
else if (data && data->num_segments == 2)
{
segments[0] = data->segment_bases[0] + text_addr;
segments[1] = data->segment_bases[1] + data_addr;
num_segments = 2;
}
/* There's no way to relocate by segment. */
else
do_segments = 0;
if (do_segments)
{