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>
+ Jan Kratochvil <jan.kratochvil@redhat.com>
+
* value.c (value_contents_copy_raw): Extend describing comment.
Assert that the destination contents we're overwriting are wholly
available.
+2011-02-16 Pedro Alves <pedro@codesourcery.com>
+
+ * 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.
+
2011-02-15 Michael Snyder <msnyder@vmware.com>
* gdb.base/default.exp: Add tests for thread commands.
}
}
+ # Use use this to test collecting overlapping memory ranges
+ # (making use of UNOP_MEMVAL, as objects don't usually overlap
+ # other objects). Note that globalarr2 should not be collected in
+ # any other way so that a regression test below can be effective.
+
+ set globalarr2_addr ""
+ set test "get address of globalarr2"
+ gdb_test_multiple "p /x &globalarr2" $test {
+ -re " = (0x\[0-9a-f\]+)\r\n$gdb_prompt $" {
+ set globalarr2_addr $expect_out(1,string)
+ pass $test
+ }
+ }
+
gdb_test "trace $testline" \
"Tracepoint \[0-9\]+ at .*" \
"collect globals: set tracepoint"
gdb_trace_setactions "collect globals: define actions" \
"" \
"collect globalc, globali, globalf, globald" "^$" \
- "collect globalstruct, globalp, globalarr" "^$"
+ "collect globalstruct, globalp, globalarr" "^$" \
+ "collect \{int \[4\]\}$globalarr2_addr" "^$" \
+ "collect \{int \[2\]\}$globalarr2_addr" "^$"
# Begin the test.
run_trace_experiment "globals" globals_test_func
"\\$\[0-9\]+ = 3$cr" \
"collect globals: collected global array element #3"
+ # Check that we didn't mess up sort&merging memory ranges to
+ # collect.
+ gdb_test "print globalarr2" \
+ "\\$\[0-9\]+ = \\{0, 1, 2, 3\\}$cr" \
+ "collect globals: collected global array 2"
+
gdb_test "tfind none" \
"#0 end .*" \
"collect globals: cease trace debugging"
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 */