diff options
| author | Randolph Chung <tausq@debian.org> | 2004-12-03 23:59:53 +0000 |
|---|---|---|
| committer | Randolph Chung <tausq@debian.org> | 2004-12-03 23:59:53 +0000 |
| commit | fe46cd3ab5b2a04cb88f5f34a2d692dc856b3a5a (patch) | |
| tree | a4fc66eb32398d046eac0d19a30812ca862dc8d6 /gdb/infrun.c | |
| parent | e1591da4fd88fe7ce7af4f6eb9a597a4abdaf76a (diff) | |
| download | gdb-fe46cd3ab5b2a04cb88f5f34a2d692dc856b3a5a.zip gdb-fe46cd3ab5b2a04cb88f5f34a2d692dc856b3a5a.tar.gz gdb-fe46cd3ab5b2a04cb88f5f34a2d692dc856b3a5a.tar.bz2 | |
2004-12-03 Randolph Chung <tausq@debian.org>
* gdbarch.sh (instruction_nullified): Delete.
* gdbarch.c: Regenerate.
* gdbarch.h: Regenerate.
* hppa-tdep.c (hppa_target_read_pc): Adjust pc if instruction is
nullified.
(hppa_unwind_pc): Likewise.
(hppa_instruction_nullified): Delete.
(hppa_gdbarch_init): Don't set instruction_nullified method.
* infrun.c (infwait_states): Remove infwait_nullified_state.
(handle_inferior_event): Remove handling of infwait_nullified_state.
Remove handling of nullified instructions.
testsuite/
* gdb.arch/pa-nullify.exp: New file.
* gdb.arch/pa-nullify.s: New file.
Diffstat (limited to 'gdb/infrun.c')
| -rw-r--r-- | gdb/infrun.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/gdb/infrun.c b/gdb/infrun.c index fcbfd6c..9352229 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -870,7 +870,6 @@ enum infwait_states { infwait_normal_state, infwait_thread_hop_state, - infwait_nullified_state, infwait_nonstep_watch_state }; @@ -1263,12 +1262,6 @@ handle_inferior_event (struct execution_control_state *ecs) stepped_after_stopped_by_watchpoint = 0; break; - case infwait_nullified_state: - if (debug_infrun) - printf_unfiltered ("infrun: infwait_nullified_state\n"); - stepped_after_stopped_by_watchpoint = 0; - break; - case infwait_nonstep_watch_state: if (debug_infrun) printf_unfiltered ("infrun: infwait_nonstep_watch_state\n"); @@ -1730,30 +1723,6 @@ handle_inferior_event (struct execution_control_state *ecs) singlestep_breakpoints_inserted_p = 0; } - /* If PC is pointing at a nullified instruction, then step beyond - it before deciding what to do. This is required when we are stepping - through a function where the last instruction is a branch with a - nullified instruction in the delay slot that belongs to the next - line (which may be in a different function altogether). */ - - if (gdbarch_instruction_nullified (current_gdbarch, current_regcache)) - { - if (debug_infrun) - printf_unfiltered ("infrun: instruction nullified\n"); - registers_changed (); - target_resume (ecs->ptid, 1, TARGET_SIGNAL_0); - - /* We may have received a signal that we want to pass to - the inferior; therefore, we must not clobber the waitstatus - in WS. */ - - ecs->infwait_state = infwait_nullified_state; - ecs->waiton_ptid = ecs->ptid; - ecs->wp = &(ecs->tmpstatus); - prepare_to_wait (ecs); - return; - } - /* It may not be necessary to disable the watchpoint to stop over it. For example, the PA can (with some kernel cooperation) single step over a watchpoint without disabling the watchpoint. */ |