d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not attempt to skip a breakpoint that is a result of a software single step,

Browse Source 
or bad things happen.
This commit is contained in:
Olivier Houchard 2004-11-21 18:11:02 +00:00
parent 4b87c653f9
commit 75f88c7ca4
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=137974
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/ddb/db_run.c
View File

@ -71,6 +71,11 @@ void db_set_single_step(void);
void db_clear_single_step(void);
#endif
#ifdef SOFTWARE_SSTEP
db_breakpoint_t db_not_taken_bkpt = 0;
db_breakpoint_t db_taken_bkpt = 0;
#endif
boolean_t
db_stop_at_pc(is_breakpoint)
boolean_t *is_breakpoint;
@ -78,10 +83,16 @@ db_stop_at_pc(is_breakpoint)
register db_addr_t pc;
register db_breakpoint_t bkpt;
pc = PC_REGS();
#ifdef SOFTWARE_SSTEP
if ((db_not_taken_bkpt != 0 && pc == db_not_taken_bkpt->address)
|| (db_taken_bkpt != 0 && pc == db_taken_bkpt->address))
*is_breakpoint = FALSE;
#endif
db_clear_single_step();
db_clear_breakpoints();
db_clear_watchpoints();
pc = PC_REGS();
#ifdef FIXUP_PC_AFTER_BREAK
if (*is_breakpoint) {
@ -245,8 +256,6 @@ db_restart_at_pc(watchpt)
* we allocate a breakpoint and save it here.
* These breakpoints are deleted on return.
*/
db_breakpoint_t db_not_taken_bkpt = 0;
db_breakpoint_t db_taken_bkpt = 0;
void
db_set_single_step(void)