2011-02-16 Pedro Alves <pedro@codesourcery.com>

Jan Kratochvil  <jan.kratochvil@redhat.com>

	gdb/
	* tracepoint.c (memrange_sortmerge): Fix list A's end calculation.

2011-02-16  Pedro Alves  <pedro@codesourcery.com>

	gdb/testsuite/
	* collection.c (globalarr2): New global.
	(main): Initialize it before collecting, and and clear it
	afterwards.
	* collection.exp (gdb_collect_globals_test): Test collecting
	overlapping memory ranges.
This commit is contained in:
Pedro Alves 2011-02-16 12:59:05 +00:00
parent fb68ae733b
commit 08807d5afd
5 changed files with 45 additions and 2 deletions

View file

@ -846,7 +846,8 @@ memrange_sortmerge (struct collection_list *memranges)
if (memranges->list[a].type == memranges->list[b].type
&& memranges->list[b].start <= memranges->list[a].end)
{
memranges->list[a].end = memranges->list[b].end;
if (memranges->list[b].end > memranges->list[a].end)
memranges->list[a].end = memranges->list[b].end;
continue; /* next b, same a */
}
a++; /* next a */