diff options
Diffstat (limited to 'gdbserver')
| -rw-r--r-- | gdbserver/ChangeLog | 10 | ||||
| -rw-r--r-- | gdbserver/remote-utils.cc | 16 | ||||
| -rw-r--r-- | gdbserver/server.h | 7 | ||||
| -rw-r--r-- | gdbserver/utils.cc | 12 | ||||
| -rw-r--r-- | gdbserver/utils.h | 1 |
5 files changed, 15 insertions, 31 deletions
diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index 1d0fbb8..2b38145 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,5 +1,15 @@ 2020-04-13 Tom Tromey <tom@tromey.com> + * server.h (gdb_fildes_t): Remove typedef. + * remote-utils.c (remote_desc, list_desc): Now int. + (INVALID_DESCRIPTOR): Remove. + (gdb_connected, remote_close) + (check_remote_input_interrupt_request): Update. + * utils.h (pfildes): Don't declare. + * utils.c (pfildes): Remove. + +2020-04-13 Tom Tromey <tom@tromey.com> + * server.h (handle_serial_event, handle_target_event): Update. * server.c: Don't call initialize_event_loop. (keep_processing_events): New global. diff --git a/gdbserver/remote-utils.cc b/gdbserver/remote-utils.cc index 6249691..67c560d 100644 --- a/gdbserver/remote-utils.cc +++ b/gdbserver/remote-utils.cc @@ -78,12 +78,6 @@ typedef int socklen_t; #ifndef IN_PROCESS_AGENT -#if USE_WIN32API -# define INVALID_DESCRIPTOR INVALID_SOCKET -#else -# define INVALID_DESCRIPTOR -1 -#endif - /* Extra value for readchar_callback. */ enum { /* The callback is currently not scheduled. */ @@ -108,8 +102,8 @@ struct sym_cache static int remote_is_stdio = 0; -static gdb_fildes_t remote_desc = INVALID_DESCRIPTOR; -static gdb_fildes_t listen_desc = INVALID_DESCRIPTOR; +static int remote_desc = -1; +static int listen_desc = -1; #ifdef USE_WIN32API # define read(fd, buf, len) recv (fd, (char *) buf, len, 0) @@ -119,7 +113,7 @@ static gdb_fildes_t listen_desc = INVALID_DESCRIPTOR; int gdb_connected (void) { - return remote_desc != INVALID_DESCRIPTOR; + return remote_desc != -1; } /* Return true if the remote connection is over stdio. */ @@ -425,7 +419,7 @@ remote_close (void) if (! remote_connection_is_stdio ()) close (remote_desc); #endif - remote_desc = INVALID_DESCRIPTOR; + remote_desc = -1; reset_readchar (); } @@ -788,7 +782,7 @@ check_remote_input_interrupt_request (void) /* This function may be called before establishing communications, therefore we need to validate the remote descriptor. */ - if (remote_desc == INVALID_DESCRIPTOR) + if (remote_desc == -1) return; input_interrupt (0); diff --git a/gdbserver/server.h b/gdbserver/server.h index 039082e..09989e4 100644 --- a/gdbserver/server.h +++ b/gdbserver/server.h @@ -81,13 +81,6 @@ extern bool disable_packet_T; extern bool run_once; extern bool non_stop; -#if USE_WIN32API -#include <winsock2.h> -typedef SOCKET gdb_fildes_t; -#else -typedef int gdb_fildes_t; -#endif - #include "gdbsupport/event-loop.h" /* Functions from server.c. */ diff --git a/gdbserver/utils.cc b/gdbserver/utils.cc index d88f4ac..d52d2ac 100644 --- a/gdbserver/utils.cc +++ b/gdbserver/utils.cc @@ -113,15 +113,3 @@ paddress (CORE_ADDR addr) { return phex_nz (addr, sizeof (CORE_ADDR)); } - -/* Convert a file descriptor into a printable string. */ - -char * -pfildes (gdb_fildes_t fd) -{ -#if USE_WIN32API - return phex_nz (fd, sizeof (gdb_fildes_t)); -#else - return plongest (fd); -#endif -} diff --git a/gdbserver/utils.h b/gdbserver/utils.h index fa3ca9b..fc56f33 100644 --- a/gdbserver/utils.h +++ b/gdbserver/utils.h @@ -20,6 +20,5 @@ #define GDBSERVER_UTILS_H char *paddress (CORE_ADDR addr); -char *pfildes (gdb_fildes_t fd); #endif /* GDBSERVER_UTILS_H */ |