diff options
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/infrun.c | 20 |
2 files changed, 16 insertions, 10 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c01f806..cde4e8d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2011-02-11 Pedro Alves <pedro@codesourcery.com> + + * infrun.c (proceed): Move switching out and in of tfind mode from + here ... + (fetch_inferior_event): ... to here. + 2011-02-11 Yao Qi <yao@codesourcery.com> * Makefile.in: Remove signals.o from COMMON_OBS. Link diff --git a/gdb/infrun.c b/gdb/infrun.c index 664d91b..c894b32 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -1994,16 +1994,6 @@ proceed (CORE_ADDR addr, enum target_signal siggnal, int step) "infrun: proceed (addr=%s, signal=%d, step=%d)\n", paddress (gdbarch, addr), siggnal, step); - /* We're handling a live event, so make sure we're doing live - debugging. If we're looking at traceframes while the target is - running, we're going to need to get back to that mode after - handling the event. */ - if (non_stop) - { - make_cleanup_restore_current_traceframe (); - set_traceframe_number (-1); - } - if (non_stop) /* In non-stop, each thread is handled individually. The context must already be set to the right thread here. */ @@ -2634,6 +2624,16 @@ fetch_inferior_event (void *client_data) /* We'll update this if & when we switch to a new thread. */ previous_inferior_ptid = inferior_ptid; + /* We're handling a live event, so make sure we're doing live + debugging. If we're looking at traceframes while the target is + running, we're going to need to get back to that mode after + handling the event. */ + if (non_stop) + { + make_cleanup_restore_current_traceframe (); + set_traceframe_number (-1); + } + if (non_stop) /* In non-stop mode, the user/frontend should not notice a thread switch due to internal events. Make sure we reverse to the |