From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1439 invoked by alias); 3 Sep 2013 20:26:47 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 1268 invoked by uid 89); 3 Sep 2013 20:26:46 -0000 Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 03 Sep 2013 20:26:46 +0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-5.8 required=5.0 tests=AWL,BAYES_00,KHOP_THREADED,RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r83KQgLG017467 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 3 Sep 2013 16:26:43 -0400 Received: from brno.lan (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r83KQdrn028397 for ; Tue, 3 Sep 2013 16:26:42 -0400 From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH 2/9] [gdbserver] Split a new remote-utils.h file out of server.h. Date: Tue, 03 Sep 2013 20:26:00 -0000 Message-Id: <1378239999-15533-3-git-send-email-palves@redhat.com> In-Reply-To: <1378239999-15533-1-git-send-email-palves@redhat.com> References: <1378239999-15533-1-git-send-email-palves@redhat.com> X-SW-Source: 2013-09/txt/msg00105.txt.bz2 gdb/gdbserver/ 2013-09-03 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/remote-utils.h | 85 ++++++++++++++++++++++++++++++++++++++++++++ gdb/gdbserver/server.h | 65 +-------------------------------- 2 files changed, 86 insertions(+), 64 deletions(-) create mode 100644 gdb/gdbserver/remote-utils.h diff --git a/gdb/gdbserver/remote-utils.h b/gdb/gdbserver/remote-utils.h new file mode 100644 index 0000000..5a82ad0 --- /dev/null +++ b/gdb/gdbserver/remote-utils.h @@ -0,0 +1,85 @@ +/* Remote utility routines for the remote server for GDB. + Copyright (C) 1993-2013 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#ifndef REMOTE_UTILS_H +#define REMOTE_UTILS_H + +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); + +#endif /* REMOTE_UTILS_H */ diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h index 371876b..4f13cd9 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" -- 1.7.11.7