OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Preserve the ignore count when we resolve a pending breakpoint. Also add 

a test for this to pending.exp.
This commit is contained in:
Jim Ingham 2004-05-05 21:18:11 +00:00
parent 33216455a7
commit 0a5e7efe29
4 changed files with 54 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/ChangeLog
View File

@ -1,3 +1,9 @@
2004-05-05 Jim Ingham <jingham@apple.com>
* breakpoint.c (create_breakpoints): Copy the ignore count and
thread id over from the pended breakpoint to the actual
breakpoint.
2004-05-05 Andrew Cagney <cagney@redhat.com>
* gdbarch.sh (PARM_BOUNDARY): Delete.

4
gdb/breakpoint.c
View File

@ -4948,6 +4948,10 @@ create_breakpoints (struct symtabs_and_lines sals, char **addr_string,
be copied too. */
if (pending_bp->commands)
b->commands = copy_command_lines (pending_bp->commands);
/* We have to copy over the ignore_count and thread as well. */
b->ignore_count = pending_bp->ignore_count;
b->thread = pending_bp->thread;
}
mention (b);
}

5
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2004-05-05 Jim Ingham <jingham@apple.com>
* gdb.base/pending.exp: Make sure pending breakpoints
preserve the ignore count.
2004-04-27 Jerome Guitton <guitton@gnat.com>
* i386-prologue.exp: Add testcase for jump instruction as first

39
gdb/testsuite/gdb.base/pending.exp
View File

@ -207,6 +207,31 @@ gdb_test "info break" \
\[0-9\]+\[\t \]+breakpoint keep y.*PENDING.*pendshr.c:26 if x > 3.*" \
"multiple pending breakpoints"
#
# Try a pending break for a line in a source file with ignore count:
#
gdb_test_multiple "break pendshr.c:27" "Set pending breakpoint 3" {
-re ".*Make breakpoint pending.*y or \\\[n\\\]. $" {
gdb_test "y" "Breakpoint.*pendshr.c:27.*pending." \
"Set pending breakpoint 3"
}
}
gdb_test {ignore $bpnum 2} "Will ignore next 2 crossings of breakpoint .*" \
"set ignore count on pending breakpoint 3"
gdb_test "info break" \
"Num Type\[ \]+Disp Enb Address\[ \]+What.*
\[0-9\]+\[\t \]+breakpoint keep n.*PENDING.*pendfunc1.*
\[\t \]+stop only if k == 1.*
\[\t \]+print k.*
\[0-9\]+\[\t \]+breakpoint keep y.* in main at .*$srcfile:$mainline.*
\[0-9\]+\[\t \]+breakpoint keep y.*PENDING.*pendshr.c:26 if x > 3.*
\[0-9\]+\[\t \]+breakpoint keep y.*PENDING.*pendshr.c:27.*ignore next 2 hits.*" \
"multiple pending breakpoints 2"
#
# Run to main which should resolve a pending breakpoint
#
@ -239,6 +264,19 @@ gdb_test "continue" \
\[$\]1 = 1." \
"continue to resolved breakpoint 1"
#
# Disable the other two breakpoints, and continue to the one with
# the ignore count. Make sure you hit it the third time, x should
# be 3 then.
#
gdb_test "disable 7" "" "Disable other breakpoints"
gdb_test "disable 5" "" "Disable other breakpoints"
gdb_test "continue" \
{.*Breakpoint.*pendfunc1.*\(x=3\) at.*pendshr.c:27.*printf.*;} \
"continue to resolved breakpoint 3"
delete_breakpoints
gdb_breakpoint "main"
@ -259,6 +297,7 @@ gdb_test_multiple "break imaginary" "set imaginary pending breakpoint" {
#
rerun_to_main
gdb_test "info break" \
"Num Type\[ \]+Disp Enb Address\[ \]+What.*
\[0-9\]+\[\t \]+breakpoint keep y.* in main at .*$srcfile:$mainline.*