From 238603485fefda11e6baa352ecb91f3781d5c32e Mon Sep 17 00:00:00 2001 From: Michael Snyder Date: Fri, 14 Jan 2005 01:46:08 +0000 Subject: [PATCH] 2005-01-13 Michael Snyder * remote.c: Whitespace tweaks. --- gdb/ChangeLog | 1 + gdb/remote.c | 640 +++++++++++++++++++++++++++----------------------- 2 files changed, 344 insertions(+), 297 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 77e7cbd927..e5e26a748c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -20,6 +20,7 @@ 2005-01-13 Michael Snyder + * remote.c: Whitespace tweaks. * remote-st.c: Whitespace tweaks. * remote-sim.c: Whitespace tweaks. * remote-mips.c: Whitespace tweaks. diff --git a/gdb/remote.c b/gdb/remote.c index 178c0a0b09..108b5e8820 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* See the GDB User Guide for details of the GDB remote protocol. */ +/* See the GDB User Guide for details of the GDB remote protocol. */ #include "defs.h" #include "gdb_string.h" @@ -56,7 +56,7 @@ #include "remote-fileio.h" -/* Prototypes for local functions */ +/* 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); @@ -206,7 +206,8 @@ struct packet_reg 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. */ + /* long size in bytes; == register_size (current_gdbarch, regnum); + at present. */ /* char *name; == REGISTER_NAME (regnum); at present. */ }; @@ -224,11 +225,11 @@ struct remote_state 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). */ + 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. */ + It is also used as a cap on the size of read/write packets. */ long remote_packet_size; }; @@ -265,7 +266,7 @@ init_remote_state (struct gdbarch *gdbarch) r->in_g_packet = (regnum < NUM_REGS); /* ...name = REGISTER_NAME (regnum); */ - /* Compute packet size by accumulating the size of all registers. */ + /* Compute packet size by accumulating the size of all registers. */ if (deprecated_register_bytes () == 0) rs->sizeof_g_packet += register_size (current_gdbarch, regnum); } @@ -276,7 +277,7 @@ init_remote_state (struct gdbarch *gdbarch) 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. */ + 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 @@ -284,11 +285,11 @@ init_remote_state (struct gdbarch *gdbarch) 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. */ + 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. */ + /* This one is filled in when a ``g'' packet is received. */ rs->actual_register_packet_size = 0; return rs; @@ -328,7 +329,7 @@ packet_reg_from_pnum (struct remote_state *rs, LONGEST pnum) to stop for a watchpoint. */ static CORE_ADDR remote_watch_data_address; -/* This is non-zero if taregt stopped for a watchpoint. */ +/* This is non-zero if taregt stopped for a watchpoint. */ static int remote_stopped_by_watchpoint_p; @@ -337,7 +338,7 @@ static struct target_ops remote_ops; static struct target_ops extended_remote_ops; /* Temporary target ops. Just like the remote_ops and - extended_remote_ops, but with asynchronous support. */ + extended_remote_ops, but with asynchronous support. */ static struct target_ops remote_async_ops; static struct target_ops extended_async_remote_ops; @@ -348,7 +349,7 @@ static struct target_ops extended_async_remote_ops; 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. */ + this can go away. */ static int wait_forever_enabled_p = 1; @@ -373,7 +374,7 @@ static struct serial *remote_desc = NULL; 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. */ + facilitate backward compatibility. */ static int remote_address_size; @@ -389,7 +390,7 @@ static int remote_async_terminal_ours_p; 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). */ + (Positive - a soft limit, negative - a hard limit). */ struct memory_packet_config { @@ -409,11 +410,11 @@ get_memory_packet_size (struct memory_packet_config *config) 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. */ + be lifted or removed. */ #ifndef MAX_REMOTE_PACKET_SIZE #define MAX_REMOTE_PACKET_SIZE 16384 #endif - /* NOTE: 16 is just chosen at random. */ + /* NOTE: 16 is just chosen at random. */ #ifndef MIN_REMOTE_PACKET_SIZE #define MIN_REMOTE_PACKET_SIZE 16 #endif @@ -428,11 +429,11 @@ get_memory_packet_size (struct memory_packet_config *config) else { what_they_get = (rs->remote_packet_size); - /* Limit the packet to the size specified by the user. */ + /* 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. */ + /* 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); @@ -445,7 +446,7 @@ get_memory_packet_size (struct memory_packet_config *config) } /* Update the size of a read/write packet. If they user wants - something really big then do a sanity check. */ + something really big then do a sanity check. */ static void set_memory_packet_size (char *args, struct memory_packet_config *config) @@ -470,12 +471,12 @@ set_memory_packet_size (char *args, struct memory_packet_config *config) /* 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. */ + large. */ if (size > MAX_REMOTE_PACKET_SIZE) error ("Invalid %s (too large).", config->name); #endif } - /* Extra checks? */ + /* Extra checks? */ if (fixed_p && !config->fixed_p) { if (! query ("The target may not be able to correctly handle a %s\n" @@ -483,7 +484,7 @@ set_memory_packet_size (char *args, struct memory_packet_config *config) config->name, size)) error ("Packet size not changed."); } - /* Update the config. */ + /* Update the config. */ config->fixed_p = fixed_p; config->size = size; } @@ -547,7 +548,7 @@ get_memory_read_packet_size (void) 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). */ + increased beyond (rs->remote_packet_size). */ if (size > (rs->remote_packet_size)) size = (rs->remote_packet_size); return size; @@ -556,7 +557,7 @@ get_memory_read_packet_size (void) /* 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. */ + as allowing GDB to auto-detect support in the remote stub. */ enum packet_support { @@ -574,7 +575,7 @@ struct packet_config }; /* Analyze a packet's return value and update the packet config - accordingly. */ + accordingly. */ enum packet_result { @@ -664,7 +665,7 @@ add_packet_config_cmd (struct packet_config *config, "", print, set_func, show_func, set_remote_list, show_remote_list); - /* set/show remote NAME-packet {auto,on,off} -- legacy */ + /* set/show remote NAME-packet {auto,on,off} -- legacy. */ if (legacy) { char *legacy_name; @@ -682,7 +683,7 @@ packet_ok (const char *buf, struct packet_config *config) if (buf[0] != '\0') { /* The stub recognized the packet request. Check that the - operation succeeded. */ + operation succeeded. */ switch (config->support) { case PACKET_SUPPORT_UNKNOWN: @@ -700,29 +701,29 @@ packet_ok (const char *buf, struct packet_config *config) break; } if (buf[0] == 'O' && buf[1] == 'K' && buf[2] == '\0') - /* "OK" - definitly OK. */ + /* "OK" - definitly OK. */ return PACKET_OK; if (buf[0] == 'E' && isxdigit (buf[1]) && isxdigit (buf[2]) && buf[3] == '\0') - /* "Enn" - definitly an error. */ + /* "Enn" - definitly an error. */ return PACKET_ERROR; - /* The packet may or may not be OK. Just assume it is */ + /* The packet may or may not be OK. Just assume it is. */ return PACKET_OK; } else { - /* The stub does not support the packet. */ + /* 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.. */ + 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. */ + /* The user set it wrong. */ error ("Enabled packet %s (%s) not recognized by stub", config->name, config->title); break; @@ -740,7 +741,7 @@ packet_ok (const char *buf, struct packet_config *config) } } -/* Should we try the 'vCont' (descriptive resume) request? */ +/* Should we try the 'vCont' (descriptive resume) request? */ static struct packet_config remote_protocol_vcont; static void @@ -757,7 +758,7 @@ show_remote_protocol_vcont_packet_cmd (char *args, int from_tty, show_packet_config_cmd (&remote_protocol_vcont); } -/* Should we try the 'qSymbol' (target symbol lookup service) request? */ +/* Should we try the 'qSymbol' (target symbol lookup service) request? */ static struct packet_config remote_protocol_qSymbol; static void @@ -807,7 +808,7 @@ enum Z_packet_type 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. */ + command callback should include a context argument. */ static void set_remote_protocol_Z_software_bp_packet_cmd (char *args, int from_tty, @@ -880,7 +881,7 @@ show_remote_protocol_Z_access_wp_packet_cmd (char *args, int from_tty, } /* For compatibility with older distributions. Provide a ``set remote - Z-packet ...'' command that updates all the Z packet types. */ + Z-packet ...'' command that updates all the Z packet types. */ static enum auto_boolean remote_Z_packet_detect; @@ -915,7 +916,7 @@ show_remote_protocol_Z_packet_cmd (char *args, int from_tty, 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). */ + only). */ static struct packet_config remote_protocol_binary_download; @@ -945,7 +946,7 @@ show_remote_protocol_binary_download_cmd (char *args, int from_tty, show_packet_config_cmd (&remote_protocol_binary_download); } -/* Should we try the 'qPart:auxv' (target auxiliary vector read) request? */ +/* Should we try the 'qPart:auxv' (target auxiliary vector read) request? */ static struct packet_config remote_protocol_qPart_auxv; static void @@ -980,7 +981,7 @@ show_remote_protocol_p_packet_cmd (char *args, int from_tty, -/* Tokens for use by the asynchronous signal handlers for SIGINT */ +/* Tokens for use by the asynchronous signal handlers for SIGINT. */ static void *sigint_remote_twice_token; static void *sigint_remote_token; @@ -1078,25 +1079,29 @@ remote_thread_alive (ptid_t ptid) /* 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 */ +/* 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 */ +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 */ + 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 */ + 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 @@ -1111,7 +1116,7 @@ struct gdb_ext_thread_info #define TAG_THREADNAME 8 #define TAG_MOREDISPLAY 16 -#define BUF_THREAD_ID_SIZE (OPAQUETHREADBYTES*2) +#define BUF_THREAD_ID_SIZE (OPAQUETHREADBYTES * 2) char *unpack_varlen_hex (char *buff, ULONGEST *result); @@ -1119,7 +1124,7 @@ static char *unpack_nibble (char *buf, int *val); static char *pack_nibble (char *buf, int nibble); -static char *pack_hex_byte (char *pkt, int /*unsigned char */ byte); +static char *pack_hex_byte (char *pkt, int /* unsigned char */ byte); static char *unpack_byte (char *buf, int *value); @@ -1129,52 +1134,56 @@ static char *unpack_int (char *buf, int *value); static char *unpack_string (char *src, char *dest, int length); -static char *pack_threadid (char *pkt, threadref * id); +static char *pack_threadid (char *pkt, threadref *id); -static char *unpack_threadid (char *inbuf, threadref * id); +static char *unpack_threadid (char *inbuf, threadref *id); -void int_to_threadref (threadref * id, int value); +void int_to_threadref (threadref *id, int value); -static int threadref_to_int (threadref * ref); +static int threadref_to_int (threadref *ref); -static void copy_threadref (threadref * dest, threadref * src); +static void copy_threadref (threadref *dest, threadref *src); -static int threadmatch (threadref * dest, threadref * src); +static int threadmatch (threadref *dest, threadref *src); -static char *pack_threadinfo_request (char *pkt, int mode, threadref * id); +static char *pack_threadinfo_request (char *pkt, int mode, + threadref *id); static int remote_unpack_thread_info_response (char *pkt, - threadref * expectedref, + threadref *expectedref, struct gdb_ext_thread_info *info); -static int remote_get_threadinfo (threadref * threadid, int fieldset, /*TAG mask */ +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); + threadref *nextthread); static int parse_threadlist_response (char *pkt, int result_limit, - threadref * original_echo, - threadref * resultlist, int *doneflag); + threadref *original_echo, + threadref *resultlist, + int *doneflag); static int remote_get_threadlist (int startflag, - threadref * nextthread, + threadref *nextthread, int result_limit, int *done, - int *result_count, threadref * threadlist); + int *result_count, + threadref *threadlist); -typedef int (*rmt_thread_action) (threadref * ref, void *context); +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); +static int remote_newthread_step (threadref *ref, void *context); -/* encode 64 bits in 16 chars of hex */ +/* Encode 64 bits in 16 chars of hex. */ static const char hexchars[] = "0123456789abcdef"; @@ -1291,7 +1300,7 @@ unpack_int (char *buf, int *value) return buf + 8; } -#if 0 /* currently unused, uncomment when needed */ +#if 0 /* Currently unused, uncomment when needed. */ static char *pack_string (char *pkt, char *string); static char * @@ -1302,13 +1311,13 @@ pack_string (char *pkt, char *string) len = strlen (string); if (len > 200) - len = 200; /* Bigger than most GDB packets, junk??? */ + 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 */ + ch = '*'; /* Protect encapsulation. */ *pkt++ = ch; } return pkt; @@ -1408,7 +1417,7 @@ copy_threadref (threadref *dest, threadref *src) static int threadmatch (threadref *dest, threadref *src) { - /* things are broken right now, so just assume we got a match */ + /* Things are broken right now, so just assume we got a match. */ #if 0 unsigned char *srcp, *destp; int i, result; @@ -1436,25 +1445,25 @@ threadmatch (threadref *dest, threadref *src) 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++ = 'q'; /* Info Query */ + *pkt++ = 'P'; /* process or thread info */ + pkt = pack_int (pkt, mode); /* mode */ pkt = pack_threadid (pkt, id); /* threadid */ - *pkt = '\0'; /* terminate */ + *pkt = '\0'; /* terminate */ return pkt; } -/* These values tag the fields in a thread info response packet */ +/* 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 */ + add more fields as time goes by. */ -#define TAG_THREADID 1 /* Echo the thread identifier */ +#define TAG_THREADID 1 /* Echo the thread identifier. */ #define TAG_EXISTS 2 /* Is this process defined enough to - fetch registers and its stack */ + 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_THREADNAME 8 /* string, maps 1-to-1 with a thread is. */ #define TAG_MOREDISPLAY 16 /* Whatever the kernel wants to say about - the process */ + the process. */ static int remote_unpack_thread_info_response (char *pkt, threadref *expectedref, @@ -1467,32 +1476,34 @@ remote_unpack_thread_info_response (char *pkt, threadref *expectedref, char *limit = pkt + (rs->remote_packet_size); /* plausable parsing limit */ int retval = 1; - /* info->threadid = 0; FIXME: implement zero_threadref */ + /* 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 */ + /* 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 */ + { /* 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 */ + /* Loop on tagged fields , try to bail if somthing goes wrong. */ - while ((pkt < limit) && mask && *pkt) /* packets are terminated with nulls */ + /* 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 */ + pkt = unpack_byte (pkt, &length); /* length */ + if (!(tag & mask)) /* Tags out of synch with mask. */ { warning ("ERROR RMT: threadinfo tag mismatch\n"); retval = 0; @@ -1542,7 +1553,7 @@ remote_unpack_thread_info_response (char *pkt, threadref *expectedref, continue; } warning ("ERROR RMT: unknown thread info tag\n"); - break; /* Not a tag we know about */ + break; /* Not a tag we know about. */ } return retval; } @@ -1558,8 +1569,8 @@ remote_get_threadinfo (threadref *threadid, int fieldset, /* TAG mask */ 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); + result = remote_unpack_thread_info_response (threadinfo_pkt + 2, + threadid, info); return result; } @@ -1571,7 +1582,7 @@ pack_threadlist_request (char *pkt, int startflag, int threadcount, { *pkt++ = 'q'; /* info query packet */ *pkt++ = 'L'; /* Process LIST or threadLIST request */ - pkt = pack_nibble (pkt, startflag); /* initflag 1 bytes */ + 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'; @@ -1591,7 +1602,8 @@ parse_threadlist_response (char *pkt, int result_limit, 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 */ + 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. */ @@ -1617,7 +1629,7 @@ remote_get_threadlist (int startflag, threadref *nextthread, int result_limit, char *t_response = alloca (rs->remote_packet_size); int result = 1; - /* Trancate result limit to be smaller than the packet size */ + /* 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; @@ -1632,8 +1644,8 @@ remote_get_threadlist (int startflag, threadref *nextthread, int result_limit, if (!threadmatch (&echo_nextthread, nextthread)) { - /* FIXME: This is a good reason to drop the packet */ - /* Possably, there is a duplicate response */ + /* 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 @@ -1641,7 +1653,7 @@ remote_get_threadlist (int startflag, threadref *nextthread, int result_limit, wait for packet, then exit */ warning ("HMM: threadlist did not echo arg thread, dropping it\n"); - return 0; /* I choose simply exiting */ + return 0; /* I choose simply exiting. */ } if (*result_count <= 0) { @@ -1661,7 +1673,8 @@ remote_get_threadlist (int startflag, threadref *nextthread, int result_limit, return result; } -/* This is the interface between remote and threads, remotes upper interface */ +/* 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, @@ -1670,7 +1683,7 @@ remote_get_threadlist (int startflag, threadref *nextthread, int result_limit, quit_flag is required. */ -/* About this many threadisds fit in a packet. */ +/* About this many threadisds fit in a packet. */ #define MAXTHREADLISTRESULTS 32 @@ -1700,7 +1713,7 @@ remote_threadlist_iterator (rmt_thread_action stepfunction, void *context, result = 0; break; } - /* clear for later iterations */ + /* Clear for later iterations. */ startflag = 0; /* Setup to resume next batch of thread references, set nextthread. */ if (result_count >= 1) @@ -1807,7 +1820,7 @@ remote_threads_info (void) } } - /* Else fall back to old method based on jmetzler protocol. */ + /* Else fall back to old method based on jmetzler protocol. */ use_threadinfo_query = 0; remote_find_new_threads (); return; @@ -1830,7 +1843,7 @@ remote_threads_extra_info (struct thread_info *tp) int set; threadref id; struct gdb_ext_thread_info threadinfo; - static char display_buf[100]; /* arbitrary... */ + static char display_buf[100]; /* arbitrary... */ char *bufp = alloca (rs->remote_packet_size); int n = 0; /* position in display_buf */ @@ -1870,7 +1883,7 @@ remote_threads_extra_info (struct thread_info *tp) if (n > 0) { - /* for purely cosmetic reasons, clear up trailing commas */ + /* For purely cosmetic reasons, clear up trailing commas. */ if (',' == display_buf[n-1]) display_buf[n-1] = ' '; return display_buf; @@ -1911,7 +1924,7 @@ remote_close (int quitting) remote_desc = NULL; } -/* Query the remote side for the text, data and bss offsets. */ +/* Query the remote side for the text, data and bss offsets. */ static void get_offsets (void) @@ -1929,7 +1942,7 @@ get_offsets (void) if (buf[0] == '\000') return; /* Return silently. Stub doesn't support - this command. */ + this command. */ if (buf[0] == 'E') { warning ("Remote failure reply: %s", buf); @@ -2000,7 +2013,7 @@ get_offsets (void) static int remote_start_remote_dummy (struct ui_out *uiout, void *dummy) { - start_remote (); /* Initialize gdb process mechanisms */ + start_remote (); /* Initialize gdb process mechanisms. */ /* NOTE: Return something >=0. A -ve value is reserved for catch_exceptions. */ return 1; @@ -2009,7 +2022,7 @@ remote_start_remote_dummy (struct ui_out *uiout, void *dummy) static int remote_start_remote (struct ui_out *uiout, void *dummy) { - immediate_quit++; /* Allow user to interrupt it */ + immediate_quit++; /* Allow user to interrupt it. */ /* Ack any packet which the remote side has already sent. */ serial_write (remote_desc, "+", 1); @@ -2019,9 +2032,9 @@ remote_start_remote (struct ui_out *uiout, void *dummy) inferior_ptid = remote_current_thread (inferior_ptid); - get_offsets (); /* Get text, data & bss offsets */ + get_offsets (); /* Get text, data & bss offsets. */ - putpkt ("?"); /* initiate a query from remote machine */ + putpkt ("?"); /* Initiate a query from remote machine. */ immediate_quit--; /* NOTE: See comment above in remote_start_remote_dummy(). This @@ -2038,7 +2051,7 @@ remote_open (char *name, int from_tty) remote_open_1 (name, from_tty, &remote_ops, 0, 0); } -/* Just like remote_open, but with asynchronous support. */ +/* Just like remote_open, but with asynchronous support. */ static void remote_async_open (char *name, int from_tty) { @@ -2055,7 +2068,7 @@ extended_remote_open (char *name, int from_tty) 0 /* async_p */); } -/* Just like extended_remote_open, but with asynchronous support. */ +/* Just like extended_remote_open, but with asynchronous support. */ static void extended_remote_async_open (char *name, int from_tty) { @@ -2076,12 +2089,12 @@ init_all_packet_configs (void) 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. */ + downloading. */ update_packet_config (&remote_protocol_binary_download); update_packet_config (&remote_protocol_qPart_auxv); } -/* Symbol look-up. */ +/* Symbol look-up. */ static void remote_check_symbols (struct objfile *objfile) @@ -2097,7 +2110,7 @@ remote_check_symbols (struct objfile *objfile) msg = alloca (rs->remote_packet_size); reply = alloca (rs->remote_packet_size); - /* Invite target to request symbol lookups. */ + /* Invite target to request symbol lookups. */ putpkt ("qSymbol::"); getpkt (reply, (rs->remote_packet_size), 0); @@ -2151,7 +2164,7 @@ remote_open_1 (char *name, int from_tty, struct target_ops *target, "serial device is attached to the remote system\n" "(e.g. /dev/ttyS0, /dev/ttya, COM1, etc.)."); - /* See FIXME above */ + /* See FIXME above. */ if (!async_p) wait_forever_enabled_p = 1; @@ -2192,7 +2205,7 @@ remote_open_1 (char *name, int from_tty, struct target_ops *target, puts_filtered (name); puts_filtered ("\n"); } - push_target (target); /* Switch to using remote target now */ + push_target (target); /* Switch to using remote target now. */ init_all_packet_configs (); @@ -2214,7 +2227,7 @@ remote_open_1 (char *name, int from_tty, struct target_ops *target, if (async_p) { - /* With this target we start out by owning the terminal. */ + /* 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 @@ -2223,12 +2236,12 @@ remote_open_1 (char *name, int from_tty, struct target_ops *target, 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. */ + implemented. */ wait_forever_enabled_p = 0; } #ifdef SOLIB_CREATE_INFERIOR_HOOK - /* First delete any symbols previously loaded from shared libraries. */ + /* First delete any symbols previously loaded from shared libraries. */ no_shared_libraries (NULL, 0); #endif @@ -2277,8 +2290,8 @@ remote_open_1 (char *name, int from_tty, struct target_ops *target, 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. */ + /* 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); @@ -2304,7 +2317,7 @@ remote_detach (char *args, int from_tty) strcpy (buf, "D"); remote_send (buf, (rs->remote_packet_size)); - /* Unregister the file descriptor from the event loop. */ + /* Unregister the file descriptor from the event loop. */ if (target_is_async_p ()) serial_async (remote_desc, NULL, 0); @@ -2324,7 +2337,7 @@ remote_disconnect (char *args, int from_tty) if (args) error ("Argument given to \"detach\" when remotely debugging."); - /* Unregister the file descriptor from the event loop. */ + /* Unregister the file descriptor from the event loop. */ if (target_is_async_p ()) serial_async (remote_desc, NULL, 0); @@ -2358,7 +2371,7 @@ hex2bin (const char *hex, char *bin, int count) 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 the count that has been converted so far. */ return i; } *bin++ = fromhex (hex[0]) * 16 + fromhex (hex[1]); @@ -2382,7 +2395,7 @@ static int bin2hex (const char *bin, char *hex, int count) { int i; - /* May use a length, or a nul-terminated string as input. */ + /* May use a length, or a nul-terminated string as input. */ if (count == 0) count = strlen (bin); @@ -2552,9 +2565,9 @@ remote_resume (ptid_t ptid, int step, enum target_signal siggnal) /* All other supported resume packets do use Hc, so call set_thread. */ if (pid == -1) - set_thread (0, 0); /* run any thread */ + set_thread (0, 0); /* Run any thread. */ else - set_thread (pid, 0); /* run this thread */ + set_thread (pid, 0); /* Run this thread. */ if (siggnal != TARGET_SIGNAL_0) { @@ -2569,7 +2582,7 @@ remote_resume (ptid_t ptid, int step, enum target_signal siggnal) putpkt (buf); } -/* Same as remote_resume, but with async support. */ +/* Same as remote_resume, but with async support. */ static void remote_async_resume (ptid_t ptid, int step, enum target_signal siggnal) { @@ -2578,13 +2591,13 @@ remote_async_resume (ptid_t ptid, int step, enum target_signal siggnal) /* 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.*/ + 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. */ + NOT asynchronously. */ if (target_can_async_p ()) target_async (inferior_event_handler, 0); - /* Tell the world that the target is now executing. */ + /* 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 @@ -2595,7 +2608,7 @@ remote_async_resume (ptid_t ptid, int step, enum target_signal siggnal) /* Set up the signal handler for SIGINT, while the target is - executing, ovewriting the 'regular' SIGINT signal handler. */ + executing, ovewriting the 'regular' SIGINT signal handler. */ static void initialize_sigint_signal_handler (void) { @@ -2604,7 +2617,7 @@ initialize_sigint_signal_handler (void) signal (SIGINT, handle_remote_sigint); } -/* Signal handler for SIGINT, while the target is executing. */ +/* Signal handler for SIGINT, while the target is executing. */ static void handle_remote_sigint (int sig) { @@ -2616,7 +2629,7 @@ handle_remote_sigint (int sig) /* 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. */ + a ^C. */ static void handle_remote_sigint_twice (int sig) { @@ -2627,7 +2640,7 @@ handle_remote_sigint_twice (int sig) } /* Perform the real interruption of the target execution, in response - to a ^C. */ + to a ^C. */ static void async_remote_interrupt (gdb_client_data arg) { @@ -2638,14 +2651,14 @@ async_remote_interrupt (gdb_client_data arg) } /* Perform interrupt, if the first attempt did not succeed. Just give - up on the target alltogether. */ + 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. */ + cntl-C. */ if (target_executing) { interrupt_query (); @@ -2654,15 +2667,17 @@ async_remote_interrupt_twice (gdb_client_data arg) } /* Reinstall the usual SIGINT handlers, after the target has - stopped. */ + 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); + 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); + 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 @@ -2673,11 +2688,11 @@ static void (*ofunc) (int); 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. */ + 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. */ + /* If this doesn't work, try more severe steps. */ signal (signo, remote_interrupt_twice); if (remote_debug) @@ -2698,7 +2713,7 @@ remote_interrupt_twice (int signo) /* 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. */ + will eventually end up here. */ static void remote_stop (void) { @@ -2732,7 +2747,7 @@ Give up (and stop debugging it)? ")) /* 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. */ + is required. */ static void remote_async_terminal_inferior (void) @@ -2741,7 +2756,7 @@ remote_async_terminal_inferior (void) 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. */ + consequently should not call this code. */ if (!sync_execution) return; /* FIXME: cagney/1999-09-27: Closely related to the above. Make @@ -2757,16 +2772,16 @@ remote_async_terminal_inferior (void) 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. */ + passed on down to the target. */ } static void remote_async_terminal_ours (void) { - /* See FIXME in remote_async_terminal_inferior. */ + /* See FIXME in remote_async_terminal_inferior. */ if (!sync_execution) return; - /* See FIXME in remote_async_terminal_inferior. */ + /* See FIXME in remote_async_terminal_inferior. */ if (remote_async_terminal_ours_p) return; cleanup_sigint_signal_handler (NULL); @@ -2827,18 +2842,18 @@ remote_wait (ptid_t ptid, struct target_waitstatus *status) switch (buf[0]) { - case 'E': /* Error of some sort */ + case 'E': /* Error of some sort. */ warning ("Remote failure reply: %s", buf); continue; - case 'F': /* File-I/O request */ + case 'F': /* File-I/O request. */ remote_fileio_request (buf); continue; - case 'T': /* Status with PC, SP, FP, ... */ + case 'T': /* Status with PC, SP, FP, ... */ { int i; char regs[MAX_REGISTER_SIZE]; - /* Expedited reply, containing Signal, {regno, reg} repeat */ + /* Expedited reply, containing Signal, {regno, reg} repeat. */ /* format is: 'Tssn...:r...;n...:r...;n...:r...;#cc', where ss = signal number n... = register number @@ -2853,12 +2868,12 @@ remote_wait (ptid_t ptid, struct target_waitstatus *status) 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 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 this packet is an awatch packet, don't parse the + 'a' as a register number. */ if (strncmp (p, "awatch", strlen("awatch")) != 0) { @@ -2869,7 +2884,7 @@ remote_wait (ptid_t ptid, struct target_waitstatus *status) else p1 = p; - if (p1 == p) /* No register number present here */ + if (p1 == p) /* No register number present here. */ { p1 = (unsigned char *) strchr (p, ':'); if (p1 == NULL) @@ -2904,26 +2919,33 @@ Packet: '%s'\n", p = p1; if (*p++ != ':') - error ("Malformed packet(b) (missing colon): %s\nPacket: '%s'\n", + error ("Malformed packet(b) (missing colon): %s\n\ +Packet: '%s'\n", p, buf); if (reg == NULL) - error ("Remote sent bad register number %s: %s\nPacket: '%s'\n", + 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)); + fieldsize = hex2bin (p, regs, + register_size (current_gdbarch, + reg->regnum)); p += 2 * fieldsize; - if (fieldsize < register_size (current_gdbarch, reg->regnum)) + if (fieldsize < register_size (current_gdbarch, + reg->regnum)) warning ("Remote reply is too short: %s", buf); - regcache_raw_supply (current_regcache, reg->regnum, regs); + regcache_raw_supply (current_regcache, + reg->regnum, regs); } if (*p++ != ';') - error ("Remote register badly formatted: %s\nhere: %s", buf, p); + error ("Remote register badly formatted: %s\nhere: %s", + buf, p); } } /* fall through */ - case 'S': /* Old style status, just signal only */ + 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]))); @@ -2934,7 +2956,7 @@ Packet: '%s'\n", record_currthread (thread_num); } goto got_status; - case 'W': /* Target exited */ + case 'W': /* Target exited. */ { /* The remote process exited. */ status->kind = TARGET_WAITKIND_EXITED; @@ -2948,7 +2970,7 @@ Packet: '%s'\n", kill_kludge = 1; goto got_status; - case 'O': /* Console output */ + case 'O': /* Console output. */ remote_console_output (buf + 1); continue; case '\0': @@ -2981,7 +3003,7 @@ got_status: return inferior_ptid; } -/* Async version of remote_wait. */ +/* Async version of remote_wait. */ static ptid_t remote_async_wait (ptid_t ptid, struct target_waitstatus *status) { @@ -3004,7 +3026,7 @@ remote_async_wait (ptid_t ptid, struct target_waitstatus *status) /* 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. */ + 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); @@ -3016,18 +3038,18 @@ remote_async_wait (ptid_t ptid, struct target_waitstatus *status) switch (buf[0]) { - case 'E': /* Error of some sort */ + case 'E': /* Error of some sort. */ warning ("Remote failure reply: %s", buf); continue; - case 'F': /* File-I/O request */ + case 'F': /* File-I/O request. */ remote_fileio_request (buf); continue; - case 'T': /* Status with PC, SP, FP, ... */ + case 'T': /* Status with PC, SP, FP, ... */ { int i; char regs[MAX_REGISTER_SIZE]; - /* Expedited reply, containing Signal, {regno, reg} repeat */ + /* Expedited reply, containing Signal, {regno, reg} repeat. */ /* format is: 'Tssn...:r...;n...:r...;n...:r...;#cc', where ss = signal number n... = register number @@ -3042,9 +3064,9 @@ remote_async_wait (ptid_t ptid, struct target_waitstatus *status) 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 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. */ @@ -3058,11 +3080,12 @@ remote_async_wait (ptid_t ptid, struct target_waitstatus *status) else p1 = p; - if (p1 == p) /* No register number present here */ + 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", + error ("Malformed packet(a) (missing colon): %s\n\ +Packet: '%s'\n", p, buf); if (strncmp (p, "thread", p1 - p) == 0) { @@ -3092,16 +3115,21 @@ remote_async_wait (ptid_t ptid, struct target_waitstatus *status) struct packet_reg *reg = packet_reg_from_pnum (rs, pnum); p = p1; if (*p++ != ':') - error ("Malformed packet(b) (missing colon): %s\nPacket: '%s'\n", + error ("Malformed packet(b) (missing colon): %s\n\ +Packet: '%s'\n", p, buf); if (reg == NULL) - error ("Remote sent bad register number %ld: %s\nPacket: '%s'\n", + 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)); + fieldsize = hex2bin (p, regs, + register_size (current_gdbarch, + reg->regnum)); p += 2 * fieldsize; - if (fieldsize < register_size (current_gdbarch, reg->regnum)) + if (fieldsize < register_size (current_gdbarch, + reg->regnum)) warning ("Remote reply is too short: %s", buf); regcache_raw_supply (current_regcache, reg->regnum, regs); } @@ -3112,7 +3140,7 @@ remote_async_wait (ptid_t ptid, struct target_waitstatus *status) } } /* fall through */ - case 'S': /* Old style status, just signal only */ + 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]))); @@ -3123,7 +3151,7 @@ remote_async_wait (ptid_t ptid, struct target_waitstatus *status) record_currthread (thread_num); } goto got_status; - case 'W': /* Target exited */ + case 'W': /* Target exited. */ { /* The remote process exited. */ status->kind = TARGET_WAITKIND_EXITED; @@ -3137,10 +3165,10 @@ remote_async_wait (ptid_t ptid, struct target_waitstatus *status) kill_kludge = 1; goto got_status; - case 'O': /* Console output */ + 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. */ + still be waiting on the inferior afterwards. */ status->kind = TARGET_WAITKIND_IGNORE; goto got_status; case '\0': @@ -3214,7 +3242,7 @@ fetch_register_using_p (int regnum) { if (p[1] == 0) { - error("fetch_register_using_p: early buf termination"); + error ("fetch_register_using_p: early buf termination"); return 0; } @@ -3276,7 +3304,7 @@ remote_fetch_registers (int regnum) /* 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. */ + target can safely receive. */ if ((rs->actual_register_packet_size) == 0) (rs->actual_register_packet_size) = strlen (buf); @@ -3288,7 +3316,7 @@ remote_fetch_registers (int regnum) 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 */ + && buf[0] != 'x') /* New: unavailable register value. */ { if (remote_debug) fprintf_unfiltered (gdb_stdlog, @@ -3384,7 +3412,7 @@ remote_prepare_to_store (void) } /* Helper: Attempt to store REGNUM using the P packet. Return fail IFF - packet was not recognized. */ + packet was not recognized. */ static int store_register_using_P (int regnum) @@ -3407,8 +3435,8 @@ store_register_using_P (int regnum) } -/* Store register REGNUM, or all registers if REGNUM == -1, from the contents - of the register cache buffer. FIXME: ignores errors. */ +/* 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) @@ -3516,7 +3544,7 @@ hexnumnstr (char *buf, ULONGEST num, int width) return width; } -/* Mask all but the least significant REMOTE_ADDRESS_SIZE bits. */ +/* Mask all but the least significant REMOTE_ADDRESS_SIZE bits. */ static CORE_ADDR remote_address_masked (CORE_ADDR addr) @@ -3525,7 +3553,7 @@ remote_address_masked (CORE_ADDR addr) && remote_address_size < (sizeof (ULONGEST) * 8)) { /* Only create a mask when that mask can safely be constructed - in a ULONGEST variable. */ + in a ULONGEST variable. */ ULONGEST mask = 1; mask = (mask << remote_address_size) - 1; addr &= mask; @@ -3536,12 +3564,13 @@ remote_address_masked (CORE_ADDR addr) /* 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. + 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". */ + X-packet". */ static void check_binary_download (CORE_ADDR addr) @@ -3595,7 +3624,7 @@ check_binary_download (CORE_ADDR addr) LEN is the number of bytes. Returns number of bytes transferred, or 0 (setting errno) for - error. Only transfer a single packet. */ + error. Only transfer a single packet. */ int remote_write_bytes (CORE_ADDR memaddr, char *myaddr, int len) @@ -3614,7 +3643,7 @@ remote_write_bytes (CORE_ADDR memaddr, char *myaddr, int len) check_binary_download (memaddr); /* Compute the size, and then allocate space for the largest - possible packet. Include space for an extra trailing NUL. */ + possible packet. Include space for an extra trailing NULL. */ sizeof_buf = get_memory_write_packet_size () + 1; buf = alloca (sizeof_buf); @@ -3627,18 +3656,18 @@ remote_write_bytes (CORE_ADDR memaddr, char *myaddr, int len) /* Construct the packet header: "[MX],:". */ /* Append "[XM]". Compute a best guess of the number of bytes - actually transfered. */ + actually transfered. */ p = buf; switch (remote_protocol_binary_download.support) { case PACKET_ENABLE: *p++ = 'X'; - /* Best guess at number of bytes that will fit. */ + /* 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 */ + /* Num bytes that will fit. */ todo = min (len, payload_size / 2); break; case PACKET_SUPPORT_UNKNOWN: @@ -3682,7 +3711,7 @@ remote_write_bytes (CORE_ADDR memaddr, char *myaddr, int len) case '$': case '#': case 0x7d: - /* These must be escaped */ + /* These must be escaped. */ *p++ = 0x7d; *p++ = (myaddr[nr_bytes] & 0xff) ^ 0x20; break; @@ -3728,8 +3757,8 @@ remote_write_bytes (CORE_ADDR memaddr, char *myaddr, int len) return 0; } - /* Return NR_BYTES, not TODO, in case escape chars caused us to send fewer - bytes than we'd planned. */ + /* Return NR_BYTES, not TODO, in case escape chars caused us to send + fewer bytes than we'd planned. */ return nr_bytes; } @@ -3746,19 +3775,19 @@ remote_write_bytes (CORE_ADDR memaddr, char *myaddr, int len) 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. */ + 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 */ + int max_buf_size; /* Max size of packet output buffer. */ long sizeof_buf; int origlen; - /* Create a buffer big enough for this packet. */ + /* 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 */ + sizeof_buf = max_buf_size + 1; /* Space for trailing NULL. */ buf = alloca (sizeof_buf); origlen = len; @@ -3787,10 +3816,11 @@ remote_read_bytes (CORE_ADDR memaddr, char *myaddr, int len) && 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. */ + /* 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; } @@ -3802,7 +3832,7 @@ remote_read_bytes (CORE_ADDR memaddr, char *myaddr, int len) 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. */ + only part of what we wanted to. */ return i + (origlen - len); } myaddr += todo; @@ -3813,9 +3843,9 @@ remote_read_bytes (CORE_ADDR memaddr, char *myaddr, int len) } /* 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. */ + 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, @@ -3827,7 +3857,8 @@ remote_xfer_memory (CORE_ADDR mem_addr, char *buffer, int mem_len, int res; /* Should this be the selected frame? */ - gdbarch_remote_translate_xfer_address (current_gdbarch, current_regcache, + gdbarch_remote_translate_xfer_address (current_gdbarch, + current_regcache, mem_addr, mem_len, &targ_addr, &targ_len); if (targ_len <= 0) @@ -3850,7 +3881,8 @@ remote_files_info (struct target_ops *ignore) /* 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. */ +/* Read a single character from the remote end, masking it down to 7 + bits. */ static int readchar (int timeout) @@ -3909,9 +3941,10 @@ putpkt (char *buf) } /* 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 */ + 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) @@ -3959,7 +3992,7 @@ putpkt_binary (char *buf, int cnt) if (serial_write (remote_desc, buf2, p - buf2)) perror_with_name ("putpkt: write failed"); - /* read until either a timeout occurs (-2) or '+' is read */ + /* Read until either a timeout occurs (-2) or '+' is read. */ while (1) { ch = readchar (remote_timeout); @@ -3993,18 +4026,19 @@ putpkt_binary (char *buf, int cnt) tcount++; if (tcount > 3) return 0; - break; /* Retransmit buffer */ + break; /* Retransmit buffer. */ case '$': { if (remote_debug) - fprintf_unfiltered (gdb_stdlog, "Packet instead of Ack, ignoring it\n"); + 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 + */ + continue; /* Now, go look for +. */ } default: if (remote_debug) @@ -4018,7 +4052,7 @@ putpkt_binary (char *buf, int cnt) } continue; } - break; /* Here to retransmit */ + break; /* Here to retransmit. */ } #if 0 @@ -4043,7 +4077,7 @@ putpkt_binary (char *buf, int cnt) 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). */ + SERIAL status indications). */ static long read_frame (char *buf, @@ -4058,7 +4092,7 @@ read_frame (char *buf, while (1) { - /* ASSERT (bc < sizeof_buf - 1) - space for trailing NUL */ + /* ASSERT (bc < sizeof_buf - 1) - space for trailing NULL. */ c = readchar (remote_timeout); switch (c) { @@ -4070,7 +4104,7 @@ read_frame (char *buf, 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 */ + return -1; /* Start a new packet, count retries. */ case '#': { unsigned char pktcsum; @@ -4086,13 +4120,15 @@ read_frame (char *buf, if (check_0 == SERIAL_TIMEOUT || check_1 == SERIAL_TIMEOUT) { if (remote_debug) - fputs_filtered ("Timeout in checksum, retrying\n", gdb_stdlog); + 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); + fputs_filtered ("Communication error in checksum\n", + gdb_stdlog); return -1; } @@ -4109,19 +4145,19 @@ read_frame (char *buf, fputs_filtered ("\n", gdb_stdlog); } /* Number of characters in buffer ignoring trailing - NUL. */ + NULL. */ return -1; } - case '*': /* Run length encoding */ + case '*': /* Run length encoding. */ { int repeat; csum += c; c = readchar (remote_timeout); csum += c; - repeat = c - ' ' + 3; /* Compute repeat count */ + repeat = c - ' ' + 3; /* Compute repeat count. */ - /* The character before ``*'' is repeated. */ + /* The character before ``*'' is repeated. */ if (repeat > 0 && repeat <= 255 && bc > 0 @@ -4133,7 +4169,8 @@ read_frame (char *buf, } buf[bc] = '\0'; - printf_filtered ("Repeat count %d too large for buffer: ", repeat); + printf_filtered ("Repeat count %d too large for buffer: ", + repeat); puts_filtered (buf); puts_filtered ("\n"); return -1; @@ -4163,7 +4200,7 @@ read_frame (char *buf, /* 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. */ + thing to do it for those. */ void getpkt (char *buf, long sizeof_buf, @@ -4180,7 +4217,7 @@ getpkt (char *buf, 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. */ + the caller. */ static int getpkt_sane (char *buf, long sizeof_buf, @@ -4206,12 +4243,14 @@ getpkt_sane (char *buf, 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. */ + 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. */ + /* 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 { @@ -4219,7 +4258,7 @@ getpkt_sane (char *buf, if (c == SERIAL_TIMEOUT) { - if (forever) /* Watchdog went off? Kill the target. */ + if (forever) /* Watchdog went off? Kill the target. */ { QUIT; target_mourn_inferior (); @@ -4253,7 +4292,8 @@ getpkt_sane (char *buf, serial_write (remote_desc, "-", 1); } - /* We have tried hard enough, and just can't receive the packet. Give up. */ + /* 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); @@ -4281,11 +4321,11 @@ remote_kill (void) target_mourn_inferior (); } -/* Async version of remote_kill. */ +/* Async version of remote_kill. */ static void remote_async_kill (void) { - /* Unregister the file descriptor from the event loop. */ + /* Unregister the file descriptor from the event loop. */ if (target_is_async_p ()) serial_async (remote_desc, NULL, 0); @@ -4298,8 +4338,8 @@ remote_async_kill (void) return; } - /* Use catch_errors so the user can quit from gdb even when we aren't on - speaking terms with the remote system. */ + /* 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 @@ -4348,8 +4388,8 @@ remote_mourn_1 (struct target_ops *target) we're debugging, arguments and an environment. */ static void -extended_remote_create_inferior (char *exec_file, char *args, char **env, - int from_tty) +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. */ @@ -4369,17 +4409,17 @@ extended_remote_create_inferior (char *exec_file, char *args, char **env, proceed (-1, TARGET_SIGNAL_0, 0); } -/* Async version of extended_remote_create_inferior. */ +/* Async version of extended_remote_create_inferior. */ static void -extended_remote_async_create_inferior (char *exec_file, char *args, char **env, - int from_tty) +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. */ + with the event loop. */ if (target_can_async_p ()) target_async (inferior_event_handler, 0); @@ -4447,7 +4487,7 @@ remote_insert_breakpoint (CORE_ADDR addr, char *contents_cache) /* 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. */ + report an error, otherwise, mark it disabled and go on. */ if (remote_protocol_Z[Z_PACKET_SOFTWARE_BP].support != PACKET_DISABLE) { @@ -4769,7 +4809,7 @@ push_remote_target (char *name, int from_tty) remote_open (name, from_tty); } -/* Table used by the crc32 function to calcuate the checksum. */ +/* Table used by the crc32 function to calcuate the checksum. */ static unsigned long crc32_table[256] = {0, 0}; @@ -4779,7 +4819,7 @@ crc32 (unsigned char *buf, int len, unsigned int crc) { if (!crc32_table[1]) { - /* Initialize the CRC table and the decoding table. */ + /* Initialize the CRC table and the decoding table. */ int i, j; unsigned int c; @@ -4809,7 +4849,7 @@ crc32 (unsigned char *buf, int len, unsigned int crc) /* 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. */ + generic_load()) to make use of this target functionality. */ static void compare_sections_command (char *args, int from_tty) @@ -4849,11 +4889,12 @@ compare_sections_command (char *args, int from_tty) matched = 1; /* do this section */ lma = s->lma; - /* FIXME: assumes lma can fit into long */ + /* 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 */ + /* 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); @@ -4987,7 +5028,7 @@ remote_xfer_partial (struct target_ops *ops, enum target_object object, return -1; len = rs->remote_packet_size; - /* except for querying the minimum buffer size, target must be open */ + /* Except for querying the minimum buffer size, target must be open. */ if (!remote_desc) error ("remote query is only available after target open"); @@ -4997,10 +5038,11 @@ remote_xfer_partial (struct target_ops *ops, enum target_object object, *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 */ + /* 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))) { @@ -5033,18 +5075,18 @@ remote_rcmd (char *command, if (!remote_desc) error ("remote rcmd is only available after target open"); - /* Send a NULL command across as an empty command */ + /* Send a NULL command across as an empty command. */ if (command == NULL) command = ""; - /* The query prefix */ + /* 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 */ + /* Encode the actual command. */ bin2hex (command, p, 0); if (putpkt (buf) < 0) @@ -5053,14 +5095,14 @@ remote_rcmd (char *command, /* get/display the response */ while (1) { - /* XXX - see also tracepoint.c:remote_get_noisy_reply() */ + /* 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 */ + remote_console_output (buf + 1); /* 'O' message from stub. */ continue; } if (strcmp (buf, "OK") == 0) @@ -5103,7 +5145,7 @@ packet_command (char *args, int from_tty) } #if 0 -/* --------- UNIT_TEST for THREAD oriented PACKETS ------------------------- */ +/* --------- UNIT_TEST for THREAD oriented PACKETS ------------------- */ static void display_thread_info (struct gdb_ext_thread_info *info); @@ -5113,17 +5155,17 @@ static void threadalive_test (char *cmd, int tty); static void threadlist_test_cmd (char *cmd, int tty); -int get_and_display_threadinfo (threadref * ref); +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 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 */ +#define SAMPLE_THREAD 0x05060708 /* Truncated 64 bit threadid. */ static void threadset_test_cmd (char *cmd, int tty) @@ -5146,14 +5188,14 @@ threadalive_test (char *cmd, int tty) printf_filtered ("FAIL: Thread alive test\n"); } -void output_threadid (char *title, threadref * ref); +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 */ + pack_threadid (&hexid[0], ref); /* Convert threead id into hex. */ hexid[16] = 0; printf_filtered ("%s %s\n", title, (&hexid[0])); } @@ -5330,22 +5372,23 @@ Specify the serial device it is connected to (e.g. /dev/ttya).", static int remote_can_async_p (void) { - /* We're async whenever the serial device is. */ + /* 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. */ + /* 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. */ + 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_callback) (enum inferior_event_type event_type, + void *context); static void *async_client_context; static serial_event_ftype remote_async_serial_handler; @@ -5358,7 +5401,8 @@ remote_async_serial_handler (struct serial *scb, void *context) } static void -remote_async (void (*callback) (enum inferior_event_type event_type, void *context), void *context) +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__, @@ -5378,13 +5422,14 @@ remote_async (void (*callback) (enum inferior_event_type event_type, void *conte This are temporary targets, until it is all tested. Eventually async support will be incorporated int the usual 'remote' - target. */ + 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_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)."; @@ -5478,18 +5523,18 @@ build_remote_gdbarch_data (void) remote_address_size = TARGET_ADDR_BIT; } -/* Saved pointer to previous owner of the new_objfile event. */ +/* 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. */ +/* 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 */ + if (remote_desc != 0) /* Have a remote connection. */ { remote_check_symbols (objfile); } - /* Call predecessor on chain, if any. */ + /* Call predecessor on chain, if any. */ if (remote_new_objfile_chain != 0 && remote_desc == 0) remote_new_objfile_chain (objfile); @@ -5503,7 +5548,8 @@ _initialize_remote (void) struct cmd_list_element *tmpcmd; /* architecture specific data */ - remote_gdbarch_data_handle = gdbarch_data_register_post_init (init_remote_state); + 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. */ @@ -5530,20 +5576,20 @@ _initialize_remote (void) init_remote_threadtests (); #endif - /* set/show remote ... */ + /* 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); + 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); + 0 /* allow-unknown */, &showlist); add_cmd ("compare-sections", class_obscure, compare_sections_command, "Compare section data on target to the exec file.\n\ @@ -5567,7 +5613,7 @@ Whether to send break if interrupted is %s.", NULL, NULL, &setlist, &showlist); - /* Install commands for configuring memory read/write packets. */ + /* 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", @@ -5633,7 +5679,7 @@ in a memory packet.\n", 1); #if 0 /* XXXX - should ``set remotebinarydownload'' be retained for - compatibility. */ + compatibility. */ deprecated_add_show_from_set (add_set_cmd ("remotebinarydownload", no_class, var_boolean, (char *) &remote_binary_download, @@ -5711,7 +5757,7 @@ in a memory packet.\n", &remote_set_cmdlist, &remote_show_cmdlist, 0); - /* Keep the old ``set remote Z-packet ...'' working. */ + /* 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", "\