* infrun.c (handle_signal_stop): Replace test for
TARGET_WAITKIND_STOPPED with an assert.
This commit is contained in:
parent
35e6a7111e
commit
f0407826d9
|
@ -1,3 +1,8 @@
|
||||||
|
2014-03-02 Doug Evans <xdje42@gmail.com>
|
||||||
|
|
||||||
|
* infrun.c (handle_signal_stop): Replace test for
|
||||||
|
TARGET_WAITKIND_STOPPED with an assert.
|
||||||
|
|
||||||
2014-03-02 Doug Evans <xdje42@gmail.com>
|
2014-03-02 Doug Evans <xdje42@gmail.com>
|
||||||
|
|
||||||
* guile/scm-objfile.c (ofscm_mark_objfile_smob): Fix typo in comment.
|
* guile/scm-objfile.c (ofscm_mark_objfile_smob): Fix typo in comment.
|
||||||
|
|
26
gdb/infrun.c
26
gdb/infrun.c
|
@ -3781,22 +3781,20 @@ handle_signal_stop (struct execution_control_state *ecs)
|
||||||
enum stop_kind stop_soon;
|
enum stop_kind stop_soon;
|
||||||
int random_signal;
|
int random_signal;
|
||||||
|
|
||||||
if (ecs->ws.kind == TARGET_WAITKIND_STOPPED)
|
gdb_assert (ecs->ws.kind == TARGET_WAITKIND_STOPPED);
|
||||||
{
|
|
||||||
/* Do we need to clean up the state of a thread that has
|
|
||||||
completed a displaced single-step? (Doing so usually affects
|
|
||||||
the PC, so do it here, before we set stop_pc.) */
|
|
||||||
displaced_step_fixup (ecs->ptid,
|
|
||||||
ecs->event_thread->suspend.stop_signal);
|
|
||||||
|
|
||||||
/* If we either finished a single-step or hit a breakpoint, but
|
/* Do we need to clean up the state of a thread that has
|
||||||
the user wanted this thread to be stopped, pretend we got a
|
completed a displaced single-step? (Doing so usually affects
|
||||||
SIG0 (generic unsignaled stop). */
|
the PC, so do it here, before we set stop_pc.) */
|
||||||
|
displaced_step_fixup (ecs->ptid,
|
||||||
|
ecs->event_thread->suspend.stop_signal);
|
||||||
|
|
||||||
if (ecs->event_thread->stop_requested
|
/* If we either finished a single-step or hit a breakpoint, but
|
||||||
&& ecs->event_thread->suspend.stop_signal == GDB_SIGNAL_TRAP)
|
the user wanted this thread to be stopped, pretend we got a
|
||||||
ecs->event_thread->suspend.stop_signal = GDB_SIGNAL_0;
|
SIG0 (generic unsignaled stop). */
|
||||||
}
|
if (ecs->event_thread->stop_requested
|
||||||
|
&& ecs->event_thread->suspend.stop_signal == GDB_SIGNAL_TRAP)
|
||||||
|
ecs->event_thread->suspend.stop_signal = GDB_SIGNAL_0;
|
||||||
|
|
||||||
stop_pc = regcache_read_pc (get_thread_regcache (ecs->ptid));
|
stop_pc = regcache_read_pc (get_thread_regcache (ecs->ptid));
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue