diff options
| author | Pedro Alves <palves@redhat.com> | 2011-05-30 21:16:35 +0000 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2011-05-30 21:16:35 +0000 |
| commit | 6d549500db3fe94ce4fa1397249df490f71dccb5 (patch) | |
| tree | 1fc26a0145a9a29c30c5c7f5dd9b6e5d0e0edaa3 | |
| parent | 395bff701ec76a411bdee2955f381b2ac33b93f7 (diff) | |
| download | ppe42-binutils-6d549500db3fe94ce4fa1397249df490f71dccb5.tar.gz ppe42-binutils-6d549500db3fe94ce4fa1397249df490f71dccb5.zip | |
2011-05-30 Pedro Alves <pedro@codesourcery.com>
gdb/
* target.h (enum inferior_event_type): Delete INF_QUIT_REQ.
* inf-loop.h (inferior_event_handler_wrapper): Delete.
* inf-loop.c (inferior_event_handler_wrapper): Delete.
(inferior_event_handler): Don't handle INF_QUIT_REQ.
* remote.c (_initialize_remote): Register
async_remote_interrupt_twice directly as
sigint_remote_twice_token event.
| -rw-r--r-- | gdb/ChangeLog | 10 | ||||
| -rw-r--r-- | gdb/inf-loop.c | 13 | ||||
| -rw-r--r-- | gdb/inf-loop.h | 1 | ||||
| -rw-r--r-- | gdb/remote.c | 2 | ||||
| -rw-r--r-- | gdb/target.h | 2 |
5 files changed, 11 insertions, 17 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1a7c89d018..5a80e276ba 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,15 @@ 2011-05-30 Pedro Alves <pedro@codesourcery.com> + * target.h (enum inferior_event_type): Delete INF_QUIT_REQ. + * inf-loop.h (inferior_event_handler_wrapper): Delete. + * inf-loop.c (inferior_event_handler_wrapper): Delete. + (inferior_event_handler): Don't handle INF_QUIT_REQ. + * remote.c (_initialize_remote): Register + async_remote_interrupt_twice directly as + sigint_remote_twice_token event. + +2011-05-30 Pedro Alves <pedro@codesourcery.com> + * target.h (enum inferior_event_type): Delete INF_ERROR. * inf-loop.c (inferior_event_handler): Don't handle INF_ERROR. diff --git a/gdb/inf-loop.c b/gdb/inf-loop.c index 8e19eef299..f86b806f37 100644 --- a/gdb/inf-loop.c +++ b/gdb/inf-loop.c @@ -32,12 +32,6 @@ static int fetch_inferior_event_wrapper (gdb_client_data client_data); -void -inferior_event_handler_wrapper (gdb_client_data client_data) -{ - inferior_event_handler (INF_QUIT_REQ, client_data); -} - /* General function to handle events in the inferior. So far it just takes care of detecting errors reported by select() or poll(), otherwise it assumes that all is OK, and goes on reading data from @@ -143,13 +137,6 @@ inferior_event_handler (enum inferior_event_type event_type, do_all_intermediate_continuations (0); break; - case INF_QUIT_REQ: - /* FIXME: ezannoni 1999-10-04. This call should really be a - target vector entry, so that it can be used for any kind of - targets. */ - async_remote_interrupt_twice (NULL); - break; - case INF_TIMER: default: printf_unfiltered (_("Event type not recognized.\n")); diff --git a/gdb/inf-loop.h b/gdb/inf-loop.h index 76cc88b49f..c82499f047 100644 --- a/gdb/inf-loop.h +++ b/gdb/inf-loop.h @@ -23,6 +23,5 @@ extern void inferior_event_handler (enum inferior_event_type event_type, void* client_data); -extern void inferior_event_handler_wrapper (void *client_data); #endif /* #ifndef INF_LOOP_H */ diff --git a/gdb/remote.c b/gdb/remote.c index ff64b04224..2c850cbe8a 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -10627,7 +10627,7 @@ _initialize_remote (void) sigint_remote_token = create_async_signal_handler (async_remote_interrupt, NULL); sigint_remote_twice_token = - create_async_signal_handler (inferior_event_handler_wrapper, NULL); + create_async_signal_handler (async_remote_interrupt_twice, NULL); #if 0 init_remote_threadtests (); diff --git a/gdb/target.h b/gdb/target.h index 1c7fcd29e6..0f41160c24 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -201,8 +201,6 @@ extern char *target_waitstatus_to_string (const struct target_waitstatus *); deal with. */ enum inferior_event_type { - /* There is a request to quit the inferior, abandon it. */ - INF_QUIT_REQ, /* Process a normal inferior event which will result in target_wait being called. */ INF_REG_EVENT, |
