From 541af0f44b761c8fdcbc6f25f0939ebd114299b0 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Thu, 5 Sep 2013 20:39:17 +0000 Subject: [PATCH] [gdbserver] Split a new remote-utils.h file out of server.h. gdb/gdbserver/ 2013-09-05 Pedro Alves * server.h (remote_debug, noack_mode, transport_is_reliable) (gdb_connected, STDIO_CONNECTION_NAME, remote_connection_is_stdio) (read_ptid, write_ptid, putpkt, putpkt_binary, putpkt_notif) (getpkt, remote_prepare, remote_open, remote_close, write_ok) (write_enn, initialize_async_io, enable_async_io) (disable_async_io, check_remote_input_interrupt_request) (convert_ascii_to_int, convert_int_to_ascii, new_thread_notify) (dead_thread_notify, prepare_resume_reply) (decode_address_to_semicolon, decode_address, decode_m_packet) (decode_M_packet, decode_X_packet, decode_xfer_write) (decode_search_memory_packet, unhexify, hexify) (remote_escape_output, unpack_varlen_hex, clear_symbol_cache) (look_up_one_symbol, relocate_instruction) (monitor_output): Move to remote-utils.h, and include it. * remote-utils.h: New file. --- gdb/gdbserver/ChangeLog | 18 ++++++++++++ gdb/gdbserver/server.h | 65 +---------------------------------------- 2 files changed, 19 insertions(+), 64 deletions(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 2a57eb440df..8b8985bdf85 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,21 @@ +2013-09-05 Pedro Alves + + * server.h (remote_debug, noack_mode, transport_is_reliable) + (gdb_connected, STDIO_CONNECTION_NAME, remote_connection_is_stdio) + (read_ptid, write_ptid, putpkt, putpkt_binary, putpkt_notif) + (getpkt, remote_prepare, remote_open, remote_close, write_ok) + (write_enn, initialize_async_io, enable_async_io) + (disable_async_io, check_remote_input_interrupt_request) + (convert_ascii_to_int, convert_int_to_ascii, new_thread_notify) + (dead_thread_notify, prepare_resume_reply) + (decode_address_to_semicolon, decode_address, decode_m_packet) + (decode_M_packet, decode_X_packet, decode_xfer_write) + (decode_search_memory_packet, unhexify, hexify) + (remote_escape_output, unpack_varlen_hex, clear_symbol_cache) + (look_up_one_symbol, relocate_instruction) + (monitor_output): Move to remote-utils.h, and include it. + * remote-utils.h: New file. + 2013-09-05 Pedro Alves * server.h (_): Delete. diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h index 371876b6d83..4f13cd9099d 100644 --- a/gdb/gdbserver/server.h +++ b/gdb/gdbserver/server.h @@ -272,70 +272,7 @@ extern int handle_vFile (char *, int, int *); /* Functions from hostio-errno.c. */ extern void hostio_last_error_from_errno (char *own_buf); -/* From remote-utils.c */ - -extern int remote_debug; -extern int noack_mode; -extern int transport_is_reliable; - -int gdb_connected (void); - -#define STDIO_CONNECTION_NAME "stdio" -int remote_connection_is_stdio (void); - -ptid_t read_ptid (char *buf, char **obuf); -char *write_ptid (char *buf, ptid_t ptid); - -int putpkt (char *buf); -int putpkt_binary (char *buf, int len); -int putpkt_notif (char *buf); -int getpkt (char *buf); -void remote_prepare (char *name); -void remote_open (char *name); -void remote_close (void); -void write_ok (char *buf); -void write_enn (char *buf); -void initialize_async_io (void); -void enable_async_io (void); -void disable_async_io (void); -void check_remote_input_interrupt_request (void); -void convert_ascii_to_int (const char *from, unsigned char *to, int n); -void convert_int_to_ascii (const unsigned char *from, char *to, int n); -void new_thread_notify (int id); -void dead_thread_notify (int id); -void prepare_resume_reply (char *buf, ptid_t ptid, - struct target_waitstatus *status); - -const char *decode_address_to_semicolon (CORE_ADDR *addrp, const char *start); -void decode_address (CORE_ADDR *addrp, const char *start, int len); -void decode_m_packet (char *from, CORE_ADDR * mem_addr_ptr, - unsigned int *len_ptr); -void decode_M_packet (char *from, CORE_ADDR * mem_addr_ptr, - unsigned int *len_ptr, unsigned char **to_p); -int decode_X_packet (char *from, int packet_len, CORE_ADDR * mem_addr_ptr, - unsigned int *len_ptr, unsigned char **to_p); -int decode_xfer_write (char *buf, int packet_len, - CORE_ADDR *offset, unsigned int *len, - unsigned char *data); -int decode_search_memory_packet (const char *buf, int packet_len, - CORE_ADDR *start_addrp, - CORE_ADDR *search_space_lenp, - gdb_byte *pattern, - unsigned int *pattern_lenp); - -int unhexify (char *bin, const char *hex, int count); -int hexify (char *hex, const char *bin, int count); -int remote_escape_output (const gdb_byte *buffer, int len, - gdb_byte *out_buf, int *out_len, - int out_maxlen); -char *unpack_varlen_hex (char *buff, ULONGEST *result); - -void clear_symbol_cache (struct sym_cache **symcache_p); -int look_up_one_symbol (const char *name, CORE_ADDR *addrp, int may_ask_gdb); - -int relocate_instruction (CORE_ADDR *to, CORE_ADDR oldloc); - -void monitor_output (const char *msg); +#include "remote-utils.h" /* Functions from utils.c */ #include "common-utils.h" -- 2.30.2