espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-19 09:14:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

* event-loop.c (event_handle_func): Adjust to use gdb_fildes_t.

Browse Source 
(struct gdb_event) <fd>: Change type to gdb_fildes_t.
	(struct file_handler) <fd>: Change type to gdb_fildes_t.
	(process_event): Change local fd's type to gdb_fildes_t.
	(create_file_handler): Adjust prototype.
	(delete_file_handler): Adjust prototype.
	(handle_file_event): Adjust prototype.  Use pfildes.
	(create_file_event): Adjsut prototype.
	* remote-utils.c (remote_desc, listen_desc): Change type to
	gdb_fildes_t.
	* server.h: New gdb_fildes_t typedef.
	[USE_WIN32API]: Include winsock2.h.
	(delete_file_handler, add_file_handler): Adjust prototypes.
	(pfildes): Declare.
	* utils.c (pfildes): New.
This commit is contained in:
Pedro Alves
2010-08-27 16:02:49 +00:00
parent f383de6633
commit ec48365dd8
5 changed files with 54 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gdb/gdbserver/ChangeLog
View File

@ -1,3 +1,21 @@
2010-08-27 Pedro Alves <pedro@codesourcery.com>
* event-loop.c (event_handle_func): Adjust to use gdb_fildes_t.
(struct gdb_event) <fd>: Change type to gdb_fildes_t.
(struct file_handler) <fd>: Change type to gdb_fildes_t.
(process_event): Change local fd's type to gdb_fildes_t.
(create_file_handler): Adjust prototype.
(delete_file_handler): Adjust prototype.
(handle_file_event): Adjust prototype. Use pfildes.
(create_file_event): Adjsut prototype.
* remote-utils.c (remote_desc, listen_desc): Change type to
gdb_fildes_t.
* server.h: New gdb_fildes_t typedef.
[USE_WIN32API]: Include winsock2.h.
(delete_file_handler, add_file_handler): Adjust prototypes.
(pfildes): Declare.
* utils.c (pfildes): New.
2010-08-27 Pedro Alves <pedro@codesourcery.com> 2010-08-27 Pedro Alves <pedro@codesourcery.com>
* configure.ac (build_warnings): Add -Wno-char-subscripts. * configure.ac (build_warnings): Add -Wno-char-subscripts.

23
gdb/gdbserver/event-loop.c
View File

@ -39,7 +39,7 @@
#endif #endif
typedef struct gdb_event gdb_event; typedef struct gdb_event gdb_event;
typedef int (event_handler_func) (int); typedef int (event_handler_func) (gdb_fildes_t);
/* Tell create_file_handler what events we are interested in. */ /* Tell create_file_handler what events we are interested in. */
@ -64,7 +64,7 @@ struct gdb_event
event_handler_func *proc; event_handler_func *proc;
/* File descriptor that is ready. */ /* File descriptor that is ready. */
int fd; gdb_fildes_t fd;
/* Next in list of events or NULL. */ /* Next in list of events or NULL. */
struct gdb_event *next_event; struct gdb_event *next_event;
@ -76,7 +76,7 @@ struct gdb_event
typedef struct file_handler typedef struct file_handler
{ {
/* File descriptor. */ /* File descriptor. */
int fd; gdb_fildes_t fd;
/* Events we want to monitor. */ /* Events we want to monitor. */
int mask; int mask;
@ -202,7 +202,7 @@ process_event (void)
{ {
gdb_event *event_ptr, *prev_ptr; gdb_event *event_ptr, *prev_ptr;
event_handler_func *proc; event_handler_func *proc;
int fd; gdb_fildes_t fd;
/* Look in the event queue to find an event that is ready /* Look in the event queue to find an event that is ready
to be processed. */ to be processed. */
@ -332,7 +332,7 @@ process_callback (void)
occurs for FD. CLIENT_DATA is the argument to pass to PROC. */ occurs for FD. CLIENT_DATA is the argument to pass to PROC. */
static void static void
create_file_handler (int fd, int mask, handler_func *proc, create_file_handler (gdb_fildes_t fd, int mask, handler_func *proc,
gdb_client_data client_data) gdb_client_data client_data)
{ {
file_handler *file_ptr; file_handler *file_ptr;
@ -382,7 +382,8 @@ create_file_handler (int fd, int mask, handler_func *proc,
/* Wrapper function for create_file_handler. */ /* Wrapper function for create_file_handler. */
void void
add_file_handler (int fd, handler_func *proc, gdb_client_data client_data) add_file_handler (gdb_fildes_t fd,
handler_func *proc, gdb_client_data client_data)
{ {
create_file_handler (fd, GDB_READABLE | GDB_EXCEPTION, proc, client_data); create_file_handler (fd, GDB_READABLE | GDB_EXCEPTION, proc, client_data);
} }
@ -391,7 +392,7 @@ add_file_handler (int fd, handler_func *proc, gdb_client_data client_data)
i.e. we don't care anymore about events on the FD. */ i.e. we don't care anymore about events on the FD. */
void void
delete_file_handler (int fd) delete_file_handler (gdb_fildes_t fd)
{ {
file_handler *file_ptr, *prev_ptr = NULL; file_handler *file_ptr, *prev_ptr = NULL;
int i; int i;
@ -454,7 +455,7 @@ delete_file_handler (int fd)
event in the front of the event queue. */ event in the front of the event queue. */
static int static int
handle_file_event (int event_file_desc) handle_file_event (gdb_fildes_t event_file_desc)
{ {
file_handler *file_ptr; file_handler *file_ptr;
int mask; int mask;
@ -471,8 +472,8 @@ handle_file_event (int event_file_desc)
if (file_ptr->ready_mask & GDB_EXCEPTION) if (file_ptr->ready_mask & GDB_EXCEPTION)
{ {
fprintf (stderr, "Exception condition detected on fd %d\n", fprintf (stderr, "Exception condition detected on fd %s\n",
file_ptr->fd); pfildes (file_ptr->fd));
file_ptr->error = 1; file_ptr->error = 1;
} }
else else
@ -502,7 +503,7 @@ handle_file_event (int event_file_desc)
associated to FD when it was registered with the event loop. */ associated to FD when it was registered with the event loop. */
static gdb_event * static gdb_event *
create_file_event (int fd) create_file_event (gdb_fildes_t fd)
{ {
gdb_event *file_event_ptr; gdb_event *file_event_ptr;

4
gdb/gdbserver/remote-utils.c
View File

@ -107,8 +107,8 @@ struct sym_cache
int remote_debug = 0; int remote_debug = 0;
struct ui_file *gdb_stdlog; struct ui_file *gdb_stdlog;
static int remote_desc = INVALID_DESCRIPTOR; static gdb_fildes_t remote_desc = INVALID_DESCRIPTOR;
static int listen_desc = INVALID_DESCRIPTOR; static gdb_fildes_t listen_desc = INVALID_DESCRIPTOR;
/* FIXME headerize? */ /* FIXME headerize? */
extern int using_threads; extern int using_threads;

12
gdb/gdbserver/server.h
View File

@ -334,13 +334,20 @@ extern int disable_packet_qfThreadInfo;
extern int multi_process; extern int multi_process;
extern int non_stop; extern int non_stop;
#if USE_WIN32API
#include <winsock2.h>
typedef SOCKET gdb_fildes_t;
#else
typedef int gdb_fildes_t;
#endif
/* Functions from event-loop.c. */ /* Functions from event-loop.c. */
typedef void *gdb_client_data; typedef void *gdb_client_data;
typedef int (handler_func) (int, gdb_client_data); typedef int (handler_func) (int, gdb_client_data);
typedef int (callback_handler_func) (gdb_client_data); typedef int (callback_handler_func) (gdb_client_data);
extern void delete_file_handler (int fd); extern void delete_file_handler (gdb_fildes_t fd);
extern void add_file_handler (int fd, handler_func *proc, extern void add_file_handler (gdb_fildes_t fd, handler_func *proc,
gdb_client_data client_data); gdb_client_data client_data);
extern int append_callback_event (callback_handler_func *proc, extern int append_callback_event (callback_handler_func *proc,
gdb_client_data client_data); gdb_client_data client_data);
@ -473,6 +480,7 @@ char *paddress (CORE_ADDR addr);
char *pulongest (ULONGEST u); char *pulongest (ULONGEST u);
char *plongest (LONGEST l); char *plongest (LONGEST l);
char *phex_nz (ULONGEST l, int sizeof_l); char *phex_nz (ULONGEST l, int sizeof_l);
char *pfildes (gdb_fildes_t fd);
#define gdb_assert(expr) \ #define gdb_assert(expr) \
((void) ((expr) ? 0 : \ ((void) ((expr) ? 0 : \

12
gdb/gdbserver/utils.c
View File

@ -370,3 +370,15 @@ paddress (CORE_ADDR addr)
{ {
return phex_nz (addr, sizeof (CORE_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
}