diff options
| author | Pedro Alves <palves@redhat.com> | 2011-02-16 12:59:05 +0000 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2011-02-16 12:59:05 +0000 |
| commit | 08807d5afd29a5dba40d31cd28a78af64e4fae15 (patch) | |
| tree | 10e476c3c3af128b54a77341cec87444a5fab9fd /gdb/tracepoint.c | |
| parent | fb68ae733b393f6a6b1b9b92f2118f55908e7171 (diff) | |
| download | gdb-08807d5afd29a5dba40d31cd28a78af64e4fae15.zip gdb-08807d5afd29a5dba40d31cd28a78af64e4fae15.tar.gz gdb-08807d5afd29a5dba40d31cd28a78af64e4fae15.tar.bz2 | |
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.
Diffstat (limited to 'gdb/tracepoint.c')
| -rw-r--r-- | gdb/tracepoint.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c index 4389f12..2d675ce 100644 --- a/gdb/tracepoint.c +++ b/gdb/tracepoint.c @@ -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 */ |