diff options
| author | Ulrich Weigand <uweigand@de.ibm.com> | 2007-06-06 15:38:56 +0000 |
|---|---|---|
| committer | Ulrich Weigand <uweigand@de.ibm.com> | 2007-06-06 15:38:56 +0000 |
| commit | e6cf791626ca6945239d5184497d5a83a7419ca8 (patch) | |
| tree | b9f4b15d1dfca4389c46f7fcd1b49012bf34bd27 /gdb/infrun.c | |
| parent | bbcf301ac831ae84e6b9bfc8697d239c245da86b (diff) | |
| download | gdb-e6cf791626ca6945239d5184497d5a83a7419ca8.zip gdb-e6cf791626ca6945239d5184497d5a83a7419ca8.tar.gz gdb-e6cf791626ca6945239d5184497d5a83a7419ca8.tar.bz2 | |
2007-06-06 Markus Deuling <deuling@de.ibm.com>
* gdbarch.sh (HAVE_NONSTEPPABLE_WATCHPOINT): Replace by
gdbarch_have_nonsteppable_watchpoint.
* infrun.c (handle_inferior_event, adjust_pc_after_break): Likewise.
* gdbarch.sh (CANNOT_STEP_BREAKPOINT): Replace by
gdbarch_cannot_step_breakpoint.
* infrun.c (resume): Likewise.
* gdbarch.c, gdbarch.h: Regenerate.
Diffstat (limited to 'gdb/infrun.c')
| -rw-r--r-- | gdb/infrun.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/gdb/infrun.c b/gdb/infrun.c index 3eb0682..dc6d894 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -600,7 +600,7 @@ a command like `return' or `jump' to continue execution.")); resume_ptid = inferior_ptid; } - if (CANNOT_STEP_BREAKPOINT) + if (gdbarch_cannot_step_breakpoint (current_gdbarch)) { /* Most targets can step a breakpoint instruction, thus executing it normally. But if this one cannot, just @@ -1166,11 +1166,11 @@ adjust_pc_after_break (struct execution_control_state *ecs) these signals at breakpoints (the code has been in GDB since at least 1992) so I can not guess how to handle them here. - In earlier versions of GDB, a target with HAVE_NONSTEPPABLE_WATCHPOINTS - would have the PC after hitting a watchpoint affected by - DECR_PC_AFTER_BREAK. I haven't found any target with both of these set - in GDB history, and it seems unlikely to be correct, so - HAVE_NONSTEPPABLE_WATCHPOINTS is not checked here. */ + In earlier versions of GDB, a target with + gdbarch_have_nonsteppable_watchpoint would have the PC after hitting a + watchpoint affected by DECR_PC_AFTER_BREAK. I haven't found any target + with both of these set in GDB history, and it seems unlikely to be correct, + so gdbarch_have_nonsteppable_watchpoint is not checked here. */ if (ecs->ws.kind != TARGET_WAITKIND_STOPPED) return; @@ -1761,7 +1761,8 @@ handle_inferior_event (struct execution_control_state *ecs) /* It is far more common to need to disable a watchpoint to step the inferior over it. FIXME. What else might a debug register or page protection watchpoint scheme need here? */ - if (HAVE_NONSTEPPABLE_WATCHPOINT && STOPPED_BY_WATCHPOINT (ecs->ws)) + if (gdbarch_have_nonsteppable_watchpoint (current_gdbarch) + && STOPPED_BY_WATCHPOINT (ecs->ws)) { /* At this point, we are stopped at an instruction which has attempted to write to a piece of memory under control of |