This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
[ob/commit] remote.c whitespace tweaks
- From: Michael Snyder <msnyder at redhat dot com>
- To: gdb-patches at sources dot redhat dot com
- Date: Thu, 13 Jan 2005 17:51:16 -0800
- Subject: [ob/commit] remote.c whitespace tweaks
- Organization: Red Hat, Inc.
2005-01-13 Michael Snyder <msnyder@redhat.com>
* remote.c: Whitespace tweaks.
Index: remote.c
===================================================================
RCS file: /cvs/src/src/gdb/remote.c,v
retrieving revision 1.159
diff -p -r1.159 remote.c
*** remote.c 13 Jan 2005 00:12:50 -0000 1.159
--- remote.c 14 Jan 2005 01:43:44 -0000
***************
*** 21,27 ****
Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
! /* See the GDB User Guide for details of the GDB remote protocol. */
#include "defs.h"
#include "gdb_string.h"
--- 21,27 ----
Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
! /* See the GDB User Guide for details of the GDB remote protocol. */
#include "defs.h"
#include "gdb_string.h"
***************
*** 56,62 ****
#include "remote-fileio.h"
! /* Prototypes for local functions */
static void cleanup_sigint_signal_handler (void *dummy);
static void initialize_sigint_signal_handler (void);
static int getpkt_sane (char *buf, long sizeof_buf, int forever);
--- 56,62 ----
#include "remote-fileio.h"
! /* Prototypes for local functions. */
static void cleanup_sigint_signal_handler (void *dummy);
static void initialize_sigint_signal_handler (void);
static int getpkt_sane (char *buf, long sizeof_buf, int forever);
*************** struct packet_reg
*** 206,212 ****
long regnum; /* GDB's internal register number. */
LONGEST pnum; /* Remote protocol register number. */
int in_g_packet; /* Always part of G packet. */
! /* long size in bytes; == register_size (current_gdbarch, regnum); at present. */
/* char *name; == REGISTER_NAME (regnum); at present. */
};
--- 206,213 ----
long regnum; /* GDB's internal register number. */
LONGEST pnum; /* Remote protocol register number. */
int in_g_packet; /* Always part of G packet. */
! /* long size in bytes; == register_size (current_gdbarch, regnum);
! at present. */
/* char *name; == REGISTER_NAME (regnum); at present. */
};
*************** struct remote_state
*** 224,234 ****
size of memory-read and memory-write packets. A target will
typically only reserve a buffer large enough to hold the ``g''
packet. The size does not include packet overhead (headers and
! trailers). */
long actual_register_packet_size;
/* This is the maximum size (in chars) of a non read/write packet.
! It is also used as a cap on the size of read/write packets. */
long remote_packet_size;
};
--- 225,235 ----
size of memory-read and memory-write packets. A target will
typically only reserve a buffer large enough to hold the ``g''
packet. The size does not include packet overhead (headers and
! trailers). */
long actual_register_packet_size;
/* This is the maximum size (in chars) of a non read/write packet.
! It is also used as a cap on the size of read/write packets. */
long remote_packet_size;
};
*************** init_remote_state (struct gdbarch *gdbar
*** 265,271 ****
r->in_g_packet = (regnum < NUM_REGS);
/* ...name = REGISTER_NAME (regnum); */
! /* Compute packet size by accumulating the size of all registers. */
if (deprecated_register_bytes () == 0)
rs->sizeof_g_packet += register_size (current_gdbarch, regnum);
}
--- 266,272 ----
r->in_g_packet = (regnum < NUM_REGS);
/* ...name = REGISTER_NAME (regnum); */
! /* Compute packet size by accumulating the size of all registers. */
if (deprecated_register_bytes () == 0)
rs->sizeof_g_packet += register_size (current_gdbarch, regnum);
}
*************** init_remote_state (struct gdbarch *gdbar
*** 276,282 ****
as the maximum packet-size to ensure that the packet and an extra
NUL character can always fit in the buffer. This stops GDB
trashing stubs that try to squeeze an extra NUL into what is
! already a full buffer (As of 1999-12-04 that was most stubs. */
rs->remote_packet_size = 400 - 1;
/* Should rs->sizeof_g_packet needs more space than the
--- 277,283 ----
as the maximum packet-size to ensure that the packet and an extra
NUL character can always fit in the buffer. This stops GDB
trashing stubs that try to squeeze an extra NUL into what is
! already a full buffer (As of 1999-12-04 that was most stubs. */
rs->remote_packet_size = 400 - 1;
/* Should rs->sizeof_g_packet needs more space than the
*************** init_remote_state (struct gdbarch *gdbar
*** 284,294 ****
encoded as two characters. 32 is the overhead for the packet
header / footer. NOTE: cagney/1999-10-26: I suspect that 8
(``$NN:G...#NN'') is a better guess, the below has been padded a
! little. */
if (rs->sizeof_g_packet > ((rs->remote_packet_size - 32) / 2))
rs->remote_packet_size = (rs->sizeof_g_packet * 2 + 32);
! /* This one is filled in when a ``g'' packet is received. */
rs->actual_register_packet_size = 0;
return rs;
--- 285,295 ----
encoded as two characters. 32 is the overhead for the packet
header / footer. NOTE: cagney/1999-10-26: I suspect that 8
(``$NN:G...#NN'') is a better guess, the below has been padded a
! little. */
if (rs->sizeof_g_packet > ((rs->remote_packet_size - 32) / 2))
rs->remote_packet_size = (rs->sizeof_g_packet * 2 + 32);
! /* This one is filled in when a ``g'' packet is received. */
rs->actual_register_packet_size = 0;
return rs;
*************** packet_reg_from_pnum (struct remote_stat
*** 328,334 ****
to stop for a watchpoint. */
static CORE_ADDR remote_watch_data_address;
! /* This is non-zero if taregt stopped for a watchpoint. */
static int remote_stopped_by_watchpoint_p;
--- 329,335 ----
to stop for a watchpoint. */
static CORE_ADDR remote_watch_data_address;
! /* This is non-zero if taregt stopped for a watchpoint. */
static int remote_stopped_by_watchpoint_p;
*************** static struct target_ops remote_ops;
*** 337,343 ****
static struct target_ops extended_remote_ops;
/* Temporary target ops. Just like the remote_ops and
! extended_remote_ops, but with asynchronous support. */
static struct target_ops remote_async_ops;
static struct target_ops extended_async_remote_ops;
--- 338,344 ----
static struct target_ops extended_remote_ops;
/* Temporary target ops. Just like the remote_ops and
! extended_remote_ops, but with asynchronous support. */
static struct target_ops remote_async_ops;
static struct target_ops extended_async_remote_ops;
*************** static struct target_ops extended_async_
*** 348,354 ****
during the initial connect always time-out. Once getpkt has been
modified to return a timeout indication and, in turn
remote_wait()/wait_for_inferior() have gained a timeout parameter
! this can go away. */
static int wait_forever_enabled_p = 1;
--- 349,355 ----
during the initial connect always time-out. Once getpkt has been
modified to return a timeout indication and, in turn
remote_wait()/wait_for_inferior() have gained a timeout parameter
! this can go away. */
static int wait_forever_enabled_p = 1;
*************** static struct serial *remote_desc = NULL
*** 373,379 ****
bits). Consequently, for 64 bit targets, the upper 32 bits of an
address was never sent. Since fixing this bug may cause a break in
some remote targets this variable is principly provided to
! facilitate backward compatibility. */
static int remote_address_size;
--- 374,380 ----
bits). Consequently, for 64 bit targets, the upper 32 bits of an
address was never sent. Since fixing this bug may cause a break in
some remote targets this variable is principly provided to
! facilitate backward compatibility. */
static int remote_address_size;
*************** static int remote_async_terminal_ours_p;
*** 389,395 ****
values (fifo overruns, et.al.) and some users need larger values
(speed up transfers). The variables ``preferred_*'' (the user
request), ``current_*'' (what was actually set) and ``forced_*''
! (Positive - a soft limit, negative - a hard limit). */
struct memory_packet_config
{
--- 390,396 ----
values (fifo overruns, et.al.) and some users need larger values
(speed up transfers). The variables ``preferred_*'' (the user
request), ``current_*'' (what was actually set) and ``forced_*''
! (Positive - a soft limit, negative - a hard limit). */
struct memory_packet_config
{
*************** get_memory_packet_size (struct memory_pa
*** 409,419 ****
law?) that some hosts don't cope very well with large alloca()
calls. Eventually the alloca() code will be replaced by calls to
xmalloc() and make_cleanups() allowing this restriction to either
! be lifted or removed. */
#ifndef MAX_REMOTE_PACKET_SIZE
#define MAX_REMOTE_PACKET_SIZE 16384
#endif
! /* NOTE: 16 is just chosen at random. */
#ifndef MIN_REMOTE_PACKET_SIZE
#define MIN_REMOTE_PACKET_SIZE 16
#endif
--- 410,420 ----
law?) that some hosts don't cope very well with large alloca()
calls. Eventually the alloca() code will be replaced by calls to
xmalloc() and make_cleanups() allowing this restriction to either
! be lifted or removed. */
#ifndef MAX_REMOTE_PACKET_SIZE
#define MAX_REMOTE_PACKET_SIZE 16384
#endif
! /* NOTE: 16 is just chosen at random. */
#ifndef MIN_REMOTE_PACKET_SIZE
#define MIN_REMOTE_PACKET_SIZE 16
#endif
*************** get_memory_packet_size (struct memory_pa
*** 428,438 ****
else
{
what_they_get = (rs->remote_packet_size);
! /* Limit the packet to the size specified by the user. */
if (config->size > 0
&& what_they_get > config->size)
what_they_get = config->size;
! /* Limit it to the size of the targets ``g'' response. */
if ((rs->actual_register_packet_size) > 0
&& what_they_get > (rs->actual_register_packet_size))
what_they_get = (rs->actual_register_packet_size);
--- 429,439 ----
else
{
what_they_get = (rs->remote_packet_size);
! /* Limit the packet to the size specified by the user. */
if (config->size > 0
&& what_they_get > config->size)
what_they_get = config->size;
! /* Limit it to the size of the targets ``g'' response. */
if ((rs->actual_register_packet_size) > 0
&& what_they_get > (rs->actual_register_packet_size))
what_they_get = (rs->actual_register_packet_size);
*************** get_memory_packet_size (struct memory_pa
*** 445,451 ****
}
/* Update the size of a read/write packet. If they user wants
! something really big then do a sanity check. */
static void
set_memory_packet_size (char *args, struct memory_packet_config *config)
--- 446,452 ----
}
/* Update the size of a read/write packet. If they user wants
! something really big then do a sanity check. */
static void
set_memory_packet_size (char *args, struct memory_packet_config *config)
*************** set_memory_packet_size (char *args, stru
*** 470,481 ****
/* Instead of explicitly capping the size of a packet to
MAX_REMOTE_PACKET_SIZE or dissallowing it, the user is
instead allowed to set the size to something arbitrarily
! large. */
if (size > MAX_REMOTE_PACKET_SIZE)
error ("Invalid %s (too large).", config->name);
#endif
}
! /* Extra checks? */
if (fixed_p && !config->fixed_p)
{
if (! query ("The target may not be able to correctly handle a %s\n"
--- 471,482 ----
/* Instead of explicitly capping the size of a packet to
MAX_REMOTE_PACKET_SIZE or dissallowing it, the user is
instead allowed to set the size to something arbitrarily
! large. */
if (size > MAX_REMOTE_PACKET_SIZE)
error ("Invalid %s (too large).", config->name);
#endif
}
! /* Extra checks? */
if (fixed_p && !config->fixed_p)
{
if (! query ("The target may not be able to correctly handle a %s\n"
*************** set_memory_packet_size (char *args, stru
*** 483,489 ****
config->name, size))
error ("Packet size not changed.");
}
! /* Update the config. */
config->fixed_p = fixed_p;
config->size = size;
}
--- 484,490 ----
config->name, size))
error ("Packet size not changed.");
}
! /* Update the config. */
config->fixed_p = fixed_p;
config->size = size;
}
*************** get_memory_read_packet_size (void)
*** 547,553 ****
long size = get_memory_packet_size (&memory_read_packet_config);
/* FIXME: cagney/1999-11-07: Functions like getpkt() need to get an
extra buffer size argument before the memory read size can be
! increased beyond (rs->remote_packet_size). */
if (size > (rs->remote_packet_size))
size = (rs->remote_packet_size);
return size;
--- 548,554 ----
long size = get_memory_packet_size (&memory_read_packet_config);
/* FIXME: cagney/1999-11-07: Functions like getpkt() need to get an
extra buffer size argument before the memory read size can be
! increased beyond (rs->remote_packet_size). */
if (size > (rs->remote_packet_size))
size = (rs->remote_packet_size);
return size;
*************** get_memory_read_packet_size (void)
*** 556,562 ****
/* Generic configuration support for packets the stub optionally
supports. Allows the user to specify the use of the packet as well
! as allowing GDB to auto-detect support in the remote stub. */
enum packet_support
{
--- 557,563 ----
/* Generic configuration support for packets the stub optionally
supports. Allows the user to specify the use of the packet as well
! as allowing GDB to auto-detect support in the remote stub. */
enum packet_support
{
*************** struct packet_config
*** 574,580 ****
};
/* Analyze a packet's return value and update the packet config
! accordingly. */
enum packet_result
{
--- 575,581 ----
};
/* Analyze a packet's return value and update the packet config
! accordingly. */
enum packet_result
{
*************** add_packet_config_cmd (struct packet_con
*** 664,670 ****
"", print,
set_func, show_func,
set_remote_list, show_remote_list);
! /* set/show remote NAME-packet {auto,on,off} -- legacy */
if (legacy)
{
char *legacy_name;
--- 665,671 ----
"", print,
set_func, show_func,
set_remote_list, show_remote_list);
! /* set/show remote NAME-packet {auto,on,off} -- legacy. */
if (legacy)
{
char *legacy_name;
*************** packet_ok (const char *buf, struct packe
*** 682,688 ****
if (buf[0] != '\0')
{
/* The stub recognized the packet request. Check that the
! operation succeeded. */
switch (config->support)
{
case PACKET_SUPPORT_UNKNOWN:
--- 683,689 ----
if (buf[0] != '\0')
{
/* The stub recognized the packet request. Check that the
! operation succeeded. */
switch (config->support)
{
case PACKET_SUPPORT_UNKNOWN:
*************** packet_ok (const char *buf, struct packe
*** 700,728 ****
break;
}
if (buf[0] == 'O' && buf[1] == 'K' && buf[2] == '\0')
! /* "OK" - definitly OK. */
return PACKET_OK;
if (buf[0] == 'E'
&& isxdigit (buf[1]) && isxdigit (buf[2])
&& buf[3] == '\0')
! /* "Enn" - definitly an error. */
return PACKET_ERROR;
! /* The packet may or may not be OK. Just assume it is */
return PACKET_OK;
}
else
{
! /* The stub does not support the packet. */
switch (config->support)
{
case PACKET_ENABLE:
if (config->detect == AUTO_BOOLEAN_AUTO)
/* If the stub previously indicated that the packet was
! supported then there is a protocol error.. */
error ("Protocol error: %s (%s) conflicting enabled responses.",
config->name, config->title);
else
! /* The user set it wrong. */
error ("Enabled packet %s (%s) not recognized by stub",
config->name, config->title);
break;
--- 701,729 ----
break;
}
if (buf[0] == 'O' && buf[1] == 'K' && buf[2] == '\0')
! /* "OK" - definitly OK. */
return PACKET_OK;
if (buf[0] == 'E'
&& isxdigit (buf[1]) && isxdigit (buf[2])
&& buf[3] == '\0')
! /* "Enn" - definitly an error. */
return PACKET_ERROR;
! /* The packet may or may not be OK. Just assume it is. */
return PACKET_OK;
}
else
{
! /* The stub does not support the packet. */
switch (config->support)
{
case PACKET_ENABLE:
if (config->detect == AUTO_BOOLEAN_AUTO)
/* If the stub previously indicated that the packet was
! supported then there is a protocol error.. */
error ("Protocol error: %s (%s) conflicting enabled responses.",
config->name, config->title);
else
! /* The user set it wrong. */
error ("Enabled packet %s (%s) not recognized by stub",
config->name, config->title);
break;
*************** packet_ok (const char *buf, struct packe
*** 740,746 ****
}
}
! /* Should we try the 'vCont' (descriptive resume) request? */
static struct packet_config remote_protocol_vcont;
static void
--- 741,747 ----
}
}
! /* Should we try the 'vCont' (descriptive resume) request? */
static struct packet_config remote_protocol_vcont;
static void
*************** show_remote_protocol_vcont_packet_cmd (c
*** 757,763 ****
show_packet_config_cmd (&remote_protocol_vcont);
}
! /* Should we try the 'qSymbol' (target symbol lookup service) request? */
static struct packet_config remote_protocol_qSymbol;
static void
--- 758,764 ----
show_packet_config_cmd (&remote_protocol_vcont);
}
! /* Should we try the 'qSymbol' (target symbol lookup service) request? */
static struct packet_config remote_protocol_qSymbol;
static void
*************** enum Z_packet_type
*** 807,813 ****
static struct packet_config remote_protocol_Z[NR_Z_PACKET_TYPES];
/* FIXME: Instead of having all these boiler plate functions, the
! command callback should include a context argument. */
static void
set_remote_protocol_Z_software_bp_packet_cmd (char *args, int from_tty,
--- 808,814 ----
static struct packet_config remote_protocol_Z[NR_Z_PACKET_TYPES];
/* FIXME: Instead of having all these boiler plate functions, the
! command callback should include a context argument. */
static void
set_remote_protocol_Z_software_bp_packet_cmd (char *args, int from_tty,
*************** show_remote_protocol_Z_access_wp_packet_
*** 880,886 ****
}
/* For compatibility with older distributions. Provide a ``set remote
! Z-packet ...'' command that updates all the Z packet types. */
static enum auto_boolean remote_Z_packet_detect;
--- 881,887 ----
}
/* For compatibility with older distributions. Provide a ``set remote
! Z-packet ...'' command that updates all the Z packet types. */
static enum auto_boolean remote_Z_packet_detect;
*************** show_remote_protocol_Z_packet_cmd (char
*** 915,921 ****
cleared if the stub does not understand it. This switch is still
needed, though in cases when the packet is supported in the stub,
but the connection does not allow it (i.e., 7-bit serial connection
! only). */
static struct packet_config remote_protocol_binary_download;
--- 916,922 ----
cleared if the stub does not understand it. This switch is still
needed, though in cases when the packet is supported in the stub,
but the connection does not allow it (i.e., 7-bit serial connection
! only). */
static struct packet_config remote_protocol_binary_download;
*************** show_remote_protocol_binary_download_cmd
*** 945,951 ****
show_packet_config_cmd (&remote_protocol_binary_download);
}
! /* Should we try the 'qPart:auxv' (target auxiliary vector read) request? */
static struct packet_config remote_protocol_qPart_auxv;
static void
--- 946,952 ----
show_packet_config_cmd (&remote_protocol_binary_download);
}
! /* Should we try the 'qPart:auxv' (target auxiliary vector read) request? */
static struct packet_config remote_protocol_qPart_auxv;
static void
*************** show_remote_protocol_p_packet_cmd (char
*** 980,986 ****
! /* Tokens for use by the asynchronous signal handlers for SIGINT */
static void *sigint_remote_twice_token;
static void *sigint_remote_token;
--- 981,987 ----
! /* Tokens for use by the asynchronous signal handlers for SIGINT. */
static void *sigint_remote_twice_token;
static void *sigint_remote_token;
*************** remote_thread_alive (ptid_t ptid)
*** 1078,1102 ****
/* a 64 bit opaque identifier */
typedef unsigned char threadref[OPAQUETHREADBYTES];
! /* WARNING: This threadref data structure comes from the remote O.S., libstub
! protocol encoding, and remote.c. it is not particularly changable */
/* Right now, the internal structure is int. We want it to be bigger.
Plan to fix this.
*/
! typedef int gdb_threadref; /* internal GDB thread reference */
/* gdb_ext_thread_info is an internal GDB data structure which is
! equivalint to the reply of the remote threadinfo packet */
struct gdb_ext_thread_info
{
! threadref threadid; /* External form of thread reference */
! int active; /* Has state interesting to GDB? , regs, stack */
! char display[256]; /* Brief state display, name, blocked/syspended */
! char shortname[32]; /* To be used to name threads */
! char more_display[256]; /* Long info, statistics, queue depth, whatever */
};
/* The volume of remote transfers can be limited by submitting
--- 1079,1107 ----
/* a 64 bit opaque identifier */
typedef unsigned char threadref[OPAQUETHREADBYTES];
! /* WARNING: This threadref data structure comes from the remote O.S.,
! libstub protocol encoding, and remote.c. it is not particularly
! changable. */
/* Right now, the internal structure is int. We want it to be bigger.
Plan to fix this.
*/
! typedef int gdb_threadref; /* Internal GDB thread reference. */
/* gdb_ext_thread_info is an internal GDB data structure which is
! equivalint to the reply of the remote threadinfo packet. */
struct gdb_ext_thread_info
{
! threadref threadid; /* External form of thread reference. */
! int active; /* Has state interesting to GDB?
! regs, stack. */
! char display[256]; /* Brief state display, name,
! blocked/syspended. */
! char shortname[32]; /* To be used to name threads. */
! char more_display[256]; /* Long info, statistics, queue depth,
! whatever. */
};
/* The volume of remote transfers can be limited by submitting
*************** struct gdb_ext_thread_info
*** 1111,1117 ****
#define TAG_THREADNAME 8
#define TAG_MOREDISPLAY 16
! #define BUF_THREAD_ID_SIZE (OPAQUETHREADBYTES*2)
char *unpack_varlen_hex (char *buff, ULONGEST *result);
--- 1116,1122 ----
#define TAG_THREADNAME 8
#define TAG_MOREDISPLAY 16
! #define BUF_THREAD_ID_SIZE (OPAQUETHREADBYTES * 2)
char *unpack_varlen_hex (char *buff, ULONGEST *result);
*************** static char *unpack_nibble (char *buf, i
*** 1119,1125 ****
static char *pack_nibble (char *buf, int nibble);
! static char *pack_hex_byte (char *pkt, int /*unsigned char */ byte);
static char *unpack_byte (char *buf, int *value);
--- 1124,1130 ----
static char *pack_nibble (char *buf, int nibble);
! static char *pack_hex_byte (char *pkt, int /* unsigned char */ byte);
static char *unpack_byte (char *buf, int *value);
*************** static char *unpack_int (char *buf, int
*** 1129,1180 ****
static char *unpack_string (char *src, char *dest, int length);
! static char *pack_threadid (char *pkt, threadref * id);
! static char *unpack_threadid (char *inbuf, threadref * id);
! void int_to_threadref (threadref * id, int value);
! static int threadref_to_int (threadref * ref);
! static void copy_threadref (threadref * dest, threadref * src);
! static int threadmatch (threadref * dest, threadref * src);
! static char *pack_threadinfo_request (char *pkt, int mode, threadref * id);
static int remote_unpack_thread_info_response (char *pkt,
! threadref * expectedref,
struct gdb_ext_thread_info
*info);
! static int remote_get_threadinfo (threadref * threadid, int fieldset, /*TAG mask */
struct gdb_ext_thread_info *info);
static char *pack_threadlist_request (char *pkt, int startflag,
int threadcount,
! threadref * nextthread);
static int parse_threadlist_response (char *pkt,
int result_limit,
! threadref * original_echo,
! threadref * resultlist, int *doneflag);
static int remote_get_threadlist (int startflag,
! threadref * nextthread,
int result_limit,
int *done,
! int *result_count, threadref * threadlist);
! typedef int (*rmt_thread_action) (threadref * ref, void *context);
static int remote_threadlist_iterator (rmt_thread_action stepfunction,
void *context, int looplimit);
! static int remote_newthread_step (threadref * ref, void *context);
! /* encode 64 bits in 16 chars of hex */
static const char hexchars[] = "0123456789abcdef";
--- 1134,1189 ----
static char *unpack_string (char *src, char *dest, int length);
! static char *pack_threadid (char *pkt, threadref *id);
! static char *unpack_threadid (char *inbuf, threadref *id);
! void int_to_threadref (threadref *id, int value);
! static int threadref_to_int (threadref *ref);
! static void copy_threadref (threadref *dest, threadref *src);
! static int threadmatch (threadref *dest, threadref *src);
! static char *pack_threadinfo_request (char *pkt, int mode,
! threadref *id);
static int remote_unpack_thread_info_response (char *pkt,
! threadref *expectedref,
struct gdb_ext_thread_info
*info);
! static int remote_get_threadinfo (threadref *threadid,
! int fieldset, /*TAG mask */
struct gdb_ext_thread_info *info);
static char *pack_threadlist_request (char *pkt, int startflag,
int threadcount,
! threadref *nextthread);
static int parse_threadlist_response (char *pkt,
int result_limit,
! threadref *original_echo,
! threadref *resultlist,
! int *doneflag);
static int remote_get_threadlist (int startflag,
! threadref *nextthread,
int result_limit,
int *done,
! int *result_count,
! threadref *threadlist);
! typedef int (*rmt_thread_action) (threadref *ref, void *context);
static int remote_threadlist_iterator (rmt_thread_action stepfunction,
void *context, int looplimit);
! static int remote_newthread_step (threadref *ref, void *context);
! /* Encode 64 bits in 16 chars of hex. */
static const char hexchars[] = "0123456789abcdef";
*************** unpack_int (char *buf, int *value)
*** 1291,1297 ****
return buf + 8;
}
! #if 0 /* currently unused, uncomment when needed */
static char *pack_string (char *pkt, char *string);
static char *
--- 1300,1306 ----
return buf + 8;
}
! #if 0 /* Currently unused, uncomment when needed. */
static char *pack_string (char *pkt, char *string);
static char *
*************** pack_string (char *pkt, char *string)
*** 1302,1314 ****
len = strlen (string);
if (len > 200)
! len = 200; /* Bigger than most GDB packets, junk??? */
pkt = pack_hex_byte (pkt, len);
while (len-- > 0)
{
ch = *string++;
if ((ch == '\0') || (ch == '#'))
! ch = '*'; /* Protect encapsulation */
*pkt++ = ch;
}
return pkt;
--- 1311,1323 ----
len = strlen (string);
if (len > 200)
! len = 200; /* Bigger than most GDB packets, junk??? */
pkt = pack_hex_byte (pkt, len);
while (len-- > 0)
{
ch = *string++;
if ((ch == '\0') || (ch == '#'))
! ch = '*'; /* Protect encapsulation. */
*pkt++ = ch;
}
return pkt;
*************** copy_threadref (threadref *dest, threadr
*** 1408,1414 ****
static int
threadmatch (threadref *dest, threadref *src)
{
! /* things are broken right now, so just assume we got a match */
#if 0
unsigned char *srcp, *destp;
int i, result;
--- 1417,1423 ----
static int
threadmatch (threadref *dest, threadref *src)
{
! /* Things are broken right now, so just assume we got a match. */
#if 0
unsigned char *srcp, *destp;
int i, result;
*************** threadmatch (threadref *dest, threadref
*** 1436,1460 ****
static char *
pack_threadinfo_request (char *pkt, int mode, threadref *id)
{
! *pkt++ = 'q'; /* Info Query */
! *pkt++ = 'P'; /* process or thread info */
! pkt = pack_int (pkt, mode); /* mode */
pkt = pack_threadid (pkt, id); /* threadid */
! *pkt = '\0'; /* terminate */
return pkt;
}
! /* These values tag the fields in a thread info response packet */
/* Tagging the fields allows us to request specific fields and to
! add more fields as time goes by */
! #define TAG_THREADID 1 /* Echo the thread identifier */
#define TAG_EXISTS 2 /* Is this process defined enough to
! fetch registers and its stack */
#define TAG_DISPLAY 4 /* A short thing maybe to put on a window */
! #define TAG_THREADNAME 8 /* string, maps 1-to-1 with a thread is */
#define TAG_MOREDISPLAY 16 /* Whatever the kernel wants to say about
! the process */
static int
remote_unpack_thread_info_response (char *pkt, threadref *expectedref,
--- 1445,1469 ----
static char *
pack_threadinfo_request (char *pkt, int mode, threadref *id)
{
! *pkt++ = 'q'; /* Info Query */
! *pkt++ = 'P'; /* process or thread info */
! pkt = pack_int (pkt, mode); /* mode */
pkt = pack_threadid (pkt, id); /* threadid */
! *pkt = '\0'; /* terminate */
return pkt;
}
! /* These values tag the fields in a thread info response packet. */
/* Tagging the fields allows us to request specific fields and to
! add more fields as time goes by. */
! #define TAG_THREADID 1 /* Echo the thread identifier. */
#define TAG_EXISTS 2 /* Is this process defined enough to
! fetch registers and its stack? */
#define TAG_DISPLAY 4 /* A short thing maybe to put on a window */
! #define TAG_THREADNAME 8 /* string, maps 1-to-1 with a thread is. */
#define TAG_MOREDISPLAY 16 /* Whatever the kernel wants to say about
! the process. */
static int
remote_unpack_thread_info_response (char *pkt, threadref *expectedref,
*************** remote_unpack_thread_info_response (char
*** 1467,1498 ****
char *limit = pkt + (rs->remote_packet_size); /* plausable parsing limit */
int retval = 1;
! /* info->threadid = 0; FIXME: implement zero_threadref */
info->active = 0;
info->display[0] = '\0';
info->shortname[0] = '\0';
info->more_display[0] = '\0';
! /* Assume the characters indicating the packet type have been stripped */
pkt = unpack_int (pkt, &mask); /* arg mask */
pkt = unpack_threadid (pkt, &ref);
if (mask == 0)
warning ("Incomplete response to threadinfo request\n");
if (!threadmatch (&ref, expectedref))
! { /* This is an answer to a different request */
warning ("ERROR RMT Thread info mismatch\n");
return 0;
}
copy_threadref (&info->threadid, &ref);
! /* Loop on tagged fields , try to bail if somthing goes wrong */
! while ((pkt < limit) && mask && *pkt) /* packets are terminated with nulls */
{
pkt = unpack_int (pkt, &tag); /* tag */
! pkt = unpack_byte (pkt, &length); /* length */
! if (!(tag & mask)) /* tags out of synch with mask */
{
warning ("ERROR RMT: threadinfo tag mismatch\n");
retval = 0;
--- 1476,1509 ----
char *limit = pkt + (rs->remote_packet_size); /* plausable parsing limit */
int retval = 1;
! /* info->threadid = 0; FIXME: implement zero_threadref. */
info->active = 0;
info->display[0] = '\0';
info->shortname[0] = '\0';
info->more_display[0] = '\0';
! /* Assume the characters indicating the packet type have been
! stripped. */
pkt = unpack_int (pkt, &mask); /* arg mask */
pkt = unpack_threadid (pkt, &ref);
if (mask == 0)
warning ("Incomplete response to threadinfo request\n");
if (!threadmatch (&ref, expectedref))
! { /* This is an answer to a different request. */
warning ("ERROR RMT Thread info mismatch\n");
return 0;
}
copy_threadref (&info->threadid, &ref);
! /* Loop on tagged fields , try to bail if somthing goes wrong. */
! /* Packets are terminated with nulls. */
! while ((pkt < limit) && mask && *pkt)
{
pkt = unpack_int (pkt, &tag); /* tag */
! pkt = unpack_byte (pkt, &length); /* length */
! if (!(tag & mask)) /* Tags out of synch with mask. */
{
warning ("ERROR RMT: threadinfo tag mismatch\n");
retval = 0;
*************** remote_unpack_thread_info_response (char
*** 1542,1548 ****
continue;
}
warning ("ERROR RMT: unknown thread info tag\n");
! break; /* Not a tag we know about */
}
return retval;
}
--- 1553,1559 ----
continue;
}
warning ("ERROR RMT: unknown thread info tag\n");
! break; /* Not a tag we know about. */
}
return retval;
}
*************** remote_get_threadinfo (threadref *thread
*** 1558,1565 ****
pack_threadinfo_request (threadinfo_pkt, fieldset, threadid);
putpkt (threadinfo_pkt);
getpkt (threadinfo_pkt, (rs->remote_packet_size), 0);
! result = remote_unpack_thread_info_response (threadinfo_pkt + 2, threadid,
! info);
return result;
}
--- 1569,1576 ----
pack_threadinfo_request (threadinfo_pkt, fieldset, threadid);
putpkt (threadinfo_pkt);
getpkt (threadinfo_pkt, (rs->remote_packet_size), 0);
! result = remote_unpack_thread_info_response (threadinfo_pkt + 2,
! threadid, info);
return result;
}
*************** pack_threadlist_request (char *pkt, int
*** 1571,1577 ****
{
*pkt++ = 'q'; /* info query packet */
*pkt++ = 'L'; /* Process LIST or threadLIST request */
! pkt = pack_nibble (pkt, startflag); /* initflag 1 bytes */
pkt = pack_hex_byte (pkt, threadcount); /* threadcount 2 bytes */
pkt = pack_threadid (pkt, nextthread); /* 64 bit thread identifier */
*pkt = '\0';
--- 1582,1588 ----
{
*pkt++ = 'q'; /* info query packet */
*pkt++ = 'L'; /* Process LIST or threadLIST request */
! pkt = pack_nibble (pkt, startflag); /* initflag 1 bytes */
pkt = pack_hex_byte (pkt, threadcount); /* threadcount 2 bytes */
pkt = pack_threadid (pkt, nextthread); /* 64 bit thread identifier */
*pkt = '\0';
*************** parse_threadlist_response (char *pkt, in
*** 1591,1597 ****
resultcount = 0;
/* Assume the 'q' and 'M chars have been stripped. */
! limit = pkt + ((rs->remote_packet_size) - BUF_THREAD_ID_SIZE); /* done parse past here */
pkt = unpack_byte (pkt, &count); /* count field */
pkt = unpack_nibble (pkt, &done);
/* The first threadid is the argument threadid. */
--- 1602,1609 ----
resultcount = 0;
/* Assume the 'q' and 'M chars have been stripped. */
! limit = pkt + ((rs->remote_packet_size) - BUF_THREAD_ID_SIZE);
! /* done parse past here */
pkt = unpack_byte (pkt, &count); /* count field */
pkt = unpack_nibble (pkt, &done);
/* The first threadid is the argument threadid. */
*************** remote_get_threadlist (int startflag, th
*** 1617,1623 ****
char *t_response = alloca (rs->remote_packet_size);
int result = 1;
! /* Trancate result limit to be smaller than the packet size */
if ((((result_limit + 1) * BUF_THREAD_ID_SIZE) + 10) >= (rs->remote_packet_size))
result_limit = ((rs->remote_packet_size) / BUF_THREAD_ID_SIZE) - 2;
--- 1629,1635 ----
char *t_response = alloca (rs->remote_packet_size);
int result = 1;
! /* Trancate result limit to be smaller than the packet size. */
if ((((result_limit + 1) * BUF_THREAD_ID_SIZE) + 10) >= (rs->remote_packet_size))
result_limit = ((rs->remote_packet_size) / BUF_THREAD_ID_SIZE) - 2;
*************** remote_get_threadlist (int startflag, th
*** 1632,1639 ****
if (!threadmatch (&echo_nextthread, nextthread))
{
! /* FIXME: This is a good reason to drop the packet */
! /* Possably, there is a duplicate response */
/* Possabilities :
retransmit immediatly - race conditions
retransmit after timeout - yes
--- 1644,1651 ----
if (!threadmatch (&echo_nextthread, nextthread))
{
! /* FIXME: This is a good reason to drop the packet. */
! /* Possably, there is a duplicate response. */
/* Possabilities :
retransmit immediatly - race conditions
retransmit after timeout - yes
*************** remote_get_threadlist (int startflag, th
*** 1641,1647 ****
wait for packet, then exit
*/
warning ("HMM: threadlist did not echo arg thread, dropping it\n");
! return 0; /* I choose simply exiting */
}
if (*result_count <= 0)
{
--- 1653,1659 ----
wait for packet, then exit
*/
warning ("HMM: threadlist did not echo arg thread, dropping it\n");
! return 0; /* I choose simply exiting. */
}
if (*result_count <= 0)
{
*************** remote_get_threadlist (int startflag, th
*** 1661,1667 ****
return result;
}
! /* This is the interface between remote and threads, remotes upper interface */
/* remote_find_new_threads retrieves the thread list and for each
thread in the list, looks up the thread in GDB's internal list,
--- 1673,1680 ----
return result;
}
! /* This is the interface between remote and threads, remotes upper
! interface. */
/* remote_find_new_threads retrieves the thread list and for each
thread in the list, looks up the thread in GDB's internal list,
*************** remote_get_threadlist (int startflag, th
*** 1670,1676 ****
quit_flag is required. */
! /* About this many threadisds fit in a packet. */
#define MAXTHREADLISTRESULTS 32
--- 1683,1689 ----
quit_flag is required. */
! /* About this many threadisds fit in a packet. */
#define MAXTHREADLISTRESULTS 32
*************** remote_threadlist_iterator (rmt_thread_a
*** 1700,1706 ****
result = 0;
break;
}
! /* clear for later iterations */
startflag = 0;
/* Setup to resume next batch of thread references, set nextthread. */
if (result_count >= 1)
--- 1713,1719 ----
result = 0;
break;
}
! /* Clear for later iterations. */
startflag = 0;
/* Setup to resume next batch of thread references, set nextthread. */
if (result_count >= 1)
*************** remote_threads_info (void)
*** 1807,1813 ****
}
}
! /* Else fall back to old method based on jmetzler protocol. */
use_threadinfo_query = 0;
remote_find_new_threads ();
return;
--- 1820,1826 ----
}
}
! /* Else fall back to old method based on jmetzler protocol. */
use_threadinfo_query = 0;
remote_find_new_threads ();
return;
*************** remote_threads_extra_info (struct thread
*** 1830,1836 ****
int set;
threadref id;
struct gdb_ext_thread_info threadinfo;
! static char display_buf[100]; /* arbitrary... */
char *bufp = alloca (rs->remote_packet_size);
int n = 0; /* position in display_buf */
--- 1843,1849 ----
int set;
threadref id;
struct gdb_ext_thread_info threadinfo;
! static char display_buf[100]; /* arbitrary... */
char *bufp = alloca (rs->remote_packet_size);
int n = 0; /* position in display_buf */
*************** remote_threads_extra_info (struct thread
*** 1870,1876 ****
if (n > 0)
{
! /* for purely cosmetic reasons, clear up trailing commas */
if (',' == display_buf[n-1])
display_buf[n-1] = ' ';
return display_buf;
--- 1883,1889 ----
if (n > 0)
{
! /* For purely cosmetic reasons, clear up trailing commas. */
if (',' == display_buf[n-1])
display_buf[n-1] = ' ';
return display_buf;
*************** remote_close (int quitting)
*** 1911,1917 ****
remote_desc = NULL;
}
! /* Query the remote side for the text, data and bss offsets. */
static void
get_offsets (void)
--- 1924,1930 ----
remote_desc = NULL;
}
! /* Query the remote side for the text, data and bss offsets. */
static void
get_offsets (void)
*************** get_offsets (void)
*** 1929,1935 ****
if (buf[0] == '\000')
return; /* Return silently. Stub doesn't support
! this command. */
if (buf[0] == 'E')
{
warning ("Remote failure reply: %s", buf);
--- 1942,1948 ----
if (buf[0] == '\000')
return; /* Return silently. Stub doesn't support
! this command. */
if (buf[0] == 'E')
{
warning ("Remote failure reply: %s", buf);
*************** get_offsets (void)
*** 2000,2006 ****
static int
remote_start_remote_dummy (struct ui_out *uiout, void *dummy)
{
! start_remote (); /* Initialize gdb process mechanisms */
/* NOTE: Return something >=0. A -ve value is reserved for
catch_exceptions. */
return 1;
--- 2013,2019 ----
static int
remote_start_remote_dummy (struct ui_out *uiout, void *dummy)
{
! start_remote (); /* Initialize gdb process mechanisms. */
/* NOTE: Return something >=0. A -ve value is reserved for
catch_exceptions. */
return 1;
*************** remote_start_remote_dummy (struct ui_out
*** 2009,2015 ****
static int
remote_start_remote (struct ui_out *uiout, void *dummy)
{
! immediate_quit++; /* Allow user to interrupt it */
/* Ack any packet which the remote side has already sent. */
serial_write (remote_desc, "+", 1);
--- 2022,2028 ----
static int
remote_start_remote (struct ui_out *uiout, void *dummy)
{
! immediate_quit++; /* Allow user to interrupt it. */
/* Ack any packet which the remote side has already sent. */
serial_write (remote_desc, "+", 1);
*************** remote_start_remote (struct ui_out *uiou
*** 2019,2027 ****
inferior_ptid = remote_current_thread (inferior_ptid);
! get_offsets (); /* Get text, data & bss offsets */
! putpkt ("?"); /* initiate a query from remote machine */
immediate_quit--;
/* NOTE: See comment above in remote_start_remote_dummy(). This
--- 2032,2040 ----
inferior_ptid = remote_current_thread (inferior_ptid);
! get_offsets (); /* Get text, data & bss offsets. */
! putpkt ("?"); /* Initiate a query from remote machine. */
immediate_quit--;
/* NOTE: See comment above in remote_start_remote_dummy(). This
*************** remote_open (char *name, int from_tty)
*** 2038,2044 ****
remote_open_1 (name, from_tty, &remote_ops, 0, 0);
}
! /* Just like remote_open, but with asynchronous support. */
static void
remote_async_open (char *name, int from_tty)
{
--- 2051,2057 ----
remote_open_1 (name, from_tty, &remote_ops, 0, 0);
}
! /* Just like remote_open, but with asynchronous support. */
static void
remote_async_open (char *name, int from_tty)
{
*************** extended_remote_open (char *name, int fr
*** 2055,2061 ****
0 /* async_p */);
}
! /* Just like extended_remote_open, but with asynchronous support. */
static void
extended_remote_async_open (char *name, int from_tty)
{
--- 2068,2074 ----
0 /* async_p */);
}
! /* Just like extended_remote_open, but with asynchronous support. */
static void
extended_remote_async_open (char *name, int from_tty)
{
*************** init_all_packet_configs (void)
*** 2076,2087 ****
for (i = 0; i < NR_Z_PACKET_TYPES; i++)
update_packet_config (&remote_protocol_Z[i]);
/* Force remote_write_bytes to check whether target supports binary
! downloading. */
update_packet_config (&remote_protocol_binary_download);
update_packet_config (&remote_protocol_qPart_auxv);
}
! /* Symbol look-up. */
static void
remote_check_symbols (struct objfile *objfile)
--- 2089,2100 ----
for (i = 0; i < NR_Z_PACKET_TYPES; i++)
update_packet_config (&remote_protocol_Z[i]);
/* Force remote_write_bytes to check whether target supports binary
! downloading. */
update_packet_config (&remote_protocol_binary_download);
update_packet_config (&remote_protocol_qPart_auxv);
}
! /* Symbol look-up. */
static void
remote_check_symbols (struct objfile *objfile)
*************** remote_check_symbols (struct objfile *ob
*** 2097,2103 ****
msg = alloca (rs->remote_packet_size);
reply = alloca (rs->remote_packet_size);
! /* Invite target to request symbol lookups. */
putpkt ("qSymbol::");
getpkt (reply, (rs->remote_packet_size), 0);
--- 2110,2116 ----
msg = alloca (rs->remote_packet_size);
reply = alloca (rs->remote_packet_size);
! /* Invite target to request symbol lookups. */
putpkt ("qSymbol::");
getpkt (reply, (rs->remote_packet_size), 0);
*************** remote_open_1 (char *name, int from_tty,
*** 2151,2157 ****
"serial device is attached to the remote system\n"
"(e.g. /dev/ttyS0, /dev/ttya, COM1, etc.).");
! /* See FIXME above */
if (!async_p)
wait_forever_enabled_p = 1;
--- 2164,2170 ----
"serial device is attached to the remote system\n"
"(e.g. /dev/ttyS0, /dev/ttya, COM1, etc.).");
! /* See FIXME above. */
if (!async_p)
wait_forever_enabled_p = 1;
*************** remote_open_1 (char *name, int from_tty,
*** 2192,2198 ****
puts_filtered (name);
puts_filtered ("\n");
}
! push_target (target); /* Switch to using remote target now */
init_all_packet_configs ();
--- 2205,2211 ----
puts_filtered (name);
puts_filtered ("\n");
}
! push_target (target); /* Switch to using remote target now. */
init_all_packet_configs ();
*************** remote_open_1 (char *name, int from_tty,
*** 2214,2220 ****
if (async_p)
{
! /* With this target we start out by owning the terminal. */
remote_async_terminal_ours_p = 1;
/* FIXME: cagney/1999-09-23: During the initial connection it is
--- 2227,2233 ----
if (async_p)
{
! /* With this target we start out by owning the terminal. */
remote_async_terminal_ours_p = 1;
/* FIXME: cagney/1999-09-23: During the initial connection it is
*************** remote_open_1 (char *name, int from_tty,
*** 2223,2234 ****
wait_for_inferior() with no timeout. wait_forever_enabled_p gets
around this. Eventually a mechanism that allows
wait_for_inferior() to expect/get timeouts will be
! implemented. */
wait_forever_enabled_p = 0;
}
#ifdef SOLIB_CREATE_INFERIOR_HOOK
! /* First delete any symbols previously loaded from shared libraries. */
no_shared_libraries (NULL, 0);
#endif
--- 2236,2247 ----
wait_for_inferior() with no timeout. wait_forever_enabled_p gets
around this. Eventually a mechanism that allows
wait_for_inferior() to expect/get timeouts will be
! implemented. */
wait_forever_enabled_p = 0;
}
#ifdef SOLIB_CREATE_INFERIOR_HOOK
! /* First delete any symbols previously loaded from shared libraries. */
no_shared_libraries (NULL, 0);
#endif
*************** remote_open_1 (char *name, int from_tty,
*** 2277,2284 ****
to the open function for any remote target that wants to
support svr4 shared libraries. */
! /* Set up to detect and load shared libraries. */
! if (exec_bfd) /* No use without an exec file. */
{
SOLIB_CREATE_INFERIOR_HOOK (PIDGET (inferior_ptid));
remote_check_symbols (symfile_objfile);
--- 2290,2297 ----
to the open function for any remote target that wants to
support svr4 shared libraries. */
! /* Set up to detect and load shared libraries. */
! if (exec_bfd) /* No use without an exec file. */
{
SOLIB_CREATE_INFERIOR_HOOK (PIDGET (inferior_ptid));
remote_check_symbols (symfile_objfile);
*************** remote_detach (char *args, int from_tty)
*** 2304,2310 ****
strcpy (buf, "D");
remote_send (buf, (rs->remote_packet_size));
! /* Unregister the file descriptor from the event loop. */
if (target_is_async_p ())
serial_async (remote_desc, NULL, 0);
--- 2317,2323 ----
strcpy (buf, "D");
remote_send (buf, (rs->remote_packet_size));
! /* Unregister the file descriptor from the event loop. */
if (target_is_async_p ())
serial_async (remote_desc, NULL, 0);
*************** remote_disconnect (char *args, int from_
*** 2324,2330 ****
if (args)
error ("Argument given to \"detach\" when remotely debugging.");
! /* Unregister the file descriptor from the event loop. */
if (target_is_async_p ())
serial_async (remote_desc, NULL, 0);
--- 2337,2343 ----
if (args)
error ("Argument given to \"detach\" when remotely debugging.");
! /* Unregister the file descriptor from the event loop. */
if (target_is_async_p ())
serial_async (remote_desc, NULL, 0);
*************** hex2bin (const char *hex, char *bin, int
*** 2358,2364 ****
if (hex[0] == 0 || hex[1] == 0)
{
/* Hex string is short, or of uneven length.
! Return the count that has been converted so far. */
return i;
}
*bin++ = fromhex (hex[0]) * 16 + fromhex (hex[1]);
--- 2371,2377 ----
if (hex[0] == 0 || hex[1] == 0)
{
/* Hex string is short, or of uneven length.
! Return the count that has been converted so far. */
return i;
}
*bin++ = fromhex (hex[0]) * 16 + fromhex (hex[1]);
*************** static int
*** 2382,2388 ****
bin2hex (const char *bin, char *hex, int count)
{
int i;
! /* May use a length, or a nul-terminated string as input. */
if (count == 0)
count = strlen (bin);
--- 2395,2401 ----
bin2hex (const char *bin, char *hex, int count)
{
int i;
! /* May use a length, or a nul-terminated string as input. */
if (count == 0)
count = strlen (bin);
*************** remote_resume (ptid_t ptid, int step, en
*** 2552,2560 ****
/* All other supported resume packets do use Hc, so call set_thread. */
if (pid == -1)
! set_thread (0, 0); /* run any thread */
else
! set_thread (pid, 0); /* run this thread */
if (siggnal != TARGET_SIGNAL_0)
{
--- 2565,2573 ----
/* All other supported resume packets do use Hc, so call set_thread. */
if (pid == -1)
! set_thread (0, 0); /* Run any thread. */
else
! set_thread (pid, 0); /* Run this thread. */
if (siggnal != TARGET_SIGNAL_0)
{
*************** remote_resume (ptid_t ptid, int step, en
*** 2569,2575 ****
putpkt (buf);
}
! /* Same as remote_resume, but with async support. */
static void
remote_async_resume (ptid_t ptid, int step, enum target_signal siggnal)
{
--- 2582,2588 ----
putpkt (buf);
}
! /* Same as remote_resume, but with async support. */
static void
remote_async_resume (ptid_t ptid, int step, enum target_signal siggnal)
{
*************** remote_async_resume (ptid_t ptid, int st
*** 2578,2590 ****
/* We are about to start executing the inferior, let's register it
with the event loop. NOTE: this is the one place where all the
execution commands end up. We could alternatively do this in each
! of the execution commands in infcmd.c.*/
/* FIXME: ezannoni 1999-09-28: We may need to move this out of here
into infcmd.c in order to allow inferior function calls to work
! NOT asynchronously. */
if (target_can_async_p ())
target_async (inferior_event_handler, 0);
! /* Tell the world that the target is now executing. */
/* FIXME: cagney/1999-09-23: Is it the targets responsibility to set
this? Instead, should the client of target just assume (for
async targets) that the target is going to start executing? Is
--- 2591,2603 ----
/* We are about to start executing the inferior, let's register it
with the event loop. NOTE: this is the one place where all the
execution commands end up. We could alternatively do this in each
! of the execution commands in infcmd.c. */
/* FIXME: ezannoni 1999-09-28: We may need to move this out of here
into infcmd.c in order to allow inferior function calls to work
! NOT asynchronously. */
if (target_can_async_p ())
target_async (inferior_event_handler, 0);
! /* Tell the world that the target is now executing. */
/* FIXME: cagney/1999-09-23: Is it the targets responsibility to set
this? Instead, should the client of target just assume (for
async targets) that the target is going to start executing? Is
*************** remote_async_resume (ptid_t ptid, int st
*** 2595,2601 ****
/* Set up the signal handler for SIGINT, while the target is
! executing, ovewriting the 'regular' SIGINT signal handler. */
static void
initialize_sigint_signal_handler (void)
{
--- 2608,2614 ----
/* Set up the signal handler for SIGINT, while the target is
! executing, ovewriting the 'regular' SIGINT signal handler. */
static void
initialize_sigint_signal_handler (void)
{
*************** initialize_sigint_signal_handler (void)
*** 2604,2610 ****
signal (SIGINT, handle_remote_sigint);
}
! /* Signal handler for SIGINT, while the target is executing. */
static void
handle_remote_sigint (int sig)
{
--- 2617,2623 ----
signal (SIGINT, handle_remote_sigint);
}
! /* Signal handler for SIGINT, while the target is executing. */
static void
handle_remote_sigint (int sig)
{
*************** handle_remote_sigint (int sig)
*** 2616,2622 ****
/* Signal handler for SIGINT, installed after SIGINT has already been
sent once. It will take effect the second time that the user sends
! a ^C. */
static void
handle_remote_sigint_twice (int sig)
{
--- 2629,2635 ----
/* Signal handler for SIGINT, installed after SIGINT has already been
sent once. It will take effect the second time that the user sends
! a ^C. */
static void
handle_remote_sigint_twice (int sig)
{
*************** handle_remote_sigint_twice (int sig)
*** 2627,2633 ****
}
/* Perform the real interruption of the target execution, in response
! to a ^C. */
static void
async_remote_interrupt (gdb_client_data arg)
{
--- 2640,2646 ----
}
/* Perform the real interruption of the target execution, in response
! to a ^C. */
static void
async_remote_interrupt (gdb_client_data arg)
{
*************** async_remote_interrupt (gdb_client_data
*** 2638,2651 ****
}
/* Perform interrupt, if the first attempt did not succeed. Just give
! up on the target alltogether. */
void
async_remote_interrupt_twice (gdb_client_data arg)
{
if (remote_debug)
fprintf_unfiltered (gdb_stdlog, "remote_interrupt_twice called\n");
/* Do something only if the target was not killed by the previous
! cntl-C. */
if (target_executing)
{
interrupt_query ();
--- 2651,2664 ----
}
/* Perform interrupt, if the first attempt did not succeed. Just give
! up on the target alltogether. */
void
async_remote_interrupt_twice (gdb_client_data arg)
{
if (remote_debug)
fprintf_unfiltered (gdb_stdlog, "remote_interrupt_twice called\n");
/* Do something only if the target was not killed by the previous
! cntl-C. */
if (target_executing)
{
interrupt_query ();
*************** async_remote_interrupt_twice (gdb_client
*** 2654,2668 ****
}
/* Reinstall the usual SIGINT handlers, after the target has
! stopped. */
static void
cleanup_sigint_signal_handler (void *dummy)
{
signal (SIGINT, handle_sigint);
if (sigint_remote_twice_token)
! delete_async_signal_handler ((struct async_signal_handler **) & sigint_remote_twice_token);
if (sigint_remote_token)
! delete_async_signal_handler ((struct async_signal_handler **) & sigint_remote_token);
}
/* Send ^C to target to halt it. Target will respond, and send us a
--- 2667,2683 ----
}
/* Reinstall the usual SIGINT handlers, after the target has
! stopped. */
static void
cleanup_sigint_signal_handler (void *dummy)
{
signal (SIGINT, handle_sigint);
if (sigint_remote_twice_token)
! delete_async_signal_handler ((struct async_signal_handler **)
! &sigint_remote_twice_token);
if (sigint_remote_token)
! delete_async_signal_handler ((struct async_signal_handler **)
! &sigint_remote_token);
}
/* Send ^C to target to halt it. Target will respond, and send us a
*************** static void (*ofunc) (int);
*** 2673,2683 ****
as a signal handler for SIGINT. The first time a user requests a
stop, we call remote_stop to send a break or ^C. If there is no
response from the target (it didn't stop when the user requested it),
! we ask the user if he'd like to detach from the target. */
static void
remote_interrupt (int signo)
{
! /* If this doesn't work, try more severe steps. */
signal (signo, remote_interrupt_twice);
if (remote_debug)
--- 2688,2698 ----
as a signal handler for SIGINT. The first time a user requests a
stop, we call remote_stop to send a break or ^C. If there is no
response from the target (it didn't stop when the user requested it),
! we ask the user if he'd like to detach from the target. */
static void
remote_interrupt (int signo)
{
! /* If this doesn't work, try more severe steps. */
signal (signo, remote_interrupt_twice);
if (remote_debug)
*************** remote_interrupt_twice (int signo)
*** 2698,2704 ****
/* This is the generic stop called via the target vector. When a target
interrupt is requested, either by the command line or the GUI, we
! will eventually end up here. */
static void
remote_stop (void)
{
--- 2713,2719 ----
/* This is the generic stop called via the target vector. When a target
interrupt is requested, either by the command line or the GUI, we
! will eventually end up here. */
static void
remote_stop (void)
{
*************** Give up (and stop debugging it)? "))
*** 2732,2738 ****
/* Enable/disable target terminal ownership. Most targets can use
terminal groups to control terminal ownership. Remote targets are
different in that explicit transfer of ownership to/from GDB/target
! is required. */
static void
remote_async_terminal_inferior (void)
--- 2747,2753 ----
/* Enable/disable target terminal ownership. Most targets can use
terminal groups to control terminal ownership. Remote targets are
different in that explicit transfer of ownership to/from GDB/target
! is required. */
static void
remote_async_terminal_inferior (void)
*************** remote_async_terminal_inferior (void)
*** 2741,2747 ****
sync_execution here. This function should only be called when
GDB is resuming the inferior in the forground. A background
resume (``run&'') should leave GDB in control of the terminal and
! consequently should not call this code. */
if (!sync_execution)
return;
/* FIXME: cagney/1999-09-27: Closely related to the above. Make
--- 2756,2762 ----
sync_execution here. This function should only be called when
GDB is resuming the inferior in the forground. A background
resume (``run&'') should leave GDB in control of the terminal and
! consequently should not call this code. */
if (!sync_execution)
return;
/* FIXME: cagney/1999-09-27: Closely related to the above. Make
*************** remote_async_terminal_inferior (void)
*** 2757,2772 ****
initialize_sigint_signal_handler ();
/* NOTE: At this point we could also register our selves as the
recipient of all input. Any characters typed could then be
! passed on down to the target. */
}
static void
remote_async_terminal_ours (void)
{
! /* See FIXME in remote_async_terminal_inferior. */
if (!sync_execution)
return;
! /* See FIXME in remote_async_terminal_inferior. */
if (remote_async_terminal_ours_p)
return;
cleanup_sigint_signal_handler (NULL);
--- 2772,2787 ----
initialize_sigint_signal_handler ();
/* NOTE: At this point we could also register our selves as the
recipient of all input. Any characters typed could then be
! passed on down to the target. */
}
static void
remote_async_terminal_ours (void)
{
! /* See FIXME in remote_async_terminal_inferior. */
if (!sync_execution)
return;
! /* See FIXME in remote_async_terminal_inferior. */
if (remote_async_terminal_ours_p)
return;
cleanup_sigint_signal_handler (NULL);
*************** remote_wait (ptid_t ptid, struct target_
*** 2827,2844 ****
switch (buf[0])
{
! case 'E': /* Error of some sort */
warning ("Remote failure reply: %s", buf);
continue;
! case 'F': /* File-I/O request */
remote_fileio_request (buf);
continue;
! case 'T': /* Status with PC, SP, FP, ... */
{
int i;
char regs[MAX_REGISTER_SIZE];
! /* Expedited reply, containing Signal, {regno, reg} repeat */
/* format is: 'Tssn...:r...;n...:r...;n...:r...;#cc', where
ss = signal number
n... = register number
--- 2842,2859 ----
switch (buf[0])
{
! case 'E': /* Error of some sort. */
warning ("Remote failure reply: %s", buf);
continue;
! case 'F': /* File-I/O request. */
remote_fileio_request (buf);
continue;
! case 'T': /* Status with PC, SP, FP, ... */
{
int i;
char regs[MAX_REGISTER_SIZE];
! /* Expedited reply, containing Signal, {regno, reg} repeat. */
/* format is: 'Tssn...:r...;n...:r...;n...:r...;#cc', where
ss = signal number
n... = register number
*************** remote_wait (ptid_t ptid, struct target_
*** 2853,2864 ****
int fieldsize;
LONGEST pnum = 0;
! /* If the packet contains a register number save it in pnum
! and set p1 to point to the character following it.
! Otherwise p1 points to p. */
! /* If this packet is an awatch packet, don't parse the 'a'
! as a register number. */
if (strncmp (p, "awatch", strlen("awatch")) != 0)
{
--- 2868,2879 ----
int fieldsize;
LONGEST pnum = 0;
! /* If the packet contains a register number save it in
! pnum and set p1 to point to the character following
! it. Otherwise p1 points to p. */
! /* If this packet is an awatch packet, don't parse the
! 'a' as a register number. */
if (strncmp (p, "awatch", strlen("awatch")) != 0)
{
*************** remote_wait (ptid_t ptid, struct target_
*** 2869,2875 ****
else
p1 = p;
! if (p1 == p) /* No register number present here */
{
p1 = (unsigned char *) strchr (p, ':');
if (p1 == NULL)
--- 2884,2890 ----
else
p1 = p;
! if (p1 == p) /* No register number present here. */
{
p1 = (unsigned char *) strchr (p, ':');
if (p1 == NULL)
*************** Packet: '%s'\n",
*** 2904,2929 ****
p = p1;
if (*p++ != ':')
! error ("Malformed packet(b) (missing colon): %s\nPacket: '%s'\n",
p, buf);
if (reg == NULL)
! error ("Remote sent bad register number %s: %s\nPacket: '%s'\n",
phex_nz (pnum, 0), p, buf);
! fieldsize = hex2bin (p, regs, register_size (current_gdbarch, reg->regnum));
p += 2 * fieldsize;
! if (fieldsize < register_size (current_gdbarch, reg->regnum))
warning ("Remote reply is too short: %s", buf);
! regcache_raw_supply (current_regcache, reg->regnum, regs);
}
if (*p++ != ';')
! error ("Remote register badly formatted: %s\nhere: %s", buf, p);
}
}
/* fall through */
! case 'S': /* Old style status, just signal only */
status->kind = TARGET_WAITKIND_STOPPED;
status->value.sig = (enum target_signal)
(((fromhex (buf[1])) << 4) + (fromhex (buf[2])));
--- 2919,2951 ----
p = p1;
if (*p++ != ':')
! error ("Malformed packet(b) (missing colon): %s\n\
! Packet: '%s'\n",
p, buf);
if (reg == NULL)
! error ("Remote sent bad register number %s: %s\n\
! Packet: '%s'\n",
phex_nz (pnum, 0), p, buf);
! fieldsize = hex2bin (p, regs,
! register_size (current_gdbarch,
! reg->regnum));
p += 2 * fieldsize;
! if (fieldsize < register_size (current_gdbarch,
! reg->regnum))
warning ("Remote reply is too short: %s", buf);
! regcache_raw_supply (current_regcache,
! reg->regnum, regs);
}
if (*p++ != ';')
! error ("Remote register badly formatted: %s\nhere: %s",
! buf, p);
}
}
/* fall through */
! case 'S': /* Old style status, just signal only. */
status->kind = TARGET_WAITKIND_STOPPED;
status->value.sig = (enum target_signal)
(((fromhex (buf[1])) << 4) + (fromhex (buf[2])));
*************** Packet: '%s'\n",
*** 2934,2940 ****
record_currthread (thread_num);
}
goto got_status;
! case 'W': /* Target exited */
{
/* The remote process exited. */
status->kind = TARGET_WAITKIND_EXITED;
--- 2956,2962 ----
record_currthread (thread_num);
}
goto got_status;
! case 'W': /* Target exited. */
{
/* The remote process exited. */
status->kind = TARGET_WAITKIND_EXITED;
*************** Packet: '%s'\n",
*** 2948,2954 ****
kill_kludge = 1;
goto got_status;
! case 'O': /* Console output */
remote_console_output (buf + 1);
continue;
case '\0':
--- 2970,2976 ----
kill_kludge = 1;
goto got_status;
! case 'O': /* Console output. */
remote_console_output (buf + 1);
continue;
case '\0':
*************** got_status:
*** 2981,2987 ****
return inferior_ptid;
}
! /* Async version of remote_wait. */
static ptid_t
remote_async_wait (ptid_t ptid, struct target_waitstatus *status)
{
--- 3003,3009 ----
return inferior_ptid;
}
! /* Async version of remote_wait. */
static ptid_t
remote_async_wait (ptid_t ptid, struct target_waitstatus *status)
{
*************** remote_async_wait (ptid_t ptid, struct t
*** 3004,3010 ****
/* FIXME: cagney/1999-09-27: If we're in async mode we should
_never_ wait for ever -> test on target_is_async_p().
However, before we do that we need to ensure that the caller
! knows how to take the target into/out of async mode. */
getpkt (buf, (rs->remote_packet_size), wait_forever_enabled_p);
if (!target_is_async_p ())
signal (SIGINT, ofunc);
--- 3026,3032 ----
/* FIXME: cagney/1999-09-27: If we're in async mode we should
_never_ wait for ever -> test on target_is_async_p().
However, before we do that we need to ensure that the caller
! knows how to take the target into/out of async mode. */
getpkt (buf, (rs->remote_packet_size), wait_forever_enabled_p);
if (!target_is_async_p ())
signal (SIGINT, ofunc);
*************** remote_async_wait (ptid_t ptid, struct t
*** 3016,3033 ****
switch (buf[0])
{
! case 'E': /* Error of some sort */
warning ("Remote failure reply: %s", buf);
continue;
! case 'F': /* File-I/O request */
remote_fileio_request (buf);
continue;
! case 'T': /* Status with PC, SP, FP, ... */
{
int i;
char regs[MAX_REGISTER_SIZE];
! /* Expedited reply, containing Signal, {regno, reg} repeat */
/* format is: 'Tssn...:r...;n...:r...;n...:r...;#cc', where
ss = signal number
n... = register number
--- 3038,3055 ----
switch (buf[0])
{
! case 'E': /* Error of some sort. */
warning ("Remote failure reply: %s", buf);
continue;
! case 'F': /* File-I/O request. */
remote_fileio_request (buf);
continue;
! case 'T': /* Status with PC, SP, FP, ... */
{
int i;
char regs[MAX_REGISTER_SIZE];
! /* Expedited reply, containing Signal, {regno, reg} repeat. */
/* format is: 'Tssn...:r...;n...:r...;n...:r...;#cc', where
ss = signal number
n... = register number
*************** remote_async_wait (ptid_t ptid, struct t
*** 3042,3050 ****
int fieldsize;
long pnum = 0;
! /* If the packet contains a register number, save it in pnum
! and set p1 to point to the character following it.
! Otherwise p1 points to p. */
/* If this packet is an awatch packet, don't parse the 'a'
as a register number. */
--- 3064,3072 ----
int fieldsize;
long pnum = 0;
! /* If the packet contains a register number, save it
! in pnum and set p1 to point to the character
! following it. Otherwise p1 points to p. */
/* If this packet is an awatch packet, don't parse the 'a'
as a register number. */
*************** remote_async_wait (ptid_t ptid, struct t
*** 3058,3068 ****
else
p1 = p;
! if (p1 == p) /* No register number present here */
{
p1 = (unsigned char *) strchr (p, ':');
if (p1 == NULL)
! error ("Malformed packet(a) (missing colon): %s\nPacket: '%s'\n",
p, buf);
if (strncmp (p, "thread", p1 - p) == 0)
{
--- 3080,3091 ----
else
p1 = p;
! if (p1 == p) /* No register number present here. */
{
p1 = (unsigned char *) strchr (p, ':');
if (p1 == NULL)
! error ("Malformed packet(a) (missing colon): %s\n\
! Packet: '%s'\n",
p, buf);
if (strncmp (p, "thread", p1 - p) == 0)
{
*************** remote_async_wait (ptid_t ptid, struct t
*** 3092,3107 ****
struct packet_reg *reg = packet_reg_from_pnum (rs, pnum);
p = p1;
if (*p++ != ':')
! error ("Malformed packet(b) (missing colon): %s\nPacket: '%s'\n",
p, buf);
if (reg == NULL)
! error ("Remote sent bad register number %ld: %s\nPacket: '%s'\n",
pnum, p, buf);
! fieldsize = hex2bin (p, regs, register_size (current_gdbarch, reg->regnum));
p += 2 * fieldsize;
! if (fieldsize < register_size (current_gdbarch, reg->regnum))
warning ("Remote reply is too short: %s", buf);
regcache_raw_supply (current_regcache, reg->regnum, regs);
}
--- 3115,3135 ----
struct packet_reg *reg = packet_reg_from_pnum (rs, pnum);
p = p1;
if (*p++ != ':')
! error ("Malformed packet(b) (missing colon): %s\n\
! Packet: '%s'\n",
p, buf);
if (reg == NULL)
! error ("Remote sent bad register number %ld: %s\n\
! Packet: '%s'\n",
pnum, p, buf);
! fieldsize = hex2bin (p, regs,
! register_size (current_gdbarch,
! reg->regnum));
p += 2 * fieldsize;
! if (fieldsize < register_size (current_gdbarch,
! reg->regnum))
warning ("Remote reply is too short: %s", buf);
regcache_raw_supply (current_regcache, reg->regnum, regs);
}
*************** remote_async_wait (ptid_t ptid, struct t
*** 3112,3118 ****
}
}
/* fall through */
! case 'S': /* Old style status, just signal only */
status->kind = TARGET_WAITKIND_STOPPED;
status->value.sig = (enum target_signal)
(((fromhex (buf[1])) << 4) + (fromhex (buf[2])));
--- 3140,3146 ----
}
}
/* fall through */
! case 'S': /* Old style status, just signal only. */
status->kind = TARGET_WAITKIND_STOPPED;
status->value.sig = (enum target_signal)
(((fromhex (buf[1])) << 4) + (fromhex (buf[2])));
*************** remote_async_wait (ptid_t ptid, struct t
*** 3123,3129 ****
record_currthread (thread_num);
}
goto got_status;
! case 'W': /* Target exited */
{
/* The remote process exited. */
status->kind = TARGET_WAITKIND_EXITED;
--- 3151,3157 ----
record_currthread (thread_num);
}
goto got_status;
! case 'W': /* Target exited. */
{
/* The remote process exited. */
status->kind = TARGET_WAITKIND_EXITED;
*************** remote_async_wait (ptid_t ptid, struct t
*** 3137,3146 ****
kill_kludge = 1;
goto got_status;
! case 'O': /* Console output */
remote_console_output (buf + 1);
/* Return immediately to the event loop. The event loop will
! still be waiting on the inferior afterwards. */
status->kind = TARGET_WAITKIND_IGNORE;
goto got_status;
case '\0':
--- 3165,3174 ----
kill_kludge = 1;
goto got_status;
! case 'O': /* Console output. */
remote_console_output (buf + 1);
/* Return immediately to the event loop. The event loop will
! still be waiting on the inferior afterwards. */
status->kind = TARGET_WAITKIND_IGNORE;
goto got_status;
case '\0':
*************** fetch_register_using_p (int regnum)
*** 3214,3220 ****
{
if (p[1] == 0)
{
! error("fetch_register_using_p: early buf termination");
return 0;
}
--- 3242,3248 ----
{
if (p[1] == 0)
{
! error ("fetch_register_using_p: early buf termination");
return 0;
}
*************** remote_fetch_registers (int regnum)
*** 3276,3282 ****
/* Save the size of the packet sent to us by the target. Its used
as a heuristic when determining the max size of packets that the
! target can safely receive. */
if ((rs->actual_register_packet_size) == 0)
(rs->actual_register_packet_size) = strlen (buf);
--- 3304,3310 ----
/* Save the size of the packet sent to us by the target. Its used
as a heuristic when determining the max size of packets that the
! target can safely receive. */
if ((rs->actual_register_packet_size) == 0)
(rs->actual_register_packet_size) = strlen (buf);
*************** remote_fetch_registers (int regnum)
*** 3288,3294 ****
and try to fetch another packet to read. */
while ((buf[0] < '0' || buf[0] > '9')
&& (buf[0] < 'a' || buf[0] > 'f')
! && buf[0] != 'x') /* New: unavailable register value */
{
if (remote_debug)
fprintf_unfiltered (gdb_stdlog,
--- 3316,3322 ----
and try to fetch another packet to read. */
while ((buf[0] < '0' || buf[0] > '9')
&& (buf[0] < 'a' || buf[0] > 'f')
! && buf[0] != 'x') /* New: unavailable register value. */
{
if (remote_debug)
fprintf_unfiltered (gdb_stdlog,
*************** remote_prepare_to_store (void)
*** 3384,3390 ****
}
/* Helper: Attempt to store REGNUM using the P packet. Return fail IFF
! packet was not recognized. */
static int
store_register_using_P (int regnum)
--- 3412,3418 ----
}
/* Helper: Attempt to store REGNUM using the P packet. Return fail IFF
! packet was not recognized. */
static int
store_register_using_P (int regnum)
*************** store_register_using_P (int regnum)
*** 3407,3414 ****
}
! /* Store register REGNUM, or all registers if REGNUM == -1, from the contents
! of the register cache buffer. FIXME: ignores errors. */
static void
remote_store_registers (int regnum)
--- 3435,3442 ----
}
! /* Store register REGNUM, or all registers if REGNUM == -1, from the
! contents of the register cache buffer. FIXME: ignores errors. */
static void
remote_store_registers (int regnum)
*************** hexnumnstr (char *buf, ULONGEST num, int
*** 3516,3522 ****
return width;
}
! /* Mask all but the least significant REMOTE_ADDRESS_SIZE bits. */
static CORE_ADDR
remote_address_masked (CORE_ADDR addr)
--- 3544,3550 ----
return width;
}
! /* Mask all but the least significant REMOTE_ADDRESS_SIZE bits. */
static CORE_ADDR
remote_address_masked (CORE_ADDR addr)
*************** remote_address_masked (CORE_ADDR addr)
*** 3525,3531 ****
&& remote_address_size < (sizeof (ULONGEST) * 8))
{
/* Only create a mask when that mask can safely be constructed
! in a ULONGEST variable. */
ULONGEST mask = 1;
mask = (mask << remote_address_size) - 1;
addr &= mask;
--- 3553,3559 ----
&& remote_address_size < (sizeof (ULONGEST) * 8))
{
/* Only create a mask when that mask can safely be constructed
! in a ULONGEST variable. */
ULONGEST mask = 1;
mask = (mask << remote_address_size) - 1;
addr &= mask;
*************** remote_address_masked (CORE_ADDR addr)
*** 3536,3547 ****
/* Determine whether the remote target supports binary downloading.
This is accomplished by sending a no-op memory write of zero length
to the target at the specified address. It does not suffice to send
! the whole packet, since many stubs strip the eighth bit and subsequently
! compute a wrong checksum, which causes real havoc with remote_write_bytes.
NOTE: This can still lose if the serial line is not eight-bit
clean. In cases like this, the user should clear "remote
! X-packet". */
static void
check_binary_download (CORE_ADDR addr)
--- 3564,3576 ----
/* Determine whether the remote target supports binary downloading.
This is accomplished by sending a no-op memory write of zero length
to the target at the specified address. It does not suffice to send
! the whole packet, since many stubs strip the eighth bit and
! subsequently compute a wrong checksum, which causes real havoc with
! remote_write_bytes.
NOTE: This can still lose if the serial line is not eight-bit
clean. In cases like this, the user should clear "remote
! X-packet". */
static void
check_binary_download (CORE_ADDR addr)
*************** check_binary_download (CORE_ADDR addr)
*** 3595,3601 ****
LEN is the number of bytes.
Returns number of bytes transferred, or 0 (setting errno) for
! error. Only transfer a single packet. */
int
remote_write_bytes (CORE_ADDR memaddr, char *myaddr, int len)
--- 3624,3630 ----
LEN is the number of bytes.
Returns number of bytes transferred, or 0 (setting errno) for
! error. Only transfer a single packet. */
int
remote_write_bytes (CORE_ADDR memaddr, char *myaddr, int len)
*************** remote_write_bytes (CORE_ADDR memaddr, c
*** 3614,3620 ****
check_binary_download (memaddr);
/* Compute the size, and then allocate space for the largest
! possible packet. Include space for an extra trailing NUL. */
sizeof_buf = get_memory_write_packet_size () + 1;
buf = alloca (sizeof_buf);
--- 3643,3649 ----
check_binary_download (memaddr);
/* Compute the size, and then allocate space for the largest
! possible packet. Include space for an extra trailing NULL. */
sizeof_buf = get_memory_write_packet_size () + 1;
buf = alloca (sizeof_buf);
*************** remote_write_bytes (CORE_ADDR memaddr, c
*** 3627,3644 ****
/* Construct the packet header: "[MX]<memaddr>,<len>:". */
/* Append "[XM]". Compute a best guess of the number of bytes
! actually transfered. */
p = buf;
switch (remote_protocol_binary_download.support)
{
case PACKET_ENABLE:
*p++ = 'X';
! /* Best guess at number of bytes that will fit. */
todo = min (len, payload_size);
break;
case PACKET_DISABLE:
*p++ = 'M';
! /* num bytes that will fit */
todo = min (len, payload_size / 2);
break;
case PACKET_SUPPORT_UNKNOWN:
--- 3656,3673 ----
/* Construct the packet header: "[MX]<memaddr>,<len>:". */
/* Append "[XM]". Compute a best guess of the number of bytes
! actually transfered. */
p = buf;
switch (remote_protocol_binary_download.support)
{
case PACKET_ENABLE:
*p++ = 'X';
! /* Best guess at number of bytes that will fit. */
todo = min (len, payload_size);
break;
case PACKET_DISABLE:
*p++ = 'M';
! /* Num bytes that will fit. */
todo = min (len, payload_size / 2);
break;
case PACKET_SUPPORT_UNKNOWN:
*************** remote_write_bytes (CORE_ADDR memaddr, c
*** 3682,3688 ****
case '$':
case '#':
case 0x7d:
! /* These must be escaped */
*p++ = 0x7d;
*p++ = (myaddr[nr_bytes] & 0xff) ^ 0x20;
break;
--- 3711,3717 ----
case '$':
case '#':
case 0x7d:
! /* These must be escaped. */
*p++ = 0x7d;
*p++ = (myaddr[nr_bytes] & 0xff) ^ 0x20;
break;
*************** remote_write_bytes (CORE_ADDR memaddr, c
*** 3728,3735 ****
return 0;
}
! /* Return NR_BYTES, not TODO, in case escape chars caused us to send fewer
! bytes than we'd planned. */
return nr_bytes;
}
--- 3757,3764 ----
return 0;
}
! /* Return NR_BYTES, not TODO, in case escape chars caused us to send
! fewer bytes than we'd planned. */
return nr_bytes;
}
*************** remote_write_bytes (CORE_ADDR memaddr, c
*** 3746,3764 ****
Instead it should read a single packet worth of data and then
return the byte size of that packet to the caller. The caller (its
caller and its callers caller ;-) already contains code for
! handling partial reads. */
int
remote_read_bytes (CORE_ADDR memaddr, char *myaddr, int len)
{
char *buf;
! int max_buf_size; /* Max size of packet output buffer */
long sizeof_buf;
int origlen;
! /* Create a buffer big enough for this packet. */
max_buf_size = get_memory_read_packet_size ();
! sizeof_buf = max_buf_size + 1; /* Space for trailing NUL */
buf = alloca (sizeof_buf);
origlen = len;
--- 3775,3793 ----
Instead it should read a single packet worth of data and then
return the byte size of that packet to the caller. The caller (its
caller and its callers caller ;-) already contains code for
! handling partial reads. */
int
remote_read_bytes (CORE_ADDR memaddr, char *myaddr, int len)
{
char *buf;
! int max_buf_size; /* Max size of packet output buffer. */
long sizeof_buf;
int origlen;
! /* Create a buffer big enough for this packet. */
max_buf_size = get_memory_read_packet_size ();
! sizeof_buf = max_buf_size + 1; /* Space for trailing NULL. */
buf = alloca (sizeof_buf);
origlen = len;
*************** remote_read_bytes (CORE_ADDR memaddr, ch
*** 3787,3796 ****
&& isxdigit (buf[1]) && isxdigit (buf[2])
&& buf[3] == '\0')
{
! /* There is no correspondance between what the remote protocol uses
! for errors and errno codes. We would like a cleaner way of
! representing errors (big enough to include errno codes, bfd_error
! codes, and others). But for now just return EIO. */
errno = EIO;
return 0;
}
--- 3816,3826 ----
&& isxdigit (buf[1]) && isxdigit (buf[2])
&& buf[3] == '\0')
{
! /* There is no correspondance between what the remote
! protocol uses for errors and errno codes. We would like
! a cleaner way of representing errors (big enough to
! include errno codes, bfd_error codes, and others). But
! for now just return EIO. */
errno = EIO;
return 0;
}
*************** remote_read_bytes (CORE_ADDR memaddr, ch
*** 3802,3808 ****
if ((i = hex2bin (p, myaddr, todo)) < todo)
{
/* Reply is short. This means that we were able to read
! only part of what we wanted to. */
return i + (origlen - len);
}
myaddr += todo;
--- 3832,3838 ----
if ((i = hex2bin (p, myaddr, todo)) < todo)
{
/* Reply is short. This means that we were able to read
! only part of what we wanted to. */
return i + (origlen - len);
}
myaddr += todo;
*************** remote_read_bytes (CORE_ADDR memaddr, ch
*** 3813,3821 ****
}
/* Read or write LEN bytes from inferior memory at MEMADDR,
! transferring to or from debugger address BUFFER. Write to inferior if
! SHOULD_WRITE is nonzero. Returns length of data written or read; 0
! for error. TARGET is unused. */
static int
remote_xfer_memory (CORE_ADDR mem_addr, char *buffer, int mem_len,
--- 3843,3851 ----
}
/* Read or write LEN bytes from inferior memory at MEMADDR,
! transferring to or from debugger address BUFFER. Write to inferior
! if SHOULD_WRITE is nonzero. Returns length of data written or
! read; 0 for error. TARGET is unused. */
static int
remote_xfer_memory (CORE_ADDR mem_addr, char *buffer, int mem_len,
*************** remote_xfer_memory (CORE_ADDR mem_addr,
*** 3827,3833 ****
int res;
/* Should this be the selected frame? */
! gdbarch_remote_translate_xfer_address (current_gdbarch, current_regcache,
mem_addr, mem_len,
&targ_addr, &targ_len);
if (targ_len <= 0)
--- 3857,3864 ----
int res;
/* Should this be the selected frame? */
! gdbarch_remote_translate_xfer_address (current_gdbarch,
! current_regcache,
mem_addr, mem_len,
&targ_addr, &targ_len);
if (targ_len <= 0)
*************** remote_files_info (struct target_ops *ig
*** 3850,3856 ****
/* Stuff for dealing with the packets which are part of this protocol.
See comment at top of file for details. */
! /* Read a single character from the remote end, masking it down to 7 bits. */
static int
readchar (int timeout)
--- 3881,3888 ----
/* Stuff for dealing with the packets which are part of this protocol.
See comment at top of file for details. */
! /* Read a single character from the remote end, masking it down to 7
! bits. */
static int
readchar (int timeout)
*************** putpkt (char *buf)
*** 3909,3917 ****
}
/* Send a packet to the remote machine, with error checking. The data
! of the packet is in BUF. The string in BUF can be at most (rs->remote_packet_size) - 5
! to account for the $, # and checksum, and for a possible /0 if we are
! debugging (remote_debug) and want to print the sent packet as a string */
static int
putpkt_binary (char *buf, int cnt)
--- 3941,3950 ----
}
/* Send a packet to the remote machine, with error checking. The data
! of the packet is in BUF. The string in BUF can be at most
! (rs->remote_packet_size) - 5 to account for the $, # and checksum,
! and for a possible /0 if we are debugging (remote_debug) and want
! to print the sent packet as a string. */
static int
putpkt_binary (char *buf, int cnt)
*************** putpkt_binary (char *buf, int cnt)
*** 3959,3965 ****
if (serial_write (remote_desc, buf2, p - buf2))
perror_with_name ("putpkt: write failed");
! /* read until either a timeout occurs (-2) or '+' is read */
while (1)
{
ch = readchar (remote_timeout);
--- 3992,3998 ----
if (serial_write (remote_desc, buf2, p - buf2))
perror_with_name ("putpkt: write failed");
! /* Read until either a timeout occurs (-2) or '+' is read. */
while (1)
{
ch = readchar (remote_timeout);
*************** putpkt_binary (char *buf, int cnt)
*** 3993,4010 ****
tcount++;
if (tcount > 3)
return 0;
! break; /* Retransmit buffer */
case '$':
{
if (remote_debug)
! fprintf_unfiltered (gdb_stdlog, "Packet instead of Ack, ignoring it\n");
/* It's probably an old response sent because an ACK
was lost. Gobble up the packet and ack it so it
doesn't get retransmitted when we resend this
packet. */
read_frame (junkbuf, sizeof_junkbuf);
serial_write (remote_desc, "+", 1);
! continue; /* Now, go look for + */
}
default:
if (remote_debug)
--- 4026,4044 ----
tcount++;
if (tcount > 3)
return 0;
! break; /* Retransmit buffer. */
case '$':
{
if (remote_debug)
! fprintf_unfiltered (gdb_stdlog,
! "Packet instead of Ack, ignoring it\n");
/* It's probably an old response sent because an ACK
was lost. Gobble up the packet and ack it so it
doesn't get retransmitted when we resend this
packet. */
read_frame (junkbuf, sizeof_junkbuf);
serial_write (remote_desc, "+", 1);
! continue; /* Now, go look for +. */
}
default:
if (remote_debug)
*************** putpkt_binary (char *buf, int cnt)
*** 4018,4024 ****
}
continue;
}
! break; /* Here to retransmit */
}
#if 0
--- 4052,4058 ----
}
continue;
}
! break; /* Here to retransmit. */
}
#if 0
*************** putpkt_binary (char *buf, int cnt)
*** 4043,4049 ****
Returns -1 on error, number of characters in buffer (ignoring the
trailing NULL) on success. (could be extended to return one of the
! SERIAL status indications). */
static long
read_frame (char *buf,
--- 4077,4083 ----
Returns -1 on error, number of characters in buffer (ignoring the
trailing NULL) on success. (could be extended to return one of the
! SERIAL status indications). */
static long
read_frame (char *buf,
*************** read_frame (char *buf,
*** 4058,4064 ****
while (1)
{
! /* ASSERT (bc < sizeof_buf - 1) - space for trailing NUL */
c = readchar (remote_timeout);
switch (c)
{
--- 4092,4098 ----
while (1)
{
! /* ASSERT (bc < sizeof_buf - 1) - space for trailing NULL. */
c = readchar (remote_timeout);
switch (c)
{
*************** read_frame (char *buf,
*** 4070,4076 ****
if (remote_debug)
fputs_filtered ("Saw new packet start in middle of old one\n",
gdb_stdlog);
! return -1; /* Start a new packet, count retries */
case '#':
{
unsigned char pktcsum;
--- 4104,4110 ----
if (remote_debug)
fputs_filtered ("Saw new packet start in middle of old one\n",
gdb_stdlog);
! return -1; /* Start a new packet, count retries. */
case '#':
{
unsigned char pktcsum;
*************** read_frame (char *buf,
*** 4086,4098 ****
if (check_0 == SERIAL_TIMEOUT || check_1 == SERIAL_TIMEOUT)
{
if (remote_debug)
! fputs_filtered ("Timeout in checksum, retrying\n", gdb_stdlog);
return -1;
}
else if (check_0 < 0 || check_1 < 0)
{
if (remote_debug)
! fputs_filtered ("Communication error in checksum\n", gdb_stdlog);
return -1;
}
--- 4120,4134 ----
if (check_0 == SERIAL_TIMEOUT || check_1 == SERIAL_TIMEOUT)
{
if (remote_debug)
! fputs_filtered ("Timeout in checksum, retrying\n",
! gdb_stdlog);
return -1;
}
else if (check_0 < 0 || check_1 < 0)
{
if (remote_debug)
! fputs_filtered ("Communication error in checksum\n",
! gdb_stdlog);
return -1;
}
*************** read_frame (char *buf,
*** 4109,4127 ****
fputs_filtered ("\n", gdb_stdlog);
}
/* Number of characters in buffer ignoring trailing
! NUL. */
return -1;
}
! case '*': /* Run length encoding */
{
int repeat;
csum += c;
c = readchar (remote_timeout);
csum += c;
! repeat = c - ' ' + 3; /* Compute repeat count */
! /* The character before ``*'' is repeated. */
if (repeat > 0 && repeat <= 255
&& bc > 0
--- 4145,4163 ----
fputs_filtered ("\n", gdb_stdlog);
}
/* Number of characters in buffer ignoring trailing
! NULL. */
return -1;
}
! case '*': /* Run length encoding. */
{
int repeat;
csum += c;
c = readchar (remote_timeout);
csum += c;
! repeat = c - ' ' + 3; /* Compute repeat count. */
! /* The character before ``*'' is repeated. */
if (repeat > 0 && repeat <= 255
&& bc > 0
*************** read_frame (char *buf,
*** 4133,4139 ****
}
buf[bc] = '\0';
! printf_filtered ("Repeat count %d too large for buffer: ", repeat);
puts_filtered (buf);
puts_filtered ("\n");
return -1;
--- 4169,4176 ----
}
buf[bc] = '\0';
! printf_filtered ("Repeat count %d too large for buffer: ",
! repeat);
puts_filtered (buf);
puts_filtered ("\n");
return -1;
*************** read_frame (char *buf,
*** 4163,4169 ****
/* FIXME: ezannoni 2000-02-01 this wrapper is necessary so that we
don't have to change all the calls to getpkt to deal with the
return value, because at the moment I don't know what the right
! thing to do it for those. */
void
getpkt (char *buf,
long sizeof_buf,
--- 4200,4206 ----
/* FIXME: ezannoni 2000-02-01 this wrapper is necessary so that we
don't have to change all the calls to getpkt to deal with the
return value, because at the moment I don't know what the right
! thing to do it for those. */
void
getpkt (char *buf,
long sizeof_buf,
*************** getpkt (char *buf,
*** 4180,4186 ****
this is used (in synchronous mode) to wait for a target that is is
executing user code to stop. If FOREVER == 0, this function is
allowed to time out gracefully and return an indication of this to
! the caller. */
static int
getpkt_sane (char *buf,
long sizeof_buf,
--- 4217,4223 ----
this is used (in synchronous mode) to wait for a target that is is
executing user code to stop. If FOREVER == 0, this function is
allowed to time out gracefully and return an indication of this to
! the caller. */
static int
getpkt_sane (char *buf,
long sizeof_buf,
*************** getpkt_sane (char *buf,
*** 4206,4217 ****
for (tries = 1; tries <= MAX_TRIES; tries++)
{
/* This can loop forever if the remote side sends us characters
! continuously, but if it pauses, we'll get a zero from readchar
! because of timeout. Then we'll count that as a retry. */
!
! /* Note that we will only wait forever prior to the start of a packet.
! After that, we expect characters to arrive at a brisk pace. They
! should show up within remote_timeout intervals. */
do
{
--- 4243,4256 ----
for (tries = 1; tries <= MAX_TRIES; tries++)
{
/* This can loop forever if the remote side sends us characters
! continuously, but if it pauses, we'll get a zero from
! readchar because of timeout. Then we'll count that as a
! retry. */
!
! /* Note that we will only wait forever prior to the start of a
! packet. After that, we expect characters to arrive at a
! brisk pace. They should show up within remote_timeout
! intervals. */
do
{
*************** getpkt_sane (char *buf,
*** 4219,4225 ****
if (c == SERIAL_TIMEOUT)
{
! if (forever) /* Watchdog went off? Kill the target. */
{
QUIT;
target_mourn_inferior ();
--- 4258,4264 ----
if (c == SERIAL_TIMEOUT)
{
! if (forever) /* Watchdog went off? Kill the target. */
{
QUIT;
target_mourn_inferior ();
*************** getpkt_sane (char *buf,
*** 4253,4259 ****
serial_write (remote_desc, "-", 1);
}
! /* We have tried hard enough, and just can't receive the packet. Give up. */
printf_unfiltered ("Ignoring packet error, continuing...\n");
serial_write (remote_desc, "+", 1);
--- 4292,4299 ----
serial_write (remote_desc, "-", 1);
}
! /* We have tried hard enough, and just can't receive the packet.
! Give up. */
printf_unfiltered ("Ignoring packet error, continuing...\n");
serial_write (remote_desc, "+", 1);
*************** remote_kill (void)
*** 4281,4291 ****
target_mourn_inferior ();
}
! /* Async version of remote_kill. */
static void
remote_async_kill (void)
{
! /* Unregister the file descriptor from the event loop. */
if (target_is_async_p ())
serial_async (remote_desc, NULL, 0);
--- 4321,4331 ----
target_mourn_inferior ();
}
! /* Async version of remote_kill. */
static void
remote_async_kill (void)
{
! /* Unregister the file descriptor from the event loop. */
if (target_is_async_p ())
serial_async (remote_desc, NULL, 0);
*************** remote_async_kill (void)
*** 4298,4305 ****
return;
}
! /* Use catch_errors so the user can quit from gdb even when we aren't on
! speaking terms with the remote system. */
catch_errors ((catch_errors_ftype *) putpkt, "k", "", RETURN_MASK_ERROR);
/* Don't wait for it to die. I'm not really sure it matters whether
--- 4338,4345 ----
return;
}
! /* Use catch_errors so the user can quit from gdb even when we
! aren't on speaking terms with the remote system. */
catch_errors ((catch_errors_ftype *) putpkt, "k", "", RETURN_MASK_ERROR);
/* Don't wait for it to die. I'm not really sure it matters whether
*************** remote_mourn_1 (struct target_ops *targe
*** 4348,4355 ****
we're debugging, arguments and an environment. */
static void
! extended_remote_create_inferior (char *exec_file, char *args, char **env,
! int from_tty)
{
/* Rip out the breakpoints; we'll reinsert them after restarting
the remote server. */
--- 4388,4395 ----
we're debugging, arguments and an environment. */
static void
! extended_remote_create_inferior (char *exec_file, char *args,
! char **env, int from_tty)
{
/* Rip out the breakpoints; we'll reinsert them after restarting
the remote server. */
*************** extended_remote_create_inferior (char *e
*** 4369,4385 ****
proceed (-1, TARGET_SIGNAL_0, 0);
}
! /* Async version of extended_remote_create_inferior. */
static void
! extended_remote_async_create_inferior (char *exec_file, char *args, char **env,
! int from_tty)
{
/* Rip out the breakpoints; we'll reinsert them after restarting
the remote server. */
remove_breakpoints ();
/* If running asynchronously, register the target file descriptor
! with the event loop. */
if (target_can_async_p ())
target_async (inferior_event_handler, 0);
--- 4409,4425 ----
proceed (-1, TARGET_SIGNAL_0, 0);
}
! /* Async version of extended_remote_create_inferior. */
static void
! extended_remote_async_create_inferior (char *exec_file, char *args,
! char **env, int from_tty)
{
/* Rip out the breakpoints; we'll reinsert them after restarting
the remote server. */
remove_breakpoints ();
/* If running asynchronously, register the target file descriptor
! with the event loop. */
if (target_can_async_p ())
target_async (inferior_event_handler, 0);
*************** remote_insert_breakpoint (CORE_ADDR addr
*** 4447,4453 ****
/* Try the "Z" s/w breakpoint packet if it is not already disabled.
If it succeeds, then set the support to PACKET_ENABLE. If it
fails, and the user has explicitly requested the Z support then
! report an error, otherwise, mark it disabled and go on. */
if (remote_protocol_Z[Z_PACKET_SOFTWARE_BP].support != PACKET_DISABLE)
{
--- 4487,4493 ----
/* Try the "Z" s/w breakpoint packet if it is not already disabled.
If it succeeds, then set the support to PACKET_ENABLE. If it
fails, and the user has explicitly requested the Z support then
! report an error, otherwise, mark it disabled and go on. */
if (remote_protocol_Z[Z_PACKET_SOFTWARE_BP].support != PACKET_DISABLE)
{
*************** push_remote_target (char *name, int from
*** 4769,4775 ****
remote_open (name, from_tty);
}
! /* Table used by the crc32 function to calcuate the checksum. */
static unsigned long crc32_table[256] =
{0, 0};
--- 4809,4815 ----
remote_open (name, from_tty);
}
! /* Table used by the crc32 function to calcuate the checksum. */
static unsigned long crc32_table[256] =
{0, 0};
*************** crc32 (unsigned char *buf, int len, unsi
*** 4779,4785 ****
{
if (!crc32_table[1])
{
! /* Initialize the CRC table and the decoding table. */
int i, j;
unsigned int c;
--- 4819,4825 ----
{
if (!crc32_table[1])
{
! /* Initialize the CRC table and the decoding table. */
int i, j;
unsigned int c;
*************** crc32 (unsigned char *buf, int len, unsi
*** 4809,4815 ****
/* FIXME: cagney/1999-10-26: This command should be broken down into a
target method (target verify memory) and generic version of the
actual command. This will allow other high-level code (especially
! generic_load()) to make use of this target functionality. */
static void
compare_sections_command (char *args, int from_tty)
--- 4849,4855 ----
/* FIXME: cagney/1999-10-26: This command should be broken down into a
target method (target verify memory) and generic version of the
actual command. This will allow other high-level code (especially
! generic_load()) to make use of this target functionality. */
static void
compare_sections_command (char *args, int from_tty)
*************** compare_sections_command (char *args, in
*** 4849,4859 ****
matched = 1; /* do this section */
lma = s->lma;
! /* FIXME: assumes lma can fit into long */
sprintf (buf, "qCRC:%lx,%lx", (long) lma, (long) size);
putpkt (buf);
! /* be clever; compute the host_crc before waiting for target reply */
sectdata = xmalloc (size);
old_chain = make_cleanup (xfree, sectdata);
bfd_get_section_contents (exec_bfd, s, sectdata, 0, size);
--- 4889,4900 ----
matched = 1; /* do this section */
lma = s->lma;
! /* FIXME: assumes lma can fit into long. */
sprintf (buf, "qCRC:%lx,%lx", (long) lma, (long) size);
putpkt (buf);
! /* Be clever; compute the host_crc before waiting for target
! reply. */
sectdata = xmalloc (size);
old_chain = make_cleanup (xfree, sectdata);
bfd_get_section_contents (exec_bfd, s, sectdata, 0, size);
*************** remote_xfer_partial (struct target_ops *
*** 4987,4993 ****
return -1;
len = rs->remote_packet_size;
! /* except for querying the minimum buffer size, target must be open */
if (!remote_desc)
error ("remote query is only available after target open");
--- 5028,5034 ----
return -1;
len = rs->remote_packet_size;
! /* Except for querying the minimum buffer size, target must be open. */
if (!remote_desc)
error ("remote query is only available after target open");
*************** remote_xfer_partial (struct target_ops *
*** 4997,5006 ****
*p2++ = 'q';
*p2++ = query_type;
! /* we used one buffer char for the remote protocol q command and another
! for the query type. As the remote protocol encapsulation uses 4 chars
! plus one extra in case we are debugging (remote_debug),
! we have PBUFZIZ - 7 left to pack the query string */
i = 0;
while (annex[i] && (i < ((rs->remote_packet_size) - 8)))
{
--- 5038,5048 ----
*p2++ = 'q';
*p2++ = query_type;
! /* We used one buffer char for the remote protocol q command and
! another for the query type. As the remote protocol encapsulation
! uses 4 chars plus one extra in case we are debugging
! (remote_debug), we have PBUFZIZ - 7 left to pack the query
! string. */
i = 0;
while (annex[i] && (i < ((rs->remote_packet_size) - 8)))
{
*************** remote_rcmd (char *command,
*** 5033,5050 ****
if (!remote_desc)
error ("remote rcmd is only available after target open");
! /* Send a NULL command across as an empty command */
if (command == NULL)
command = "";
! /* The query prefix */
strcpy (buf, "qRcmd,");
p = strchr (buf, '\0');
if ((strlen (buf) + strlen (command) * 2 + 8/*misc*/) > (rs->remote_packet_size))
error ("\"monitor\" command ``%s'' is too long\n", command);
! /* Encode the actual command */
bin2hex (command, p, 0);
if (putpkt (buf) < 0)
--- 5075,5092 ----
if (!remote_desc)
error ("remote rcmd is only available after target open");
! /* Send a NULL command across as an empty command. */
if (command == NULL)
command = "";
! /* The query prefix. */
strcpy (buf, "qRcmd,");
p = strchr (buf, '\0');
if ((strlen (buf) + strlen (command) * 2 + 8/*misc*/) > (rs->remote_packet_size))
error ("\"monitor\" command ``%s'' is too long\n", command);
! /* Encode the actual command. */
bin2hex (command, p, 0);
if (putpkt (buf) < 0)
*************** remote_rcmd (char *command,
*** 5053,5066 ****
/* get/display the response */
while (1)
{
! /* XXX - see also tracepoint.c:remote_get_noisy_reply() */
buf[0] = '\0';
getpkt (buf, (rs->remote_packet_size), 0);
if (buf[0] == '\0')
error ("Target does not support this command\n");
if (buf[0] == 'O' && buf[1] != 'K')
{
! remote_console_output (buf + 1); /* 'O' message from stub */
continue;
}
if (strcmp (buf, "OK") == 0)
--- 5095,5108 ----
/* get/display the response */
while (1)
{
! /* XXX - see also tracepoint.c:remote_get_noisy_reply(). */
buf[0] = '\0';
getpkt (buf, (rs->remote_packet_size), 0);
if (buf[0] == '\0')
error ("Target does not support this command\n");
if (buf[0] == 'O' && buf[1] != 'K')
{
! remote_console_output (buf + 1); /* 'O' message from stub. */
continue;
}
if (strcmp (buf, "OK") == 0)
*************** packet_command (char *args, int from_tty
*** 5103,5109 ****
}
#if 0
! /* --------- UNIT_TEST for THREAD oriented PACKETS ------------------------- */
static void display_thread_info (struct gdb_ext_thread_info *info);
--- 5145,5151 ----
}
#if 0
! /* --------- UNIT_TEST for THREAD oriented PACKETS ------------------- */
static void display_thread_info (struct gdb_ext_thread_info *info);
*************** static void threadalive_test (char *cmd,
*** 5113,5129 ****
static void threadlist_test_cmd (char *cmd, int tty);
! int get_and_display_threadinfo (threadref * ref);
static void threadinfo_test_cmd (char *cmd, int tty);
! static int thread_display_step (threadref * ref, void *context);
static void threadlist_update_test_cmd (char *cmd, int tty);
static void init_remote_threadtests (void);
! #define SAMPLE_THREAD 0x05060708 /* Truncated 64 bit threadid */
static void
threadset_test_cmd (char *cmd, int tty)
--- 5155,5171 ----
static void threadlist_test_cmd (char *cmd, int tty);
! int get_and_display_threadinfo (threadref *ref);
static void threadinfo_test_cmd (char *cmd, int tty);
! static int thread_display_step (threadref *ref, void *context);
static void threadlist_update_test_cmd (char *cmd, int tty);
static void init_remote_threadtests (void);
! #define SAMPLE_THREAD 0x05060708 /* Truncated 64 bit threadid. */
static void
threadset_test_cmd (char *cmd, int tty)
*************** threadalive_test (char *cmd, int tty)
*** 5146,5159 ****
printf_filtered ("FAIL: Thread alive test\n");
}
! void output_threadid (char *title, threadref * ref);
void
output_threadid (char *title, threadref *ref)
{
char hexid[20];
! pack_threadid (&hexid[0], ref); /* Convert threead id into hex */
hexid[16] = 0;
printf_filtered ("%s %s\n", title, (&hexid[0]));
}
--- 5188,5201 ----
printf_filtered ("FAIL: Thread alive test\n");
}
! void output_threadid (char *title, threadref *ref);
void
output_threadid (char *title, threadref *ref)
{
char hexid[20];
! pack_threadid (&hexid[0], ref); /* Convert threead id into hex. */
hexid[16] = 0;
printf_filtered ("%s %s\n", title, (&hexid[0]));
}
*************** Specify the serial device it is connecte
*** 5330,5351 ****
static int
remote_can_async_p (void)
{
! /* We're async whenever the serial device is. */
return (current_target.to_async_mask_value) && serial_can_async_p (remote_desc);
}
static int
remote_is_async_p (void)
{
! /* We're async whenever the serial device is. */
return (current_target.to_async_mask_value) && serial_is_async_p (remote_desc);
}
/* Pass the SERIAL event on and up to the client. One day this code
will be able to delay notifying the client of an event until the
! point where an entire packet has been received. */
! static void (*async_client_callback) (enum inferior_event_type event_type, void *context);
static void *async_client_context;
static serial_event_ftype remote_async_serial_handler;
--- 5372,5394 ----
static int
remote_can_async_p (void)
{
! /* We're async whenever the serial device is. */
return (current_target.to_async_mask_value) && serial_can_async_p (remote_desc);
}
static int
remote_is_async_p (void)
{
! /* We're async whenever the serial device is. */
return (current_target.to_async_mask_value) && serial_is_async_p (remote_desc);
}
/* Pass the SERIAL event on and up to the client. One day this code
will be able to delay notifying the client of an event until the
! point where an entire packet has been received. */
! static void (*async_client_callback) (enum inferior_event_type event_type,
! void *context);
static void *async_client_context;
static serial_event_ftype remote_async_serial_handler;
*************** remote_async_serial_handler (struct seri
*** 5358,5364 ****
}
static void
! remote_async (void (*callback) (enum inferior_event_type event_type, void *context), void *context)
{
if (current_target.to_async_mask_value == 0)
internal_error (__FILE__, __LINE__,
--- 5401,5408 ----
}
static void
! remote_async (void (*callback) (enum inferior_event_type event_type,
! void *context), void *context)
{
if (current_target.to_async_mask_value == 0)
internal_error (__FILE__, __LINE__,
*************** remote_async (void (*callback) (enum inf
*** 5378,5390 ****
This are temporary targets, until it is all tested. Eventually
async support will be incorporated int the usual 'remote'
! target. */
static void
init_remote_async_ops (void)
{
remote_async_ops.to_shortname = "async";
! remote_async_ops.to_longname = "Remote serial target in async version of the gdb-specific protocol";
remote_async_ops.to_doc =
"Use a remote computer via a serial line, using a gdb-specific protocol.\n\
Specify the serial device it is connected to (e.g. /dev/ttya).";
--- 5422,5435 ----
This are temporary targets, until it is all tested. Eventually
async support will be incorporated int the usual 'remote'
! target. */
static void
init_remote_async_ops (void)
{
remote_async_ops.to_shortname = "async";
! remote_async_ops.to_longname =
! "Remote serial target in async version of the gdb-specific protocol";
remote_async_ops.to_doc =
"Use a remote computer via a serial line, using a gdb-specific protocol.\n\
Specify the serial device it is connected to (e.g. /dev/ttya).";
*************** build_remote_gdbarch_data (void)
*** 5478,5495 ****
remote_address_size = TARGET_ADDR_BIT;
}
! /* Saved pointer to previous owner of the new_objfile event. */
static void (*remote_new_objfile_chain) (struct objfile *);
! /* Function to be called whenever a new objfile (shlib) is detected. */
static void
remote_new_objfile (struct objfile *objfile)
{
! if (remote_desc != 0) /* Have a remote connection */
{
remote_check_symbols (objfile);
}
! /* Call predecessor on chain, if any. */
if (remote_new_objfile_chain != 0 &&
remote_desc == 0)
remote_new_objfile_chain (objfile);
--- 5523,5540 ----
remote_address_size = TARGET_ADDR_BIT;
}
! /* Saved pointer to previous owner of the new_objfile event. */
static void (*remote_new_objfile_chain) (struct objfile *);
! /* Function to be called whenever a new objfile (shlib) is detected. */
static void
remote_new_objfile (struct objfile *objfile)
{
! if (remote_desc != 0) /* Have a remote connection. */
{
remote_check_symbols (objfile);
}
! /* Call predecessor on chain, if any. */
if (remote_new_objfile_chain != 0 &&
remote_desc == 0)
remote_new_objfile_chain (objfile);
*************** _initialize_remote (void)
*** 5503,5509 ****
struct cmd_list_element *tmpcmd;
/* architecture specific data */
! remote_gdbarch_data_handle = gdbarch_data_register_post_init (init_remote_state);
/* Old tacky stuff. NOTE: This comes after the remote protocol so
that the remote protocol has been initialized. */
--- 5548,5555 ----
struct cmd_list_element *tmpcmd;
/* architecture specific data */
! remote_gdbarch_data_handle =
! gdbarch_data_register_post_init (init_remote_state);
/* Old tacky stuff. NOTE: This comes after the remote protocol so
that the remote protocol has been initialized. */
*************** _initialize_remote (void)
*** 5530,5549 ****
init_remote_threadtests ();
#endif
! /* set/show remote ... */
add_prefix_cmd ("remote", class_maintenance, set_remote_cmd, "\
Remote protocol specific variables\n\
Configure various remote-protocol specific variables such as\n\
the packets being used",
&remote_set_cmdlist, "set remote ",
! 0/*allow-unknown*/, &setlist);
add_prefix_cmd ("remote", class_maintenance, show_remote_cmd, "\
Remote protocol specific variables\n\
Configure various remote-protocol specific variables such as\n\
the packets being used",
&remote_show_cmdlist, "show remote ",
! 0/*allow-unknown*/, &showlist);
add_cmd ("compare-sections", class_obscure, compare_sections_command,
"Compare section data on target to the exec file.\n\
--- 5576,5595 ----
init_remote_threadtests ();
#endif
! /* set/show remote ... */
add_prefix_cmd ("remote", class_maintenance, set_remote_cmd, "\
Remote protocol specific variables\n\
Configure various remote-protocol specific variables such as\n\
the packets being used",
&remote_set_cmdlist, "set remote ",
! 0 /* allow-unknown */, &setlist);
add_prefix_cmd ("remote", class_maintenance, show_remote_cmd, "\
Remote protocol specific variables\n\
Configure various remote-protocol specific variables such as\n\
the packets being used",
&remote_show_cmdlist, "show remote ",
! 0 /* allow-unknown */, &showlist);
add_cmd ("compare-sections", class_obscure, compare_sections_command,
"Compare section data on target to the exec file.\n\
*************** Whether to send break if interrupted is
*** 5567,5573 ****
NULL, NULL,
&setlist, &showlist);
! /* Install commands for configuring memory read/write packets. */
add_cmd ("remotewritesize", no_class, set_memory_write_packet_size,
"Set the maximum number of bytes per memory write packet (deprecated).\n",
--- 5613,5619 ----
NULL, NULL,
&setlist, &showlist);
! /* Install commands for configuring memory read/write packets. */
add_cmd ("remotewritesize", no_class, set_memory_write_packet_size,
"Set the maximum number of bytes per memory write packet (deprecated).\n",
*************** in a memory packet.\n",
*** 5633,5639 ****
1);
#if 0
/* XXXX - should ``set remotebinarydownload'' be retained for
! compatibility. */
deprecated_add_show_from_set
(add_set_cmd ("remotebinarydownload", no_class,
var_boolean, (char *) &remote_binary_download,
--- 5679,5685 ----
1);
#if 0
/* XXXX - should ``set remotebinarydownload'' be retained for
! compatibility. */
deprecated_add_show_from_set
(add_set_cmd ("remotebinarydownload", no_class,
var_boolean, (char *) &remote_binary_download,
*************** in a memory packet.\n",
*** 5711,5717 ****
&remote_set_cmdlist, &remote_show_cmdlist,
0);
! /* Keep the old ``set remote Z-packet ...'' working. */
add_setshow_auto_boolean_cmd ("Z-packet", class_obscure,
&remote_Z_packet_detect, "\
Set use of remote protocol `Z' packets", "\
--- 5757,5763 ----
&remote_set_cmdlist, &remote_show_cmdlist,
0);
! /* Keep the old ``set remote Z-packet ...'' working. */
add_setshow_auto_boolean_cmd ("Z-packet", class_obscure,
&remote_Z_packet_detect, "\
Set use of remote protocol `Z' packets", "\