Fix hardware watchpoints in replay mode

Changes introduced by commit 9e8915c6ce
caused a regression that meant hardware watchpoint stops would not
trigger in reverse execution or replay mode.  This was documented in
PR breakpoints/21969.
The problem is that record_check_stopped_by_breakpoint always overwrites
record_full_stop_reason, thus loosing the TARGET_STOPPED_BY_WATCHPOINT
value which would be checked afterwards.

This commit fixes that by not overwriting the stop-reason in
record_full_stop_reason if we're not stopped at a breakpoint.

And the test for hw watchpoints in gdb.reverse/watch-reverse.exp actually
tested sw watchpoints again, since "set can-use-hw-watchpoints 1"
doesn't convert enabled watchpoints to use hardware.
This is fixed by disabling said watchpoint while enabling hw watchpoints.
The same is not done for gdb.reverse/watch-precsave.exp, since it's not
possible to use hw watchpoints in restored recordings anyways.

Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=21969
Approved-by: Guinevere Larsen <blarsen@redhat.com>
This commit is contained in:
Hannes Domani 2023-12-06 13:45:51 +01:00
parent 5a22e042e4
commit 288363c173
2 changed files with 4 additions and 1 deletions

View file

@ -248,7 +248,6 @@ record_check_stopped_by_breakpoint (const address_space *aspace,
return 1; return 1;
} }
*reason = TARGET_STOPPED_BY_NO_REASON;
return 0; return 0;
} }

View file

@ -118,8 +118,12 @@ gdb_test "continue" \
".*\[Ww\]atchpoint.*ival3.*Old value = 0.*New value = -1.*ival3 = count; ival4 = count;.*" \ ".*\[Ww\]atchpoint.*ival3.*Old value = 0.*New value = -1.*ival3 = count; ival4 = count;.*" \
"watchpoint hit in reverse, fifth time" "watchpoint hit in reverse, fifth time"
gdb_test_no_output "disable \$bpnum" "disable non-hw watchpoint"
gdb_test_no_output "set can-use-hw-watchpoints 1" "enable hw watchpoints" gdb_test_no_output "set can-use-hw-watchpoints 1" "enable hw watchpoints"
gdb_test_no_output "enable \$bpnum" "enable hw watchpoint"
### ###
### ###
### ###