/* Remote target communications for serial-line targets in custom GDB protocol
- Copyright 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996,
- 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
- Free Software Foundation, Inc.
+ Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
+ 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+ 2010, 2011 Free Software Foundation, Inc.
This file is part of GDB.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
-/* 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"
#include "inferior.h"
#include "bfd.h"
#include "symfile.h"
+#include "exceptions.h"
#include "target.h"
/*#include "terminal.h" */
#include "gdbcmd.h"
#include "regcache.h"
#include "value.h"
#include "gdb_assert.h"
+#include "observer.h"
+#include "solib.h"
+#include "cli/cli-decode.h"
+#include "cli/cli-setshow.h"
+#include "target-descriptions.h"
#include <ctype.h>
#include <sys/time.h>
#include "gdbcore.h" /* for exec_bfd */
#include "remote-fileio.h"
-
-/* Prototypes for local functions */
+#include "gdb/fileio.h"
+#include "gdb_stat.h"
+#include "xml-support.h"
+
+#include "memory-map.h"
+
+#include "tracepoint.h"
+#include "ax.h"
+#include "ax-gdb.h"
+
+/* Temp hacks for tracepoint encoding migration. */
+static char *target_buf;
+static long target_buf_size;
+/*static*/ void
+encode_actions (struct breakpoint *t, struct bp_location *tloc,
+ char ***tdp_actions, char ***stepping_actions);
+
+/* The size to align memory write packets, when practical. The protocol
+ does not guarantee any alignment, and gdb will generate short
+ writes and unaligned writes, but even as a best-effort attempt this
+ can improve bulk transfers. For instance, if a write is misaligned
+ relative to the target's data bus, the stub may need to make an extra
+ round trip fetching data from the target. This doesn't make a
+ huge difference, but it's easy to do, so we try to be helpful.
+
+ The alignment chosen is arbitrary; usually data bus width is
+ important here, not the possibly larger cache line size. */
+enum { REMOTE_ALIGN_WRITES = 16 };
+
+/* 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);
+static int getpkt_sane (char **buf, long *sizeof_buf, int forever);
+static int getpkt_or_notif_sane (char **buf, long *sizeof_buf,
+ int forever);
static void handle_remote_sigint (int);
static void handle_remote_sigint_twice (int);
static void async_remote_interrupt (gdb_client_data);
void async_remote_interrupt_twice (gdb_client_data);
-static void build_remote_gdbarch_data (void);
-
static void remote_files_info (struct target_ops *ignore);
-static int remote_xfer_memory (CORE_ADDR memaddr, char *myaddr,
- int len, int should_write,
- struct mem_attrib *attrib,
- struct target_ops *target);
-
-static void remote_prepare_to_store (void);
-
-static void remote_fetch_registers (int regno);
-
-static void remote_resume (ptid_t ptid, int step,
- enum target_signal siggnal);
-static void remote_async_resume (ptid_t ptid, int step,
- enum target_signal siggnal);
-static int remote_start_remote (struct ui_out *uiout, void *dummy);
+static void remote_prepare_to_store (struct regcache *regcache);
static void remote_open (char *name, int from_tty);
-static void remote_async_open (char *name, int from_tty);
static void extended_remote_open (char *name, int from_tty);
-static void extended_remote_async_open (char *name, int from_tty);
-static void remote_open_1 (char *, int, struct target_ops *, int extended_p,
- int async_p);
+static void remote_open_1 (char *, int, struct target_ops *, int extended_p);
static void remote_close (int quitting);
-static void remote_store_registers (int regno);
-
-static void remote_mourn (void);
-static void remote_async_mourn (void);
+static void remote_mourn (struct target_ops *ops);
static void extended_remote_restart (void);
-static void extended_remote_mourn (void);
+static void extended_remote_mourn (struct target_ops *);
static void remote_mourn_1 (struct target_ops *);
-static void remote_send (char *buf, long sizeof_buf);
+static void remote_send (char **buf, long *sizeof_buf_p);
static int readchar (int timeout);
-static ptid_t remote_wait (ptid_t ptid,
- struct target_waitstatus *status);
-static ptid_t remote_async_wait (ptid_t ptid,
- struct target_waitstatus *status);
-
-static void remote_kill (void);
-static void remote_async_kill (void);
+static void remote_kill (struct target_ops *ops);
static int tohex (int nib);
-static void remote_detach (char *args, int from_tty);
+static int remote_can_async_p (void);
+
+static int remote_is_async_p (void);
+
+static void remote_async (void (*callback) (enum inferior_event_type event_type,
+ void *context), void *context);
+
+static void remote_detach (struct target_ops *ops, char *args, int from_tty);
static void remote_interrupt (int signo);
static void interrupt_query (void);
-static void set_thread (int, int);
-
-static int remote_thread_alive (ptid_t);
+static void set_general_thread (struct ptid ptid);
+static void set_continue_thread (struct ptid ptid);
static void get_offsets (void);
-static long read_frame (char *buf, long sizeof_buf);
-
-static int remote_insert_breakpoint (CORE_ADDR, char *);
+static void skip_frame (void);
-static int remote_remove_breakpoint (CORE_ADDR, char *);
+static long read_frame (char **buf_p, long *sizeof_buf);
static int hexnumlen (ULONGEST num);
static void init_extended_remote_ops (void);
-static void remote_stop (void);
+static void remote_stop (ptid_t);
static int ishex (int ch, int *val);
static void print_packet (char *);
-static unsigned long crc32 (unsigned char *, int, unsigned int);
-
static void compare_sections_command (char *, int);
static void packet_command (char *, int);
static void remote_find_new_threads (void);
-static void record_currthread (int currthread);
+static void record_currthread (ptid_t currthread);
static int fromhex (int a);
-static int hex2bin (const char *hex, char *bin, int count);
+extern int hex2bin (const char *hex, gdb_byte *bin, int count);
-static int bin2hex (const char *bin, char *hex, int count);
+extern int bin2hex (const gdb_byte *bin, char *hex, int count);
static int putpkt_binary (char *buf, int cnt);
static void update_packet_config (struct packet_config *config);
+static void set_remote_protocol_packet_cmd (char *args, int from_tty,
+ struct cmd_list_element *c);
+
+static void show_remote_protocol_packet_cmd (struct ui_file *file,
+ int from_tty,
+ struct cmd_list_element *c,
+ const char *value);
+
+static char *write_ptid (char *buf, const char *endbuf, ptid_t ptid);
+static ptid_t read_ptid (char *buf, char **obuf);
+
+static void remote_set_permissions (void);
+
+struct remote_state;
+static int remote_get_trace_status (struct trace_status *ts);
+
+static int remote_upload_tracepoints (struct uploaded_tp **utpp);
+
+static int remote_upload_trace_state_variables (struct uploaded_tsv **utsvp);
+
+static void remote_query_supported (void);
+
+static void remote_check_symbols (struct objfile *objfile);
+
void _initialize_remote (void);
-/* Description of the remote protocol. Strictly speaking, when the
- target is open()ed, remote.c should create a per-target description
- of the remote protocol using that target's architecture.
- Unfortunately, the target stack doesn't include local state. For
- the moment keep the information in the target's architecture
- object. Sigh.. */
+struct stop_reply;
+static struct stop_reply *stop_reply_xmalloc (void);
+static void stop_reply_xfree (struct stop_reply *);
+static void do_stop_reply_xfree (void *arg);
+static void remote_parse_stop_reply (char *buf, struct stop_reply *);
+static void push_stop_reply (struct stop_reply *);
+static void remote_get_pending_stop_replies (void);
+static void discard_pending_stop_replies (int pid);
+static int peek_stop_reply (ptid_t ptid);
+
+static void remote_async_inferior_event_handler (gdb_client_data);
+static void remote_async_get_pending_events_handler (gdb_client_data);
+
+static void remote_terminal_ours (void);
+
+static int remote_read_description_p (struct target_ops *target);
+
+static void remote_console_output (char *msg);
+
+/* The non-stop remote protocol provisions for one pending stop reply.
+ This is where we keep it until it is acknowledged. */
+
+static struct stop_reply *pending_stop_reply = NULL;
+
+/* For "remote". */
+
+static struct cmd_list_element *remote_cmdlist;
+
+/* For "set remote" and "show remote". */
+
+static struct cmd_list_element *remote_set_cmdlist;
+static struct cmd_list_element *remote_show_cmdlist;
+
+/* Description of the remote protocol state for the currently
+ connected target. This is per-target state, and independent of the
+ selected architecture. */
+
+struct remote_state
+{
+ /* A buffer to use for incoming packets, and its current size. The
+ buffer is grown dynamically for larger incoming packets.
+ Outgoing packets may also be constructed in this buffer.
+ BUF_SIZE is always at least REMOTE_PACKET_SIZE;
+ REMOTE_PACKET_SIZE should be used to limit the length of outgoing
+ packets. */
+ char *buf;
+ long buf_size;
+
+ /* If we negotiated packet size explicitly (and thus can bypass
+ heuristics for the largest packet size that will not overflow
+ a buffer in the stub), this will be set to that packet size.
+ Otherwise zero, meaning to use the guessed size. */
+ long explicit_packet_size;
+
+ /* remote_wait is normally called when the target is running and
+ waits for a stop reply packet. But sometimes we need to call it
+ when the target is already stopped. We can send a "?" packet
+ and have remote_wait read the response. Or, if we already have
+ the response, we can stash it in BUF and tell remote_wait to
+ skip calling getpkt. This flag is set when BUF contains a
+ stop reply packet and the target is not waiting. */
+ int cached_wait_status;
+
+ /* True, if in no ack mode. That is, neither GDB nor the stub will
+ expect acks from each other. The connection is assumed to be
+ reliable. */
+ int noack_mode;
+
+ /* True if we're connected in extended remote mode. */
+ int extended;
+
+ /* True if the stub reported support for multi-process
+ extensions. */
+ int multi_process_aware;
+
+ /* True if we resumed the target and we're waiting for the target to
+ stop. In the mean time, we can't start another command/query.
+ The remote server wouldn't be ready to process it, so we'd
+ timeout waiting for a reply that would never come and eventually
+ we'd close the connection. This can happen in asynchronous mode
+ because we allow GDB commands while the target is running. */
+ int waiting_for_stop_reply;
+
+ /* True if the stub reports support for non-stop mode. */
+ int non_stop_aware;
+
+ /* True if the stub reports support for vCont;t. */
+ int support_vCont_t;
+
+ /* True if the stub reports support for conditional tracepoints. */
+ int cond_tracepoints;
+
+ /* True if the stub reports support for fast tracepoints. */
+ int fast_tracepoints;
+
+ /* True if the stub reports support for static tracepoints. */
+ int static_tracepoints;
+
+ /* True if the stub can continue running a trace while GDB is
+ disconnected. */
+ int disconnected_tracing;
+
+ /* True if the stub reports support for enabling and disabling
+ tracepoints while a trace experiment is running. */
+ int enable_disable_tracepoints;
+
+ /* Nonzero if the user has pressed Ctrl-C, but the target hasn't
+ responded to that. */
+ int ctrlc_pending_p;
+};
+
+/* Private data that we'll store in (struct thread_info)->private. */
+struct private_thread_info
+{
+ char *extra;
+ int core;
+};
+
+static void
+free_private_thread_info (struct private_thread_info *info)
+{
+ xfree (info->extra);
+ xfree (info);
+}
+
+/* Returns true if the multi-process extensions are in effect. */
+static int
+remote_multi_process_p (struct remote_state *rs)
+{
+ return rs->extended && rs->multi_process_aware;
+}
+
+/* This data could be associated with a target, but we do not always
+ have access to the current target when we need it, so for now it is
+ static. This will be fine for as long as only one target is in use
+ at a time. */
+static struct remote_state remote_state;
+
+static struct remote_state *
+get_remote_state_raw (void)
+{
+ return &remote_state;
+}
+
+/* Description of the remote protocol for a given architecture. */
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. */
- /* char *name; == REGISTER_NAME (regnum); at present. */
+ /* long size in bytes; == register_size (target_gdbarch, regnum);
+ at present. */
+ /* char *name; == gdbarch_register_name (target_gdbarch, regnum);
+ at present. */
};
-struct remote_state
+struct remote_arch_state
{
/* Description of the remote protocol registers. */
long sizeof_g_packet;
/* Description of the remote protocol registers indexed by REGNUM
- (making an array of NUM_REGS + NUM_PSEUDO_REGS in size). */
+ (making an array gdbarch_num_regs in size). */
struct packet_reg *regs;
/* This is the size (in chars) of the first response to the ``g''
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;
};
+long sizeof_pkt = 2000;
+
+/* Utility: generate error from an incoming stub packet. */
+static void
+trace_error (char *buf)
+{
+ if (*buf++ != 'E')
+ return; /* not an error msg */
+ switch (*buf)
+ {
+ case '1': /* malformed packet error */
+ if (*++buf == '0') /* general case: */
+ error (_("remote.c: error in outgoing packet."));
+ else
+ error (_("remote.c: error in outgoing packet at field #%ld."),
+ strtol (buf, NULL, 16));
+ case '2':
+ error (_("trace API error 0x%s."), ++buf);
+ default:
+ error (_("Target returns error code '%s'."), buf);
+ }
+}
+
+/* Utility: wait for reply from stub, while accepting "O" packets. */
+static char *
+remote_get_noisy_reply (char **buf_p,
+ long *sizeof_buf)
+{
+ do /* Loop on reply from remote stub. */
+ {
+ char *buf;
+
+ QUIT; /* Allow user to bail out with ^C. */
+ getpkt (buf_p, sizeof_buf, 0);
+ buf = *buf_p;
+ if (buf[0] == 'E')
+ trace_error (buf);
+ else if (strncmp (buf, "qRelocInsn:", strlen ("qRelocInsn:")) == 0)
+ {
+ ULONGEST ul;
+ CORE_ADDR from, to, org_to;
+ char *p, *pp;
+ int adjusted_size = 0;
+ volatile struct gdb_exception ex;
+
+ p = buf + strlen ("qRelocInsn:");
+ pp = unpack_varlen_hex (p, &ul);
+ if (*pp != ';')
+ error (_("invalid qRelocInsn packet: %s"), buf);
+ from = ul;
+
+ p = pp + 1;
+ unpack_varlen_hex (p, &ul);
+ to = ul;
+
+ org_to = to;
+
+ TRY_CATCH (ex, RETURN_MASK_ALL)
+ {
+ gdbarch_relocate_instruction (target_gdbarch, &to, from);
+ }
+ if (ex.reason >= 0)
+ {
+ adjusted_size = to - org_to;
+
+ sprintf (buf, "qRelocInsn:%x", adjusted_size);
+ putpkt (buf);
+ }
+ else if (ex.reason < 0 && ex.error == MEMORY_ERROR)
+ {
+ /* Propagate memory errors silently back to the target.
+ The stub may have limited the range of addresses we
+ can write to, for example. */
+ putpkt ("E01");
+ }
+ else
+ {
+ /* Something unexpectedly bad happened. Be verbose so
+ we can tell what, and propagate the error back to the
+ stub, so it doesn't get stuck waiting for a
+ response. */
+ exception_fprintf (gdb_stderr, ex,
+ _("warning: relocating instruction: "));
+ putpkt ("E01");
+ }
+ }
+ else if (buf[0] == 'O' && buf[1] != 'K')
+ remote_console_output (buf + 1); /* 'O' message from stub */
+ else
+ return buf; /* Here's the actual reply. */
+ }
+ while (1);
+}
/* Handle for retreving the remote protocol data from gdbarch. */
static struct gdbarch_data *remote_gdbarch_data_handle;
+static struct remote_arch_state *
+get_remote_arch_state (void)
+{
+ return gdbarch_data (target_gdbarch, remote_gdbarch_data_handle);
+}
+
+/* Fetch the global remote target state. */
+
static struct remote_state *
get_remote_state (void)
{
- return gdbarch_data (current_gdbarch, remote_gdbarch_data_handle);
+ /* Make sure that the remote architecture state has been
+ initialized, because doing so might reallocate rs->buf. Any
+ function which calls getpkt also needs to be mindful of changes
+ to rs->buf, but this call limits the number of places which run
+ into trouble. */
+ get_remote_arch_state ();
+
+ return get_remote_state_raw ();
}
-static void *
-init_remote_state (struct gdbarch *gdbarch)
+static int
+compare_pnums (const void *lhs_, const void *rhs_)
{
- int regnum;
- struct remote_state *rs = GDBARCH_OBSTACK_ZALLOC (gdbarch, struct remote_state);
+ const struct packet_reg * const *lhs = lhs_;
+ const struct packet_reg * const *rhs = rhs_;
- if (deprecated_register_bytes () != 0)
- rs->sizeof_g_packet = deprecated_register_bytes ();
+ if ((*lhs)->pnum < (*rhs)->pnum)
+ return -1;
+ else if ((*lhs)->pnum == (*rhs)->pnum)
+ return 0;
else
- rs->sizeof_g_packet = 0;
+ return 1;
+}
- /* Assume a 1:1 regnum<->pnum table. */
- rs->regs = GDBARCH_OBSTACK_CALLOC (gdbarch, NUM_REGS + NUM_PSEUDO_REGS,
- struct packet_reg);
- for (regnum = 0; regnum < NUM_REGS + NUM_PSEUDO_REGS; regnum++)
+static int
+map_regcache_remote_table (struct gdbarch *gdbarch, struct packet_reg *regs)
+{
+ int regnum, num_remote_regs, offset;
+ struct packet_reg **remote_regs;
+
+ for (regnum = 0; regnum < gdbarch_num_regs (gdbarch); regnum++)
{
- struct packet_reg *r = &rs->regs[regnum];
- r->pnum = regnum;
+ struct packet_reg *r = ®s[regnum];
+
+ if (register_size (gdbarch, regnum) == 0)
+ /* Do not try to fetch zero-sized (placeholder) registers. */
+ r->pnum = -1;
+ else
+ r->pnum = gdbarch_remote_register_number (gdbarch, regnum);
+
r->regnum = regnum;
- r->offset = DEPRECATED_REGISTER_BYTE (regnum);
- r->in_g_packet = (regnum < NUM_REGS);
- /* ...name = REGISTER_NAME (regnum); */
+ }
+
+ /* Define the g/G packet format as the contents of each register
+ with a remote protocol number, in order of ascending protocol
+ number. */
- /* Compute packet size by accumulating the size of all registers. */
- if (deprecated_register_bytes () == 0)
- rs->sizeof_g_packet += register_size (current_gdbarch, regnum);
+ remote_regs = alloca (gdbarch_num_regs (gdbarch)
+ * sizeof (struct packet_reg *));
+ for (num_remote_regs = 0, regnum = 0;
+ regnum < gdbarch_num_regs (gdbarch);
+ regnum++)
+ if (regs[regnum].pnum != -1)
+ remote_regs[num_remote_regs++] = ®s[regnum];
+
+ qsort (remote_regs, num_remote_regs, sizeof (struct packet_reg *),
+ compare_pnums);
+
+ for (regnum = 0, offset = 0; regnum < num_remote_regs; regnum++)
+ {
+ remote_regs[regnum]->in_g_packet = 1;
+ remote_regs[regnum]->offset = offset;
+ offset += register_size (gdbarch, remote_regs[regnum]->regnum);
}
- /* Default maximum number of characters in a packet body. Many
+ return offset;
+}
+
+/* Given the architecture described by GDBARCH, return the remote
+ protocol register's number and the register's offset in the g/G
+ packets of GDB register REGNUM, in PNUM and POFFSET respectively.
+ If the target does not have a mapping for REGNUM, return false,
+ otherwise, return true. */
+
+int
+remote_register_number_and_offset (struct gdbarch *gdbarch, int regnum,
+ int *pnum, int *poffset)
+{
+ int sizeof_g_packet;
+ struct packet_reg *regs;
+ struct cleanup *old_chain;
+
+ gdb_assert (regnum < gdbarch_num_regs (gdbarch));
+
+ regs = xcalloc (gdbarch_num_regs (gdbarch), sizeof (struct packet_reg));
+ old_chain = make_cleanup (xfree, regs);
+
+ sizeof_g_packet = map_regcache_remote_table (gdbarch, regs);
+
+ *pnum = regs[regnum].pnum;
+ *poffset = regs[regnum].offset;
+
+ do_cleanups (old_chain);
+
+ return *pnum != -1;
+}
+
+static void *
+init_remote_state (struct gdbarch *gdbarch)
+{
+ struct remote_state *rs = get_remote_state_raw ();
+ struct remote_arch_state *rsa;
+
+ rsa = GDBARCH_OBSTACK_ZALLOC (gdbarch, struct remote_arch_state);
+
+ /* Use the architecture to build a regnum<->pnum table, which will be
+ 1:1 unless a feature set specifies otherwise. */
+ rsa->regs = GDBARCH_OBSTACK_CALLOC (gdbarch,
+ gdbarch_num_regs (gdbarch),
+ struct packet_reg);
+
+ /* Record the maximum possible size of the g packet - it may turn out
+ to be smaller. */
+ rsa->sizeof_g_packet = map_regcache_remote_table (gdbarch, rsa->regs);
+
+ /* Default maximum number of characters in a packet body. Many
remote stubs have a hardwired buffer size of 400 bytes
(c.f. BUFMAX in m68k-stub.c and i386-stub.c). BUFMAX-1 is used
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;
+ already a full buffer (As of 1999-12-04 that was most stubs). */
+ rsa->remote_packet_size = 400 - 1;
+
+ /* This one is filled in when a ``g'' packet is received. */
+ rsa->actual_register_packet_size = 0;
- /* Should rs->sizeof_g_packet needs more space than the
- default, adjust the size accordingly. Remember that each byte is
- encoded as two characters. 32 is the overhead for the packet
- header / footer. NOTE: cagney/1999-10-26: I suspect that 8
+ /* Should rsa->sizeof_g_packet needs more space than the
+ default, adjust the size accordingly. Remember that each byte is
+ 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);
+ little. */
+ if (rsa->sizeof_g_packet > ((rsa->remote_packet_size - 32) / 2))
+ rsa->remote_packet_size = (rsa->sizeof_g_packet * 2 + 32);
+
+ /* Make sure that the packet buffer is plenty big enough for
+ this architecture. */
+ if (rs->buf_size < rsa->remote_packet_size)
+ {
+ rs->buf_size = 2 * rsa->remote_packet_size;
+ rs->buf = xrealloc (rs->buf, rs->buf_size);
+ }
+
+ return rsa;
+}
+
+/* Return the current allowed size of a remote packet. This is
+ inferred from the current architecture, and should be used to
+ limit the length of outgoing packets. */
+static long
+get_remote_packet_size (void)
+{
+ struct remote_state *rs = get_remote_state ();
+ struct remote_arch_state *rsa = get_remote_arch_state ();
- /* This one is filled in when a ``g'' packet is received. */
- rs->actual_register_packet_size = 0;
+ if (rs->explicit_packet_size)
+ return rs->explicit_packet_size;
- return rs;
+ return rsa->remote_packet_size;
}
static struct packet_reg *
-packet_reg_from_regnum (struct remote_state *rs, long regnum)
+packet_reg_from_regnum (struct remote_arch_state *rsa, long regnum)
{
- if (regnum < 0 && regnum >= NUM_REGS + NUM_PSEUDO_REGS)
+ if (regnum < 0 && regnum >= gdbarch_num_regs (target_gdbarch))
return NULL;
else
{
- struct packet_reg *r = &rs->regs[regnum];
+ struct packet_reg *r = &rsa->regs[regnum];
+
gdb_assert (r->regnum == regnum);
return r;
}
}
static struct packet_reg *
-packet_reg_from_pnum (struct remote_state *rs, LONGEST pnum)
+packet_reg_from_pnum (struct remote_arch_state *rsa, LONGEST pnum)
{
int i;
- for (i = 0; i < NUM_REGS + NUM_PSEUDO_REGS; i++)
+
+ for (i = 0; i < gdbarch_num_regs (target_gdbarch); i++)
{
- struct packet_reg *r = &rs->regs[i];
+ struct packet_reg *r = &rsa->regs[i];
+
if (r->pnum == pnum)
return r;
}
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 target stopped for a watchpoint. */
static int remote_stopped_by_watchpoint_p;
-
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. */
-static struct target_ops remote_async_ops;
-
-static struct target_ops extended_async_remote_ops;
-
/* FIXME: cagney/1999-09-23: Even though getpkt was called with
``forever'' still use the normal timeout mechanism. This is
currently used by the ASYNC code to guarentee that target reads
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;
+/* Allow the user to specify what sequence to send to the remote
+ when he requests a program interruption: Although ^C is usually
+ what remote systems expect (this is the default, here), it is
+ sometimes preferable to send a break. On other systems such
+ as the Linux kernel, a break followed by g, which is Magic SysRq g
+ is required in order to interrupt the execution. */
+const char interrupt_sequence_control_c[] = "Ctrl-C";
+const char interrupt_sequence_break[] = "BREAK";
+const char interrupt_sequence_break_g[] = "BREAK-g";
+static const char *interrupt_sequence_modes[] =
+ {
+ interrupt_sequence_control_c,
+ interrupt_sequence_break,
+ interrupt_sequence_break_g,
+ NULL
+ };
+static const char *interrupt_sequence_mode = interrupt_sequence_control_c;
+
+static void
+show_interrupt_sequence (struct ui_file *file, int from_tty,
+ struct cmd_list_element *c,
+ const char *value)
+{
+ if (interrupt_sequence_mode == interrupt_sequence_control_c)
+ fprintf_filtered (file,
+ _("Send the ASCII ETX character (Ctrl-c) "
+ "to the remote target to interrupt the "
+ "execution of the program.\n"));
+ else if (interrupt_sequence_mode == interrupt_sequence_break)
+ fprintf_filtered (file,
+ _("send a break signal to the remote target "
+ "to interrupt the execution of the program.\n"));
+ else if (interrupt_sequence_mode == interrupt_sequence_break_g)
+ fprintf_filtered (file,
+ _("Send a break signal and 'g' a.k.a. Magic SysRq g to "
+ "the remote target to interrupt the execution "
+ "of Linux kernel.\n"));
+ else
+ internal_error (__FILE__, __LINE__,
+ _("Invalid value for interrupt_sequence_mode: %s."),
+ interrupt_sequence_mode);
+}
-/* This variable chooses whether to send a ^C or a break when the user
- requests program interruption. Although ^C is usually what remote
- systems expect, and that is the default here, sometimes a break is
- preferable instead. */
+/* This boolean variable specifies whether interrupt_sequence is sent
+ to the remote target when gdb connects to it.
+ This is mostly needed when you debug the Linux kernel: The Linux kernel
+ expects BREAK g which is Magic SysRq g for connecting gdb. */
+static int interrupt_on_connect = 0;
+/* This variable is used to implement the "set/show remotebreak" commands.
+ Since these commands are now deprecated in favor of "set/show remote
+ interrupt-sequence", it no longer has any effect on the code. */
static int remote_break;
+static void
+set_remotebreak (char *args, int from_tty, struct cmd_list_element *c)
+{
+ if (remote_break)
+ interrupt_sequence_mode = interrupt_sequence_break;
+ else
+ interrupt_sequence_mode = interrupt_sequence_control_c;
+}
+
+static void
+show_remotebreak (struct ui_file *file, int from_tty,
+ struct cmd_list_element *c,
+ const char *value)
+{
+}
+
/* Descriptor for I/O to remote machine. Initialize it to NULL so that
remote_open knows that we don't have a file open when the program
starts. */
/* This variable sets the number of bits in an address that are to be
sent in a memory ("M" or "m") packet. Normally, after stripping
- leading zeros, the entire address would be sent. This variable
+ leading zeros, the entire address would be sent. This variable
restricts the address to REMOTE_ADDRESS_SIZE bits. HISTORY: The
initial implementation of remote.c restricted the address sent in
memory packets to ``host::sizeof long'' bytes - (typically 32
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;
-/* Tempoary to track who currently owns the terminal. See
- target_async_terminal_* for more details. */
+/* Temporary to track who currently owns the terminal. See
+ remote_terminal_* for more details. */
static int remote_async_terminal_ours_p;
+/* The executable file to use for "run" on the remote side. */
+
+static char *remote_exec_file = "";
+
\f
/* User configurable variables for the number of characters in a
- memory read/write packet. MIN ((rs->remote_packet_size),
- rs->sizeof_g_packet) is the default. Some targets need smaller
- values (fifo overruns, et.al.) and some users need larger values
+ memory read/write packet. MIN (rsa->remote_packet_size,
+ rsa->sizeof_g_packet) is the default. Some targets need smaller
+ 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
{
get_memory_packet_size (struct memory_packet_config *config)
{
struct remote_state *rs = get_remote_state ();
+ struct remote_arch_state *rsa = get_remote_arch_state ();
+
/* NOTE: The somewhat arbitrary 16k comes from the knowledge (folk
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: 20 ensures we can write at least one byte. */
#ifndef MIN_REMOTE_PACKET_SIZE
-#define MIN_REMOTE_PACKET_SIZE 16
+#define MIN_REMOTE_PACKET_SIZE 20
#endif
long what_they_get;
if (config->fixed_p)
}
else
{
- what_they_get = (rs->remote_packet_size);
- /* Limit the packet to the size specified by the user. */
+ what_they_get = get_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);
+
+ /* Limit it to the size of the targets ``g'' response unless we have
+ permission from the stub to use a larger packet size. */
+ if (rs->explicit_packet_size == 0
+ && rsa->actual_register_packet_size > 0
+ && what_they_get > rsa->actual_register_packet_size)
+ what_they_get = rsa->actual_register_packet_size;
}
if (what_they_get > MAX_REMOTE_PACKET_SIZE)
what_they_get = MAX_REMOTE_PACKET_SIZE;
if (what_they_get < MIN_REMOTE_PACKET_SIZE)
what_they_get = MIN_REMOTE_PACKET_SIZE;
+
+ /* Make sure there is room in the global buffer for this packet
+ (including its trailing NUL byte). */
+ if (rs->buf_size < what_they_get + 1)
+ {
+ rs->buf_size = 2 * what_they_get;
+ rs->buf = xrealloc (rs->buf, 2 * what_they_get);
+ }
+
return what_they_get;
}
-/* Update the size of a read/write packet. If they user wants
- something really big then do a sanity check. */
+/* 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)
{
int fixed_p = config->fixed_p;
long size = config->size;
+
if (args == NULL)
- error ("Argument required (integer, `fixed' or `limited').");
+ error (_("Argument required (integer, `fixed' or `limited')."));
else if (strcmp (args, "hard") == 0
|| strcmp (args, "fixed") == 0)
fixed_p = 1;
else
{
char *end;
+
size = strtoul (args, &end, 0);
if (args == end)
- error ("Invalid %s (bad syntax).", config->name);
+ error (_("Invalid %s (bad syntax)."), config->name);
#if 0
/* 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);
+ 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"
- "of %ld bytes. Change the packet size? ",
+ if (! query (_("The target may not be able to correctly handle a %s\n"
+ "of %ld bytes. Change the packet size? "),
config->name, size))
- error ("Packet size not changed.");
+ error (_("Packet size not changed."));
}
- /* Update the config. */
+ /* Update the config. */
config->fixed_p = fixed_p;
config->size = size;
}
static void
show_memory_packet_size (struct memory_packet_config *config)
{
- printf_filtered ("The %s is %ld. ", config->name, config->size);
+ printf_filtered (_("The %s is %ld. "), config->name, config->size);
if (config->fixed_p)
- printf_filtered ("Packets are fixed at %ld bytes.\n",
+ printf_filtered (_("Packets are fixed at %ld bytes.\n"),
get_memory_packet_size (config));
else
- printf_filtered ("Packets are limited to %ld bytes.\n",
+ printf_filtered (_("Packets are limited to %ld bytes.\n"),
get_memory_packet_size (config));
}
static long
get_memory_read_packet_size (void)
{
- struct remote_state *rs = get_remote_state ();
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);
+ increased beyond this. */
+ if (size > get_remote_packet_size ())
+ size = get_remote_packet_size ();
return size;
}
\f
/* 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. */
+ 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
{
- char *name;
- char *title;
+ const char *name;
+ const char *title;
enum auto_boolean detect;
enum packet_support support;
};
/* Analyze a packet's return value and update the packet config
- accordingly. */
+ accordingly. */
enum packet_result
{
show_packet_config_cmd (struct packet_config *config)
{
char *support = "internal-error";
+
switch (config->support)
{
case PACKET_ENABLE:
switch (config->detect)
{
case AUTO_BOOLEAN_AUTO:
- printf_filtered ("Support for remote protocol `%s' (%s) packet is auto-detected, currently %s.\n",
- config->name, config->title, support);
+ printf_filtered (_("Support for the `%s' packet "
+ "is auto-detected, currently %s.\n"),
+ config->name, support);
break;
case AUTO_BOOLEAN_TRUE:
case AUTO_BOOLEAN_FALSE:
- printf_filtered ("Support for remote protocol `%s' (%s) packet is currently %s.\n",
- config->name, config->title, support);
+ printf_filtered (_("Support for the `%s' packet is currently %s.\n"),
+ config->name, support);
break;
}
}
static void
-add_packet_config_cmd (struct packet_config *config,
- char *name,
- char *title,
- cmd_sfunc_ftype *set_func,
- cmd_sfunc_ftype *show_func,
- struct cmd_list_element **set_remote_list,
- struct cmd_list_element **show_remote_list,
- int legacy)
+add_packet_config_cmd (struct packet_config *config, const char *name,
+ const char *title, int legacy)
{
- struct cmd_list_element *set_cmd;
- struct cmd_list_element *show_cmd;
char *set_doc;
char *show_doc;
- char *help_doc;
- char *print;
char *cmd_name;
+
config->name = name;
config->title = title;
config->detect = AUTO_BOOLEAN_AUTO;
config->support = PACKET_SUPPORT_UNKNOWN;
set_doc = xstrprintf ("Set use of remote protocol `%s' (%s) packet",
name, title);
- show_doc = xstrprintf ("Show current use of remote protocol `%s' (%s) packet",
+ show_doc = xstrprintf ("Show current use of remote "
+ "protocol `%s' (%s) packet",
name, title);
- print = xstrprintf ("Current use of remote protocol `%s' (%s) is %%s",
- name, title);
/* set/show TITLE-packet {auto,on,off} */
cmd_name = xstrprintf ("%s-packet", title);
add_setshow_auto_boolean_cmd (cmd_name, class_obscure,
- &config->detect, set_doc, show_doc,
- "", print,
- set_func, show_func,
- set_remote_list, show_remote_list);
- /* set/show remote NAME-packet {auto,on,off} -- legacy */
+ &config->detect, set_doc,
+ show_doc, NULL, /* help_doc */
+ set_remote_protocol_packet_cmd,
+ show_remote_protocol_packet_cmd,
+ &remote_set_cmdlist, &remote_show_cmdlist);
+ /* The command code copies the documentation strings. */
+ xfree (set_doc);
+ xfree (show_doc);
+ /* set/show remote NAME-packet {auto,on,off} -- legacy. */
if (legacy)
{
char *legacy_name;
+
legacy_name = xstrprintf ("%s-packet", name);
add_alias_cmd (legacy_name, cmd_name, class_obscure, 0,
- set_remote_list);
+ &remote_set_cmdlist);
add_alias_cmd (legacy_name, cmd_name, class_obscure, 0,
- show_remote_list);
+ &remote_show_cmdlist);
}
}
static enum packet_result
-packet_ok (const char *buf, struct packet_config *config)
+packet_check_result (const char *buf)
{
if (buf[0] != '\0')
{
/* The stub recognized the packet request. Check that the
- operation succeeded. */
+ operation succeeded. */
+ if (buf[0] == 'E'
+ && isxdigit (buf[1]) && isxdigit (buf[2])
+ && buf[3] == '\0')
+ /* "Enn" - definitly an error. */
+ return PACKET_ERROR;
+
+ /* Always treat "E." as an error. This will be used for
+ more verbose error messages, such as E.memtypes. */
+ if (buf[0] == 'E' && buf[1] == '.')
+ 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. */
+ return PACKET_UNKNOWN;
+}
+
+static enum packet_result
+packet_ok (const char *buf, struct packet_config *config)
+{
+ enum packet_result result;
+
+ result = packet_check_result (buf);
+ switch (result)
+ {
+ case PACKET_OK:
+ case PACKET_ERROR:
+ /* The stub recognized the packet request. */
switch (config->support)
{
case PACKET_SUPPORT_UNKNOWN:
break;
case PACKET_DISABLE:
internal_error (__FILE__, __LINE__,
- "packet_ok: attempt to use a disabled packet");
+ _("packet_ok: attempt to use a disabled packet"));
break;
case PACKET_ENABLE:
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. */
+ break;
+ case PACKET_UNKNOWN:
+ /* 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.",
+ 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",
+ /* The user set it wrong. */
+ error (_("Enabled packet %s (%s) not recognized by stub"),
config->name, config->title);
break;
case PACKET_SUPPORT_UNKNOWN:
case PACKET_DISABLE:
break;
}
- return PACKET_UNKNOWN;
+ break;
}
-}
-/* Should we try the 'vCont' (descriptive resume) request? */
-static struct packet_config remote_protocol_vcont;
-
-static void
-set_remote_protocol_vcont_packet_cmd (char *args, int from_tty,
- struct cmd_list_element *c)
-{
- update_packet_config (&remote_protocol_vcont);
+ return result;
}
-static void
-show_remote_protocol_vcont_packet_cmd (char *args, int from_tty,
- struct cmd_list_element *c)
-{
- show_packet_config_cmd (&remote_protocol_vcont);
-}
+enum {
+ PACKET_vCont = 0,
+ PACKET_X,
+ PACKET_qSymbol,
+ PACKET_P,
+ PACKET_p,
+ PACKET_Z0,
+ PACKET_Z1,
+ PACKET_Z2,
+ PACKET_Z3,
+ PACKET_Z4,
+ PACKET_vFile_open,
+ PACKET_vFile_pread,
+ PACKET_vFile_pwrite,
+ PACKET_vFile_close,
+ PACKET_vFile_unlink,
+ PACKET_qXfer_auxv,
+ PACKET_qXfer_features,
+ PACKET_qXfer_libraries,
+ PACKET_qXfer_memory_map,
+ PACKET_qXfer_spu_read,
+ PACKET_qXfer_spu_write,
+ PACKET_qXfer_osdata,
+ PACKET_qXfer_threads,
+ PACKET_qXfer_statictrace_read,
+ PACKET_qXfer_traceframe_info,
+ PACKET_qGetTIBAddr,
+ PACKET_qGetTLSAddr,
+ PACKET_qSupported,
+ PACKET_QPassSignals,
+ PACKET_qSearch_memory,
+ PACKET_vAttach,
+ PACKET_vRun,
+ PACKET_QStartNoAckMode,
+ PACKET_vKill,
+ PACKET_qXfer_siginfo_read,
+ PACKET_qXfer_siginfo_write,
+ PACKET_qAttached,
+ PACKET_ConditionalTracepoints,
+ PACKET_FastTracepoints,
+ PACKET_StaticTracepoints,
+ PACKET_bc,
+ PACKET_bs,
+ PACKET_TracepointSource,
+ PACKET_QAllow,
+ PACKET_MAX
+};
-/* Should we try the 'qSymbol' (target symbol lookup service) request? */
-static struct packet_config remote_protocol_qSymbol;
+static struct packet_config remote_protocol_packets[PACKET_MAX];
static void
-set_remote_protocol_qSymbol_packet_cmd (char *args, int from_tty,
- struct cmd_list_element *c)
+set_remote_protocol_packet_cmd (char *args, int from_tty,
+ struct cmd_list_element *c)
{
- update_packet_config (&remote_protocol_qSymbol);
-}
+ struct packet_config *packet;
-static void
-show_remote_protocol_qSymbol_packet_cmd (char *args, int from_tty,
- struct cmd_list_element *c)
-{
- show_packet_config_cmd (&remote_protocol_qSymbol);
+ for (packet = remote_protocol_packets;
+ packet < &remote_protocol_packets[PACKET_MAX];
+ packet++)
+ {
+ if (&packet->detect == c->var)
+ {
+ update_packet_config (packet);
+ return;
+ }
+ }
+ internal_error (__FILE__, __LINE__, _("Could not find config for %s"),
+ c->name);
}
-/* Should we try the 'P' (set register) request? */
-
-static struct packet_config remote_protocol_P;
-
static void
-set_remote_protocol_P_packet_cmd (char *args, int from_tty,
- struct cmd_list_element *c)
+show_remote_protocol_packet_cmd (struct ui_file *file, int from_tty,
+ struct cmd_list_element *c,
+ const char *value)
{
- update_packet_config (&remote_protocol_P);
-}
+ struct packet_config *packet;
-static void
-show_remote_protocol_P_packet_cmd (char *args, int from_tty,
- struct cmd_list_element *c)
-{
- show_packet_config_cmd (&remote_protocol_P);
+ for (packet = remote_protocol_packets;
+ packet < &remote_protocol_packets[PACKET_MAX];
+ packet++)
+ {
+ if (&packet->detect == c->var)
+ {
+ show_packet_config_cmd (packet);
+ return;
+ }
+ }
+ internal_error (__FILE__, __LINE__, _("Could not find config for %s"),
+ c->name);
}
/* Should we try one of the 'Z' requests? */
NR_Z_PACKET_TYPES
};
-static struct packet_config remote_protocol_Z[NR_Z_PACKET_TYPES];
+/* For compatibility with older distributions. Provide a ``set remote
+ Z-packet ...'' command that updates all the Z packet types. */
-/* FIXME: Instead of having all these boiler plate functions, the
- command callback should include a context argument. */
+static enum auto_boolean remote_Z_packet_detect;
static void
-set_remote_protocol_Z_software_bp_packet_cmd (char *args, int from_tty,
- struct cmd_list_element *c)
+set_remote_protocol_Z_packet_cmd (char *args, int from_tty,
+ struct cmd_list_element *c)
{
- update_packet_config (&remote_protocol_Z[Z_PACKET_SOFTWARE_BP]);
-}
+ int i;
-static void
-show_remote_protocol_Z_software_bp_packet_cmd (char *args, int from_tty,
- struct cmd_list_element *c)
-{
- show_packet_config_cmd (&remote_protocol_Z[Z_PACKET_SOFTWARE_BP]);
+ for (i = 0; i < NR_Z_PACKET_TYPES; i++)
+ {
+ remote_protocol_packets[PACKET_Z0 + i].detect = remote_Z_packet_detect;
+ update_packet_config (&remote_protocol_packets[PACKET_Z0 + i]);
+ }
}
static void
-set_remote_protocol_Z_hardware_bp_packet_cmd (char *args, int from_tty,
- struct cmd_list_element *c)
+show_remote_protocol_Z_packet_cmd (struct ui_file *file, int from_tty,
+ struct cmd_list_element *c,
+ const char *value)
{
- update_packet_config (&remote_protocol_Z[Z_PACKET_HARDWARE_BP]);
+ int i;
+
+ for (i = 0; i < NR_Z_PACKET_TYPES; i++)
+ {
+ show_packet_config_cmd (&remote_protocol_packets[PACKET_Z0 + i]);
+ }
}
-static void
-show_remote_protocol_Z_hardware_bp_packet_cmd (char *args, int from_tty,
- struct cmd_list_element *c)
-{
- show_packet_config_cmd (&remote_protocol_Z[Z_PACKET_HARDWARE_BP]);
-}
+/* Should we try the 'ThreadInfo' query packet?
-static void
-set_remote_protocol_Z_write_wp_packet_cmd (char *args, int from_tty,
- struct cmd_list_element *c)
-{
- update_packet_config (&remote_protocol_Z[Z_PACKET_WRITE_WP]);
-}
+ This variable (NOT available to the user: auto-detect only!)
+ determines whether GDB will use the new, simpler "ThreadInfo"
+ query or the older, more complex syntax for thread queries.
+ This is an auto-detect variable (set to true at each connect,
+ and set to false when the target fails to recognize it). */
-static void
-show_remote_protocol_Z_write_wp_packet_cmd (char *args, int from_tty,
- struct cmd_list_element *c)
-{
- show_packet_config_cmd (&remote_protocol_Z[Z_PACKET_WRITE_WP]);
-}
+static int use_threadinfo_query;
+static int use_threadextra_query;
-static void
-set_remote_protocol_Z_read_wp_packet_cmd (char *args, int from_tty,
- struct cmd_list_element *c)
-{
- update_packet_config (&remote_protocol_Z[Z_PACKET_READ_WP]);
-}
+/* Tokens for use by the asynchronous signal handlers for SIGINT. */
+static struct async_signal_handler *sigint_remote_twice_token;
+static struct async_signal_handler *sigint_remote_token;
-static void
-show_remote_protocol_Z_read_wp_packet_cmd (char *args, int from_tty,
- struct cmd_list_element *c)
-{
- show_packet_config_cmd (&remote_protocol_Z[Z_PACKET_READ_WP]);
-}
+\f
+/* Asynchronous signal handle registered as event loop source for
+ when we have pending events ready to be passed to the core. */
-static void
-set_remote_protocol_Z_access_wp_packet_cmd (char *args, int from_tty,
- struct cmd_list_element *c)
-{
- update_packet_config (&remote_protocol_Z[Z_PACKET_ACCESS_WP]);
-}
+static struct async_event_handler *remote_async_inferior_event_token;
-static void
-show_remote_protocol_Z_access_wp_packet_cmd (char *args, int from_tty,
- struct cmd_list_element *c)
-{
- show_packet_config_cmd (&remote_protocol_Z[Z_PACKET_ACCESS_WP]);
-}
+/* Asynchronous signal handle registered as event loop source for when
+ the remote sent us a %Stop notification. The registered callback
+ will do a vStopped sequence to pull the rest of the events out of
+ the remote side into our event queue. */
-/* For compatibility with older distributions. Provide a ``set remote
- Z-packet ...'' command that updates all the Z packet types. */
+static struct async_event_handler *remote_async_get_pending_events_token;
+\f
-static enum auto_boolean remote_Z_packet_detect;
+static ptid_t magic_null_ptid;
+static ptid_t not_sent_ptid;
+static ptid_t any_thread_ptid;
-static void
-set_remote_protocol_Z_packet_cmd (char *args, int from_tty,
- struct cmd_list_element *c)
-{
- int i;
- for (i = 0; i < NR_Z_PACKET_TYPES; i++)
- {
- remote_protocol_Z[i].detect = remote_Z_packet_detect;
- update_packet_config (&remote_protocol_Z[i]);
- }
-}
+/* These are the threads which we last sent to the remote system. The
+ TID member will be -1 for all or -2 for not sent yet. */
-static void
-show_remote_protocol_Z_packet_cmd (char *args, int from_tty,
- struct cmd_list_element *c)
-{
- int i;
- for (i = 0; i < NR_Z_PACKET_TYPES; i++)
- {
- show_packet_config_cmd (&remote_protocol_Z[i]);
- }
-}
+static ptid_t general_thread;
+static ptid_t continue_thread;
-/* Should we try the 'X' (remote binary download) packet?
+/* This the traceframe which we last selected on the remote system.
+ It will be -1 if no traceframe is selected. */
+static int remote_traceframe_number = -1;
- This variable (available to the user via "set remote X-packet")
- dictates whether downloads are sent in binary (via the 'X' packet).
- We assume that the stub can, and attempt to do it. This will be
- 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). */
+/* Find out if the stub attached to PID (and hence GDB should offer to
+ detach instead of killing it when bailing out). */
-static struct packet_config remote_protocol_binary_download;
+static int
+remote_query_attached (int pid)
+{
+ struct remote_state *rs = get_remote_state ();
-/* Should we try the 'ThreadInfo' query packet?
+ if (remote_protocol_packets[PACKET_qAttached].support == PACKET_DISABLE)
+ return 0;
- This variable (NOT available to the user: auto-detect only!)
- determines whether GDB will use the new, simpler "ThreadInfo"
- query or the older, more complex syntax for thread queries.
- This is an auto-detect variable (set to true at each connect,
- and set to false when the target fails to recognize it). */
+ if (remote_multi_process_p (rs))
+ sprintf (rs->buf, "qAttached:%x", pid);
+ else
+ sprintf (rs->buf, "qAttached");
-static int use_threadinfo_query;
-static int use_threadextra_query;
+ putpkt (rs->buf);
+ getpkt (&rs->buf, &rs->buf_size, 0);
-static void
-set_remote_protocol_binary_download_cmd (char *args,
- int from_tty,
- struct cmd_list_element *c)
-{
- update_packet_config (&remote_protocol_binary_download);
-}
+ switch (packet_ok (rs->buf,
+ &remote_protocol_packets[PACKET_qAttached]))
+ {
+ case PACKET_OK:
+ if (strcmp (rs->buf, "1") == 0)
+ return 1;
+ break;
+ case PACKET_ERROR:
+ warning (_("Remote failure reply: %s"), rs->buf);
+ break;
+ case PACKET_UNKNOWN:
+ break;
+ }
-static void
-show_remote_protocol_binary_download_cmd (char *args, int from_tty,
- struct cmd_list_element *c)
-{
- show_packet_config_cmd (&remote_protocol_binary_download);
+ return 0;
}
-/* Should we try the 'qPart:auxv' (target auxiliary vector read) request? */
-static struct packet_config remote_protocol_qPart_auxv;
+/* Add PID to GDB's inferior table. Since we can be connected to a
+ remote system before before knowing about any inferior, mark the
+ target with execution when we find the first inferior. If ATTACHED
+ is 1, then we had just attached to this inferior. If it is 0, then
+ we just created this inferior. If it is -1, then try querying the
+ remote stub to find out if it had attached to the inferior or
+ not. */
-static void
-set_remote_protocol_qPart_auxv_packet_cmd (char *args, int from_tty,
- struct cmd_list_element *c)
+static struct inferior *
+remote_add_inferior (int pid, int attached)
{
- update_packet_config (&remote_protocol_qPart_auxv);
-}
+ struct inferior *inf;
-static void
-show_remote_protocol_qPart_auxv_packet_cmd (char *args, int from_tty,
- struct cmd_list_element *c)
-{
- show_packet_config_cmd (&remote_protocol_qPart_auxv);
+ /* Check whether this process we're learning about is to be
+ considered attached, or if is to be considered to have been
+ spawned by the stub. */
+ if (attached == -1)
+ attached = remote_query_attached (pid);
+
+ if (gdbarch_has_global_solist (target_gdbarch))
+ {
+ /* If the target shares code across all inferiors, then every
+ attach adds a new inferior. */
+ inf = add_inferior (pid);
+
+ /* ... and every inferior is bound to the same program space.
+ However, each inferior may still have its own address
+ space. */
+ inf->aspace = maybe_new_address_space ();
+ inf->pspace = current_program_space;
+ }
+ else
+ {
+ /* In the traditional debugging scenario, there's a 1-1 match
+ between program/address spaces. We simply bind the inferior
+ to the program space's address space. */
+ inf = current_inferior ();
+ inferior_appeared (inf, pid);
+ }
+
+ inf->attach_flag = attached;
+
+ return inf;
}
-static struct packet_config remote_protocol_p;
+/* Add thread PTID to GDB's thread list. Tag it as executing/running
+ according to RUNNING. */
static void
-set_remote_protocol_p_packet_cmd (char *args, int from_tty,
- struct cmd_list_element *c)
+remote_add_thread (ptid_t ptid, int running)
{
- update_packet_config (&remote_protocol_p);
+ add_thread (ptid);
+
+ set_executing (ptid, running);
+ set_running (ptid, running);
}
+/* Come here when we learn about a thread id from the remote target.
+ It may be the first time we hear about such thread, so take the
+ opportunity to add it to GDB's thread list. In case this is the
+ first time we're noticing its corresponding inferior, add it to
+ GDB's inferior list as well. */
+
static void
-show_remote_protocol_p_packet_cmd (char *args, int from_tty,
- struct cmd_list_element *c)
+remote_notice_new_inferior (ptid_t currthread, int running)
{
- show_packet_config_cmd (&remote_protocol_p);
-}
+ /* If this is a new thread, add it to GDB's thread list.
+ If we leave it up to WFI to do this, bad things will happen. */
+
+ if (in_thread_list (currthread) && is_exited (currthread))
+ {
+ /* We're seeing an event on a thread id we knew had exited.
+ This has to be a new thread reusing the old id. Add it. */
+ remote_add_thread (currthread, running);
+ return;
+ }
+
+ if (!in_thread_list (currthread))
+ {
+ struct inferior *inf = NULL;
+ int pid = ptid_get_pid (currthread);
+ if (ptid_is_pid (inferior_ptid)
+ && pid == ptid_get_pid (inferior_ptid))
+ {
+ /* inferior_ptid has no thread member yet. This can happen
+ with the vAttach -> remote_wait,"TAAthread:" path if the
+ stub doesn't support qC. This is the first stop reported
+ after an attach, so this is the main thread. Update the
+ ptid in the thread list. */
+ if (in_thread_list (pid_to_ptid (pid)))
+ thread_change_ptid (inferior_ptid, currthread);
+ else
+ {
+ remote_add_thread (currthread, running);
+ inferior_ptid = currthread;
+ }
+ return;
+ }
+ if (ptid_equal (magic_null_ptid, inferior_ptid))
+ {
+ /* inferior_ptid is not set yet. This can happen with the
+ vRun -> remote_wait,"TAAthread:" path if the stub
+ doesn't support qC. This is the first stop reported
+ after an attach, so this is the main thread. Update the
+ ptid in the thread list. */
+ thread_change_ptid (inferior_ptid, currthread);
+ return;
+ }
-/* Tokens for use by the asynchronous signal handlers for SIGINT */
-static void *sigint_remote_twice_token;
-static void *sigint_remote_token;
+ /* When connecting to a target remote, or to a target
+ extended-remote which already was debugging an inferior, we
+ may not know about it yet. Add it before adding its child
+ thread, so notifications are emitted in a sensible order. */
+ if (!in_inferior_list (ptid_get_pid (currthread)))
+ inf = remote_add_inferior (ptid_get_pid (currthread), -1);
+
+ /* This is really a new thread. Add it. */
+ remote_add_thread (currthread, running);
+
+ /* If we found a new inferior, let the common code do whatever
+ it needs to with it (e.g., read shared libraries, insert
+ breakpoints). */
+ if (inf != NULL)
+ notice_new_inferior (currthread, running, 0);
+ }
+}
-/* These are pointers to hook functions that may be set in order to
- modify resume/wait behavior for a particular architecture. */
+/* Return the private thread data, creating it if necessary. */
-void (*deprecated_target_resume_hook) (void);
-void (*deprecated_target_wait_loop_hook) (void);
-\f
+struct private_thread_info *
+demand_private_info (ptid_t ptid)
+{
+ struct thread_info *info = find_thread_ptid (ptid);
+ gdb_assert (info);
-/* These are the threads which we last sent to the remote system.
- -1 for all or -2 for not sent yet. */
-static int general_thread;
-static int continue_thread;
+ if (!info->private)
+ {
+ info->private = xmalloc (sizeof (*(info->private)));
+ info->private_dtor = free_private_thread_info;
+ info->private->core = -1;
+ info->private->extra = 0;
+ }
+
+ return info->private;
+}
/* Call this function as a result of
1) A halt indication (T packet) containing a thread id
2) A direct query of currthread
- 3) Successful execution of set thread
- */
+ 3) Successful execution of set thread */
static void
-record_currthread (int currthread)
+record_currthread (ptid_t currthread)
{
general_thread = currthread;
+}
- /* If this is a new thread, add it to GDB's thread list.
- If we leave it up to WFI to do this, bad things will happen. */
- if (!in_thread_list (pid_to_ptid (currthread)))
+static char *last_pass_packet;
+
+/* If 'QPassSignals' is supported, tell the remote stub what signals
+ it can simply pass through to the inferior without reporting. */
+
+static void
+remote_pass_signals (int numsigs, unsigned char *pass_signals)
+{
+ if (remote_protocol_packets[PACKET_QPassSignals].support != PACKET_DISABLE)
{
- add_thread (pid_to_ptid (currthread));
- ui_out_text (uiout, "[New ");
- ui_out_text (uiout, target_pid_to_str (pid_to_ptid (currthread)));
- ui_out_text (uiout, "]\n");
+ char *pass_packet, *p;
+ int count = 0, i;
+
+ gdb_assert (numsigs < 256);
+ for (i = 0; i < numsigs; i++)
+ {
+ if (pass_signals[i])
+ count++;
+ }
+ pass_packet = xmalloc (count * 3 + strlen ("QPassSignals:") + 1);
+ strcpy (pass_packet, "QPassSignals:");
+ p = pass_packet + strlen (pass_packet);
+ for (i = 0; i < numsigs; i++)
+ {
+ if (pass_signals[i])
+ {
+ if (i >= 16)
+ *p++ = tohex (i >> 4);
+ *p++ = tohex (i & 15);
+ if (count)
+ *p++ = ';';
+ else
+ break;
+ count--;
+ }
+ }
+ *p = 0;
+ if (!last_pass_packet || strcmp (last_pass_packet, pass_packet))
+ {
+ struct remote_state *rs = get_remote_state ();
+ char *buf = rs->buf;
+
+ putpkt (pass_packet);
+ getpkt (&rs->buf, &rs->buf_size, 0);
+ packet_ok (buf, &remote_protocol_packets[PACKET_QPassSignals]);
+ if (last_pass_packet)
+ xfree (last_pass_packet);
+ last_pass_packet = pass_packet;
+ }
+ else
+ xfree (pass_packet);
}
}
-#define MAGIC_NULL_PID 42000
-
+/* If PTID is MAGIC_NULL_PTID, don't set any thread. If PTID is
+ MINUS_ONE_PTID, set the thread to -1, so the stub returns the
+ thread. If GEN is set, set the general thread, if not, then set
+ the step/continue thread. */
static void
-set_thread (int th, int gen)
+set_thread (struct ptid ptid, int gen)
{
struct remote_state *rs = get_remote_state ();
- char *buf = alloca (rs->remote_packet_size);
- int state = gen ? general_thread : continue_thread;
+ ptid_t state = gen ? general_thread : continue_thread;
+ char *buf = rs->buf;
+ char *endbuf = rs->buf + get_remote_packet_size ();
- if (state == th)
+ if (ptid_equal (state, ptid))
return;
- buf[0] = 'H';
- buf[1] = gen ? 'g' : 'c';
- if (th == MAGIC_NULL_PID)
- {
- buf[2] = '0';
- buf[3] = '\0';
- }
- else if (th < 0)
- sprintf (&buf[2], "-%x", -th);
+ *buf++ = 'H';
+ *buf++ = gen ? 'g' : 'c';
+ if (ptid_equal (ptid, magic_null_ptid))
+ xsnprintf (buf, endbuf - buf, "0");
+ else if (ptid_equal (ptid, any_thread_ptid))
+ xsnprintf (buf, endbuf - buf, "0");
+ else if (ptid_equal (ptid, minus_one_ptid))
+ xsnprintf (buf, endbuf - buf, "-1");
else
- sprintf (&buf[2], "%x", th);
- putpkt (buf);
- getpkt (buf, (rs->remote_packet_size), 0);
+ write_ptid (buf, endbuf, ptid);
+ putpkt (rs->buf);
+ getpkt (&rs->buf, &rs->buf_size, 0);
if (gen)
- general_thread = th;
+ general_thread = ptid;
else
- continue_thread = th;
+ continue_thread = ptid;
+}
+
+static void
+set_general_thread (struct ptid ptid)
+{
+ set_thread (ptid, 1);
+}
+
+static void
+set_continue_thread (struct ptid ptid)
+{
+ set_thread (ptid, 0);
+}
+
+/* Change the remote current process. Which thread within the process
+ ends up selected isn't important, as long as it is the same process
+ as what INFERIOR_PTID points to.
+
+ This comes from that fact that there is no explicit notion of
+ "selected process" in the protocol. The selected process for
+ general operations is the process the selected general thread
+ belongs to. */
+
+static void
+set_general_process (void)
+{
+ struct remote_state *rs = get_remote_state ();
+
+ /* If the remote can't handle multiple processes, don't bother. */
+ if (!remote_multi_process_p (rs))
+ return;
+
+ /* We only need to change the remote current thread if it's pointing
+ at some other process. */
+ if (ptid_get_pid (general_thread) != ptid_get_pid (inferior_ptid))
+ set_general_thread (inferior_ptid);
}
+
\f
-/* Return nonzero if the thread TH is still alive on the remote system. */
+/* Return nonzero if the thread PTID is still alive on the remote
+ system. */
static int
-remote_thread_alive (ptid_t ptid)
+remote_thread_alive (struct target_ops *ops, ptid_t ptid)
{
- int tid = PIDGET (ptid);
- char buf[16];
+ struct remote_state *rs = get_remote_state ();
+ char *p, *endp;
- if (tid < 0)
- sprintf (buf, "T-%08x", -tid);
- else
- sprintf (buf, "T%08x", tid);
- putpkt (buf);
- getpkt (buf, sizeof (buf), 0);
- return (buf[0] == 'O' && buf[1] == 'K');
+ if (ptid_equal (ptid, magic_null_ptid))
+ /* The main thread is always alive. */
+ return 1;
+
+ if (ptid_get_pid (ptid) != 0 && ptid_get_tid (ptid) == 0)
+ /* The main thread is always alive. This can happen after a
+ vAttach, if the remote side doesn't support
+ multi-threading. */
+ return 1;
+
+ p = rs->buf;
+ endp = rs->buf + get_remote_packet_size ();
+
+ *p++ = 'T';
+ write_ptid (p, endp, ptid);
+
+ putpkt (rs->buf);
+ getpkt (&rs->buf, &rs->buf_size, 0);
+ return (rs->buf[0] == 'O' && rs->buf[1] == 'K');
}
/* About these extended threadlist and threadinfo packets. They are
/* 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.
- */
+ 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 */
+ equivalent 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/suspended. */
+ 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
a mask containing bits specifying the desired information.
Use a union of these values as the 'selection' parameter to
- get_thread_info. FIXME: Make these TAG names more thread specific.
- */
+ get_thread_info. FIXME: Make these TAG names more thread specific. */
#define TAG_THREADID 1
#define TAG_EXISTS 2
#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);
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);
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);
+
+
+/* Write a PTID to BUF. ENDBUF points to one-passed-the-end of the
+ buffer we're allowed to write to. Returns
+ BUF+CHARACTERS_WRITTEN. */
+
+static char *
+write_ptid (char *buf, const char *endbuf, ptid_t ptid)
+{
+ int pid, tid;
+ struct remote_state *rs = get_remote_state ();
+
+ if (remote_multi_process_p (rs))
+ {
+ pid = ptid_get_pid (ptid);
+ if (pid < 0)
+ buf += xsnprintf (buf, endbuf - buf, "p-%x.", -pid);
+ else
+ buf += xsnprintf (buf, endbuf - buf, "p%x.", pid);
+ }
+ tid = ptid_get_tid (ptid);
+ if (tid < 0)
+ buf += xsnprintf (buf, endbuf - buf, "-%x", -tid);
+ else
+ buf += xsnprintf (buf, endbuf - buf, "%x", tid);
+
+ return buf;
+}
+
+/* Extract a PTID from BUF. If non-null, OBUF is set to the to one
+ passed the last parsed char. Returns null_ptid on error. */
+
+static ptid_t
+read_ptid (char *buf, char **obuf)
+{
+ char *p = buf;
+ char *pp;
+ ULONGEST pid = 0, tid = 0;
+
+ if (*p == 'p')
+ {
+ /* Multi-process ptid. */
+ pp = unpack_varlen_hex (p + 1, &pid);
+ if (*pp != '.')
+ error (_("invalid remote ptid: %s"), p);
+
+ p = pp;
+ pp = unpack_varlen_hex (p + 1, &tid);
+ if (obuf)
+ *obuf = pp;
+ return ptid_build (pid, 0, tid);
+ }
+
+ /* No multi-process. Just a tid. */
+ pp = unpack_varlen_hex (p, &tid);
+
+ /* Since the stub is not sending a process id, then default to
+ what's in inferior_ptid, unless it's null at this point. If so,
+ then since there's no way to know the pid of the reported
+ threads, use the magic number. */
+ if (ptid_equal (inferior_ptid, null_ptid))
+ pid = ptid_get_pid (magic_null_ptid);
+ else
+ pid = ptid_get_pid (inferior_ptid);
+
+ if (obuf)
+ *obuf = pp;
+ return ptid_build (pid, 0, tid);
+}
-/* encode 64 bits in 16 chars of hex */
+/* Encode 64 bits in 16 chars of hex. */
static const char hexchars[] = "0123456789abcdef";
ULONGEST *result)
{
int nibble;
- int retval = 0;
+ ULONGEST retval = 0;
while (ishex (*buff, &nibble))
{
static char *
unpack_nibble (char *buf, int *val)
{
- ishex (*buf++, val);
+ *val = fromhex (*buf++);
return buf;
}
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 *
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;
}
/* Externally, threadrefs are 64 bits but internally, they are still
- ints. This is due to a mismatch of specifications. We would like
+ ints. This is due to a mismatch of specifications. We would like
to use 64bit thread references internally. This is an adapter
function. */
int i, value = 0;
unsigned char *scan;
- scan = (char *) ref;
+ scan = *ref;
scan += 4;
i = 4;
while (i-- > 0)
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;
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,
{
struct remote_state *rs = get_remote_state ();
int mask, length;
- unsigned int tag;
+ int tag;
threadref ref;
- char *limit = pkt + (rs->remote_packet_size); /* plausable parsing limit */
+ char *limit = pkt + rs->buf_size; /* Plausible 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");
+ warning (_("Incomplete response to threadinfo request."));
if (!threadmatch (&ref, expectedref))
- { /* This is an answer to a different request */
- warning ("ERROR RMT Thread info mismatch\n");
+ { /* This is an answer to a different request. */
+ warning (_("ERROR RMT Thread info mismatch."));
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");
+ warning (_("ERROR RMT: threadinfo tag mismatch."));
retval = 0;
break;
}
{
if (length != 16)
{
- warning ("ERROR RMT: length of threadid is not 16\n");
+ warning (_("ERROR RMT: length of threadid is not 16."));
retval = 0;
break;
}
mask = mask & ~(TAG_EXISTS);
if (length > 8)
{
- warning ("ERROR RMT: 'exists' length too long\n");
+ warning (_("ERROR RMT: 'exists' length too long."));
retval = 0;
break;
}
mask = mask & ~TAG_MOREDISPLAY;
continue;
}
- warning ("ERROR RMT: unknown thread info tag\n");
- break; /* Not a tag we know about */
+ warning (_("ERROR RMT: unknown thread info tag."));
+ break; /* Not a tag we know about. */
}
return retval;
}
{
struct remote_state *rs = get_remote_state ();
int result;
- char *threadinfo_pkt = alloca (rs->remote_packet_size);
- 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);
+ pack_threadinfo_request (rs->buf, fieldset, threadid);
+ putpkt (rs->buf);
+ getpkt (&rs->buf, &rs->buf_size, 0);
+
+ if (rs->buf[0] == '\0')
+ return 0;
+
+ result = remote_unpack_thread_info_response (rs->buf + 2,
+ threadid, info);
return result;
}
{
*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';
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->buf_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. */
{
struct remote_state *rs = get_remote_state ();
static threadref echo_nextthread;
- char *threadlist_packet = alloca (rs->remote_packet_size);
- 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;
+ /* Trancate result limit to be smaller than the packet size. */
+ if ((((result_limit + 1) * BUF_THREAD_ID_SIZE) + 10)
+ >= get_remote_packet_size ())
+ result_limit = (get_remote_packet_size () / BUF_THREAD_ID_SIZE) - 2;
- pack_threadlist_request (threadlist_packet,
- startflag, result_limit, nextthread);
- putpkt (threadlist_packet);
- getpkt (t_response, (rs->remote_packet_size), 0);
+ pack_threadlist_request (rs->buf, startflag, result_limit, nextthread);
+ putpkt (rs->buf);
+ getpkt (&rs->buf, &rs->buf_size, 0);
- *result_count =
- parse_threadlist_response (t_response + 2, result_limit, &echo_nextthread,
- threadlist, done);
+ if (*rs->buf == '\0')
+ return 0;
+ else
+ *result_count =
+ parse_threadlist_response (rs->buf + 2, result_limit, &echo_nextthread,
+ threadlist, done);
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
exit
wait for packet, then exit
*/
- warning ("HMM: threadlist did not echo arg thread, dropping it\n");
- return 0; /* I choose simply exiting */
+ warning (_("HMM: threadlist did not echo arg thread, dropping it."));
+ return 0; /* I choose simply exiting. */
}
if (*result_count <= 0)
{
if (*done != 1)
{
- warning ("RMT ERROR : failed to get remote thread list\n");
+ warning (_("RMT ERROR : failed to get remote thread list."));
result = 0;
}
return result; /* break; */
if (*result_count > result_limit)
{
*result_count = 0;
- warning ("RMT ERROR: threadlist response longer than requested\n");
+ warning (_("RMT ERROR: threadlist response longer than requested."));
return 0;
}
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,
- ading the thread if it does not already exist. This involves
+ adding the thread if it does not already exist. This involves
getting partial thread lists from the remote target so, polling the
quit_flag is required. */
-/* About this many threadisds fit in a packet. */
+/* About this many threadisds fit in a packet. */
#define MAXTHREADLISTRESULTS 32
if (loopcount++ > looplimit)
{
result = 0;
- warning ("Remote fetch threadlist -infinite loop-\n");
+ warning (_("Remote fetch threadlist -infinite loop-."));
break;
}
if (!remote_get_threadlist (startflag, &nextthread, MAXTHREADLISTRESULTS,
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)
static int
remote_newthread_step (threadref *ref, void *context)
{
- ptid_t ptid;
-
- ptid = pid_to_ptid (threadref_to_int (ref));
+ int pid = ptid_get_pid (inferior_ptid);
+ ptid_t ptid = ptid_build (pid, 0, threadref_to_int (ref));
if (!in_thread_list (ptid))
add_thread (ptid);
remote_current_thread (ptid_t oldpid)
{
struct remote_state *rs = get_remote_state ();
- char *buf = alloca (rs->remote_packet_size);
putpkt ("qC");
- getpkt (buf, (rs->remote_packet_size), 0);
- if (buf[0] == 'Q' && buf[1] == 'C')
- return pid_to_ptid (strtol (&buf[2], NULL, 16));
+ getpkt (&rs->buf, &rs->buf_size, 0);
+ if (rs->buf[0] == 'Q' && rs->buf[1] == 'C')
+ return read_ptid (&rs->buf[2], NULL);
else
return oldpid;
}
{
remote_threadlist_iterator (remote_newthread_step, 0,
CRAZY_MAX_THREADS);
- if (PIDGET (inferior_ptid) == MAGIC_NULL_PID) /* ack ack ack */
- inferior_ptid = remote_current_thread (inferior_ptid);
}
+#if defined(HAVE_LIBEXPAT)
+
+typedef struct thread_item
+{
+ ptid_t ptid;
+ char *extra;
+ int core;
+} thread_item_t;
+DEF_VEC_O(thread_item_t);
+
+struct threads_parsing_context
+{
+ VEC (thread_item_t) *items;
+};
+
+static void
+start_thread (struct gdb_xml_parser *parser,
+ const struct gdb_xml_element *element,
+ void *user_data, VEC(gdb_xml_value_s) *attributes)
+{
+ struct threads_parsing_context *data = user_data;
+
+ struct thread_item item;
+ char *id;
+ struct gdb_xml_value *attr;
+
+ id = xml_find_attribute (attributes, "id")->value;
+ item.ptid = read_ptid (id, NULL);
+
+ attr = xml_find_attribute (attributes, "core");
+ if (attr != NULL)
+ item.core = *(ULONGEST *) attr->value;
+ else
+ item.core = -1;
+
+ item.extra = 0;
+
+ VEC_safe_push (thread_item_t, data->items, &item);
+}
+
+static void
+end_thread (struct gdb_xml_parser *parser,
+ const struct gdb_xml_element *element,
+ void *user_data, const char *body_text)
+{
+ struct threads_parsing_context *data = user_data;
+
+ if (body_text && *body_text)
+ VEC_last (thread_item_t, data->items)->extra = xstrdup (body_text);
+}
+
+const struct gdb_xml_attribute thread_attributes[] = {
+ { "id", GDB_XML_AF_NONE, NULL, NULL },
+ { "core", GDB_XML_AF_OPTIONAL, gdb_xml_parse_attr_ulongest, NULL },
+ { NULL, GDB_XML_AF_NONE, NULL, NULL }
+};
+
+const struct gdb_xml_element thread_children[] = {
+ { NULL, NULL, NULL, GDB_XML_EF_NONE, NULL, NULL }
+};
+
+const struct gdb_xml_element threads_children[] = {
+ { "thread", thread_attributes, thread_children,
+ GDB_XML_EF_REPEATABLE | GDB_XML_EF_OPTIONAL,
+ start_thread, end_thread },
+ { NULL, NULL, NULL, GDB_XML_EF_NONE, NULL, NULL }
+};
+
+const struct gdb_xml_element threads_elements[] = {
+ { "threads", NULL, threads_children,
+ GDB_XML_EF_NONE, NULL, NULL },
+ { NULL, NULL, NULL, GDB_XML_EF_NONE, NULL, NULL }
+};
+
+/* Discard the contents of the constructed thread info context. */
+
+static void
+clear_threads_parsing_context (void *p)
+{
+ struct threads_parsing_context *context = p;
+ int i;
+ struct thread_item *item;
+
+ for (i = 0; VEC_iterate (thread_item_t, context->items, i, item); ++i)
+ xfree (item->extra);
+
+ VEC_free (thread_item_t, context->items);
+}
+
+#endif
+
/*
* Find all threads for info threads command.
* Uses new thread protocol contributed by Cisco.
*/
static void
-remote_threads_info (void)
+remote_threads_info (struct target_ops *ops)
{
struct remote_state *rs = get_remote_state ();
- char *buf = alloca (rs->remote_packet_size);
char *bufp;
- int tid;
+ ptid_t new_thread;
if (remote_desc == 0) /* paranoia */
- error ("Command can only be used when connected to the remote target.");
+ error (_("Command can only be used when connected to the remote target."));
- if (use_threadinfo_query)
+#if defined(HAVE_LIBEXPAT)
+ if (remote_protocol_packets[PACKET_qXfer_threads].support == PACKET_ENABLE)
{
- putpkt ("qfThreadInfo");
- bufp = buf;
- getpkt (bufp, (rs->remote_packet_size), 0);
- if (bufp[0] != '\0') /* q packet recognized */
+ char *xml = target_read_stralloc (¤t_target,
+ TARGET_OBJECT_THREADS, NULL);
+
+ struct cleanup *back_to = make_cleanup (xfree, xml);
+
+ if (xml && *xml)
{
- while (*bufp++ == 'm') /* reply contains one or more TID */
+ struct threads_parsing_context context;
+
+ context.items = NULL;
+ make_cleanup (clear_threads_parsing_context, &context);
+
+ if (gdb_xml_parse_quick (_("threads"), "threads.dtd",
+ threads_elements, xml, &context) == 0)
{
- do
+ int i;
+ struct thread_item *item;
+
+ for (i = 0;
+ VEC_iterate (thread_item_t, context.items, i, item);
+ ++i)
{
- tid = strtol (bufp, &bufp, 16);
- if (tid != 0 && !in_thread_list (pid_to_ptid (tid)))
- add_thread (pid_to_ptid (tid));
+ if (!ptid_equal (item->ptid, null_ptid))
+ {
+ struct private_thread_info *info;
+ /* In non-stop mode, we assume new found threads
+ are running until proven otherwise with a
+ stop reply. In all-stop, we can only get
+ here if all threads are stopped. */
+ int running = non_stop ? 1 : 0;
+
+ remote_notice_new_inferior (item->ptid, running);
+
+ info = demand_private_info (item->ptid);
+ info->core = item->core;
+ info->extra = item->extra;
+ item->extra = NULL;
+ }
+ }
+ }
+ }
+
+ do_cleanups (back_to);
+ return;
+ }
+#endif
+
+ if (use_threadinfo_query)
+ {
+ putpkt ("qfThreadInfo");
+ getpkt (&rs->buf, &rs->buf_size, 0);
+ bufp = rs->buf;
+ if (bufp[0] != '\0') /* q packet recognized */
+ {
+ while (*bufp++ == 'm') /* reply contains one or more TID */
+ {
+ do
+ {
+ new_thread = read_ptid (bufp, &bufp);
+ if (!ptid_equal (new_thread, null_ptid))
+ {
+ /* In non-stop mode, we assume new found threads
+ are running until proven otherwise with a
+ stop reply. In all-stop, we can only get
+ here if all threads are stopped. */
+ int running = non_stop ? 1 : 0;
+
+ remote_notice_new_inferior (new_thread, running);
+ }
}
while (*bufp++ == ','); /* comma-separated list */
putpkt ("qsThreadInfo");
- bufp = buf;
- getpkt (bufp, (rs->remote_packet_size), 0);
+ getpkt (&rs->buf, &rs->buf_size, 0);
+ bufp = rs->buf;
}
return; /* done */
}
}
- /* Else fall back to old method based on jmetzler protocol. */
+ /* Only qfThreadInfo is supported in non-stop mode. */
+ if (non_stop)
+ return;
+
+ /* Else fall back to old method based on jmetzler protocol. */
use_threadinfo_query = 0;
remote_find_new_threads ();
return;
int set;
threadref id;
struct gdb_ext_thread_info threadinfo;
- static char display_buf[100]; /* arbitrary... */
- char *bufp = alloca (rs->remote_packet_size);
+ static char display_buf[100]; /* arbitrary... */
int n = 0; /* position in display_buf */
if (remote_desc == 0) /* paranoia */
internal_error (__FILE__, __LINE__,
- "remote_threads_extra_info");
+ _("remote_threads_extra_info"));
+
+ if (ptid_equal (tp->ptid, magic_null_ptid)
+ || (ptid_get_pid (tp->ptid) != 0 && ptid_get_tid (tp->ptid) == 0))
+ /* This is the main thread which was added by GDB. The remote
+ server doesn't know about it. */
+ return NULL;
+
+ if (remote_protocol_packets[PACKET_qXfer_threads].support == PACKET_ENABLE)
+ {
+ struct thread_info *info = find_thread_ptid (tp->ptid);
+
+ if (info && info->private)
+ return info->private->extra;
+ else
+ return NULL;
+ }
if (use_threadextra_query)
{
- sprintf (bufp, "qThreadExtraInfo,%x", PIDGET (tp->ptid));
- putpkt (bufp);
- getpkt (bufp, (rs->remote_packet_size), 0);
- if (bufp[0] != 0)
+ char *b = rs->buf;
+ char *endb = rs->buf + get_remote_packet_size ();
+
+ xsnprintf (b, endb - b, "qThreadExtraInfo,");
+ b += strlen (b);
+ write_ptid (b, endb, tp->ptid);
+
+ putpkt (rs->buf);
+ getpkt (&rs->buf, &rs->buf_size, 0);
+ if (rs->buf[0] != 0)
{
- n = min (strlen (bufp) / 2, sizeof (display_buf));
- result = hex2bin (bufp, display_buf, n);
+ n = min (strlen (rs->buf) / 2, sizeof (display_buf));
+ result = hex2bin (rs->buf, (gdb_byte *) display_buf, n);
display_buf [result] = '\0';
return display_buf;
}
use_threadextra_query = 0;
set = TAG_THREADID | TAG_EXISTS | TAG_THREADNAME
| TAG_MOREDISPLAY | TAG_DISPLAY;
- int_to_threadref (&id, PIDGET (tp->ptid));
+ int_to_threadref (&id, ptid_get_tid (tp->ptid));
if (remote_get_threadinfo (&id, set, &threadinfo))
if (threadinfo.active)
{
if (*threadinfo.shortname)
- n += sprintf(&display_buf[0], " Name: %s,", threadinfo.shortname);
+ n += xsnprintf (&display_buf[0], sizeof (display_buf) - n,
+ " Name: %s,", threadinfo.shortname);
if (*threadinfo.display)
- n += sprintf(&display_buf[n], " State: %s,", threadinfo.display);
+ n += xsnprintf (&display_buf[n], sizeof (display_buf) - n,
+ " State: %s,", threadinfo.display);
if (*threadinfo.more_display)
- n += sprintf(&display_buf[n], " Priority: %s",
- threadinfo.more_display);
+ n += xsnprintf (&display_buf[n], sizeof (display_buf) - n,
+ " Priority: %s", threadinfo.more_display);
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;
}
return NULL;
}
+\f
+
+static int
+remote_static_tracepoint_marker_at (CORE_ADDR addr,
+ struct static_tracepoint_marker *marker)
+{
+ struct remote_state *rs = get_remote_state ();
+ char *p = rs->buf;
+
+ sprintf (p, "qTSTMat:");
+ p += strlen (p);
+ p += hexnumstr (p, addr);
+ putpkt (rs->buf);
+ getpkt (&rs->buf, &rs->buf_size, 0);
+ p = rs->buf;
+
+ if (*p == 'E')
+ error (_("Remote failure reply: %s"), p);
+
+ if (*p++ == 'm')
+ {
+ parse_static_tracepoint_marker_definition (p, &p, marker);
+ return 1;
+ }
+
+ return 0;
+}
+
+static void
+free_current_marker (void *arg)
+{
+ struct static_tracepoint_marker **marker_p = arg;
+
+ if (*marker_p != NULL)
+ {
+ release_static_tracepoint_marker (*marker_p);
+ xfree (*marker_p);
+ }
+ else
+ *marker_p = NULL;
+}
+
+static VEC(static_tracepoint_marker_p) *
+remote_static_tracepoint_markers_by_strid (const char *strid)
+{
+ struct remote_state *rs = get_remote_state ();
+ VEC(static_tracepoint_marker_p) *markers = NULL;
+ struct static_tracepoint_marker *marker = NULL;
+ struct cleanup *old_chain;
+ char *p;
+
+ /* Ask for a first packet of static tracepoint marker
+ definition. */
+ putpkt ("qTfSTM");
+ getpkt (&rs->buf, &rs->buf_size, 0);
+ p = rs->buf;
+ if (*p == 'E')
+ error (_("Remote failure reply: %s"), p);
+
+ old_chain = make_cleanup (free_current_marker, &marker);
+
+ while (*p++ == 'm')
+ {
+ if (marker == NULL)
+ marker = XCNEW (struct static_tracepoint_marker);
+
+ do
+ {
+ parse_static_tracepoint_marker_definition (p, &p, marker);
+
+ if (strid == NULL || strcmp (strid, marker->str_id) == 0)
+ {
+ VEC_safe_push (static_tracepoint_marker_p,
+ markers, marker);
+ marker = NULL;
+ }
+ else
+ {
+ release_static_tracepoint_marker (marker);
+ memset (marker, 0, sizeof (*marker));
+ }
+ }
+ while (*p++ == ','); /* comma-separated list */
+ /* Ask for another packet of static tracepoint definition. */
+ putpkt ("qTsSTM");
+ getpkt (&rs->buf, &rs->buf_size, 0);
+ p = rs->buf;
+ }
+
+ do_cleanups (old_chain);
+ return markers;
+}
+
+\f
+/* Implement the to_get_ada_task_ptid function for the remote targets. */
+static ptid_t
+remote_get_ada_task_ptid (long lwp, long thread)
+{
+ return ptid_build (ptid_get_pid (inferior_ptid), 0, lwp);
+}
\f
-/* Restart the remote side; this is an extended protocol operation. */
+/* Restart the remote side; this is an extended protocol operation. */
static void
extended_remote_restart (void)
{
struct remote_state *rs = get_remote_state ();
- char *buf = alloca (rs->remote_packet_size);
/* Send the restart command; for reasons I don't understand the
remote side really expects a number after the "R". */
- buf[0] = 'R';
- sprintf (&buf[1], "%x", 0);
- putpkt (buf);
+ xsnprintf (rs->buf, get_remote_packet_size (), "R%x", 0);
+ putpkt (rs->buf);
- /* Now query for status so this looks just like we restarted
- gdbserver from scratch. */
- putpkt ("?");
- getpkt (buf, (rs->remote_packet_size), 0);
+ remote_fileio_reset ();
}
\f
/* Clean up connection to a remote debugger. */
static void
remote_close (int quitting)
{
- if (remote_desc)
- serial_close (remote_desc);
+ if (remote_desc == NULL)
+ return; /* already closed */
+
+ /* Make sure we leave stdin registered in the event loop, and we
+ don't leave the async SIGINT signal handler installed. */
+ remote_terminal_ours ();
+
+ serial_close (remote_desc);
remote_desc = NULL;
+
+ /* We don't have a connection to the remote stub anymore. Get rid
+ of all the inferiors and their threads we were controlling.
+ Reset inferior_ptid to null_ptid first, as otherwise has_stack_frame
+ will be unable to find the thread corresponding to (pid, 0, 0). */
+ inferior_ptid = null_ptid;
+ discard_all_inferiors ();
+
+ /* We're no longer interested in any of these events. */
+ discard_pending_stop_replies (-1);
+
+ if (remote_async_inferior_event_token)
+ delete_async_event_handler (&remote_async_inferior_event_token);
+ if (remote_async_get_pending_events_token)
+ delete_async_event_handler (&remote_async_get_pending_events_token);
}
-/* 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)
{
struct remote_state *rs = get_remote_state ();
- char *buf = alloca (rs->remote_packet_size);
+ char *buf;
char *ptr;
- int lose;
- CORE_ADDR text_addr, data_addr, bss_addr;
+ int lose, num_segments = 0, do_sections, do_segments;
+ CORE_ADDR text_addr, data_addr, bss_addr, segments[2];
struct section_offsets *offs;
+ struct symfile_segment_data *data;
- putpkt ("qOffsets");
+ if (symfile_objfile == NULL)
+ return;
- getpkt (buf, (rs->remote_packet_size), 0);
+ putpkt ("qOffsets");
+ getpkt (&rs->buf, &rs->buf_size, 0);
+ buf = rs->buf;
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);
+ warning (_("Remote failure reply: %s"), buf);
return;
}
/* Don't use strtol, could lose on big values. */
while (*ptr && *ptr != ';')
text_addr = (text_addr << 4) + fromhex (*ptr++);
- }
- else
- lose = 1;
- if (!lose && strncmp (ptr, ";Data=", 6) == 0)
- {
- ptr += 6;
- while (*ptr && *ptr != ';')
- data_addr = (data_addr << 4) + fromhex (*ptr++);
- }
- else
- lose = 1;
+ if (strncmp (ptr, ";Data=", 6) == 0)
+ {
+ ptr += 6;
+ while (*ptr && *ptr != ';')
+ data_addr = (data_addr << 4) + fromhex (*ptr++);
+ }
+ else
+ lose = 1;
+
+ if (!lose && strncmp (ptr, ";Bss=", 5) == 0)
+ {
+ ptr += 5;
+ while (*ptr && *ptr != ';')
+ bss_addr = (bss_addr << 4) + fromhex (*ptr++);
- if (!lose && strncmp (ptr, ";Bss=", 5) == 0)
+ if (bss_addr != data_addr)
+ warning (_("Target reported unsupported offsets: %s"), buf);
+ }
+ else
+ lose = 1;
+ }
+ else if (strncmp (ptr, "TextSeg=", 8) == 0)
{
- ptr += 5;
+ ptr += 8;
+ /* Don't use strtol, could lose on big values. */
while (*ptr && *ptr != ';')
- bss_addr = (bss_addr << 4) + fromhex (*ptr++);
+ text_addr = (text_addr << 4) + fromhex (*ptr++);
+ num_segments = 1;
+
+ if (strncmp (ptr, ";DataSeg=", 9) == 0)
+ {
+ ptr += 9;
+ while (*ptr && *ptr != ';')
+ data_addr = (data_addr << 4) + fromhex (*ptr++);
+ num_segments++;
+ }
}
else
lose = 1;
if (lose)
- error ("Malformed response to offset query, %s", buf);
-
- if (symfile_objfile == NULL)
- return;
+ error (_("Malformed response to offset query, %s"), buf);
+ else if (*ptr != '\0')
+ warning (_("Target reported unsupported offsets: %s"), buf);
offs = ((struct section_offsets *)
alloca (SIZEOF_N_SECTION_OFFSETS (symfile_objfile->num_sections)));
memcpy (offs, symfile_objfile->section_offsets,
SIZEOF_N_SECTION_OFFSETS (symfile_objfile->num_sections));
- offs->offsets[SECT_OFF_TEXT (symfile_objfile)] = text_addr;
+ data = get_symfile_segment_data (symfile_objfile->obfd);
+ do_segments = (data != NULL);
+ do_sections = num_segments == 0;
+
+ if (num_segments > 0)
+ {
+ segments[0] = text_addr;
+ segments[1] = data_addr;
+ }
+ /* If we have two segments, we can still try to relocate everything
+ by assuming that the .text and .data offsets apply to the whole
+ text and data segments. Convert the offsets given in the packet
+ to base addresses for symfile_map_offsets_to_segments. */
+ else if (data && data->num_segments == 2)
+ {
+ segments[0] = data->segment_bases[0] + text_addr;
+ segments[1] = data->segment_bases[1] + data_addr;
+ num_segments = 2;
+ }
+ /* If the object file has only one segment, assume that it is text
+ rather than data; main programs with no writable data are rare,
+ but programs with no code are useless. Of course the code might
+ have ended up in the data segment... to detect that we would need
+ the permissions here. */
+ else if (data && data->num_segments == 1)
+ {
+ segments[0] = data->segment_bases[0] + text_addr;
+ num_segments = 1;
+ }
+ /* There's no way to relocate by segment. */
+ else
+ do_segments = 0;
+
+ if (do_segments)
+ {
+ int ret = symfile_map_offsets_to_segments (symfile_objfile->obfd, data,
+ offs, num_segments, segments);
+
+ if (ret == 0 && !do_sections)
+ error (_("Can not handle qOffsets TextSeg "
+ "response with this symbol file"));
+
+ if (ret > 0)
+ do_sections = 0;
+ }
- /* This is a temporary kludge to force data and bss to use the same offsets
- because that's what nlmconv does now. The real solution requires changes
- to the stub and remote.c that I don't have time to do right now. */
+ if (data)
+ free_symfile_segment_data (data);
- offs->offsets[SECT_OFF_DATA (symfile_objfile)] = data_addr;
- offs->offsets[SECT_OFF_BSS (symfile_objfile)] = data_addr;
+ if (do_sections)
+ {
+ offs->offsets[SECT_OFF_TEXT (symfile_objfile)] = text_addr;
+
+ /* This is a temporary kludge to force data and bss to use the
+ same offsets because that's what nlmconv does now. The real
+ solution requires changes to the stub and remote.c that I
+ don't have time to do right now. */
+
+ offs->offsets[SECT_OFF_DATA (symfile_objfile)] = data_addr;
+ offs->offsets[SECT_OFF_BSS (symfile_objfile)] = data_addr;
+ }
objfile_relocate (symfile_objfile, offs);
}
-/* Stub for catch_errors. */
+/* Callback for iterate_over_threads. Set the STOP_REQUESTED flags in
+ threads we know are stopped already. This is used during the
+ initial remote connection in non-stop mode --- threads that are
+ reported as already being stopped are left stopped. */
static int
-remote_start_remote_dummy (struct ui_out *uiout, void *dummy)
+set_stop_requested_callback (struct thread_info *thread, void *data)
{
- start_remote (); /* Initialize gdb process mechanisms */
- /* NOTE: Return something >=0. A -ve value is reserved for
- catch_exceptions. */
- return 1;
+ /* If we have a stop reply for this thread, it must be stopped. */
+ if (peek_stop_reply (thread->ptid))
+ set_stop_requested (thread->ptid, 1);
+
+ return 0;
}
-static int
-remote_start_remote (struct ui_out *uiout, void *dummy)
+/* Send interrupt_sequence to remote target. */
+static void
+send_interrupt_sequence (void)
+{
+ if (interrupt_sequence_mode == interrupt_sequence_control_c)
+ serial_write (remote_desc, "\x03", 1);
+ else if (interrupt_sequence_mode == interrupt_sequence_break)
+ serial_send_break (remote_desc);
+ else if (interrupt_sequence_mode == interrupt_sequence_break_g)
+ {
+ serial_send_break (remote_desc);
+ serial_write (remote_desc, "g", 1);
+ }
+ else
+ internal_error (__FILE__, __LINE__,
+ _("Invalid value for interrupt_sequence_mode: %s."),
+ interrupt_sequence_mode);
+}
+
+static void
+remote_start_remote (int from_tty, struct target_ops *target, int extended_p)
{
- immediate_quit++; /* Allow user to interrupt it */
+ struct remote_state *rs = get_remote_state ();
+ struct packet_config *noack_config;
+ char *wait_status = NULL;
+
+ immediate_quit++; /* Allow user to interrupt it. */
+
+ if (interrupt_on_connect)
+ send_interrupt_sequence ();
/* Ack any packet which the remote side has already sent. */
serial_write (remote_desc, "+", 1);
- /* Let the stub know that we want it to return the thread. */
- set_thread (-1, 0);
+ /* The first packet we send to the target is the optional "supported
+ packets" request. If the target can answer this, it will tell us
+ which later probes to skip. */
+ remote_query_supported ();
- inferior_ptid = remote_current_thread (inferior_ptid);
+ /* If the stub wants to get a QAllow, compose one and send it. */
+ if (remote_protocol_packets[PACKET_QAllow].support != PACKET_DISABLE)
+ remote_set_permissions ();
+
+ /* Next, we possibly activate noack mode.
+
+ If the QStartNoAckMode packet configuration is set to AUTO,
+ enable noack mode if the stub reported a wish for it with
+ qSupported.
+
+ If set to TRUE, then enable noack mode even if the stub didn't
+ report it in qSupported. If the stub doesn't reply OK, the
+ session ends with an error.
+
+ If FALSE, then don't activate noack mode, regardless of what the
+ stub claimed should be the default with qSupported. */
+
+ noack_config = &remote_protocol_packets[PACKET_QStartNoAckMode];
+
+ if (noack_config->detect == AUTO_BOOLEAN_TRUE
+ || (noack_config->detect == AUTO_BOOLEAN_AUTO
+ && noack_config->support == PACKET_ENABLE))
+ {
+ putpkt ("QStartNoAckMode");
+ getpkt (&rs->buf, &rs->buf_size, 0);
+ if (packet_ok (rs->buf, noack_config) == PACKET_OK)
+ rs->noack_mode = 1;
+ }
+
+ if (extended_p)
+ {
+ /* Tell the remote that we are using the extended protocol. */
+ putpkt ("!");
+ getpkt (&rs->buf, &rs->buf_size, 0);
+ }
+
+ /* Next, if the target can specify a description, read it. We do
+ this before anything involving memory or registers. */
+ target_find_description ();
+
+ /* Next, now that we know something about the target, update the
+ address spaces in the program spaces. */
+ update_address_spaces ();
+
+ /* On OSs where the list of libraries is global to all
+ processes, we fetch them early. */
+ if (gdbarch_has_global_solist (target_gdbarch))
+ solib_add (NULL, from_tty, target, auto_solib_add);
+
+ if (non_stop)
+ {
+ if (!rs->non_stop_aware)
+ error (_("Non-stop mode requested, but remote "
+ "does not support non-stop"));
+
+ putpkt ("QNonStop:1");
+ getpkt (&rs->buf, &rs->buf_size, 0);
+
+ if (strcmp (rs->buf, "OK") != 0)
+ error (_("Remote refused setting non-stop mode with: %s"), rs->buf);
+
+ /* Find about threads and processes the stub is already
+ controlling. We default to adding them in the running state.
+ The '?' query below will then tell us about which threads are
+ stopped. */
+ remote_threads_info (target);
+ }
+ else if (rs->non_stop_aware)
+ {
+ /* Don't assume that the stub can operate in all-stop mode.
+ Request it explicitely. */
+ putpkt ("QNonStop:0");
+ getpkt (&rs->buf, &rs->buf_size, 0);
+
+ if (strcmp (rs->buf, "OK") != 0)
+ error (_("Remote refused setting all-stop mode with: %s"), rs->buf);
+ }
+
+ /* Check whether the target is running now. */
+ putpkt ("?");
+ getpkt (&rs->buf, &rs->buf_size, 0);
+
+ if (!non_stop)
+ {
+ if (rs->buf[0] == 'W' || rs->buf[0] == 'X')
+ {
+ if (!extended_p)
+ error (_("The target is not running (try extended-remote?)"));
+
+ /* We're connected, but not running. Drop out before we
+ call start_remote. */
+ return;
+ }
+ else
+ {
+ /* Save the reply for later. */
+ wait_status = alloca (strlen (rs->buf) + 1);
+ strcpy (wait_status, rs->buf);
+ }
+
+ /* Let the stub know that we want it to return the thread. */
+ set_continue_thread (minus_one_ptid);
+
+ /* Without this, some commands which require an active target
+ (such as kill) won't work. This variable serves (at least)
+ double duty as both the pid of the target process (if it has
+ such), and as a flag indicating that a target is active.
+ These functions should be split out into seperate variables,
+ especially since GDB will someday have a notion of debugging
+ several processes. */
+ inferior_ptid = magic_null_ptid;
- get_offsets (); /* Get text, data & bss offsets */
+ /* Now, if we have thread information, update inferior_ptid. */
+ inferior_ptid = remote_current_thread (inferior_ptid);
- putpkt ("?"); /* initiate a query from remote machine */
- immediate_quit--;
+ remote_add_inferior (ptid_get_pid (inferior_ptid), -1);
- /* NOTE: See comment above in remote_start_remote_dummy(). This
- function returns something >=0. */
- return remote_start_remote_dummy (uiout, dummy);
+ /* Always add the main thread. */
+ add_thread_silent (inferior_ptid);
+
+ get_offsets (); /* Get text, data & bss offsets. */
+
+ /* If we could not find a description using qXfer, and we know
+ how to do it some other way, try again. This is not
+ supported for non-stop; it could be, but it is tricky if
+ there are no stopped threads when we connect. */
+ if (remote_read_description_p (target)
+ && gdbarch_target_desc (target_gdbarch) == NULL)
+ {
+ target_clear_description ();
+ target_find_description ();
+ }
+
+ /* Use the previously fetched status. */
+ gdb_assert (wait_status != NULL);
+ strcpy (rs->buf, wait_status);
+ rs->cached_wait_status = 1;
+
+ immediate_quit--;
+ start_remote (from_tty); /* Initialize gdb process mechanisms. */
+ }
+ else
+ {
+ /* Clear WFI global state. Do this before finding about new
+ threads and inferiors, and setting the current inferior.
+ Otherwise we would clear the proceed status of the current
+ inferior when we want its stop_soon state to be preserved
+ (see notice_new_inferior). */
+ init_wait_for_inferior ();
+
+ /* In non-stop, we will either get an "OK", meaning that there
+ are no stopped threads at this time; or, a regular stop
+ reply. In the latter case, there may be more than one thread
+ stopped --- we pull them all out using the vStopped
+ mechanism. */
+ if (strcmp (rs->buf, "OK") != 0)
+ {
+ struct stop_reply *stop_reply;
+ struct cleanup *old_chain;
+
+ stop_reply = stop_reply_xmalloc ();
+ old_chain = make_cleanup (do_stop_reply_xfree, stop_reply);
+
+ remote_parse_stop_reply (rs->buf, stop_reply);
+ discard_cleanups (old_chain);
+
+ /* get_pending_stop_replies acks this one, and gets the rest
+ out. */
+ pending_stop_reply = stop_reply;
+ remote_get_pending_stop_replies ();
+
+ /* Make sure that threads that were stopped remain
+ stopped. */
+ iterate_over_threads (set_stop_requested_callback, NULL);
+ }
+
+ if (target_can_async_p ())
+ target_async (inferior_event_handler, 0);
+
+ if (thread_count () == 0)
+ {
+ if (!extended_p)
+ error (_("The target is not running (try extended-remote?)"));
+
+ /* We're connected, but not running. Drop out before we
+ call start_remote. */
+ return;
+ }
+
+ /* Let the stub know that we want it to return the thread. */
+
+ /* Force the stub to choose a thread. */
+ set_general_thread (null_ptid);
+
+ /* Query it. */
+ inferior_ptid = remote_current_thread (minus_one_ptid);
+ if (ptid_equal (inferior_ptid, minus_one_ptid))
+ error (_("remote didn't report the current thread in non-stop mode"));
+
+ get_offsets (); /* Get text, data & bss offsets. */
+
+ /* In non-stop mode, any cached wait status will be stored in
+ the stop reply queue. */
+ gdb_assert (wait_status == NULL);
+
+ /* Report all signals during attach/startup. */
+ remote_pass_signals (0, NULL);
+ }
+
+ /* If we connected to a live target, do some additional setup. */
+ if (target_has_execution)
+ {
+ if (exec_bfd) /* No use without an exec file. */
+ remote_check_symbols (symfile_objfile);
+ }
+
+ /* Possibly the target has been engaged in a trace run started
+ previously; find out where things are at. */
+ if (remote_get_trace_status (current_trace_status ()) != -1)
+ {
+ struct uploaded_tp *uploaded_tps = NULL;
+ struct uploaded_tsv *uploaded_tsvs = NULL;
+
+ if (current_trace_status ()->running)
+ printf_filtered (_("Trace is already running on the target.\n"));
+
+ /* Get trace state variables first, they may be checked when
+ parsing uploaded commands. */
+
+ remote_upload_trace_state_variables (&uploaded_tsvs);
+
+ merge_uploaded_trace_state_variables (&uploaded_tsvs);
+
+ remote_upload_tracepoints (&uploaded_tps);
+
+ merge_uploaded_tracepoints (&uploaded_tps);
+ }
+
+ /* If breakpoints are global, insert them now. */
+ if (gdbarch_has_global_breakpoints (target_gdbarch)
+ && breakpoints_always_inserted_mode ())
+ insert_breakpoints ();
}
/* Open a connection to a remote debugger.
static void
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. */
-static void
-remote_async_open (char *name, int from_tty)
-{
- remote_open_1 (name, from_tty, &remote_async_ops, 0, 1);
+ remote_open_1 (name, from_tty, &remote_ops, 0);
}
/* Open a connection to a remote debugger using the extended
static void
extended_remote_open (char *name, int from_tty)
{
- remote_open_1 (name, from_tty, &extended_remote_ops, 1 /*extended_p */,
- 0 /* async_p */);
-}
-
-/* Just like extended_remote_open, but with asynchronous support. */
-static void
-extended_remote_async_open (char *name, int from_tty)
-{
- remote_open_1 (name, from_tty, &extended_async_remote_ops,
- 1 /*extended_p */, 1 /* async_p */);
+ remote_open_1 (name, from_tty, &extended_remote_ops, 1 /*extended_p */);
}
/* Generic code for opening a connection to a remote target. */
init_all_packet_configs (void)
{
int i;
- update_packet_config (&remote_protocol_P);
- update_packet_config (&remote_protocol_p);
- update_packet_config (&remote_protocol_qSymbol);
- update_packet_config (&remote_protocol_vcont);
- 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);
+
+ for (i = 0; i < PACKET_MAX; i++)
+ update_packet_config (&remote_protocol_packets[i]);
}
-/* Symbol look-up. */
+/* Symbol look-up. */
static void
remote_check_symbols (struct objfile *objfile)
struct minimal_symbol *sym;
int end;
- if (remote_protocol_qSymbol.support == PACKET_DISABLE)
+ /* The remote side has no concept of inferiors that aren't running
+ yet, it only knows about running processes. If we're connected
+ but our current inferior is not running, we should not invite the
+ remote target to request symbol lookups related to its
+ (unrelated) current process. */
+ if (!target_has_execution)
+ return;
+
+ if (remote_protocol_packets[PACKET_qSymbol].support == PACKET_DISABLE)
return;
- msg = alloca (rs->remote_packet_size);
- reply = alloca (rs->remote_packet_size);
+ /* Make sure the remote is pointing at the right process. Note
+ there's no way to select "no process". */
+ set_general_process ();
- /* Invite target to request symbol lookups. */
+ /* Allocate a message buffer. We can't reuse the input buffer in RS,
+ because we need both at the same time. */
+ msg = alloca (get_remote_packet_size ());
+
+ /* Invite target to request symbol lookups. */
putpkt ("qSymbol::");
- getpkt (reply, (rs->remote_packet_size), 0);
- packet_ok (reply, &remote_protocol_qSymbol);
+ getpkt (&rs->buf, &rs->buf_size, 0);
+ packet_ok (rs->buf, &remote_protocol_packets[PACKET_qSymbol]);
+ reply = rs->buf;
while (strncmp (reply, "qSymbol:", 8) == 0)
{
tmp = &reply[8];
- end = hex2bin (tmp, msg, strlen (tmp) / 2);
+ end = hex2bin (tmp, (gdb_byte *) msg, strlen (tmp) / 2);
msg[end] = '\0';
sym = lookup_minimal_symbol (msg, NULL, NULL);
if (sym == NULL)
- sprintf (msg, "qSymbol::%s", &reply[8]);
+ xsnprintf (msg, get_remote_packet_size (), "qSymbol::%s", &reply[8]);
else
- sprintf (msg, "qSymbol:%s:%s",
- paddr_nz (SYMBOL_VALUE_ADDRESS (sym)),
- &reply[8]);
+ {
+ int addr_size = gdbarch_addr_bit (target_gdbarch) / 8;
+ CORE_ADDR sym_addr = SYMBOL_VALUE_ADDRESS (sym);
+
+ /* If this is a function address, return the start of code
+ instead of any data function descriptor. */
+ sym_addr = gdbarch_convert_from_func_ptr_addr (target_gdbarch,
+ sym_addr,
+ ¤t_target);
+
+ xsnprintf (msg, get_remote_packet_size (), "qSymbol:%s:%s",
+ phex_nz (sym_addr, addr_size), &reply[8]);
+ }
+
putpkt (msg);
- getpkt (reply, (rs->remote_packet_size), 0);
+ getpkt (&rs->buf, &rs->buf_size, 0);
+ reply = rs->buf;
}
}
to be. */
if (!udp_warning && strncmp (name, "udp:", 4) == 0)
{
- warning ("The remote protocol may be unreliable over UDP.");
- warning ("Some events may be lost, rendering further debugging "
- "impossible.");
+ warning (_("The remote protocol may be unreliable over UDP.\n"
+ "Some events may be lost, rendering further debugging "
+ "impossible."));
udp_warning = 1;
}
return serial_open (name);
}
-static void
-remote_open_1 (char *name, int from_tty, struct target_ops *target,
- int extended_p, int async_p)
+/* Inform the target of our permission settings. The permission flags
+ work without this, but if the target knows the settings, it can do
+ a couple things. First, it can add its own check, to catch cases
+ that somehow manage to get by the permissions checks in target
+ methods. Second, if the target is wired to disallow particular
+ settings (for instance, a system in the field that is not set up to
+ be able to stop at a breakpoint), it can object to any unavailable
+ permissions. */
+
+void
+remote_set_permissions (void)
{
- int ex;
struct remote_state *rs = get_remote_state ();
- if (name == 0)
- error ("To open a remote debug connection, you need to specify what\n"
- "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;
+ sprintf (rs->buf, "QAllow:"
+ "WriteReg:%x;WriteMem:%x;"
+ "InsertBreak:%x;InsertTrace:%x;"
+ "InsertFastTrace:%x;Stop:%x",
+ may_write_registers, may_write_memory,
+ may_insert_breakpoints, may_insert_tracepoints,
+ may_insert_fast_tracepoints, may_stop);
+ putpkt (rs->buf);
+ getpkt (&rs->buf, &rs->buf_size, 0);
- reopen_exec_file ();
- reread_symbols ();
+ /* If the target didn't like the packet, warn the user. Do not try
+ to undo the user's settings, that would just be maddening. */
+ if (strcmp (rs->buf, "OK") != 0)
+ warning (_("Remote refused setting permissions with: %s"), rs->buf);
+}
+
+/* This type describes each known response to the qSupported
+ packet. */
+struct protocol_feature
+{
+ /* The name of this protocol feature. */
+ const char *name;
+
+ /* The default for this protocol feature. */
+ enum packet_support default_support;
+
+ /* The function to call when this feature is reported, or after
+ qSupported processing if the feature is not supported.
+ The first argument points to this structure. The second
+ argument indicates whether the packet requested support be
+ enabled, disabled, or probed (or the default, if this function
+ is being called at the end of processing and this feature was
+ not reported). The third argument may be NULL; if not NULL, it
+ is a NUL-terminated string taken from the packet following
+ this feature's name and an equals sign. */
+ void (*func) (const struct protocol_feature *, enum packet_support,
+ const char *);
+
+ /* The corresponding packet for this feature. Only used if
+ FUNC is remote_supported_packet. */
+ int packet;
+};
+
+static void
+remote_supported_packet (const struct protocol_feature *feature,
+ enum packet_support support,
+ const char *argument)
+{
+ if (argument)
+ {
+ warning (_("Remote qSupported response supplied an unexpected value for"
+ " \"%s\"."), feature->name);
+ return;
+ }
+
+ if (remote_protocol_packets[feature->packet].support
+ == PACKET_SUPPORT_UNKNOWN)
+ remote_protocol_packets[feature->packet].support = support;
+}
+
+static void
+remote_packet_size (const struct protocol_feature *feature,
+ enum packet_support support, const char *value)
+{
+ struct remote_state *rs = get_remote_state ();
+
+ int packet_size;
+ char *value_end;
+
+ if (support != PACKET_ENABLE)
+ return;
+
+ if (value == NULL || *value == '\0')
+ {
+ warning (_("Remote target reported \"%s\" without a size."),
+ feature->name);
+ return;
+ }
+
+ errno = 0;
+ packet_size = strtol (value, &value_end, 16);
+ if (errno != 0 || *value_end != '\0' || packet_size < 0)
+ {
+ warning (_("Remote target reported \"%s\" with a bad size: \"%s\"."),
+ feature->name, value);
+ return;
+ }
+
+ if (packet_size > MAX_REMOTE_PACKET_SIZE)
+ {
+ warning (_("limiting remote suggested packet size (%d bytes) to %d"),
+ packet_size, MAX_REMOTE_PACKET_SIZE);
+ packet_size = MAX_REMOTE_PACKET_SIZE;
+ }
+
+ /* Record the new maximum packet size. */
+ rs->explicit_packet_size = packet_size;
+}
+
+static void
+remote_multi_process_feature (const struct protocol_feature *feature,
+ enum packet_support support, const char *value)
+{
+ struct remote_state *rs = get_remote_state ();
+
+ rs->multi_process_aware = (support == PACKET_ENABLE);
+}
+
+static void
+remote_non_stop_feature (const struct protocol_feature *feature,
+ enum packet_support support, const char *value)
+{
+ struct remote_state *rs = get_remote_state ();
+
+ rs->non_stop_aware = (support == PACKET_ENABLE);
+}
+
+static void
+remote_cond_tracepoint_feature (const struct protocol_feature *feature,
+ enum packet_support support,
+ const char *value)
+{
+ struct remote_state *rs = get_remote_state ();
+
+ rs->cond_tracepoints = (support == PACKET_ENABLE);
+}
+
+static void
+remote_fast_tracepoint_feature (const struct protocol_feature *feature,
+ enum packet_support support,
+ const char *value)
+{
+ struct remote_state *rs = get_remote_state ();
+
+ rs->fast_tracepoints = (support == PACKET_ENABLE);
+}
+
+static void
+remote_static_tracepoint_feature (const struct protocol_feature *feature,
+ enum packet_support support,
+ const char *value)
+{
+ struct remote_state *rs = get_remote_state ();
+
+ rs->static_tracepoints = (support == PACKET_ENABLE);
+}
+
+static void
+remote_disconnected_tracing_feature (const struct protocol_feature *feature,
+ enum packet_support support,
+ const char *value)
+{
+ struct remote_state *rs = get_remote_state ();
+
+ rs->disconnected_tracing = (support == PACKET_ENABLE);
+}
+
+static void
+remote_enable_disable_tracepoint_feature (const struct protocol_feature *feature,
+ enum packet_support support,
+ const char *value)
+{
+ struct remote_state *rs = get_remote_state ();
+
+ rs->enable_disable_tracepoints = (support == PACKET_ENABLE);
+}
+
+static struct protocol_feature remote_protocol_features[] = {
+ { "PacketSize", PACKET_DISABLE, remote_packet_size, -1 },
+ { "qXfer:auxv:read", PACKET_DISABLE, remote_supported_packet,
+ PACKET_qXfer_auxv },
+ { "qXfer:features:read", PACKET_DISABLE, remote_supported_packet,
+ PACKET_qXfer_features },
+ { "qXfer:libraries:read", PACKET_DISABLE, remote_supported_packet,
+ PACKET_qXfer_libraries },
+ { "qXfer:memory-map:read", PACKET_DISABLE, remote_supported_packet,
+ PACKET_qXfer_memory_map },
+ { "qXfer:spu:read", PACKET_DISABLE, remote_supported_packet,
+ PACKET_qXfer_spu_read },
+ { "qXfer:spu:write", PACKET_DISABLE, remote_supported_packet,
+ PACKET_qXfer_spu_write },
+ { "qXfer:osdata:read", PACKET_DISABLE, remote_supported_packet,
+ PACKET_qXfer_osdata },
+ { "qXfer:threads:read", PACKET_DISABLE, remote_supported_packet,
+ PACKET_qXfer_threads },
+ { "qXfer:traceframe-info:read", PACKET_DISABLE, remote_supported_packet,
+ PACKET_qXfer_traceframe_info },
+ { "QPassSignals", PACKET_DISABLE, remote_supported_packet,
+ PACKET_QPassSignals },
+ { "QStartNoAckMode", PACKET_DISABLE, remote_supported_packet,
+ PACKET_QStartNoAckMode },
+ { "multiprocess", PACKET_DISABLE, remote_multi_process_feature, -1 },
+ { "QNonStop", PACKET_DISABLE, remote_non_stop_feature, -1 },
+ { "qXfer:siginfo:read", PACKET_DISABLE, remote_supported_packet,
+ PACKET_qXfer_siginfo_read },
+ { "qXfer:siginfo:write", PACKET_DISABLE, remote_supported_packet,
+ PACKET_qXfer_siginfo_write },
+ { "ConditionalTracepoints", PACKET_DISABLE, remote_cond_tracepoint_feature,
+ PACKET_ConditionalTracepoints },
+ { "FastTracepoints", PACKET_DISABLE, remote_fast_tracepoint_feature,
+ PACKET_FastTracepoints },
+ { "StaticTracepoints", PACKET_DISABLE, remote_static_tracepoint_feature,
+ PACKET_StaticTracepoints },
+ { "DisconnectedTracing", PACKET_DISABLE, remote_disconnected_tracing_feature,
+ -1 },
+ { "ReverseContinue", PACKET_DISABLE, remote_supported_packet,
+ PACKET_bc },
+ { "ReverseStep", PACKET_DISABLE, remote_supported_packet,
+ PACKET_bs },
+ { "TracepointSource", PACKET_DISABLE, remote_supported_packet,
+ PACKET_TracepointSource },
+ { "QAllow", PACKET_DISABLE, remote_supported_packet,
+ PACKET_QAllow },
+ { "EnableDisableTracepoints", PACKET_DISABLE,
+ remote_enable_disable_tracepoint_feature, -1 },
+};
+
+static char *remote_support_xml;
+
+/* Register string appended to "xmlRegisters=" in qSupported query. */
+
+void
+register_remote_support_xml (const char *xml)
+{
+#if defined(HAVE_LIBEXPAT)
+ if (remote_support_xml == NULL)
+ remote_support_xml = concat ("xmlRegisters=", xml, (char *) NULL);
+ else
+ {
+ char *copy = xstrdup (remote_support_xml + 13);
+ char *p = strtok (copy, ",");
+
+ do
+ {
+ if (strcmp (p, xml) == 0)
+ {
+ /* already there */
+ xfree (copy);
+ return;
+ }
+ }
+ while ((p = strtok (NULL, ",")) != NULL);
+ xfree (copy);
+
+ remote_support_xml = reconcat (remote_support_xml,
+ remote_support_xml, ",", xml,
+ (char *) NULL);
+ }
+#endif
+}
+
+static char *
+remote_query_supported_append (char *msg, const char *append)
+{
+ if (msg)
+ return reconcat (msg, msg, ";", append, (char *) NULL);
+ else
+ return xstrdup (append);
+}
+
+static void
+remote_query_supported (void)
+{
+ struct remote_state *rs = get_remote_state ();
+ char *next;
+ int i;
+ unsigned char seen [ARRAY_SIZE (remote_protocol_features)];
+
+ /* The packet support flags are handled differently for this packet
+ than for most others. We treat an error, a disabled packet, and
+ an empty response identically: any features which must be reported
+ to be used will be automatically disabled. An empty buffer
+ accomplishes this, since that is also the representation for a list
+ containing no features. */
+
+ rs->buf[0] = 0;
+ if (remote_protocol_packets[PACKET_qSupported].support != PACKET_DISABLE)
+ {
+ char *q = NULL;
+ struct cleanup *old_chain = make_cleanup (free_current_contents, &q);
+
+ if (rs->extended)
+ q = remote_query_supported_append (q, "multiprocess+");
+
+ if (remote_support_xml)
+ q = remote_query_supported_append (q, remote_support_xml);
+
+ q = remote_query_supported_append (q, "qRelocInsn+");
+
+ q = reconcat (q, "qSupported:", q, (char *) NULL);
+ putpkt (q);
+
+ do_cleanups (old_chain);
+
+ getpkt (&rs->buf, &rs->buf_size, 0);
+
+ /* If an error occured, warn, but do not return - just reset the
+ buffer to empty and go on to disable features. */
+ if (packet_ok (rs->buf, &remote_protocol_packets[PACKET_qSupported])
+ == PACKET_ERROR)
+ {
+ warning (_("Remote failure reply: %s"), rs->buf);
+ rs->buf[0] = 0;
+ }
+ }
+
+ memset (seen, 0, sizeof (seen));
+
+ next = rs->buf;
+ while (*next)
+ {
+ enum packet_support is_supported;
+ char *p, *end, *name_end, *value;
+
+ /* First separate out this item from the rest of the packet. If
+ there's another item after this, we overwrite the separator
+ (terminated strings are much easier to work with). */
+ p = next;
+ end = strchr (p, ';');
+ if (end == NULL)
+ {
+ end = p + strlen (p);
+ next = end;
+ }
+ else
+ {
+ *end = '\0';
+ next = end + 1;
+
+ if (end == p)
+ {
+ warning (_("empty item in \"qSupported\" response"));
+ continue;
+ }
+ }
+
+ name_end = strchr (p, '=');
+ if (name_end)
+ {
+ /* This is a name=value entry. */
+ is_supported = PACKET_ENABLE;
+ value = name_end + 1;
+ *name_end = '\0';
+ }
+ else
+ {
+ value = NULL;
+ switch (end[-1])
+ {
+ case '+':
+ is_supported = PACKET_ENABLE;
+ break;
+
+ case '-':
+ is_supported = PACKET_DISABLE;
+ break;
+
+ case '?':
+ is_supported = PACKET_SUPPORT_UNKNOWN;
+ break;
+
+ default:
+ warning (_("unrecognized item \"%s\" "
+ "in \"qSupported\" response"), p);
+ continue;
+ }
+ end[-1] = '\0';
+ }
+
+ for (i = 0; i < ARRAY_SIZE (remote_protocol_features); i++)
+ if (strcmp (remote_protocol_features[i].name, p) == 0)
+ {
+ const struct protocol_feature *feature;
+
+ seen[i] = 1;
+ feature = &remote_protocol_features[i];
+ feature->func (feature, is_supported, value);
+ break;
+ }
+ }
+
+ /* If we increased the packet size, make sure to increase the global
+ buffer size also. We delay this until after parsing the entire
+ qSupported packet, because this is the same buffer we were
+ parsing. */
+ if (rs->buf_size < rs->explicit_packet_size)
+ {
+ rs->buf_size = rs->explicit_packet_size;
+ rs->buf = xrealloc (rs->buf, rs->buf_size);
+ }
+
+ /* Handle the defaults for unmentioned features. */
+ for (i = 0; i < ARRAY_SIZE (remote_protocol_features); i++)
+ if (!seen[i])
+ {
+ const struct protocol_feature *feature;
+
+ feature = &remote_protocol_features[i];
+ feature->func (feature, feature->default_support, NULL);
+ }
+}
+
+
+static void
+remote_open_1 (char *name, int from_tty,
+ struct target_ops *target, int extended_p)
+{
+ struct remote_state *rs = get_remote_state ();
+
+ if (name == 0)
+ error (_("To open a remote debug connection, you need to specify what\n"
+ "serial device is attached to the remote system\n"
+ "(e.g. /dev/ttyS0, /dev/ttya, COM1, etc.)."));
+
+ /* See FIXME above. */
+ if (!target_async_permitted)
+ wait_forever_enabled_p = 1;
+
+ /* If we're connected to a running target, target_preopen will kill it.
+ But if we're connected to a target system with no running process,
+ then we will still be connected when it returns. Ask this question
+ first, before target_preopen has a chance to kill anything. */
+ if (remote_desc != NULL && !have_inferiors ())
+ {
+ if (!from_tty
+ || query (_("Already connected to a remote target. Disconnect? ")))
+ pop_target ();
+ else
+ error (_("Still connected."));
+ }
target_preopen (from_tty);
unpush_target (target);
+ /* This time without a query. If we were connected to an
+ extended-remote target and target_preopen killed the running
+ process, we may still be connected. If we are starting "target
+ remote" now, the extended-remote target will not have been
+ removed by unpush_target. */
+ if (remote_desc != NULL && !have_inferiors ())
+ pop_target ();
+
+ /* Make sure we send the passed signals list the next time we resume. */
+ xfree (last_pass_packet);
+ last_pass_packet = NULL;
+
+ remote_fileio_reset ();
+ reopen_exec_file ();
+ reread_symbols ();
+
remote_desc = remote_serial_open (name);
if (!remote_desc)
perror_with_name (name);
puts_filtered (name);
puts_filtered ("\n");
}
- push_target (target); /* Switch to using remote target now */
-
+ push_target (target); /* Switch to using remote target now. */
+
+ /* Register extra event sources in the event loop. */
+ remote_async_inferior_event_token
+ = create_async_event_handler (remote_async_inferior_event_handler,
+ NULL);
+ remote_async_get_pending_events_token
+ = create_async_event_handler (remote_async_get_pending_events_handler,
+ NULL);
+
+ /* Reset the target state; these things will be queried either by
+ remote_query_supported or as they are needed. */
init_all_packet_configs ();
-
- general_thread = -2;
- continue_thread = -2;
+ rs->cached_wait_status = 0;
+ rs->explicit_packet_size = 0;
+ rs->noack_mode = 0;
+ rs->multi_process_aware = 0;
+ rs->extended = extended_p;
+ rs->non_stop_aware = 0;
+ rs->waiting_for_stop_reply = 0;
+ rs->ctrlc_pending_p = 0;
+
+ general_thread = not_sent_ptid;
+ continue_thread = not_sent_ptid;
+ remote_traceframe_number = -1;
/* Probe for ability to use "ThreadInfo" query, as required. */
use_threadinfo_query = 1;
use_threadextra_query = 1;
- /* Without this, some commands which require an active target (such
- as kill) won't work. This variable serves (at least) double duty
- as both the pid of the target process (if it has such), and as a
- flag indicating that a target is active. These functions should
- be split out into seperate variables, especially since GDB will
- someday have a notion of debugging several processes. */
-
- inferior_ptid = pid_to_ptid (MAGIC_NULL_PID);
-
- if (async_p)
+ if (target_async_permitted)
{
- /* 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
assumed that the target is already ready and able to respond to
- requests. Unfortunately remote_start_remote() eventually calls
+ requests. Unfortunately remote_start_remote() eventually calls
wait_for_inferior() with no timeout. wait_forever_enabled_p gets
- around this. Eventually a mechanism that allows
+ 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
+
+ /* Start afresh. */
+ init_thread_list ();
/* Start the remote connection. If error() or QUIT, discard this
target (we'd otherwise be in an inconsistent state) and then
been fixed - the function set_cmd_context() makes it possible for
all the ``target ....'' commands to share a common callback
function. See cli-dump.c. */
- ex = catch_exceptions (uiout,
- remote_start_remote, NULL,
- "Couldn't establish connection to remote"
- " target\n",
- RETURN_MASK_ALL);
- if (ex < 0)
- {
- pop_target ();
- if (async_p)
- wait_forever_enabled_p = 1;
- throw_exception (ex);
- }
-
- if (async_p)
- wait_forever_enabled_p = 1;
+ {
+ volatile struct gdb_exception ex;
- if (extended_p)
- {
- /* Tell the remote that we are using the extended protocol. */
- char *buf = alloca (rs->remote_packet_size);
- putpkt ("!");
- getpkt (buf, (rs->remote_packet_size), 0);
- }
-#ifdef SOLIB_CREATE_INFERIOR_HOOK
- /* FIXME: need a master target_open vector from which all
- remote_opens can be called, so that stuff like this can
- go there. Failing that, the following code must be copied
- to the open function for any remote target that wants to
- support svr4 shared libraries. */
+ TRY_CATCH (ex, RETURN_MASK_ALL)
+ {
+ remote_start_remote (from_tty, target, extended_p);
+ }
+ if (ex.reason < 0)
+ {
+ /* Pop the partially set up target - unless something else did
+ already before throwing the exception. */
+ if (remote_desc != NULL)
+ pop_target ();
+ if (target_async_permitted)
+ wait_forever_enabled_p = 1;
+ throw_exception (ex);
+ }
+ }
- /* 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);
- }
-#endif
+ if (target_async_permitted)
+ wait_forever_enabled_p = 1;
}
/* This takes a program previously attached to and detaches it. After
die when it hits one. */
static void
-remote_detach (char *args, int from_tty)
+remote_detach_1 (char *args, int from_tty, int extended)
{
+ int pid = ptid_get_pid (inferior_ptid);
struct remote_state *rs = get_remote_state ();
- char *buf = alloca (rs->remote_packet_size);
if (args)
- error ("Argument given to \"detach\" when remotely debugging.");
+ error (_("Argument given to \"detach\" when remotely debugging."));
+
+ if (!target_has_execution)
+ error (_("No process to detach from."));
/* Tell the remote target to detach. */
- strcpy (buf, "D");
- remote_send (buf, (rs->remote_packet_size));
+ if (remote_multi_process_p (rs))
+ sprintf (rs->buf, "D;%x", pid);
+ else
+ strcpy (rs->buf, "D");
- /* Unregister the file descriptor from the event loop. */
- if (target_is_async_p ())
- serial_async (remote_desc, NULL, 0);
+ putpkt (rs->buf);
+ getpkt (&rs->buf, &rs->buf_size, 0);
+
+ if (rs->buf[0] == 'O' && rs->buf[1] == 'K')
+ ;
+ else if (rs->buf[0] == '\0')
+ error (_("Remote doesn't know how to detach"));
+ else
+ error (_("Can't detach process."));
- target_mourn_inferior ();
if (from_tty)
- puts_filtered ("Ending remote debugging.\n");
+ {
+ if (remote_multi_process_p (rs))
+ printf_filtered (_("Detached from remote %s.\n"),
+ target_pid_to_str (pid_to_ptid (pid)));
+ else
+ {
+ if (extended)
+ puts_filtered (_("Detached from remote process.\n"));
+ else
+ puts_filtered (_("Ending remote debugging.\n"));
+ }
+ }
+
+ discard_pending_stop_replies (pid);
+ target_mourn_inferior ();
}
-/* Same as remote_detach, but don't send the "D" packet; just disconnect. */
+static void
+remote_detach (struct target_ops *ops, char *args, int from_tty)
+{
+ remote_detach_1 (args, from_tty, 0);
+}
static void
-remote_disconnect (char *args, int from_tty)
+extended_remote_detach (struct target_ops *ops, char *args, int from_tty)
{
- struct remote_state *rs = get_remote_state ();
- char *buf = alloca (rs->remote_packet_size);
+ remote_detach_1 (args, from_tty, 1);
+}
+
+/* Same as remote_detach, but don't send the "D" packet; just disconnect. */
+static void
+remote_disconnect (struct target_ops *target, char *args, int from_tty)
+{
if (args)
- error ("Argument given to \"detach\" when remotely debugging.");
+ error (_("Argument given to \"disconnect\" when remotely debugging."));
- /* Unregister the file descriptor from the event loop. */
- if (target_is_async_p ())
- serial_async (remote_desc, NULL, 0);
+ /* Make sure we unpush even the extended remote targets; mourn
+ won't do it. So call remote_mourn_1 directly instead of
+ target_mourn_inferior. */
+ remote_mourn_1 (target);
- target_mourn_inferior ();
if (from_tty)
puts_filtered ("Ending remote debugging.\n");
}
-/* Convert hex digit A to a number. */
+/* Attach to the process specified by ARGS. If FROM_TTY is non-zero,
+ be chatty about it. */
-static int
-fromhex (int a)
+static void
+extended_remote_attach_1 (struct target_ops *target, char *args, int from_tty)
{
- if (a >= '0' && a <= '9')
- return a - '0';
- else if (a >= 'a' && a <= 'f')
- return a - 'a' + 10;
- else if (a >= 'A' && a <= 'F')
- return a - 'A' + 10;
- else
- error ("Reply contains invalid hex digit %d", a);
-}
+ struct remote_state *rs = get_remote_state ();
+ int pid;
+ char *wait_status = NULL;
-static int
-hex2bin (const char *hex, char *bin, int count)
-{
- int i;
+ pid = parse_pid_to_attach (args);
- for (i = 0; i < count; i++)
+ /* Remote PID can be freely equal to getpid, do not check it here the same
+ way as in other targets. */
+
+ if (remote_protocol_packets[PACKET_vAttach].support == PACKET_DISABLE)
+ error (_("This target does not support attaching to a process"));
+
+ sprintf (rs->buf, "vAttach;%x", pid);
+ putpkt (rs->buf);
+ getpkt (&rs->buf, &rs->buf_size, 0);
+
+ if (packet_ok (rs->buf,
+ &remote_protocol_packets[PACKET_vAttach]) == PACKET_OK)
{
- if (hex[0] == 0 || hex[1] == 0)
+ if (from_tty)
+ printf_unfiltered (_("Attached to %s\n"),
+ target_pid_to_str (pid_to_ptid (pid)));
+
+ if (!non_stop)
{
- /* Hex string is short, or of uneven length.
- Return the count that has been converted so far. */
- return i;
+ /* Save the reply for later. */
+ wait_status = alloca (strlen (rs->buf) + 1);
+ strcpy (wait_status, rs->buf);
}
- *bin++ = fromhex (hex[0]) * 16 + fromhex (hex[1]);
- hex += 2;
+ else if (strcmp (rs->buf, "OK") != 0)
+ error (_("Attaching to %s failed with: %s"),
+ target_pid_to_str (pid_to_ptid (pid)),
+ rs->buf);
+ }
+ else if (remote_protocol_packets[PACKET_vAttach].support == PACKET_DISABLE)
+ error (_("This target does not support attaching to a process"));
+ else
+ error (_("Attaching to %s failed"),
+ target_pid_to_str (pid_to_ptid (pid)));
+
+ set_current_inferior (remote_add_inferior (pid, 1));
+
+ inferior_ptid = pid_to_ptid (pid);
+
+ if (non_stop)
+ {
+ struct thread_info *thread;
+
+ /* Get list of threads. */
+ remote_threads_info (target);
+
+ thread = first_thread_of_process (pid);
+ if (thread)
+ inferior_ptid = thread->ptid;
+ else
+ inferior_ptid = pid_to_ptid (pid);
+
+ /* Invalidate our notion of the remote current thread. */
+ record_currthread (minus_one_ptid);
+ }
+ else
+ {
+ /* Now, if we have thread information, update inferior_ptid. */
+ inferior_ptid = remote_current_thread (inferior_ptid);
+
+ /* Add the main thread to the thread list. */
+ add_thread_silent (inferior_ptid);
+ }
+
+ /* Next, if the target can specify a description, read it. We do
+ this before anything involving memory or registers. */
+ target_find_description ();
+
+ if (!non_stop)
+ {
+ /* Use the previously fetched status. */
+ gdb_assert (wait_status != NULL);
+
+ if (target_can_async_p ())
+ {
+ struct stop_reply *stop_reply;
+ struct cleanup *old_chain;
+
+ stop_reply = stop_reply_xmalloc ();
+ old_chain = make_cleanup (do_stop_reply_xfree, stop_reply);
+ remote_parse_stop_reply (wait_status, stop_reply);
+ discard_cleanups (old_chain);
+ push_stop_reply (stop_reply);
+
+ target_async (inferior_event_handler, 0);
+ }
+ else
+ {
+ gdb_assert (wait_status != NULL);
+ strcpy (rs->buf, wait_status);
+ rs->cached_wait_status = 1;
+ }
+ }
+ else
+ gdb_assert (wait_status == NULL);
+}
+
+static void
+extended_remote_attach (struct target_ops *ops, char *args, int from_tty)
+{
+ extended_remote_attach_1 (ops, args, from_tty);
+}
+
+/* Convert hex digit A to a number. */
+
+static int
+fromhex (int a)
+{
+ if (a >= '0' && a <= '9')
+ return a - '0';
+ else if (a >= 'a' && a <= 'f')
+ return a - 'a' + 10;
+ else if (a >= 'A' && a <= 'F')
+ return a - 'A' + 10;
+ else
+ error (_("Reply contains invalid hex digit %d"), a);
+}
+
+int
+hex2bin (const char *hex, gdb_byte *bin, int count)
+{
+ int i;
+
+ for (i = 0; i < count; i++)
+ {
+ 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]);
+ hex += 2;
}
return i;
}
return 'a' + nib - 10;
}
-static int
-bin2hex (const char *bin, char *hex, int count)
+int
+bin2hex (const gdb_byte *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);
+ count = strlen ((char *) bin);
for (i = 0; i < count; i++)
{
the response. */
static void
-remote_vcont_probe (struct remote_state *rs, char *buf)
+remote_vcont_probe (struct remote_state *rs)
{
- strcpy (buf, "vCont?");
- putpkt (buf);
- getpkt (buf, rs->remote_packet_size, 0);
+ char *buf;
+
+ strcpy (rs->buf, "vCont?");
+ putpkt (rs->buf);
+ getpkt (&rs->buf, &rs->buf_size, 0);
+ buf = rs->buf;
/* Make sure that the features we assume are supported. */
if (strncmp (buf, "vCont", 5) == 0)
support_S = 0;
support_c = 0;
support_C = 0;
+ rs->support_vCont_t = 0;
while (p && *p == ';')
{
p++;
support_c = 1;
else if (*p == 'C' && (*(p + 1) == ';' || *(p + 1) == 0))
support_C = 1;
+ else if (*p == 't' && (*(p + 1) == ';' || *(p + 1) == 0))
+ rs->support_vCont_t = 1;
p = strchr (p, ';');
}
buf[0] = 0;
}
- packet_ok (buf, &remote_protocol_vcont);
+ packet_ok (buf, &remote_protocol_packets[PACKET_vCont]);
+}
+
+/* Helper function for building "vCont" resumptions. Write a
+ resumption to P. ENDP points to one-passed-the-end of the buffer
+ we're allowed to write to. Returns BUF+CHARACTERS_WRITTEN. The
+ thread to be resumed is PTID; STEP and SIGGNAL indicate whether the
+ resumed thread should be single-stepped and/or signalled. If PTID
+ equals minus_one_ptid, then all threads are resumed; if PTID
+ represents a process, then all threads of the process are resumed;
+ the thread to be stepped and/or signalled is given in the global
+ INFERIOR_PTID. */
+
+static char *
+append_resumption (char *p, char *endp,
+ ptid_t ptid, int step, enum target_signal siggnal)
+{
+ struct remote_state *rs = get_remote_state ();
+
+ if (step && siggnal != TARGET_SIGNAL_0)
+ p += xsnprintf (p, endp - p, ";S%02x", siggnal);
+ else if (step)
+ p += xsnprintf (p, endp - p, ";s");
+ else if (siggnal != TARGET_SIGNAL_0)
+ p += xsnprintf (p, endp - p, ";C%02x", siggnal);
+ else
+ p += xsnprintf (p, endp - p, ";c");
+
+ if (remote_multi_process_p (rs) && ptid_is_pid (ptid))
+ {
+ ptid_t nptid;
+
+ /* All (-1) threads of process. */
+ nptid = ptid_build (ptid_get_pid (ptid), 0, -1);
+
+ p += xsnprintf (p, endp - p, ":");
+ p = write_ptid (p, endp, nptid);
+ }
+ else if (!ptid_equal (ptid, minus_one_ptid))
+ {
+ p += xsnprintf (p, endp - p, ":");
+ p = write_ptid (p, endp, ptid);
+ }
+
+ return p;
}
/* Resume the remote inferior by using a "vCont" packet. The thread
to be resumed is PTID; STEP and SIGGNAL indicate whether the
- resumed thread should be single-stepped and/or signalled. If PTID's
- PID is -1, then all threads are resumed; the thread to be stepped and/or
- signalled is given in the global INFERIOR_PTID. This function returns
- non-zero iff it resumes the inferior.
+ resumed thread should be single-stepped and/or signalled. If PTID
+ equals minus_one_ptid, then all threads are resumed; the thread to
+ be stepped and/or signalled is given in the global INFERIOR_PTID.
+ This function returns non-zero iff it resumes the inferior.
This function issues a strict subset of all possible vCont commands at the
moment. */
remote_vcont_resume (ptid_t ptid, int step, enum target_signal siggnal)
{
struct remote_state *rs = get_remote_state ();
- int pid = PIDGET (ptid);
- char *buf = NULL, *outbuf;
- struct cleanup *old_cleanup;
+ char *p;
+ char *endp;
- buf = xmalloc (rs->remote_packet_size);
- old_cleanup = make_cleanup (xfree, buf);
+ if (remote_protocol_packets[PACKET_vCont].support == PACKET_SUPPORT_UNKNOWN)
+ remote_vcont_probe (rs);
- if (remote_protocol_vcont.support == PACKET_SUPPORT_UNKNOWN)
- remote_vcont_probe (rs, buf);
+ if (remote_protocol_packets[PACKET_vCont].support == PACKET_DISABLE)
+ return 0;
- if (remote_protocol_vcont.support == PACKET_DISABLE)
- {
- do_cleanups (old_cleanup);
- return 0;
- }
+ p = rs->buf;
+ endp = rs->buf + get_remote_packet_size ();
/* If we could generate a wider range of packets, we'd have to worry
about overflowing BUF. Should there be a generic
"multi-part-packet" packet? */
- if (PIDGET (inferior_ptid) == MAGIC_NULL_PID)
- {
- /* MAGIC_NULL_PTID means that we don't have any active threads, so we
- don't have any PID numbers the inferior will understand. Make sure
- to only send forms that do not specify a PID. */
- if (step && siggnal != TARGET_SIGNAL_0)
- outbuf = xstrprintf ("vCont;S%02x", siggnal);
- else if (step)
- outbuf = xstrprintf ("vCont;s");
- else if (siggnal != TARGET_SIGNAL_0)
- outbuf = xstrprintf ("vCont;C%02x", siggnal);
- else
- outbuf = xstrprintf ("vCont;c");
- }
- else if (pid == -1)
- {
- /* Resume all threads, with preference for INFERIOR_PTID. */
- if (step && siggnal != TARGET_SIGNAL_0)
- outbuf = xstrprintf ("vCont;S%02x:%x;c", siggnal,
- PIDGET (inferior_ptid));
- else if (step)
- outbuf = xstrprintf ("vCont;s:%x;c", PIDGET (inferior_ptid));
- else if (siggnal != TARGET_SIGNAL_0)
- outbuf = xstrprintf ("vCont;C%02x:%x;c", siggnal,
- PIDGET (inferior_ptid));
- else
- outbuf = xstrprintf ("vCont;c");
+ p += xsnprintf (p, endp - p, "vCont");
+
+ if (ptid_equal (ptid, magic_null_ptid))
+ {
+ /* MAGIC_NULL_PTID means that we don't have any active threads,
+ so we don't have any TID numbers the inferior will
+ understand. Make sure to only send forms that do not specify
+ a TID. */
+ append_resumption (p, endp, minus_one_ptid, step, siggnal);
+ }
+ else if (ptid_equal (ptid, minus_one_ptid) || ptid_is_pid (ptid))
+ {
+ /* Resume all threads (of all processes, or of a single
+ process), with preference for INFERIOR_PTID. This assumes
+ inferior_ptid belongs to the set of all threads we are about
+ to resume. */
+ if (step || siggnal != TARGET_SIGNAL_0)
+ {
+ /* Step inferior_ptid, with or without signal. */
+ p = append_resumption (p, endp, inferior_ptid, step, siggnal);
+ }
+
+ /* And continue others without a signal. */
+ append_resumption (p, endp, ptid, /*step=*/ 0, TARGET_SIGNAL_0);
}
else
{
/* Scheduler locking; resume only PTID. */
- if (step && siggnal != TARGET_SIGNAL_0)
- outbuf = xstrprintf ("vCont;S%02x:%x", siggnal, pid);
- else if (step)
- outbuf = xstrprintf ("vCont;s:%x", pid);
- else if (siggnal != TARGET_SIGNAL_0)
- outbuf = xstrprintf ("vCont;C%02x:%x", siggnal, pid);
- else
- outbuf = xstrprintf ("vCont;c:%x", pid);
+ append_resumption (p, endp, ptid, step, siggnal);
}
- gdb_assert (outbuf && strlen (outbuf) < rs->remote_packet_size);
- make_cleanup (xfree, outbuf);
+ gdb_assert (strlen (rs->buf) < get_remote_packet_size ());
+ putpkt (rs->buf);
- putpkt (outbuf);
-
- do_cleanups (old_cleanup);
+ if (non_stop)
+ {
+ /* In non-stop, the stub replies to vCont with "OK". The stop
+ reply will be reported asynchronously by means of a `%Stop'
+ notification. */
+ getpkt (&rs->buf, &rs->buf_size, 0);
+ if (strcmp (rs->buf, "OK") != 0)
+ error (_("Unexpected vCont reply in non-stop mode: %s"), rs->buf);
+ }
return 1;
}
static int last_sent_step;
static void
-remote_resume (ptid_t ptid, int step, enum target_signal siggnal)
+remote_resume (struct target_ops *ops,
+ ptid_t ptid, int step, enum target_signal siggnal)
{
struct remote_state *rs = get_remote_state ();
- char *buf = alloca (rs->remote_packet_size);
- int pid = PIDGET (ptid);
- char *p;
+ char *buf;
last_sent_signal = siggnal;
last_sent_step = step;
- /* A hook for when we need to do something at the last moment before
- resumption. */
- if (deprecated_target_resume_hook)
- (*deprecated_target_resume_hook) ();
-
/* The vCont packet doesn't need to specify threads via Hc. */
- if (remote_vcont_resume (ptid, step, siggnal))
- return;
-
- /* All other supported resume packets do use Hc, so call set_thread. */
- if (pid == -1)
- set_thread (0, 0); /* run any thread */
+ /* No reverse support (yet) for vCont. */
+ if (execution_direction != EXEC_REVERSE)
+ if (remote_vcont_resume (ptid, step, siggnal))
+ goto done;
+
+ /* All other supported resume packets do use Hc, so set the continue
+ thread. */
+ if (ptid_equal (ptid, minus_one_ptid))
+ set_continue_thread (any_thread_ptid);
else
- set_thread (pid, 0); /* run this thread */
+ set_continue_thread (ptid);
- if (siggnal != TARGET_SIGNAL_0)
+ buf = rs->buf;
+ if (execution_direction == EXEC_REVERSE)
+ {
+ /* We don't pass signals to the target in reverse exec mode. */
+ if (info_verbose && siggnal != TARGET_SIGNAL_0)
+ warning (_(" - Can't pass signal %d to target in reverse: ignored."),
+ siggnal);
+
+ if (step
+ && remote_protocol_packets[PACKET_bs].support == PACKET_DISABLE)
+ error (_("Remote reverse-step not supported."));
+ if (!step
+ && remote_protocol_packets[PACKET_bc].support == PACKET_DISABLE)
+ error (_("Remote reverse-continue not supported."));
+
+ strcpy (buf, step ? "bs" : "bc");
+ }
+ else if (siggnal != TARGET_SIGNAL_0)
{
buf[0] = step ? 'S' : 'C';
buf[1] = tohex (((int) siggnal >> 4) & 0xf);
strcpy (buf, step ? "s" : "c");
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_resume (ptid, step, siggnal);
+ done:
/* 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.*/
+ 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. */
+ 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
- this information already found in the continuation block? */
- if (target_is_async_p ())
- target_executing = 1;
+
+ /* We've just told the target to resume. The remote server will
+ wait for the inferior to stop, and then send a stop reply. In
+ the mean time, we can't start another command/query ourselves
+ because the stub wouldn't be ready to process it. This applies
+ only to the base all-stop protocol, however. In non-stop (which
+ only supports vCont), the stub replies with an "OK", and is
+ immediate able to process further serial input. */
+ if (!non_stop)
+ rs->waiting_for_stop_reply = 1;
}
\f
/* 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)
{
- sigint_remote_token =
- create_async_signal_handler (async_remote_interrupt, NULL);
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)
{
signal (sig, handle_remote_sigint_twice);
- sigint_remote_twice_token =
- create_async_signal_handler (async_remote_interrupt_twice, NULL);
mark_async_signal_handler_wrapper (sigint_remote_token);
}
/* 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)
{
- signal (sig, handle_sigint);
- sigint_remote_twice_token =
- create_async_signal_handler (inferior_event_handler_wrapper, NULL);
+ signal (sig, handle_remote_sigint);
mark_async_signal_handler_wrapper (sigint_remote_twice_token);
}
/* 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)
{
if (remote_debug)
fprintf_unfiltered (gdb_stdlog, "remote_interrupt called\n");
- target_stop ();
+ target_stop (inferior_ptid);
}
-/* Perform interrupt, if the first attempt did not succeed. Just give
- up on the target alltogether. */
+/* 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 ();
- signal (SIGINT, handle_remote_sigint);
- }
+
+ interrupt_query ();
}
/* 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);
- 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
packet. */
static void (*ofunc) (int);
-/* The command line interface's stop routine. This function is installed
- 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
+/* The command line interface's stop routine. This function is installed
+ 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)
- fprintf_unfiltered (gdb_stdlog, "remote_interrupt called\n");
-
- target_stop ();
+ gdb_call_async_signal_handler (sigint_remote_token, 1);
}
/* The user typed ^C twice. */
remote_interrupt_twice (int signo)
{
signal (signo, ofunc);
- interrupt_query ();
+ gdb_call_async_signal_handler (sigint_remote_twice_token, 1);
signal (signo, remote_interrupt);
}
-/* This is the generic stop called via the target vector. When a target
+/* Non-stop version of target_stop. Uses `vCont;t' to stop a remote
+ thread, all threads of a remote process, or all threads of all
+ processes. */
+
+static void
+remote_stop_ns (ptid_t ptid)
+{
+ struct remote_state *rs = get_remote_state ();
+ char *p = rs->buf;
+ char *endp = rs->buf + get_remote_packet_size ();
+
+ if (remote_protocol_packets[PACKET_vCont].support == PACKET_SUPPORT_UNKNOWN)
+ remote_vcont_probe (rs);
+
+ if (!rs->support_vCont_t)
+ error (_("Remote server does not support stopping threads"));
+
+ if (ptid_equal (ptid, minus_one_ptid)
+ || (!remote_multi_process_p (rs) && ptid_is_pid (ptid)))
+ p += xsnprintf (p, endp - p, "vCont;t");
+ else
+ {
+ ptid_t nptid;
+
+ p += xsnprintf (p, endp - p, "vCont;t:");
+
+ if (ptid_is_pid (ptid))
+ /* All (-1) threads of process. */
+ nptid = ptid_build (ptid_get_pid (ptid), 0, -1);
+ else
+ {
+ /* Small optimization: if we already have a stop reply for
+ this thread, no use in telling the stub we want this
+ stopped. */
+ if (peek_stop_reply (ptid))
+ return;
+
+ nptid = ptid;
+ }
+
+ write_ptid (p, endp, nptid);
+ }
+
+ /* In non-stop, we get an immediate OK reply. The stop reply will
+ come in asynchronously by notification. */
+ putpkt (rs->buf);
+ getpkt (&rs->buf, &rs->buf_size, 0);
+ if (strcmp (rs->buf, "OK") != 0)
+ error (_("Stopping %s failed: %s"), target_pid_to_str (ptid), rs->buf);
+}
+
+/* All-stop version of target_stop. Sends a break or a ^C to stop the
+ remote target. It is undefined which thread of which process
+ reports the stop. */
+
+static void
+remote_stop_as (ptid_t ptid)
+{
+ struct remote_state *rs = get_remote_state ();
+
+ rs->ctrlc_pending_p = 1;
+
+ /* If the inferior is stopped already, but the core didn't know
+ about it yet, just ignore the request. The cached wait status
+ will be collected in remote_wait. */
+ if (rs->cached_wait_status)
+ return;
+
+ /* Send interrupt_sequence to remote target. */
+ send_interrupt_sequence ();
+}
+
+/* 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)
+remote_stop (ptid_t ptid)
{
- /* Send a break or a ^C, depending on user preference. */
if (remote_debug)
fprintf_unfiltered (gdb_stdlog, "remote_stop called\n");
- if (remote_break)
- serial_send_break (remote_desc);
+ if (non_stop)
+ remote_stop_ns (ptid);
else
- serial_write (remote_desc, "\003", 1);
+ remote_stop_as (ptid);
}
/* Ask the user what to do when an interrupt is received. */
{
target_terminal_ours ();
- if (query ("Interrupted while waiting for the program.\n\
-Give up (and stop debugging it)? "))
+ if (target_can_async_p ())
+ {
+ signal (SIGINT, handle_sigint);
+ deprecated_throw_reason (RETURN_QUIT);
+ }
+ else
{
- target_mourn_inferior ();
- throw_exception (RETURN_QUIT);
+ if (query (_("Interrupted while waiting for the program.\n\
+Give up (and stop debugging it)? ")))
+ {
+ pop_target ();
+ deprecated_throw_reason (RETURN_QUIT);
+ }
}
target_terminal_inferior ();
/* 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)
+remote_terminal_inferior (void)
{
- /* FIXME: cagney/1999-09-27: Shouldn't need to test for
- 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)
+ if (!target_async_permitted)
+ /* Nothing to do. */
return;
- /* FIXME: cagney/1999-09-27: Closely related to the above. Make
- calls target_terminal_*() idenpotent. The event-loop GDB talking
- to an asynchronous target with a synchronous command calls this
- function from both event-top.c and infrun.c/infcmd.c. Once GDB
- stops trying to transfer the terminal to the target when it
- shouldn't this guard can go away. */
+
+ /* FIXME: cagney/1999-09-27: Make calls to target_terminal_*()
+ idempotent. The event-loop GDB talking to an asynchronous target
+ with a synchronous command calls this function from both
+ event-top.c and infrun.c/infcmd.c. Once GDB stops trying to
+ transfer the terminal to the target when it shouldn't this guard
+ can go away. */
if (!remote_async_terminal_ours_p)
return;
delete_file_handler (input_fd);
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)
+remote_terminal_ours (void)
{
- /* See FIXME in remote_async_terminal_inferior. */
- if (!sync_execution)
+ if (!target_async_permitted)
+ /* Nothing to do. */
return;
- /* See FIXME in remote_async_terminal_inferior. */
+
+ /* See FIXME in remote_terminal_inferior. */
if (remote_async_terminal_ours_p)
return;
cleanup_sigint_signal_handler (NULL);
remote_async_terminal_ours_p = 1;
}
-/* If nonzero, ignore the next kill. */
-
-int kill_kludge;
-
-void
+static void
remote_console_output (char *msg)
{
char *p;
{
char tb[2];
char c = fromhex (p[0]) * 16 + fromhex (p[1]);
+
tb[0] = c;
tb[1] = 0;
fputs_unfiltered (tb, gdb_stdtarg);
}
- gdb_flush (gdb_stdtarg);
-}
+ gdb_flush (gdb_stdtarg);
+ }
+
+typedef struct cached_reg
+{
+ int num;
+ gdb_byte data[MAX_REGISTER_SIZE];
+} cached_reg_t;
-/* Wait until the remote machine stops, then return,
- storing status in STATUS just as `wait' would.
- Returns "pid", which in the case of a multi-threaded
- remote OS, is the thread-id. */
+DEF_VEC_O(cached_reg_t);
-static ptid_t
-remote_wait (ptid_t ptid, struct target_waitstatus *status)
+struct stop_reply
{
- struct remote_state *rs = get_remote_state ();
- unsigned char *buf = alloca (rs->remote_packet_size);
- ULONGEST thread_num = -1;
- ULONGEST addr;
+ struct stop_reply *next;
- status->kind = TARGET_WAITKIND_EXITED;
- status->value.integer = 0;
+ ptid_t ptid;
- while (1)
- {
- unsigned char *p;
+ struct target_waitstatus ws;
- ofunc = signal (SIGINT, remote_interrupt);
- getpkt (buf, (rs->remote_packet_size), 1);
- signal (SIGINT, ofunc);
+ VEC(cached_reg_t) *regcache;
- /* This is a hook for when we need to do something (perhaps the
- collection of trace data) every time the target stops. */
- if (deprecated_target_wait_loop_hook)
- (*deprecated_target_wait_loop_hook) ();
+ int stopped_by_watchpoint_p;
+ CORE_ADDR watch_data_address;
- remote_stopped_by_watchpoint_p = 0;
+ int solibs_changed;
+ int replay_event;
- 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
- r... = register contents
- */
- p = &buf[3]; /* after Txx */
-
- while (*p)
- {
- unsigned char *p1;
- char *p_temp;
- int fieldsize;
- LONGEST pnum = 0;
+ int core;
+};
- /* 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. */
+/* The list of already fetched and acknowledged stop events. */
+static struct stop_reply *stop_reply_queue;
- /* If this packet is an awatch packet, don't parse the 'a'
- as a register number. */
+static struct stop_reply *
+stop_reply_xmalloc (void)
+{
+ struct stop_reply *r = XMALLOC (struct stop_reply);
- if (strncmp (p, "awatch", strlen("awatch")) != 0)
- {
- /* Read the ``P'' register number. */
- pnum = strtol (p, &p_temp, 16);
- p1 = (unsigned char *) p_temp;
- }
- else
- p1 = p;
+ r->next = NULL;
+ return r;
+}
- if (p1 == p) /* No register number present here */
- {
- p1 = (unsigned char *) strchr (p, ':');
- if (p1 == NULL)
- warning ("Malformed packet(a) (missing colon): %s\n\
-Packet: '%s'\n",
- p, buf);
- if (strncmp (p, "thread", p1 - p) == 0)
- {
- p_temp = unpack_varlen_hex (++p1, &thread_num);
- record_currthread (thread_num);
- p = (unsigned char *) p_temp;
- }
- else if ((strncmp (p, "watch", p1 - p) == 0)
- || (strncmp (p, "rwatch", p1 - p) == 0)
- || (strncmp (p, "awatch", p1 - p) == 0))
- {
- remote_stopped_by_watchpoint_p = 1;
- p = unpack_varlen_hex (++p1, &addr);
- remote_watch_data_address = (CORE_ADDR)addr;
- }
- else
- {
- /* Silently skip unknown optional info. */
- p_temp = strchr (p1 + 1, ';');
- if (p_temp)
- p = (unsigned char *) p_temp;
- }
- }
- else
- {
- 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 %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);
- }
+static void
+stop_reply_xfree (struct stop_reply *r)
+{
+ if (r != NULL)
+ {
+ VEC_free (cached_reg_t, r->regcache);
+ xfree (r);
+ }
+}
- 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])));
+/* Discard all pending stop replies of inferior PID. If PID is -1,
+ discard everything. */
- if (buf[3] == 'p')
- {
- thread_num = strtol ((const char *) &buf[4], NULL, 16);
- record_currthread (thread_num);
- }
- goto got_status;
- case 'W': /* Target exited */
- {
- /* The remote process exited. */
- status->kind = TARGET_WAITKIND_EXITED;
- status->value.integer = (fromhex (buf[1]) << 4) + fromhex (buf[2]);
- goto got_status;
- }
- case 'X':
- status->kind = TARGET_WAITKIND_SIGNALLED;
- status->value.sig = (enum target_signal)
- (((fromhex (buf[1])) << 4) + (fromhex (buf[2])));
- kill_kludge = 1;
+static void
+discard_pending_stop_replies (int pid)
+{
+ struct stop_reply *prev = NULL, *reply, *next;
- goto got_status;
- case 'O': /* Console output */
- remote_console_output (buf + 1);
- continue;
- case '\0':
- if (last_sent_signal != TARGET_SIGNAL_0)
- {
- /* Zero length reply means that we tried 'S' or 'C' and
- the remote system doesn't support it. */
- target_terminal_ours_for_output ();
- printf_filtered
- ("Can't send signals to this remote system. %s not sent.\n",
- target_signal_to_name (last_sent_signal));
- last_sent_signal = TARGET_SIGNAL_0;
- target_terminal_inferior ();
-
- strcpy ((char *) buf, last_sent_step ? "s" : "c");
- putpkt ((char *) buf);
- continue;
- }
- /* else fallthrough */
- default:
- warning ("Invalid remote reply: %s", buf);
- continue;
- }
+ /* Discard the in-flight notification. */
+ if (pending_stop_reply != NULL
+ && (pid == -1
+ || ptid_get_pid (pending_stop_reply->ptid) == pid))
+ {
+ stop_reply_xfree (pending_stop_reply);
+ pending_stop_reply = NULL;
}
-got_status:
- if (thread_num != -1)
+
+ /* Discard the stop replies we have already pulled with
+ vStopped. */
+ for (reply = stop_reply_queue; reply; reply = next)
{
- return pid_to_ptid (thread_num);
+ next = reply->next;
+ if (pid == -1
+ || ptid_get_pid (reply->ptid) == pid)
+ {
+ if (reply == stop_reply_queue)
+ stop_reply_queue = reply->next;
+ else
+ prev->next = reply->next;
+
+ stop_reply_xfree (reply);
+ }
+ else
+ prev = reply;
}
- return inferior_ptid;
}
-/* Async version of remote_wait. */
-static ptid_t
-remote_async_wait (ptid_t ptid, struct target_waitstatus *status)
+/* Cleanup wrapper. */
+
+static void
+do_stop_reply_xfree (void *arg)
{
- struct remote_state *rs = get_remote_state ();
- unsigned char *buf = alloca (rs->remote_packet_size);
- ULONGEST thread_num = -1;
- ULONGEST addr;
+ struct stop_reply *r = arg;
- status->kind = TARGET_WAITKIND_EXITED;
- status->value.integer = 0;
+ stop_reply_xfree (r);
+}
- remote_stopped_by_watchpoint_p = 0;
+/* Look for a queued stop reply belonging to PTID. If one is found,
+ remove it from the queue, and return it. Returns NULL if none is
+ found. If there are still queued events left to process, tell the
+ event loop to get back to target_wait soon. */
- while (1)
+static struct stop_reply *
+queued_stop_reply (ptid_t ptid)
+{
+ struct stop_reply *it;
+ struct stop_reply **it_link;
+
+ it = stop_reply_queue;
+ it_link = &stop_reply_queue;
+ while (it)
{
- unsigned char *p;
+ if (ptid_match (it->ptid, ptid))
+ {
+ *it_link = it->next;
+ it->next = NULL;
+ break;
+ }
- if (!target_is_async_p ())
- ofunc = signal (SIGINT, remote_interrupt);
- /* 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);
+ it_link = &it->next;
+ it = *it_link;
+ }
- /* This is a hook for when we need to do something (perhaps the
- collection of trace data) every time the target stops. */
- if (deprecated_target_wait_loop_hook)
- (*deprecated_target_wait_loop_hook) ();
+ if (stop_reply_queue)
+ /* There's still at least an event left. */
+ mark_async_event_handler (remote_async_inferior_event_token);
- 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
- r... = register contents
- */
- p = &buf[3]; /* after Txx */
-
- while (*p)
- {
- unsigned char *p1;
- char *p_temp;
- 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. */
-
- if (!strncmp (p, "awatch", strlen ("awatch")) != 0)
- {
- /* Read the register number. */
- pnum = strtol (p, &p_temp, 16);
- p1 = (unsigned char *) p_temp;
- }
- 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)
- {
- p_temp = unpack_varlen_hex (++p1, &thread_num);
- record_currthread (thread_num);
- p = (unsigned char *) p_temp;
- }
- else if ((strncmp (p, "watch", p1 - p) == 0)
- || (strncmp (p, "rwatch", p1 - p) == 0)
- || (strncmp (p, "awatch", p1 - p) == 0))
- {
- remote_stopped_by_watchpoint_p = 1;
- p = unpack_varlen_hex (++p1, &addr);
- remote_watch_data_address = (CORE_ADDR)addr;
- }
- else
- {
- /* Silently skip unknown optional info. */
- p_temp = (unsigned char *) strchr (p1 + 1, ';');
- if (p_temp)
- p = p_temp;
- }
- }
+ return it;
+}
- else
- {
- 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);
- }
+/* Push a fully parsed stop reply in the stop reply queue. Since we
+ know that we now have at least one queued event left to pass to the
+ core side, tell the event loop to get back to target_wait soon. */
- 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])));
+static void
+push_stop_reply (struct stop_reply *new_event)
+{
+ struct stop_reply *event;
- if (buf[3] == 'p')
- {
- thread_num = strtol ((const char *) &buf[4], NULL, 16);
- record_currthread (thread_num);
- }
- goto got_status;
- case 'W': /* Target exited */
- {
- /* The remote process exited. */
- status->kind = TARGET_WAITKIND_EXITED;
- status->value.integer = (fromhex (buf[1]) << 4) + fromhex (buf[2]);
- goto got_status;
- }
- case 'X':
- status->kind = TARGET_WAITKIND_SIGNALLED;
- status->value.sig = (enum target_signal)
- (((fromhex (buf[1])) << 4) + (fromhex (buf[2])));
- 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':
- if (last_sent_signal != TARGET_SIGNAL_0)
- {
- /* Zero length reply means that we tried 'S' or 'C' and
- the remote system doesn't support it. */
- target_terminal_ours_for_output ();
- printf_filtered
- ("Can't send signals to this remote system. %s not sent.\n",
- target_signal_to_name (last_sent_signal));
- last_sent_signal = TARGET_SIGNAL_0;
- target_terminal_inferior ();
-
- strcpy ((char *) buf, last_sent_step ? "s" : "c");
- putpkt ((char *) buf);
- continue;
- }
- /* else fallthrough */
- default:
- warning ("Invalid remote reply: %s", buf);
- continue;
- }
- }
-got_status:
- if (thread_num != -1)
+ if (stop_reply_queue)
{
- return pid_to_ptid (thread_num);
- }
- return inferior_ptid;
-}
+ for (event = stop_reply_queue;
+ event && event->next;
+ event = event->next)
+ ;
-/* Number of bytes of registers this stub implements. */
+ event->next = new_event;
+ }
+ else
+ stop_reply_queue = new_event;
-static int register_bytes_found;
+ mark_async_event_handler (remote_async_inferior_event_token);
+}
-/* Read the remote registers into the block REGS. */
-/* Currently we just read all the registers, so we don't use regnum. */
+/* Returns true if we have a stop reply for PTID. */
static int
-fetch_register_using_p (int regnum)
+peek_stop_reply (ptid_t ptid)
{
- struct remote_state *rs = get_remote_state ();
- char *buf = alloca (rs->remote_packet_size), *p;
- char regp[MAX_REGISTER_SIZE];
- int i;
+ struct stop_reply *it;
- p = buf;
- *p++ = 'p';
- p += hexnumstr (p, regnum);
- *p++ = '\0';
- remote_send (buf, rs->remote_packet_size);
- if (buf[0] != 0 && buf[0] != 'E') {
- p = buf;
- i = 0;
- while (p[0] != 0) {
- if (p[1] == 0) {
- error("fetch_register_using_p: early buf termination");
- return 0;
- }
- regp[i++] = fromhex (p[0]) * 16 + fromhex (p[1]);
- p += 2;
- }
- regcache_raw_supply (current_regcache, regnum, regp);
- return 1;
- }
+ for (it = stop_reply_queue; it; it = it->next)
+ if (ptid_equal (ptid, it->ptid))
+ {
+ if (it->ws.kind == TARGET_WAITKIND_STOPPED)
+ return 1;
+ }
- return 0;
+ return 0;
}
+/* Parse the stop reply in BUF. Either the function succeeds, and the
+ result is stored in EVENT, or throws an error. */
+
static void
-remote_fetch_registers (int regnum)
+remote_parse_stop_reply (char *buf, struct stop_reply *event)
{
- struct remote_state *rs = get_remote_state ();
- char *buf = alloca (rs->remote_packet_size);
- int i;
+ struct remote_arch_state *rsa = get_remote_arch_state ();
+ ULONGEST addr;
char *p;
- char *regs = alloca (rs->sizeof_g_packet);
- set_thread (PIDGET (inferior_ptid), 1);
+ event->ptid = null_ptid;
+ event->ws.kind = TARGET_WAITKIND_IGNORE;
+ event->ws.value.integer = 0;
+ event->solibs_changed = 0;
+ event->replay_event = 0;
+ event->stopped_by_watchpoint_p = 0;
+ event->regcache = NULL;
+ event->core = -1;
- if (regnum >= 0)
+ switch (buf[0])
{
- struct packet_reg *reg = packet_reg_from_regnum (rs, regnum);
- gdb_assert (reg != NULL);
- if (!reg->in_g_packet)
- internal_error (__FILE__, __LINE__,
- "Attempt to fetch a non G-packet register when this "
- "remote.c does not support the p-packet.");
- }
- switch (remote_protocol_p.support)
+ case 'T': /* Status with PC, SP, FP, ... */
+ /* Expedited reply, containing Signal, {regno, reg} repeat. */
+ /* format is: 'Tssn...:r...;n...:r...;n...:r...;#cc', where
+ ss = signal number
+ n... = register number
+ r... = register contents
+ */
+
+ p = &buf[3]; /* after Txx */
+ while (*p)
{
- case PACKET_DISABLE:
- break;
- case PACKET_ENABLE:
- if (fetch_register_using_p (regnum))
- return;
- else
- error ("Protocol error: p packet not recognized by stub");
- case PACKET_SUPPORT_UNKNOWN:
- if (fetch_register_using_p (regnum))
+ char *p1;
+ char *p_temp;
+ 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
+ && strncmp (p, "core", strlen ("core") != 0))
{
- /* The stub recognized the 'p' packet. Remember this. */
- remote_protocol_p.support = PACKET_ENABLE;
- return;
+ /* Read the ``P'' register number. */
+ pnum = strtol (p, &p_temp, 16);
+ p1 = p_temp;
}
else
+ p1 = p;
+
+ if (p1 == p) /* No register number present here. */
{
- /* The stub does not support the 'P' packet. Use 'G'
- instead, and don't try using 'P' in the future (it
- will just waste our time). */
- remote_protocol_p.support = PACKET_DISABLE;
- break;
+ p1 = 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)
+ event->ptid = read_ptid (++p1, &p);
+ else if ((strncmp (p, "watch", p1 - p) == 0)
+ || (strncmp (p, "rwatch", p1 - p) == 0)
+ || (strncmp (p, "awatch", p1 - p) == 0))
+ {
+ event->stopped_by_watchpoint_p = 1;
+ p = unpack_varlen_hex (++p1, &addr);
+ event->watch_data_address = (CORE_ADDR) addr;
+ }
+ else if (strncmp (p, "library", p1 - p) == 0)
+ {
+ p1++;
+ p_temp = p1;
+ while (*p_temp && *p_temp != ';')
+ p_temp++;
+
+ event->solibs_changed = 1;
+ p = p_temp;
+ }
+ else if (strncmp (p, "replaylog", p1 - p) == 0)
+ {
+ /* NO_HISTORY event.
+ p1 will indicate "begin" or "end", but
+ it makes no difference for now, so ignore it. */
+ event->replay_event = 1;
+ p_temp = strchr (p1 + 1, ';');
+ if (p_temp)
+ p = p_temp;
+ }
+ else if (strncmp (p, "core", p1 - p) == 0)
+ {
+ ULONGEST c;
+
+ p = unpack_varlen_hex (++p1, &c);
+ event->core = c;
+ }
+ else
+ {
+ /* Silently skip unknown optional info. */
+ p_temp = strchr (p1 + 1, ';');
+ if (p_temp)
+ p = p_temp;
+ }
}
- }
+ else
+ {
+ struct packet_reg *reg = packet_reg_from_pnum (rsa, pnum);
+ cached_reg_t cached_reg;
- sprintf (buf, "g");
- remote_send (buf, (rs->remote_packet_size));
+ p = p1;
- /* 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);
+ if (*p != ':')
+ error (_("Malformed packet(b) (missing colon): %s\n\
+Packet: '%s'\n"),
+ p, buf);
+ ++p;
- /* Unimplemented registers read as all bits zero. */
- memset (regs, 0, rs->sizeof_g_packet);
+ if (reg == NULL)
+ error (_("Remote sent bad register number %s: %s\n\
+Packet: '%s'\n"),
+ hex_string (pnum), p, buf);
- /* We can get out of synch in various cases. If the first character
- in the buffer is not a hex character, assume that has happened
- 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,
- "Bad register packet; fetching a new packet\n");
- getpkt (buf, (rs->remote_packet_size), 0);
- }
+ cached_reg.num = reg->regnum;
- /* Reply describes registers byte by byte, each byte encoded as two
- hex characters. Suck them all up, then supply them to the
- register cacheing/storage mechanism. */
+ fieldsize = hex2bin (p, cached_reg.data,
+ register_size (target_gdbarch,
+ reg->regnum));
+ p += 2 * fieldsize;
+ if (fieldsize < register_size (target_gdbarch,
+ reg->regnum))
+ warning (_("Remote reply is too short: %s"), buf);
- p = buf;
- for (i = 0; i < rs->sizeof_g_packet; i++)
- {
- if (p[0] == 0)
- break;
- if (p[1] == 0)
- {
- warning ("Remote reply is of odd length: %s", buf);
- /* Don't change register_bytes_found in this case, and don't
- print a second warning. */
- goto supply_them;
+ VEC_safe_push (cached_reg_t, event->regcache, &cached_reg);
+ }
+
+ if (*p != ';')
+ error (_("Remote register badly formatted: %s\nhere: %s"),
+ buf, p);
+ ++p;
}
- if (p[0] == 'x' && p[1] == 'x')
- regs[i] = 0; /* 'x' */
+ /* fall through */
+ case 'S': /* Old style status, just signal only. */
+ if (event->solibs_changed)
+ event->ws.kind = TARGET_WAITKIND_LOADED;
+ else if (event->replay_event)
+ event->ws.kind = TARGET_WAITKIND_NO_HISTORY;
else
- regs[i] = fromhex (p[0]) * 16 + fromhex (p[1]);
- p += 2;
- }
+ {
+ event->ws.kind = TARGET_WAITKIND_STOPPED;
+ event->ws.value.sig = (enum target_signal)
+ (((fromhex (buf[1])) << 4) + (fromhex (buf[2])));
+ }
+ break;
+ case 'W': /* Target exited. */
+ case 'X':
+ {
+ char *p;
+ int pid;
+ ULONGEST value;
- if (i != register_bytes_found)
- {
- register_bytes_found = i;
- if (REGISTER_BYTES_OK_P ()
- && !REGISTER_BYTES_OK (i))
- warning ("Remote reply is too short: %s", buf);
- }
+ /* GDB used to accept only 2 hex chars here. Stubs should
+ only send more if they detect GDB supports multi-process
+ support. */
+ p = unpack_varlen_hex (&buf[1], &value);
- supply_them:
- {
- int i;
- for (i = 0; i < NUM_REGS + NUM_PSEUDO_REGS; i++)
- {
- struct packet_reg *r = &rs->regs[i];
- if (r->in_g_packet)
+ if (buf[0] == 'W')
{
- if (r->offset * 2 >= strlen (buf))
- /* A short packet that didn't include the register's
- value, this implies that the register is zero (and
- not that the register is unavailable). Supply that
- zero value. */
- regcache_raw_supply (current_regcache, r->regnum, NULL);
- else if (buf[r->offset * 2] == 'x')
+ /* The remote process exited. */
+ event->ws.kind = TARGET_WAITKIND_EXITED;
+ event->ws.value.integer = value;
+ }
+ else
+ {
+ /* The remote process exited with a signal. */
+ event->ws.kind = TARGET_WAITKIND_SIGNALLED;
+ event->ws.value.sig = (enum target_signal) value;
+ }
+
+ /* If no process is specified, assume inferior_ptid. */
+ pid = ptid_get_pid (inferior_ptid);
+ if (*p == '\0')
+ ;
+ else if (*p == ';')
+ {
+ p++;
+
+ if (p == '\0')
+ ;
+ else if (strncmp (p,
+ "process:", sizeof ("process:") - 1) == 0)
{
- gdb_assert (r->offset * 2 < strlen (buf));
- /* The register isn't available, mark it as such (at
- the same time setting the value to zero). */
- regcache_raw_supply (current_regcache, r->regnum, NULL);
- set_register_cached (i, -1);
+ ULONGEST upid;
+
+ p += sizeof ("process:") - 1;
+ unpack_varlen_hex (p, &upid);
+ pid = upid;
}
else
- regcache_raw_supply (current_regcache, r->regnum,
- regs + r->offset);
+ error (_("unknown stop reply packet: %s"), buf);
}
+ else
+ error (_("unknown stop reply packet: %s"), buf);
+ event->ptid = pid_to_ptid (pid);
}
- }
-}
+ break;
+ }
-/* Prepare to store registers. Since we may send them all (using a
- 'G' request), we have to read out the ones we don't want to change
- first. */
+ if (non_stop && ptid_equal (event->ptid, null_ptid))
+ error (_("No process or thread specified in stop reply: %s"), buf);
+}
+
+/* When the stub wants to tell GDB about a new stop reply, it sends a
+ stop notification (%Stop). Those can come it at any time, hence,
+ we have to make sure that any pending putpkt/getpkt sequence we're
+ making is finished, before querying the stub for more events with
+ vStopped. E.g., if we started a vStopped sequence immediatelly
+ upon receiving the %Stop notification, something like this could
+ happen:
+
+ 1.1) --> Hg 1
+ 1.2) <-- OK
+ 1.3) --> g
+ 1.4) <-- %Stop
+ 1.5) --> vStopped
+ 1.6) <-- (registers reply to step #1.3)
+
+ Obviously, the reply in step #1.6 would be unexpected to a vStopped
+ query.
+
+ To solve this, whenever we parse a %Stop notification sucessfully,
+ we mark the REMOTE_ASYNC_GET_PENDING_EVENTS_TOKEN, and carry on
+ doing whatever we were doing:
+
+ 2.1) --> Hg 1
+ 2.2) <-- OK
+ 2.3) --> g
+ 2.4) <-- %Stop
+ <GDB marks the REMOTE_ASYNC_GET_PENDING_EVENTS_TOKEN>
+ 2.5) <-- (registers reply to step #2.3)
+
+ Eventualy after step #2.5, we return to the event loop, which
+ notices there's an event on the
+ REMOTE_ASYNC_GET_PENDING_EVENTS_TOKEN event and calls the
+ associated callback --- the function below. At this point, we're
+ always safe to start a vStopped sequence. :
+
+ 2.6) --> vStopped
+ 2.7) <-- T05 thread:2
+ 2.8) --> vStopped
+ 2.9) --> OK
+*/
static void
-remote_prepare_to_store (void)
+remote_get_pending_stop_replies (void)
{
struct remote_state *rs = get_remote_state ();
- int i;
- char buf[MAX_REGISTER_SIZE];
- /* Make sure the entire registers array is valid. */
- switch (remote_protocol_P.support)
+ if (pending_stop_reply)
{
- case PACKET_DISABLE:
- case PACKET_SUPPORT_UNKNOWN:
- /* Make sure all the necessary registers are cached. */
- for (i = 0; i < NUM_REGS; i++)
- if (rs->regs[i].in_g_packet)
- regcache_raw_read (current_regcache, rs->regs[i].regnum, buf);
- break;
- case PACKET_ENABLE:
- break;
- }
-}
+ /* acknowledge */
+ putpkt ("vStopped");
-/* Helper: Attempt to store REGNUM using the P packet. Return fail IFF
- packet was not recognized. */
+ /* Now we can rely on it. */
+ push_stop_reply (pending_stop_reply);
+ pending_stop_reply = NULL;
-static int
-store_register_using_P (int regnum)
-{
- struct remote_state *rs = get_remote_state ();
- struct packet_reg *reg = packet_reg_from_regnum (rs, regnum);
- /* Try storing a single register. */
- char *buf = alloca (rs->remote_packet_size);
- char regp[MAX_REGISTER_SIZE];
- char *p;
- int i;
+ while (1)
+ {
+ getpkt (&rs->buf, &rs->buf_size, 0);
+ if (strcmp (rs->buf, "OK") == 0)
+ break;
+ else
+ {
+ struct cleanup *old_chain;
+ struct stop_reply *stop_reply = stop_reply_xmalloc ();
- sprintf (buf, "P%s=", phex_nz (reg->pnum, 0));
- p = buf + strlen (buf);
- regcache_raw_collect (current_regcache, reg->regnum, regp);
- bin2hex (regp, p, register_size (current_gdbarch, reg->regnum));
- remote_send (buf, rs->remote_packet_size);
+ old_chain = make_cleanup (do_stop_reply_xfree, stop_reply);
+ remote_parse_stop_reply (rs->buf, stop_reply);
- return buf[0] != '\0';
+ /* acknowledge */
+ putpkt ("vStopped");
+
+ if (stop_reply->ws.kind != TARGET_WAITKIND_IGNORE)
+ {
+ /* Now we can rely on it. */
+ discard_cleanups (old_chain);
+ push_stop_reply (stop_reply);
+ }
+ else
+ /* We got an unknown stop reply. */
+ do_cleanups (old_chain);
+ }
+ }
+ }
}
-/* Store register REGNUM, or all registers if REGNUM == -1, from the contents
- of the register cache buffer. FIXME: ignores errors. */
+/* Called when it is decided that STOP_REPLY holds the info of the
+ event that is to be returned to the core. This function always
+ destroys STOP_REPLY. */
-static void
-remote_store_registers (int regnum)
+static ptid_t
+process_stop_reply (struct stop_reply *stop_reply,
+ struct target_waitstatus *status)
{
- struct remote_state *rs = get_remote_state ();
- char *buf;
- char *regs;
- int i;
- char *p;
+ ptid_t ptid;
- set_thread (PIDGET (inferior_ptid), 1);
+ *status = stop_reply->ws;
+ ptid = stop_reply->ptid;
- if (regnum >= 0)
+ /* If no thread/process was reported by the stub, assume the current
+ inferior. */
+ if (ptid_equal (ptid, null_ptid))
+ ptid = inferior_ptid;
+
+ if (status->kind != TARGET_WAITKIND_EXITED
+ && status->kind != TARGET_WAITKIND_SIGNALLED)
{
- switch (remote_protocol_P.support)
+ /* Expedited registers. */
+ if (stop_reply->regcache)
{
- case PACKET_DISABLE:
- break;
- case PACKET_ENABLE:
- if (store_register_using_P (regnum))
- return;
- else
- error ("Protocol error: P packet not recognized by stub");
- case PACKET_SUPPORT_UNKNOWN:
- if (store_register_using_P (regnum))
- {
- /* The stub recognized the 'P' packet. Remember this. */
- remote_protocol_P.support = PACKET_ENABLE;
- return;
- }
- else
- {
- /* The stub does not support the 'P' packet. Use 'G'
- instead, and don't try using 'P' in the future (it
- will just waste our time). */
- remote_protocol_P.support = PACKET_DISABLE;
- break;
- }
+ struct regcache *regcache
+ = get_thread_arch_regcache (ptid, target_gdbarch);
+ cached_reg_t *reg;
+ int ix;
+
+ for (ix = 0;
+ VEC_iterate(cached_reg_t, stop_reply->regcache, ix, reg);
+ ix++)
+ regcache_raw_supply (regcache, reg->num, reg->data);
+ VEC_free (cached_reg_t, stop_reply->regcache);
}
- }
-
- /* Extract all the registers in the regcache copying them into a
- local buffer. */
- {
- int i;
- regs = alloca (rs->sizeof_g_packet);
- memset (regs, rs->sizeof_g_packet, 0);
- for (i = 0; i < NUM_REGS + NUM_PSEUDO_REGS; i++)
- {
- struct packet_reg *r = &rs->regs[i];
- if (r->in_g_packet)
- regcache_raw_collect (current_regcache, r->regnum, regs + r->offset);
- }
- }
-
- /* Command describes registers byte by byte,
- each byte encoded as two hex characters. */
- buf = alloca (rs->remote_packet_size);
- p = buf;
- *p++ = 'G';
- /* remote_prepare_to_store insures that register_bytes_found gets set. */
- bin2hex (regs, p, register_bytes_found);
- remote_send (buf, (rs->remote_packet_size));
-}
-\f
-/* Return the number of hex digits in num. */
-
-static int
-hexnumlen (ULONGEST num)
-{
- int i;
+ remote_stopped_by_watchpoint_p = stop_reply->stopped_by_watchpoint_p;
+ remote_watch_data_address = stop_reply->watch_data_address;
- for (i = 0; num != 0; i++)
- num >>= 4;
+ remote_notice_new_inferior (ptid, 0);
+ demand_private_info (ptid)->core = stop_reply->core;
+ }
- return max (i, 1);
+ stop_reply_xfree (stop_reply);
+ return ptid;
}
-/* Set BUF to the minimum number of hex digits representing NUM. */
+/* The non-stop mode version of target_wait. */
-static int
-hexnumstr (char *buf, ULONGEST num)
+static ptid_t
+remote_wait_ns (ptid_t ptid, struct target_waitstatus *status, int options)
{
- int len = hexnumlen (num);
- return hexnumnstr (buf, num, len);
-}
+ struct remote_state *rs = get_remote_state ();
+ struct stop_reply *stop_reply;
+ int ret;
+ /* If in non-stop mode, get out of getpkt even if a
+ notification is received. */
-/* Set BUF to the hex digits representing NUM, padded to WIDTH characters. */
+ ret = getpkt_or_notif_sane (&rs->buf, &rs->buf_size,
+ 0 /* forever */);
+ while (1)
+ {
+ if (ret != -1)
+ switch (rs->buf[0])
+ {
+ case 'E': /* Error of some sort. */
+ /* We're out of sync with the target now. Did it continue
+ or not? We can't tell which thread it was in non-stop,
+ so just ignore this. */
+ warning (_("Remote failure reply: %s"), rs->buf);
+ break;
+ case 'O': /* Console output. */
+ remote_console_output (rs->buf + 1);
+ break;
+ default:
+ warning (_("Invalid remote reply: %s"), rs->buf);
+ break;
+ }
-static int
-hexnumnstr (char *buf, ULONGEST num, int width)
-{
- int i;
+ /* Acknowledge a pending stop reply that may have arrived in the
+ mean time. */
+ if (pending_stop_reply != NULL)
+ remote_get_pending_stop_replies ();
- buf[width] = '\0';
+ /* If indeed we noticed a stop reply, we're done. */
+ stop_reply = queued_stop_reply (ptid);
+ if (stop_reply != NULL)
+ return process_stop_reply (stop_reply, status);
- for (i = width - 1; i >= 0; i--)
- {
- buf[i] = "0123456789abcdef"[(num & 0xf)];
- num >>= 4;
- }
+ /* Still no event. If we're just polling for an event, then
+ return to the event loop. */
+ if (options & TARGET_WNOHANG)
+ {
+ status->kind = TARGET_WAITKIND_IGNORE;
+ return minus_one_ptid;
+ }
- return width;
+ /* Otherwise do a blocking wait. */
+ ret = getpkt_or_notif_sane (&rs->buf, &rs->buf_size,
+ 1 /* forever */);
+ }
}
-/* Mask all but the least significant REMOTE_ADDRESS_SIZE bits. */
+/* Wait until the remote machine stops, then return, storing status in
+ STATUS just as `wait' would. */
-static CORE_ADDR
-remote_address_masked (CORE_ADDR addr)
+static ptid_t
+remote_wait_as (ptid_t ptid, struct target_waitstatus *status, int options)
{
- if (remote_address_size > 0
- && remote_address_size < (sizeof (ULONGEST) * 8))
+ struct remote_state *rs = get_remote_state ();
+ ptid_t event_ptid = null_ptid;
+ char *buf;
+ struct stop_reply *stop_reply;
+
+ again:
+
+ status->kind = TARGET_WAITKIND_IGNORE;
+ status->value.integer = 0;
+
+ stop_reply = queued_stop_reply (ptid);
+ if (stop_reply != NULL)
+ return process_stop_reply (stop_reply, status);
+
+ if (rs->cached_wait_status)
+ /* Use the cached wait status, but only once. */
+ rs->cached_wait_status = 0;
+ else
{
- /* 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;
+ int ret;
+
+ if (!target_is_async_p ())
+ {
+ ofunc = signal (SIGINT, remote_interrupt);
+ /* If the user hit C-c before this packet, or between packets,
+ pretend that it was hit right here. */
+ if (quit_flag)
+ {
+ quit_flag = 0;
+ remote_interrupt (SIGINT);
+ }
+ }
+
+ /* 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. */
+ ret = getpkt_sane (&rs->buf, &rs->buf_size, wait_forever_enabled_p);
+ if (!target_is_async_p ())
+ signal (SIGINT, ofunc);
}
- return 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.
+ buf = rs->buf;
- 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". */
+ remote_stopped_by_watchpoint_p = 0;
-static void
-check_binary_download (CORE_ADDR addr)
-{
- struct remote_state *rs = get_remote_state ();
- switch (remote_protocol_binary_download.support)
+ /* We got something. */
+ rs->waiting_for_stop_reply = 0;
+
+ /* Assume that the target has acknowledged Ctrl-C unless we receive
+ an 'F' or 'O' packet. */
+ if (buf[0] != 'F' && buf[0] != 'O')
+ rs->ctrlc_pending_p = 0;
+
+ switch (buf[0])
{
- case PACKET_DISABLE:
+ case 'E': /* Error of some sort. */
+ /* We're out of sync with the target now. Did it continue or
+ not? Not is more likely, so report a stop. */
+ warning (_("Remote failure reply: %s"), buf);
+ status->kind = TARGET_WAITKIND_STOPPED;
+ status->value.sig = TARGET_SIGNAL_0;
break;
- case PACKET_ENABLE:
+ case 'F': /* File-I/O request. */
+ remote_fileio_request (buf, rs->ctrlc_pending_p);
+ rs->ctrlc_pending_p = 0;
break;
- case PACKET_SUPPORT_UNKNOWN:
+ case 'T': case 'S': case 'X': case 'W':
{
- char *buf = alloca (rs->remote_packet_size);
- char *p;
+ struct stop_reply *stop_reply;
+ struct cleanup *old_chain;
+
+ stop_reply = stop_reply_xmalloc ();
+ old_chain = make_cleanup (do_stop_reply_xfree, stop_reply);
+ remote_parse_stop_reply (buf, stop_reply);
+ discard_cleanups (old_chain);
+ event_ptid = process_stop_reply (stop_reply, status);
+ break;
+ }
+ case 'O': /* Console output. */
+ remote_console_output (buf + 1);
- p = buf;
- *p++ = 'X';
- p += hexnumstr (p, (ULONGEST) addr);
- *p++ = ',';
- p += hexnumstr (p, (ULONGEST) 0);
- *p++ = ':';
- *p = '\0';
+ /* The target didn't really stop; keep waiting. */
+ rs->waiting_for_stop_reply = 1;
- putpkt_binary (buf, (int) (p - buf));
- getpkt (buf, (rs->remote_packet_size), 0);
+ break;
+ case '\0':
+ if (last_sent_signal != TARGET_SIGNAL_0)
+ {
+ /* Zero length reply means that we tried 'S' or 'C' and the
+ remote system doesn't support it. */
+ target_terminal_ours_for_output ();
+ printf_filtered
+ ("Can't send signals to this remote system. %s not sent.\n",
+ target_signal_to_name (last_sent_signal));
+ last_sent_signal = TARGET_SIGNAL_0;
+ target_terminal_inferior ();
+
+ strcpy ((char *) buf, last_sent_step ? "s" : "c");
+ putpkt ((char *) buf);
+
+ /* We just told the target to resume, so a stop reply is in
+ order. */
+ rs->waiting_for_stop_reply = 1;
+ break;
+ }
+ /* else fallthrough */
+ default:
+ warning (_("Invalid remote reply: %s"), buf);
+ /* Keep waiting. */
+ rs->waiting_for_stop_reply = 1;
+ break;
+ }
- if (buf[0] == '\0')
- {
- if (remote_debug)
- fprintf_unfiltered (gdb_stdlog,
- "binary downloading NOT suppported by target\n");
- remote_protocol_binary_download.support = PACKET_DISABLE;
- }
- else
- {
- if (remote_debug)
- fprintf_unfiltered (gdb_stdlog,
- "binary downloading suppported by target\n");
- remote_protocol_binary_download.support = PACKET_ENABLE;
- }
- break;
- }
+ if (status->kind == TARGET_WAITKIND_IGNORE)
+ {
+ /* Nothing interesting happened. If we're doing a non-blocking
+ poll, we're done. Otherwise, go back to waiting. */
+ if (options & TARGET_WNOHANG)
+ return minus_one_ptid;
+ else
+ goto again;
}
-}
+ else if (status->kind != TARGET_WAITKIND_EXITED
+ && status->kind != TARGET_WAITKIND_SIGNALLED)
+ {
+ if (!ptid_equal (event_ptid, null_ptid))
+ record_currthread (event_ptid);
+ else
+ event_ptid = inferior_ptid;
+ }
+ else
+ /* A process exit. Invalidate our notion of current thread. */
+ record_currthread (minus_one_ptid);
-/* Write memory data directly to the remote machine.
- This does not inform the data cache; the data cache uses this.
- MEMADDR is the address in the remote memory space.
- MYADDR is the address of the buffer in our space.
- LEN is the number of bytes.
+ return event_ptid;
+}
- Returns number of bytes transferred, or 0 (setting errno) for
- error. Only transfer a single packet. */
+/* Wait until the remote machine stops, then return, storing status in
+ STATUS just as `wait' would. */
-int
-remote_write_bytes (CORE_ADDR memaddr, char *myaddr, int len)
+static ptid_t
+remote_wait (struct target_ops *ops,
+ ptid_t ptid, struct target_waitstatus *status, int options)
{
- unsigned char *buf;
- unsigned char *p;
- unsigned char *plen;
- long sizeof_buf;
- int plenlen;
- int todo;
- int nr_bytes;
- int payload_size;
- unsigned char *payload_start;
+ ptid_t event_ptid;
- /* Verify that the target can support a binary download. */
- check_binary_download (memaddr);
+ if (non_stop)
+ event_ptid = remote_wait_ns (ptid, status, options);
+ else
+ event_ptid = remote_wait_as (ptid, status, options);
- /* 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);
+ if (target_can_async_p ())
+ {
+ /* If there are are events left in the queue tell the event loop
+ to return here. */
+ if (stop_reply_queue)
+ mark_async_event_handler (remote_async_inferior_event_token);
+ }
- /* Compute the size of the actual payload by subtracting out the
- packet header and footer overhead: "$M<memaddr>,<len>:...#nn". */
- payload_size = (get_memory_write_packet_size () - (strlen ("$M,:#NN")
- + hexnumlen (memaddr)
- + hexnumlen (len)));
+ return event_ptid;
+}
- /* Construct the packet header: "[MX]<memaddr>,<len>:". */
+/* Fetch a single register using a 'p' packet. */
- /* 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:
- internal_error (__FILE__, __LINE__,
- "remote_write_bytes: bad internal state");
- default:
- internal_error (__FILE__, __LINE__, "bad switch");
- }
+static int
+fetch_register_using_p (struct regcache *regcache, struct packet_reg *reg)
+{
+ struct remote_state *rs = get_remote_state ();
+ char *buf, *p;
+ char regp[MAX_REGISTER_SIZE];
+ int i;
- /* Append "<memaddr>". */
- memaddr = remote_address_masked (memaddr);
- p += hexnumstr (p, (ULONGEST) memaddr);
+ if (remote_protocol_packets[PACKET_p].support == PACKET_DISABLE)
+ return 0;
- /* Append ",". */
- *p++ = ',';
+ if (reg->pnum == -1)
+ return 0;
- /* Append <len>. Retain the location/size of <len>. It may need to
- be adjusted once the packet body has been created. */
- plen = p;
- plenlen = hexnumstr (p, (ULONGEST) todo);
- p += plenlen;
+ p = rs->buf;
+ *p++ = 'p';
+ p += hexnumstr (p, reg->pnum);
+ *p++ = '\0';
+ putpkt (rs->buf);
+ getpkt (&rs->buf, &rs->buf_size, 0);
- /* Append ":". */
- *p++ = ':';
- *p = '\0';
+ buf = rs->buf;
- /* Append the packet body. */
- payload_start = p;
- switch (remote_protocol_binary_download.support)
+ switch (packet_ok (buf, &remote_protocol_packets[PACKET_p]))
{
- case PACKET_ENABLE:
- /* Binary mode. Send target system values byte by byte, in
- increasing byte addresses. Only escape certain critical
- characters. */
- for (nr_bytes = 0;
- (nr_bytes < todo) && (p - payload_start) < payload_size;
- nr_bytes++)
- {
- switch (myaddr[nr_bytes] & 0xff)
- {
- case '$':
- case '#':
- case 0x7d:
- /* These must be escaped */
- *p++ = 0x7d;
- *p++ = (myaddr[nr_bytes] & 0xff) ^ 0x20;
- break;
- default:
- *p++ = myaddr[nr_bytes] & 0xff;
- break;
- }
- }
- if (nr_bytes < todo)
- {
- /* Escape chars have filled up the buffer prematurely,
- and we have actually sent fewer bytes than planned.
- Fix-up the length field of the packet. Use the same
- number of characters as before. */
- plen += hexnumnstr (plen, (ULONGEST) nr_bytes, plenlen);
- *plen = ':'; /* overwrite \0 from hexnumnstr() */
- }
- break;
- case PACKET_DISABLE:
- /* Normal mode: Send target system values byte by byte, in
- increasing byte addresses. Each byte is encoded as a two hex
- value. */
- nr_bytes = bin2hex (myaddr, p, todo);
- p += 2 * nr_bytes;
+ case PACKET_OK:
break;
- case PACKET_SUPPORT_UNKNOWN:
- internal_error (__FILE__, __LINE__,
- "remote_write_bytes: bad internal state");
- default:
- internal_error (__FILE__, __LINE__, "bad switch");
+ case PACKET_UNKNOWN:
+ return 0;
+ case PACKET_ERROR:
+ error (_("Could not fetch register \"%s\"; remote failure reply '%s'"),
+ gdbarch_register_name (get_regcache_arch (regcache),
+ reg->regnum),
+ buf);
}
- putpkt_binary (buf, (int) (p - buf));
- getpkt (buf, sizeof_buf, 0);
-
- if (buf[0] == 'E')
+ /* If this register is unfetchable, tell the regcache. */
+ if (buf[0] == 'x')
{
- /* 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;
+ regcache_raw_supply (regcache, reg->regnum, NULL);
+ return 1;
}
- /* Return NR_BYTES, not TODO, in case escape chars caused us to send fewer
- bytes than we'd planned. */
- return nr_bytes;
-}
-
-/* Read memory data directly from the remote machine.
- This does not use the data cache; the data cache uses this.
- MEMADDR is the address in the remote memory space.
- MYADDR is the address of the buffer in our space.
- LEN is the number of bytes.
+ /* Otherwise, parse and supply the value. */
+ p = buf;
+ i = 0;
+ while (p[0] != 0)
+ {
+ if (p[1] == 0)
+ error (_("fetch_register_using_p: early buf termination"));
- Returns number of bytes transferred, or 0 for error. */
+ regp[i++] = fromhex (p[0]) * 16 + fromhex (p[1]);
+ p += 2;
+ }
+ regcache_raw_supply (regcache, reg->regnum, regp);
+ return 1;
+}
-/* NOTE: cagney/1999-10-18: This function (and its siblings in other
- remote targets) shouldn't attempt to read the entire buffer.
- 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. */
+/* Fetch the registers included in the target's 'g' packet. */
-int
-remote_read_bytes (CORE_ADDR memaddr, char *myaddr, int len)
+static int
+send_g_packet (void)
{
- char *buf;
- int max_buf_size; /* Max size of packet output buffer */
- long sizeof_buf;
- int origlen;
+ struct remote_state *rs = get_remote_state ();
+ int buf_len;
- /* 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);
+ sprintf (rs->buf, "g");
+ remote_send (&rs->buf, &rs->buf_size);
- origlen = len;
- while (len > 0)
+ /* We can get out of synch in various cases. If the first character
+ in the buffer is not a hex character, assume that has happened
+ and try to fetch another packet to read. */
+ while ((rs->buf[0] < '0' || rs->buf[0] > '9')
+ && (rs->buf[0] < 'A' || rs->buf[0] > 'F')
+ && (rs->buf[0] < 'a' || rs->buf[0] > 'f')
+ && rs->buf[0] != 'x') /* New: unavailable register value. */
{
- char *p;
- int todo;
- int i;
+ if (remote_debug)
+ fprintf_unfiltered (gdb_stdlog,
+ "Bad register packet; fetching a new packet\n");
+ getpkt (&rs->buf, &rs->buf_size, 0);
+ }
- todo = min (len, max_buf_size / 2); /* num bytes that will fit */
+ buf_len = strlen (rs->buf);
- /* construct "m"<memaddr>","<len>" */
- /* sprintf (buf, "m%lx,%x", (unsigned long) memaddr, todo); */
- memaddr = remote_address_masked (memaddr);
- p = buf;
- *p++ = 'm';
- p += hexnumstr (p, (ULONGEST) memaddr);
- *p++ = ',';
- p += hexnumstr (p, (ULONGEST) todo);
- *p = '\0';
+ /* Sanity check the received packet. */
+ if (buf_len % 2 != 0)
+ error (_("Remote 'g' packet reply is of odd length: %s"), rs->buf);
- putpkt (buf);
- getpkt (buf, sizeof_buf, 0);
+ return buf_len / 2;
+}
- if (buf[0] == 'E'
- && isxdigit (buf[1]) && isxdigit (buf[2])
- && buf[3] == '\0')
+static void
+process_g_packet (struct regcache *regcache)
+{
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
+ struct remote_state *rs = get_remote_state ();
+ struct remote_arch_state *rsa = get_remote_arch_state ();
+ int i, buf_len;
+ char *p;
+ char *regs;
+
+ buf_len = strlen (rs->buf);
+
+ /* Further sanity checks, with knowledge of the architecture. */
+ if (buf_len > 2 * rsa->sizeof_g_packet)
+ error (_("Remote 'g' packet reply is too long: %s"), rs->buf);
+
+ /* Save the size of the packet sent to us by the target. It is used
+ as a heuristic when determining the max size of packets that the
+ target can safely receive. */
+ if (rsa->actual_register_packet_size == 0)
+ rsa->actual_register_packet_size = buf_len;
+
+ /* If this is smaller than we guessed the 'g' packet would be,
+ update our records. A 'g' reply that doesn't include a register's
+ value implies either that the register is not available, or that
+ the 'p' packet must be used. */
+ if (buf_len < 2 * rsa->sizeof_g_packet)
+ {
+ rsa->sizeof_g_packet = buf_len / 2;
+
+ for (i = 0; i < gdbarch_num_regs (gdbarch); i++)
{
- /* 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;
+ if (rsa->regs[i].pnum == -1)
+ continue;
+
+ if (rsa->regs[i].offset >= rsa->sizeof_g_packet)
+ rsa->regs[i].in_g_packet = 0;
+ else
+ rsa->regs[i].in_g_packet = 1;
}
+ }
+
+ regs = alloca (rsa->sizeof_g_packet);
+
+ /* Unimplemented registers read as all bits zero. */
+ memset (regs, 0, rsa->sizeof_g_packet);
+
+ /* Reply describes registers byte by byte, each byte encoded as two
+ hex characters. Suck them all up, then supply them to the
+ register cacheing/storage mechanism. */
+
+ p = rs->buf;
+ for (i = 0; i < rsa->sizeof_g_packet; i++)
+ {
+ if (p[0] == 0 || p[1] == 0)
+ /* This shouldn't happen - we adjusted sizeof_g_packet above. */
+ internal_error (__FILE__, __LINE__,
+ _("unexpected end of 'g' packet reply"));
+
+ if (p[0] == 'x' && p[1] == 'x')
+ regs[i] = 0; /* 'x' */
+ else
+ regs[i] = fromhex (p[0]) * 16 + fromhex (p[1]);
+ p += 2;
+ }
- /* Reply describes memory byte by byte,
- each byte encoded as two hex characters. */
+ for (i = 0; i < gdbarch_num_regs (gdbarch); i++)
+ {
+ struct packet_reg *r = &rsa->regs[i];
- p = buf;
- if ((i = hex2bin (p, myaddr, todo)) < todo)
+ if (r->in_g_packet)
{
- /* Reply is short. This means that we were able to read
- only part of what we wanted to. */
- return i + (origlen - len);
+ if (r->offset * 2 >= strlen (rs->buf))
+ /* This shouldn't happen - we adjusted in_g_packet above. */
+ internal_error (__FILE__, __LINE__,
+ _("unexpected end of 'g' packet reply"));
+ else if (rs->buf[r->offset * 2] == 'x')
+ {
+ gdb_assert (r->offset * 2 < strlen (rs->buf));
+ /* The register isn't available, mark it as such (at
+ the same time setting the value to zero). */
+ regcache_raw_supply (regcache, r->regnum, NULL);
+ }
+ else
+ regcache_raw_supply (regcache, r->regnum,
+ regs + r->offset);
}
- myaddr += todo;
- memaddr += todo;
- len -= todo;
}
- return origlen;
}
-\f
-/* 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,
- int should_write, struct mem_attrib *attrib,
- struct target_ops *target)
+static void
+fetch_registers_using_g (struct regcache *regcache)
{
- CORE_ADDR targ_addr;
- int targ_len;
- int res;
+ send_g_packet ();
+ process_g_packet (regcache);
+}
- /* 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)
- return 0;
+/* Make the remote selected traceframe match GDB's selected
+ traceframe. */
- if (should_write)
- res = remote_write_bytes (targ_addr, buffer, targ_len);
- else
- res = remote_read_bytes (targ_addr, buffer, targ_len);
+static void
+set_remote_traceframe (void)
+{
+ int newnum;
- return res;
+ if (remote_traceframe_number == get_traceframe_number ())
+ return;
+
+ /* Avoid recursion, remote_trace_find calls us again. */
+ remote_traceframe_number = get_traceframe_number ();
+
+ newnum = target_trace_find (tfind_number,
+ get_traceframe_number (), 0, 0, NULL);
+
+ /* Should not happen. If it does, all bets are off. */
+ if (newnum != get_traceframe_number ())
+ warning (_("could not set remote traceframe"));
}
static void
-remote_files_info (struct target_ops *ignore)
+remote_fetch_registers (struct target_ops *ops,
+ struct regcache *regcache, int regnum)
{
- puts_filtered ("Debugging a target over a serial line.\n");
+ struct remote_arch_state *rsa = get_remote_arch_state ();
+ int i;
+
+ set_remote_traceframe ();
+ set_general_thread (inferior_ptid);
+
+ if (regnum >= 0)
+ {
+ struct packet_reg *reg = packet_reg_from_regnum (rsa, regnum);
+
+ gdb_assert (reg != NULL);
+
+ /* If this register might be in the 'g' packet, try that first -
+ we are likely to read more than one register. If this is the
+ first 'g' packet, we might be overly optimistic about its
+ contents, so fall back to 'p'. */
+ if (reg->in_g_packet)
+ {
+ fetch_registers_using_g (regcache);
+ if (reg->in_g_packet)
+ return;
+ }
+
+ if (fetch_register_using_p (regcache, reg))
+ return;
+
+ /* This register is not available. */
+ regcache_raw_supply (regcache, reg->regnum, NULL);
+
+ return;
+ }
+
+ fetch_registers_using_g (regcache);
+
+ for (i = 0; i < gdbarch_num_regs (get_regcache_arch (regcache)); i++)
+ if (!rsa->regs[i].in_g_packet)
+ if (!fetch_register_using_p (regcache, &rsa->regs[i]))
+ {
+ /* This register is not available. */
+ regcache_raw_supply (regcache, i, NULL);
+ }
}
-\f
-/* 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. */
+/* Prepare to store registers. Since we may send them all (using a
+ 'G' request), we have to read out the ones we don't want to change
+ first. */
+
+static void
+remote_prepare_to_store (struct regcache *regcache)
+{
+ struct remote_arch_state *rsa = get_remote_arch_state ();
+ int i;
+ gdb_byte buf[MAX_REGISTER_SIZE];
+
+ /* Make sure the entire registers array is valid. */
+ switch (remote_protocol_packets[PACKET_P].support)
+ {
+ case PACKET_DISABLE:
+ case PACKET_SUPPORT_UNKNOWN:
+ /* Make sure all the necessary registers are cached. */
+ for (i = 0; i < gdbarch_num_regs (get_regcache_arch (regcache)); i++)
+ if (rsa->regs[i].in_g_packet)
+ regcache_raw_read (regcache, rsa->regs[i].regnum, buf);
+ break;
+ case PACKET_ENABLE:
+ break;
+ }
+}
+
+/* Helper: Attempt to store REGNUM using the P packet. Return fail IFF
+ packet was not recognized. */
static int
-readchar (int timeout)
+store_register_using_P (const struct regcache *regcache,
+ struct packet_reg *reg)
{
- int ch;
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
+ struct remote_state *rs = get_remote_state ();
+ /* Try storing a single register. */
+ char *buf = rs->buf;
+ gdb_byte regp[MAX_REGISTER_SIZE];
+ char *p;
- ch = serial_readchar (remote_desc, timeout);
+ if (remote_protocol_packets[PACKET_P].support == PACKET_DISABLE)
+ return 0;
- if (ch >= 0)
- return (ch & 0x7f);
+ if (reg->pnum == -1)
+ return 0;
- switch ((enum serial_rc) ch)
+ xsnprintf (buf, get_remote_packet_size (), "P%s=", phex_nz (reg->pnum, 0));
+ p = buf + strlen (buf);
+ regcache_raw_collect (regcache, reg->regnum, regp);
+ bin2hex (regp, p, register_size (gdbarch, reg->regnum));
+ putpkt (rs->buf);
+ getpkt (&rs->buf, &rs->buf_size, 0);
+
+ switch (packet_ok (rs->buf, &remote_protocol_packets[PACKET_P]))
{
- case SERIAL_EOF:
- target_mourn_inferior ();
- error ("Remote connection closed");
- /* no return */
- case SERIAL_ERROR:
- perror_with_name ("Remote communication error");
- /* no return */
- case SERIAL_TIMEOUT:
- break;
+ case PACKET_OK:
+ return 1;
+ case PACKET_ERROR:
+ error (_("Could not write register \"%s\"; remote failure reply '%s'"),
+ gdbarch_register_name (gdbarch, reg->regnum), rs->buf);
+ case PACKET_UNKNOWN:
+ return 0;
+ default:
+ internal_error (__FILE__, __LINE__, _("Bad result from packet_ok"));
}
- return ch;
}
-/* Send the command in BUF to the remote machine, and read the reply
- into BUF. Report an error if we get an error reply. */
+/* Store register REGNUM, or all registers if REGNUM == -1, from the
+ contents of the register cache buffer. FIXME: ignores errors. */
static void
-remote_send (char *buf,
- long sizeof_buf)
+store_registers_using_G (const struct regcache *regcache)
{
- putpkt (buf);
- getpkt (buf, sizeof_buf, 0);
+ struct remote_state *rs = get_remote_state ();
+ struct remote_arch_state *rsa = get_remote_arch_state ();
+ gdb_byte *regs;
+ char *p;
- if (buf[0] == 'E')
- error ("Remote failure reply: %s", buf);
+ /* Extract all the registers in the regcache copying them into a
+ local buffer. */
+ {
+ int i;
+
+ regs = alloca (rsa->sizeof_g_packet);
+ memset (regs, 0, rsa->sizeof_g_packet);
+ for (i = 0; i < gdbarch_num_regs (get_regcache_arch (regcache)); i++)
+ {
+ struct packet_reg *r = &rsa->regs[i];
+
+ if (r->in_g_packet)
+ regcache_raw_collect (regcache, r->regnum, regs + r->offset);
+ }
+ }
+
+ /* Command describes registers byte by byte,
+ each byte encoded as two hex characters. */
+ p = rs->buf;
+ *p++ = 'G';
+ /* remote_prepare_to_store insures that rsa->sizeof_g_packet gets
+ updated. */
+ bin2hex (regs, p, rsa->sizeof_g_packet);
+ putpkt (rs->buf);
+ getpkt (&rs->buf, &rs->buf_size, 0);
+ if (packet_check_result (rs->buf) == PACKET_ERROR)
+ error (_("Could not write registers; remote failure reply '%s'"),
+ rs->buf);
}
-/* Display a null-terminated packet on stdout, for debugging, using C
- string notation. */
+/* Store register REGNUM, or all registers if REGNUM == -1, from the contents
+ of the register cache buffer. FIXME: ignores errors. */
static void
-print_packet (char *buf)
+remote_store_registers (struct target_ops *ops,
+ struct regcache *regcache, int regnum)
{
- puts_filtered ("\"");
- fputstr_filtered (buf, '"', gdb_stdout);
- puts_filtered ("\"");
+ struct remote_arch_state *rsa = get_remote_arch_state ();
+ int i;
+
+ set_remote_traceframe ();
+ set_general_thread (inferior_ptid);
+
+ if (regnum >= 0)
+ {
+ struct packet_reg *reg = packet_reg_from_regnum (rsa, regnum);
+
+ gdb_assert (reg != NULL);
+
+ /* Always prefer to store registers using the 'P' packet if
+ possible; we often change only a small number of registers.
+ Sometimes we change a larger number; we'd need help from a
+ higher layer to know to use 'G'. */
+ if (store_register_using_P (regcache, reg))
+ return;
+
+ /* For now, don't complain if we have no way to write the
+ register. GDB loses track of unavailable registers too
+ easily. Some day, this may be an error. We don't have
+ any way to read the register, either... */
+ if (!reg->in_g_packet)
+ return;
+
+ store_registers_using_G (regcache);
+ return;
+ }
+
+ store_registers_using_G (regcache);
+
+ for (i = 0; i < gdbarch_num_regs (get_regcache_arch (regcache)); i++)
+ if (!rsa->regs[i].in_g_packet)
+ if (!store_register_using_P (regcache, &rsa->regs[i]))
+ /* See above for why we do not issue an error here. */
+ continue;
}
+\f
-int
-putpkt (char *buf)
+/* Return the number of hex digits in num. */
+
+static int
+hexnumlen (ULONGEST num)
{
- return putpkt_binary (buf, strlen (buf));
+ int i;
+
+ for (i = 0; num != 0; i++)
+ num >>= 4;
+
+ return max (i, 1);
}
-/* 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 */
+/* Set BUF to the minimum number of hex digits representing NUM. */
static int
-putpkt_binary (char *buf, int cnt)
+hexnumstr (char *buf, ULONGEST num)
+{
+ int len = hexnumlen (num);
+
+ return hexnumnstr (buf, num, len);
+}
+
+
+/* Set BUF to the hex digits representing NUM, padded to WIDTH characters. */
+
+static int
+hexnumnstr (char *buf, ULONGEST num, int width)
{
- struct remote_state *rs = get_remote_state ();
int i;
- unsigned char csum = 0;
- char *buf2 = alloca (cnt + 6);
- long sizeof_junkbuf = (rs->remote_packet_size);
- char *junkbuf = alloca (sizeof_junkbuf);
- int ch;
- int tcount = 0;
- char *p;
+ buf[width] = '\0';
- /* Copy the packet into buffer BUF2, encapsulating it
- and giving it a checksum. */
+ for (i = width - 1; i >= 0; i--)
+ {
+ buf[i] = "0123456789abcdef"[(num & 0xf)];
+ num >>= 4;
+ }
- p = buf2;
- *p++ = '$';
+ return width;
+}
- for (i = 0; i < cnt; i++)
+/* Mask all but the least significant REMOTE_ADDRESS_SIZE bits. */
+
+static CORE_ADDR
+remote_address_masked (CORE_ADDR addr)
+{
+ int address_size = remote_address_size;
+
+ /* If "remoteaddresssize" was not set, default to target address size. */
+ if (!address_size)
+ address_size = gdbarch_addr_bit (target_gdbarch);
+
+ if (address_size > 0
+ && address_size < (sizeof (ULONGEST) * 8))
{
- csum += buf[i];
- *p++ = buf[i];
+ /* Only create a mask when that mask can safely be constructed
+ in a ULONGEST variable. */
+ ULONGEST mask = 1;
+
+ mask = (mask << address_size) - 1;
+ addr &= mask;
}
- *p++ = '#';
- *p++ = tohex ((csum >> 4) & 0xf);
- *p++ = tohex (csum & 0xf);
+ return addr;
+}
- /* Send it over and over until we get a positive ack. */
+/* Convert BUFFER, binary data at least LEN bytes long, into escaped
+ binary data in OUT_BUF. Set *OUT_LEN to the length of the data
+ encoded in OUT_BUF, and return the number of bytes in OUT_BUF
+ (which may be more than *OUT_LEN due to escape characters). The
+ total number of bytes in the output buffer will be at most
+ OUT_MAXLEN. */
- while (1)
+static int
+remote_escape_output (const gdb_byte *buffer, int len,
+ gdb_byte *out_buf, int *out_len,
+ int out_maxlen)
+{
+ int input_index, output_index;
+
+ output_index = 0;
+ for (input_index = 0; input_index < len; input_index++)
{
- int started_error_output = 0;
+ gdb_byte b = buffer[input_index];
- if (remote_debug)
+ if (b == '$' || b == '#' || b == '}')
{
- *p = '\0';
- fprintf_unfiltered (gdb_stdlog, "Sending packet: ");
- fputstrn_unfiltered (buf2, p - buf2, 0, gdb_stdlog);
- fprintf_unfiltered (gdb_stdlog, "...");
- gdb_flush (gdb_stdlog);
+ /* These must be escaped. */
+ if (output_index + 2 > out_maxlen)
+ break;
+ out_buf[output_index++] = '}';
+ out_buf[output_index++] = b ^ 0x20;
}
- 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)
+ else
{
- ch = readchar (remote_timeout);
+ if (output_index + 1 > out_maxlen)
+ break;
+ out_buf[output_index++] = b;
+ }
+ }
- if (remote_debug)
- {
- switch (ch)
- {
- case '+':
- case '-':
- case SERIAL_TIMEOUT:
- case '$':
- if (started_error_output)
- {
- putchar_unfiltered ('\n');
- started_error_output = 0;
- }
- }
- }
+ *out_len = input_index;
+ return output_index;
+}
- switch (ch)
- {
- case '+':
- if (remote_debug)
- fprintf_unfiltered (gdb_stdlog, "Ack\n");
- return 1;
- case '-':
- if (remote_debug)
- fprintf_unfiltered (gdb_stdlog, "Nak\n");
- case SERIAL_TIMEOUT:
- 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)
- {
- if (!started_error_output)
- {
- started_error_output = 1;
- fprintf_unfiltered (gdb_stdlog, "putpkt: Junk: ");
- }
- fputc_unfiltered (ch & 0177, gdb_stdlog);
- }
- continue;
- }
- break; /* Here to retransmit */
+/* Convert BUFFER, escaped data LEN bytes long, into binary data
+ in OUT_BUF. Return the number of bytes written to OUT_BUF.
+ Raise an error if the total number of bytes exceeds OUT_MAXLEN.
+
+ This function reverses remote_escape_output. It allows more
+ escaped characters than that function does, in particular because
+ '*' must be escaped to avoid the run-length encoding processing
+ in reading packets. */
+
+static int
+remote_unescape_input (const gdb_byte *buffer, int len,
+ gdb_byte *out_buf, int out_maxlen)
+{
+ int input_index, output_index;
+ int escaped;
+
+ output_index = 0;
+ escaped = 0;
+ for (input_index = 0; input_index < len; input_index++)
+ {
+ gdb_byte b = buffer[input_index];
+
+ if (output_index + 1 > out_maxlen)
+ {
+ warning (_("Received too much data from remote target;"
+ " ignoring overflow."));
+ return output_index;
}
-#if 0
- /* This is wrong. If doing a long backtrace, the user should be
- able to get out next time we call QUIT, without anything as
- violent as interrupt_query. If we want to provide a way out of
- here without getting to the next QUIT, it should be based on
- hitting ^C twice as in remote_wait. */
- if (quit_flag)
+ if (escaped)
+ {
+ out_buf[output_index++] = b ^ 0x20;
+ escaped = 0;
+ }
+ else if (b == '}')
+ escaped = 1;
+ else
+ out_buf[output_index++] = b;
+ }
+
+ if (escaped)
+ error (_("Unmatched escape character in target response."));
+
+ return output_index;
+}
+
+/* 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)
+{
+ struct remote_state *rs = get_remote_state ();
+
+ switch (remote_protocol_packets[PACKET_X].support)
+ {
+ case PACKET_DISABLE:
+ break;
+ case PACKET_ENABLE:
+ break;
+ case PACKET_SUPPORT_UNKNOWN:
+ {
+ char *p;
+
+ p = rs->buf;
+ *p++ = 'X';
+ p += hexnumstr (p, (ULONGEST) addr);
+ *p++ = ',';
+ p += hexnumstr (p, (ULONGEST) 0);
+ *p++ = ':';
+ *p = '\0';
+
+ putpkt_binary (rs->buf, (int) (p - rs->buf));
+ getpkt (&rs->buf, &rs->buf_size, 0);
+
+ if (rs->buf[0] == '\0')
+ {
+ if (remote_debug)
+ fprintf_unfiltered (gdb_stdlog,
+ "binary downloading NOT "
+ "supported by target\n");
+ remote_protocol_packets[PACKET_X].support = PACKET_DISABLE;
+ }
+ else
+ {
+ if (remote_debug)
+ fprintf_unfiltered (gdb_stdlog,
+ "binary downloading supported by target\n");
+ remote_protocol_packets[PACKET_X].support = PACKET_ENABLE;
+ }
+ break;
+ }
+ }
+}
+
+/* Write memory data directly to the remote machine.
+ This does not inform the data cache; the data cache uses this.
+ HEADER is the starting part of the packet.
+ MEMADDR is the address in the remote memory space.
+ MYADDR is the address of the buffer in our space.
+ LEN is the number of bytes.
+ PACKET_FORMAT should be either 'X' or 'M', and indicates if we
+ should send data as binary ('X'), or hex-encoded ('M').
+
+ The function creates packet of the form
+ <HEADER><ADDRESS>,<LENGTH>:<DATA>
+
+ where encoding of <DATA> is termined by PACKET_FORMAT.
+
+ If USE_LENGTH is 0, then the <LENGTH> field and the preceding comma
+ are omitted.
+
+ Returns the number of bytes transferred, or 0 (setting errno) for
+ error. Only transfer a single packet. */
+
+static int
+remote_write_bytes_aux (const char *header, CORE_ADDR memaddr,
+ const gdb_byte *myaddr, int len,
+ char packet_format, int use_length)
+{
+ struct remote_state *rs = get_remote_state ();
+ char *p;
+ char *plen = NULL;
+ int plenlen = 0;
+ int todo;
+ int nr_bytes;
+ int payload_size;
+ int payload_length;
+ int header_length;
+
+ if (packet_format != 'X' && packet_format != 'M')
+ internal_error (__FILE__, __LINE__,
+ _("remote_write_bytes_aux: bad packet format"));
+
+ if (len <= 0)
+ return 0;
+
+ payload_size = get_memory_write_packet_size ();
+
+ /* The packet buffer will be large enough for the payload;
+ get_memory_packet_size ensures this. */
+ rs->buf[0] = '\0';
+
+ /* Compute the size of the actual payload by subtracting out the
+ packet header and footer overhead: "$M<memaddr>,<len>:...#nn". */
+
+ payload_size -= strlen ("$,:#NN");
+ if (!use_length)
+ /* The comma won't be used. */
+ payload_size += 1;
+ header_length = strlen (header);
+ payload_size -= header_length;
+ payload_size -= hexnumlen (memaddr);
+
+ /* Construct the packet excluding the data: "<header><memaddr>,<len>:". */
+
+ strcat (rs->buf, header);
+ p = rs->buf + strlen (header);
+
+ /* Compute a best guess of the number of bytes actually transfered. */
+ if (packet_format == 'X')
+ {
+ /* Best guess at number of bytes that will fit. */
+ todo = min (len, payload_size);
+ if (use_length)
+ payload_size -= hexnumlen (todo);
+ todo = min (todo, payload_size);
+ }
+ else
+ {
+ /* Num bytes that will fit. */
+ todo = min (len, payload_size / 2);
+ if (use_length)
+ payload_size -= hexnumlen (todo);
+ todo = min (todo, payload_size / 2);
+ }
+
+ if (todo <= 0)
+ internal_error (__FILE__, __LINE__,
+ _("minumum packet size too small to write data"));
+
+ /* If we already need another packet, then try to align the end
+ of this packet to a useful boundary. */
+ if (todo > 2 * REMOTE_ALIGN_WRITES && todo < len)
+ todo = ((memaddr + todo) & ~(REMOTE_ALIGN_WRITES - 1)) - memaddr;
+
+ /* Append "<memaddr>". */
+ memaddr = remote_address_masked (memaddr);
+ p += hexnumstr (p, (ULONGEST) memaddr);
+
+ if (use_length)
+ {
+ /* Append ",". */
+ *p++ = ',';
+
+ /* Append <len>. Retain the location/size of <len>. It may need to
+ be adjusted once the packet body has been created. */
+ plen = p;
+ plenlen = hexnumstr (p, (ULONGEST) todo);
+ p += plenlen;
+ }
+
+ /* Append ":". */
+ *p++ = ':';
+ *p = '\0';
+
+ /* Append the packet body. */
+ if (packet_format == 'X')
+ {
+ /* Binary mode. Send target system values byte by byte, in
+ increasing byte addresses. Only escape certain critical
+ characters. */
+ payload_length = remote_escape_output (myaddr, todo, p, &nr_bytes,
+ payload_size);
+
+ /* If not all TODO bytes fit, then we'll need another packet. Make
+ a second try to keep the end of the packet aligned. Don't do
+ this if the packet is tiny. */
+ if (nr_bytes < todo && nr_bytes > 2 * REMOTE_ALIGN_WRITES)
+ {
+ int new_nr_bytes;
+
+ new_nr_bytes = (((memaddr + nr_bytes) & ~(REMOTE_ALIGN_WRITES - 1))
+ - memaddr);
+ if (new_nr_bytes != nr_bytes)
+ payload_length = remote_escape_output (myaddr, new_nr_bytes,
+ p, &nr_bytes,
+ payload_size);
+ }
+
+ p += payload_length;
+ if (use_length && nr_bytes < todo)
+ {
+ /* Escape chars have filled up the buffer prematurely,
+ and we have actually sent fewer bytes than planned.
+ Fix-up the length field of the packet. Use the same
+ number of characters as before. */
+ plen += hexnumnstr (plen, (ULONGEST) nr_bytes, plenlen);
+ *plen = ':'; /* overwrite \0 from hexnumnstr() */
+ }
+ }
+ else
+ {
+ /* Normal mode: Send target system values byte by byte, in
+ increasing byte addresses. Each byte is encoded as a two hex
+ value. */
+ nr_bytes = bin2hex (myaddr, p, todo);
+ p += 2 * nr_bytes;
+ }
+
+ putpkt_binary (rs->buf, (int) (p - rs->buf));
+ getpkt (&rs->buf, &rs->buf_size, 0);
+
+ if (rs->buf[0] == 'E')
+ {
+ /* 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;
+ }
+
+ /* Return NR_BYTES, not TODO, in case escape chars caused us to send
+ fewer bytes than we'd planned. */
+ return nr_bytes;
+}
+
+/* Write memory data directly to the remote machine.
+ This does not inform the data cache; the data cache uses this.
+ MEMADDR is the address in the remote memory space.
+ MYADDR is the address of the buffer in our space.
+ LEN is the number of bytes.
+
+ Returns number of bytes transferred, or 0 (setting errno) for
+ error. Only transfer a single packet. */
+
+static int
+remote_write_bytes (CORE_ADDR memaddr, const gdb_byte *myaddr, int len)
+{
+ char *packet_format = 0;
+
+ /* Check whether the target supports binary download. */
+ check_binary_download (memaddr);
+
+ switch (remote_protocol_packets[PACKET_X].support)
+ {
+ case PACKET_ENABLE:
+ packet_format = "X";
+ break;
+ case PACKET_DISABLE:
+ packet_format = "M";
+ break;
+ case PACKET_SUPPORT_UNKNOWN:
+ internal_error (__FILE__, __LINE__,
+ _("remote_write_bytes: bad internal state"));
+ default:
+ internal_error (__FILE__, __LINE__, _("bad switch"));
+ }
+
+ return remote_write_bytes_aux (packet_format,
+ memaddr, myaddr, len, packet_format[0], 1);
+}
+
+/* Read memory data directly from the remote machine.
+ This does not use the data cache; the data cache uses this.
+ MEMADDR is the address in the remote memory space.
+ MYADDR is the address of the buffer in our space.
+ LEN is the number of bytes.
+
+ Returns number of bytes transferred, or 0 for error. */
+
+static int
+remote_read_bytes (CORE_ADDR memaddr, gdb_byte *myaddr, int len)
+{
+ struct remote_state *rs = get_remote_state ();
+ int max_buf_size; /* Max size of packet output buffer. */
+ char *p;
+ int todo;
+ int i;
+
+ if (len <= 0)
+ return 0;
+
+ max_buf_size = get_memory_read_packet_size ();
+ /* The packet buffer will be large enough for the payload;
+ get_memory_packet_size ensures this. */
+
+ /* Number if bytes that will fit. */
+ todo = min (len, max_buf_size / 2);
+
+ /* Construct "m"<memaddr>","<len>". */
+ memaddr = remote_address_masked (memaddr);
+ p = rs->buf;
+ *p++ = 'm';
+ p += hexnumstr (p, (ULONGEST) memaddr);
+ *p++ = ',';
+ p += hexnumstr (p, (ULONGEST) todo);
+ *p = '\0';
+ putpkt (rs->buf);
+ getpkt (&rs->buf, &rs->buf_size, 0);
+ if (rs->buf[0] == 'E'
+ && isxdigit (rs->buf[1]) && isxdigit (rs->buf[2])
+ && rs->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;
+ }
+ /* Reply describes memory byte by byte, each byte encoded as two hex
+ characters. */
+ p = rs->buf;
+ i = hex2bin (p, myaddr, todo);
+ /* Return what we have. Let higher layers handle partial reads. */
+ return i;
+}
+\f
+
+/* Remote notification handler. */
+
+static void
+handle_notification (char *buf, size_t length)
+{
+ if (strncmp (buf, "Stop:", 5) == 0)
+ {
+ if (pending_stop_reply)
+ {
+ /* We've already parsed the in-flight stop-reply, but the
+ stub for some reason thought we didn't, possibly due to
+ timeout on its side. Just ignore it. */
+ if (remote_debug)
+ fprintf_unfiltered (gdb_stdlog, "ignoring resent notification\n");
+ }
+ else
+ {
+ struct cleanup *old_chain;
+ struct stop_reply *reply = stop_reply_xmalloc ();
+
+ old_chain = make_cleanup (do_stop_reply_xfree, reply);
+
+ remote_parse_stop_reply (buf + 5, reply);
+
+ discard_cleanups (old_chain);
+
+ /* Be careful to only set it after parsing, since an error
+ may be thrown then. */
+ pending_stop_reply = reply;
+
+ /* Notify the event loop there's a stop reply to acknowledge
+ and that there may be more events to fetch. */
+ mark_async_event_handler (remote_async_get_pending_events_token);
+
+ if (remote_debug)
+ fprintf_unfiltered (gdb_stdlog, "stop notification captured\n");
+ }
+ }
+ else
+ /* We ignore notifications we don't recognize, for compatibility
+ with newer stubs. */
+ ;
+}
+
+\f
+/* 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, gdb_byte *buffer, int mem_len,
+ int should_write, struct mem_attrib *attrib,
+ struct target_ops *target)
+{
+ int res;
+
+ set_remote_traceframe ();
+ set_general_thread (inferior_ptid);
+
+ if (should_write)
+ res = remote_write_bytes (mem_addr, buffer, mem_len);
+ else
+ res = remote_read_bytes (mem_addr, buffer, mem_len);
+
+ return res;
+}
+
+/* Sends a packet with content determined by the printf format string
+ FORMAT and the remaining arguments, then gets the reply. Returns
+ whether the packet was a success, a failure, or unknown. */
+
+static enum packet_result
+remote_send_printf (const char *format, ...)
+{
+ struct remote_state *rs = get_remote_state ();
+ int max_size = get_remote_packet_size ();
+ va_list ap;
+
+ va_start (ap, format);
+
+ rs->buf[0] = '\0';
+ if (vsnprintf (rs->buf, max_size, format, ap) >= max_size)
+ internal_error (__FILE__, __LINE__, _("Too long remote packet."));
+
+ if (putpkt (rs->buf) < 0)
+ error (_("Communication problem with target."));
+
+ rs->buf[0] = '\0';
+ getpkt (&rs->buf, &rs->buf_size, 0);
+
+ return packet_check_result (rs->buf);
+}
+
+static void
+restore_remote_timeout (void *p)
+{
+ int value = *(int *)p;
+
+ remote_timeout = value;
+}
+
+/* Flash writing can take quite some time. We'll set
+ effectively infinite timeout for flash operations.
+ In future, we'll need to decide on a better approach. */
+static const int remote_flash_timeout = 1000;
+
+static void
+remote_flash_erase (struct target_ops *ops,
+ ULONGEST address, LONGEST length)
+{
+ int addr_size = gdbarch_addr_bit (target_gdbarch) / 8;
+ int saved_remote_timeout = remote_timeout;
+ enum packet_result ret;
+ struct cleanup *back_to = make_cleanup (restore_remote_timeout,
+ &saved_remote_timeout);
+
+ remote_timeout = remote_flash_timeout;
+
+ ret = remote_send_printf ("vFlashErase:%s,%s",
+ phex (address, addr_size),
+ phex (length, 4));
+ switch (ret)
+ {
+ case PACKET_UNKNOWN:
+ error (_("Remote target does not support flash erase"));
+ case PACKET_ERROR:
+ error (_("Error erasing flash with vFlashErase packet"));
+ default:
+ break;
+ }
+
+ do_cleanups (back_to);
+}
+
+static LONGEST
+remote_flash_write (struct target_ops *ops,
+ ULONGEST address, LONGEST length,
+ const gdb_byte *data)
+{
+ int saved_remote_timeout = remote_timeout;
+ int ret;
+ struct cleanup *back_to = make_cleanup (restore_remote_timeout,
+ &saved_remote_timeout);
+
+ remote_timeout = remote_flash_timeout;
+ ret = remote_write_bytes_aux ("vFlashWrite:", address, data, length, 'X', 0);
+ do_cleanups (back_to);
+
+ return ret;
+}
+
+static void
+remote_flash_done (struct target_ops *ops)
+{
+ int saved_remote_timeout = remote_timeout;
+ int ret;
+ struct cleanup *back_to = make_cleanup (restore_remote_timeout,
+ &saved_remote_timeout);
+
+ remote_timeout = remote_flash_timeout;
+ ret = remote_send_printf ("vFlashDone");
+ do_cleanups (back_to);
+
+ switch (ret)
+ {
+ case PACKET_UNKNOWN:
+ error (_("Remote target does not support vFlashDone"));
+ case PACKET_ERROR:
+ error (_("Error finishing flash operation"));
+ default:
+ break;
+ }
+}
+
+static void
+remote_files_info (struct target_ops *ignore)
+{
+ puts_filtered ("Debugging a target over a serial line.\n");
+}
+\f
+/* 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. */
+
+static int
+readchar (int timeout)
+{
+ int ch;
+
+ ch = serial_readchar (remote_desc, timeout);
+
+ if (ch >= 0)
+ return ch;
+
+ switch ((enum serial_rc) ch)
+ {
+ case SERIAL_EOF:
+ pop_target ();
+ error (_("Remote connection closed"));
+ /* no return */
+ case SERIAL_ERROR:
+ pop_target ();
+ perror_with_name (_("Remote communication error. "
+ "Target disconnected."));
+ /* no return */
+ case SERIAL_TIMEOUT:
+ break;
+ }
+ return ch;
+}
+
+/* Send the command in *BUF to the remote machine, and read the reply
+ into *BUF. Report an error if we get an error reply. Resize
+ *BUF using xrealloc if necessary to hold the result, and update
+ *SIZEOF_BUF. */
+
+static void
+remote_send (char **buf,
+ long *sizeof_buf)
+{
+ putpkt (*buf);
+ getpkt (buf, sizeof_buf, 0);
+
+ if ((*buf)[0] == 'E')
+ error (_("Remote failure reply: %s"), *buf);
+}
+
+/* Return a pointer to an xmalloc'ed string representing an escaped
+ version of BUF, of len N. E.g. \n is converted to \\n, \t to \\t,
+ etc. The caller is responsible for releasing the returned
+ memory. */
+
+static char *
+escape_buffer (const char *buf, int n)
+{
+ struct cleanup *old_chain;
+ struct ui_file *stb;
+ char *str;
+
+ stb = mem_fileopen ();
+ old_chain = make_cleanup_ui_file_delete (stb);
+
+ fputstrn_unfiltered (buf, n, 0, stb);
+ str = ui_file_xstrdup (stb, NULL);
+ do_cleanups (old_chain);
+ return str;
+}
+
+/* Display a null-terminated packet on stdout, for debugging, using C
+ string notation. */
+
+static void
+print_packet (char *buf)
+{
+ puts_filtered ("\"");
+ fputstr_filtered (buf, '"', gdb_stdout);
+ puts_filtered ("\"");
+}
+
+int
+putpkt (char *buf)
+{
+ return putpkt_binary (buf, strlen (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
+ get_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)
+{
+ struct remote_state *rs = get_remote_state ();
+ int i;
+ unsigned char csum = 0;
+ char *buf2 = alloca (cnt + 6);
+
+ int ch;
+ int tcount = 0;
+ char *p;
+
+ /* Catch cases like trying to read memory or listing threads while
+ we're waiting for a stop reply. The remote server wouldn't be
+ ready to handle this request, so we'd hang and timeout. We don't
+ have to worry about this in synchronous mode, because in that
+ case it's not possible to issue a command while the target is
+ running. This is not a problem in non-stop mode, because in that
+ case, the stub is always ready to process serial input. */
+ if (!non_stop && target_can_async_p () && rs->waiting_for_stop_reply)
+ error (_("Cannot execute this command while the target is running."));
+
+ /* We're sending out a new packet. Make sure we don't look at a
+ stale cached response. */
+ rs->cached_wait_status = 0;
+
+ /* Copy the packet into buffer BUF2, encapsulating it
+ and giving it a checksum. */
+
+ p = buf2;
+ *p++ = '$';
+
+ for (i = 0; i < cnt; i++)
+ {
+ csum += buf[i];
+ *p++ = buf[i];
+ }
+ *p++ = '#';
+ *p++ = tohex ((csum >> 4) & 0xf);
+ *p++ = tohex (csum & 0xf);
+
+ /* Send it over and over until we get a positive ack. */
+
+ while (1)
+ {
+ int started_error_output = 0;
+
+ if (remote_debug)
+ {
+ struct cleanup *old_chain;
+ char *str;
+
+ *p = '\0';
+ str = escape_buffer (buf2, p - buf2);
+ old_chain = make_cleanup (xfree, str);
+ fprintf_unfiltered (gdb_stdlog, "Sending packet: %s...", str);
+ gdb_flush (gdb_stdlog);
+ do_cleanups (old_chain);
+ }
+ if (serial_write (remote_desc, buf2, p - buf2))
+ perror_with_name (_("putpkt: write failed"));
+
+ /* If this is a no acks version of the remote protocol, send the
+ packet and move on. */
+ if (rs->noack_mode)
+ break;
+
+ /* Read until either a timeout occurs (-2) or '+' is read.
+ Handle any notification that arrives in the mean time. */
+ while (1)
+ {
+ ch = readchar (remote_timeout);
+
+ if (remote_debug)
+ {
+ switch (ch)
+ {
+ case '+':
+ case '-':
+ case SERIAL_TIMEOUT:
+ case '$':
+ case '%':
+ if (started_error_output)
+ {
+ putchar_unfiltered ('\n');
+ started_error_output = 0;
+ }
+ }
+ }
+
+ switch (ch)
+ {
+ case '+':
+ if (remote_debug)
+ fprintf_unfiltered (gdb_stdlog, "Ack\n");
+ return 1;
+ case '-':
+ if (remote_debug)
+ fprintf_unfiltered (gdb_stdlog, "Nak\n");
+ /* FALLTHROUGH */
+ case SERIAL_TIMEOUT:
+ 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. */
+ skip_frame ();
+ serial_write (remote_desc, "+", 1);
+ continue; /* Now, go look for +. */
+ }
+
+ case '%':
+ {
+ int val;
+
+ /* If we got a notification, handle it, and go back to looking
+ for an ack. */
+ /* We've found the start of a notification. Now
+ collect the data. */
+ val = read_frame (&rs->buf, &rs->buf_size);
+ if (val >= 0)
+ {
+ if (remote_debug)
+ {
+ struct cleanup *old_chain;
+ char *str;
+
+ str = escape_buffer (rs->buf, val);
+ old_chain = make_cleanup (xfree, str);
+ fprintf_unfiltered (gdb_stdlog,
+ " Notification received: %s\n",
+ str);
+ do_cleanups (old_chain);
+ }
+ handle_notification (rs->buf, val);
+ /* We're in sync now, rewait for the ack. */
+ tcount = 0;
+ }
+ else
+ {
+ if (remote_debug)
+ {
+ if (!started_error_output)
+ {
+ started_error_output = 1;
+ fprintf_unfiltered (gdb_stdlog, "putpkt: Junk: ");
+ }
+ fputc_unfiltered (ch & 0177, gdb_stdlog);
+ fprintf_unfiltered (gdb_stdlog, "%s", rs->buf);
+ }
+ }
+ continue;
+ }
+ /* fall-through */
+ default:
+ if (remote_debug)
+ {
+ if (!started_error_output)
+ {
+ started_error_output = 1;
+ fprintf_unfiltered (gdb_stdlog, "putpkt: Junk: ");
+ }
+ fputc_unfiltered (ch & 0177, gdb_stdlog);
+ }
+ continue;
+ }
+ break; /* Here to retransmit. */
+ }
+
+#if 0
+ /* This is wrong. If doing a long backtrace, the user should be
+ able to get out next time we call QUIT, without anything as
+ violent as interrupt_query. If we want to provide a way out of
+ here without getting to the next QUIT, it should be based on
+ hitting ^C twice as in remote_wait. */
+ if (quit_flag)
{
quit_flag = 0;
interrupt_query ();
}
-#endif
+#endif
+ }
+ return 0;
+}
+
+/* Come here after finding the start of a frame when we expected an
+ ack. Do our best to discard the rest of this packet. */
+
+static void
+skip_frame (void)
+{
+ int c;
+
+ while (1)
+ {
+ c = readchar (remote_timeout);
+ switch (c)
+ {
+ case SERIAL_TIMEOUT:
+ /* Nothing we can do. */
+ return;
+ case '#':
+ /* Discard the two bytes of checksum and stop. */
+ c = readchar (remote_timeout);
+ if (c >= 0)
+ c = readchar (remote_timeout);
+
+ return;
+ case '*': /* Run length encoding. */
+ /* Discard the repeat count. */
+ c = readchar (remote_timeout);
+ if (c < 0)
+ return;
+ break;
+ default:
+ /* A regular character. */
+ break;
+ }
+ }
+}
+
+/* Come here after finding the start of the frame. Collect the rest
+ into *BUF, verifying the checksum, length, and handling run-length
+ compression. NUL terminate the buffer. If there is not enough room,
+ expand *BUF using xrealloc.
+
+ 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_p,
+ long *sizeof_buf)
+{
+ unsigned char csum;
+ long bc;
+ int c;
+ char *buf = *buf_p;
+ struct remote_state *rs = get_remote_state ();
+
+ csum = 0;
+ bc = 0;
+
+ while (1)
+ {
+ c = readchar (remote_timeout);
+ switch (c)
+ {
+ case SERIAL_TIMEOUT:
+ if (remote_debug)
+ fputs_filtered ("Timeout in mid-packet, retrying\n", gdb_stdlog);
+ return -1;
+ case '$':
+ 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;
+ int check_0 = 0;
+ int check_1 = 0;
+
+ buf[bc] = '\0';
+
+ check_0 = readchar (remote_timeout);
+ if (check_0 >= 0)
+ check_1 = readchar (remote_timeout);
+
+ 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;
+ }
+
+ /* Don't recompute the checksum; with no ack packets we
+ don't have any way to indicate a packet retransmission
+ is necessary. */
+ if (rs->noack_mode)
+ return bc;
+
+ pktcsum = (fromhex (check_0) << 4) | fromhex (check_1);
+ if (csum == pktcsum)
+ return bc;
+
+ if (remote_debug)
+ {
+ struct cleanup *old_chain;
+ char *str;
+
+ str = escape_buffer (buf, bc);
+ old_chain = make_cleanup (xfree, str);
+ fprintf_unfiltered (gdb_stdlog,
+ "Bad checksum, sentsum=0x%x, "
+ "csum=0x%x, buf=%s\n",
+ pktcsum, csum, str);
+ do_cleanups (old_chain);
+ }
+ /* 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)
+ {
+ if (bc + repeat - 1 >= *sizeof_buf - 1)
+ {
+ /* Make some more room in the buffer. */
+ *sizeof_buf += repeat;
+ *buf_p = xrealloc (*buf_p, *sizeof_buf);
+ buf = *buf_p;
+ }
+
+ memset (&buf[bc], buf[bc - 1], repeat);
+ bc += repeat;
+ continue;
+ }
+
+ buf[bc] = '\0';
+ printf_filtered (_("Invalid run length encoding: %s\n"), buf);
+ return -1;
+ }
+ default:
+ if (bc >= *sizeof_buf - 1)
+ {
+ /* Make some more room in the buffer. */
+ *sizeof_buf *= 2;
+ *buf_p = xrealloc (*buf_p, *sizeof_buf);
+ buf = *buf_p;
+ }
+
+ buf[bc++] = c;
+ csum += c;
+ continue;
+ }
+ }
+}
+
+/* Read a packet from the remote machine, with error checking, and
+ store it in *BUF. Resize *BUF using xrealloc if necessary to hold
+ the result, and update *SIZEOF_BUF. If FOREVER, wait forever
+ rather than timing out; this is used (in synchronous mode) to wait
+ for a target that is is executing user code to stop. */
+/* 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,
+ int forever)
+{
+ int timed_out;
+
+ timed_out = getpkt_sane (buf, sizeof_buf, forever);
+}
+
+
+/* Read a packet from the remote machine, with error checking, and
+ store it in *BUF. Resize *BUF using xrealloc if necessary to hold
+ the result, and update *SIZEOF_BUF. If FOREVER, wait forever
+ rather than timing out; 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. Otherwise return the number of
+ bytes read. If EXPECTING_NOTIF, consider receiving a notification
+ enough reason to return to the caller. */
+
+static int
+getpkt_or_notif_sane_1 (char **buf, long *sizeof_buf, int forever,
+ int expecting_notif)
+{
+ struct remote_state *rs = get_remote_state ();
+ int c;
+ int tries;
+ int timeout;
+ int val = -1;
+
+ /* We're reading a new response. Make sure we don't look at a
+ previously cached response. */
+ rs->cached_wait_status = 0;
+
+ strcpy (*buf, "timeout");
+
+ if (forever)
+ timeout = watchdog > 0 ? watchdog : -1;
+ else if (expecting_notif)
+ timeout = 0; /* There should already be a char in the buffer. If
+ not, bail out. */
+ else
+ timeout = remote_timeout;
+
+#define MAX_TRIES 3
+
+ /* Process any number of notifications, and then return when
+ we get a packet. */
+ for (;;)
+ {
+ /* If we get a timeout or bad checksm, retry up to MAX_TRIES
+ times. */
+ 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
+ SERIAL_TIMEOUT from readchar because of timeout. Then
+ we'll count that as a retry.
+
+ Note that even when forever is set, 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
+ c = readchar (timeout);
+ while (c != SERIAL_TIMEOUT && c != '$' && c != '%');
+
+ if (c == SERIAL_TIMEOUT)
+ {
+ if (expecting_notif)
+ return -1; /* Don't complain, it's normal to not get
+ anything in this case. */
+
+ if (forever) /* Watchdog went off? Kill the target. */
+ {
+ QUIT;
+ pop_target ();
+ error (_("Watchdog timeout has expired. Target detached."));
+ }
+ if (remote_debug)
+ fputs_filtered ("Timed out.\n", gdb_stdlog);
+ }
+ else
+ {
+ /* We've found the start of a packet or notification.
+ Now collect the data. */
+ val = read_frame (buf, sizeof_buf);
+ if (val >= 0)
+ break;
+ }
+
+ serial_write (remote_desc, "-", 1);
+ }
+
+ if (tries > MAX_TRIES)
+ {
+ /* We have tried hard enough, and just can't receive the
+ packet/notification. Give up. */
+ printf_unfiltered (_("Ignoring packet error, continuing...\n"));
+
+ /* Skip the ack char if we're in no-ack mode. */
+ if (!rs->noack_mode)
+ serial_write (remote_desc, "+", 1);
+ return -1;
+ }
+
+ /* If we got an ordinary packet, return that to our caller. */
+ if (c == '$')
+ {
+ if (remote_debug)
+ {
+ struct cleanup *old_chain;
+ char *str;
+
+ str = escape_buffer (*buf, val);
+ old_chain = make_cleanup (xfree, str);
+ fprintf_unfiltered (gdb_stdlog, "Packet received: %s\n", str);
+ do_cleanups (old_chain);
+ }
+
+ /* Skip the ack char if we're in no-ack mode. */
+ if (!rs->noack_mode)
+ serial_write (remote_desc, "+", 1);
+ return val;
+ }
+
+ /* If we got a notification, handle it, and go back to looking
+ for a packet. */
+ else
+ {
+ gdb_assert (c == '%');
+
+ if (remote_debug)
+ {
+ struct cleanup *old_chain;
+ char *str;
+
+ str = escape_buffer (*buf, val);
+ old_chain = make_cleanup (xfree, str);
+ fprintf_unfiltered (gdb_stdlog,
+ " Notification received: %s\n",
+ str);
+ do_cleanups (old_chain);
+ }
+
+ handle_notification (*buf, val);
+
+ /* Notifications require no acknowledgement. */
+
+ if (expecting_notif)
+ return -1;
+ }
+ }
+}
+
+static int
+getpkt_sane (char **buf, long *sizeof_buf, int forever)
+{
+ return getpkt_or_notif_sane_1 (buf, sizeof_buf, forever, 0);
+}
+
+static int
+getpkt_or_notif_sane (char **buf, long *sizeof_buf, int forever)
+{
+ return getpkt_or_notif_sane_1 (buf, sizeof_buf, forever, 1);
+}
+
+\f
+static void
+remote_kill (struct target_ops *ops)
+{
+ /* 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
+ we do or not. For the existing stubs, kill is a noop. */
+ target_mourn_inferior ();
+}
+
+static int
+remote_vkill (int pid, struct remote_state *rs)
+{
+ if (remote_protocol_packets[PACKET_vKill].support == PACKET_DISABLE)
+ return -1;
+
+ /* Tell the remote target to detach. */
+ sprintf (rs->buf, "vKill;%x", pid);
+ putpkt (rs->buf);
+ getpkt (&rs->buf, &rs->buf_size, 0);
+
+ if (packet_ok (rs->buf,
+ &remote_protocol_packets[PACKET_vKill]) == PACKET_OK)
+ return 0;
+ else if (remote_protocol_packets[PACKET_vKill].support == PACKET_DISABLE)
+ return -1;
+ else
+ return 1;
+}
+
+static void
+extended_remote_kill (struct target_ops *ops)
+{
+ int res;
+ int pid = ptid_get_pid (inferior_ptid);
+ struct remote_state *rs = get_remote_state ();
+
+ res = remote_vkill (pid, rs);
+ if (res == -1 && !remote_multi_process_p (rs))
+ {
+ /* Don't try 'k' on a multi-process aware stub -- it has no way
+ to specify the pid. */
+
+ putpkt ("k");
+#if 0
+ getpkt (&rs->buf, &rs->buf_size, 0);
+ if (rs->buf[0] != 'O' || rs->buf[0] != 'K')
+ res = 1;
+#else
+ /* Don't wait for it to die. I'm not really sure it matters whether
+ we do or not. For the existing stubs, kill is a noop. */
+ res = 0;
+#endif
+ }
+
+ if (res != 0)
+ error (_("Can't kill process"));
+
+ target_mourn_inferior ();
+}
+
+static void
+remote_mourn (struct target_ops *ops)
+{
+ remote_mourn_1 (ops);
+}
+
+/* Worker function for remote_mourn. */
+static void
+remote_mourn_1 (struct target_ops *target)
+{
+ unpush_target (target);
+
+ /* remote_close takes care of doing most of the clean up. */
+ generic_mourn_inferior ();
+}
+
+static void
+extended_remote_mourn_1 (struct target_ops *target)
+{
+ struct remote_state *rs = get_remote_state ();
+
+ /* In case we got here due to an error, but we're going to stay
+ connected. */
+ rs->waiting_for_stop_reply = 0;
+
+ /* We're no longer interested in these events. */
+ discard_pending_stop_replies (ptid_get_pid (inferior_ptid));
+
+ /* If the current general thread belonged to the process we just
+ detached from or has exited, the remote side current general
+ thread becomes undefined. Considering a case like this:
+
+ - We just got here due to a detach.
+ - The process that we're detaching from happens to immediately
+ report a global breakpoint being hit in non-stop mode, in the
+ same thread we had selected before.
+ - GDB attaches to this process again.
+ - This event happens to be the next event we handle.
+
+ GDB would consider that the current general thread didn't need to
+ be set on the stub side (with Hg), since for all it knew,
+ GENERAL_THREAD hadn't changed.
+
+ Notice that although in all-stop mode, the remote server always
+ sets the current thread to the thread reporting the stop event,
+ that doesn't happen in non-stop mode; in non-stop, the stub *must
+ not* change the current thread when reporting a breakpoint hit,
+ due to the decoupling of event reporting and event handling.
+
+ To keep things simple, we always invalidate our notion of the
+ current thread. */
+ record_currthread (minus_one_ptid);
+
+ /* Unlike "target remote", we do not want to unpush the target; then
+ the next time the user says "run", we won't be connected. */
+
+ /* Call common code to mark the inferior as not running. */
+ generic_mourn_inferior ();
+
+ if (!have_inferiors ())
+ {
+ if (!remote_multi_process_p (rs))
+ {
+ /* Check whether the target is running now - some remote stubs
+ automatically restart after kill. */
+ putpkt ("?");
+ getpkt (&rs->buf, &rs->buf_size, 0);
+
+ if (rs->buf[0] == 'S' || rs->buf[0] == 'T')
+ {
+ /* Assume that the target has been restarted. Set
+ inferior_ptid so that bits of core GDB realizes
+ there's something here, e.g., so that the user can
+ say "kill" again. */
+ inferior_ptid = magic_null_ptid;
+ }
+ }
+ }
+}
+
+static void
+extended_remote_mourn (struct target_ops *ops)
+{
+ extended_remote_mourn_1 (ops);
+}
+
+static int
+extended_remote_run (char *args)
+{
+ struct remote_state *rs = get_remote_state ();
+ int len;
+
+ /* If the user has disabled vRun support, or we have detected that
+ support is not available, do not try it. */
+ if (remote_protocol_packets[PACKET_vRun].support == PACKET_DISABLE)
+ return -1;
+
+ strcpy (rs->buf, "vRun;");
+ len = strlen (rs->buf);
+
+ if (strlen (remote_exec_file) * 2 + len >= get_remote_packet_size ())
+ error (_("Remote file name too long for run packet"));
+ len += 2 * bin2hex ((gdb_byte *) remote_exec_file, rs->buf + len, 0);
+
+ gdb_assert (args != NULL);
+ if (*args)
+ {
+ struct cleanup *back_to;
+ int i;
+ char **argv;
+
+ argv = gdb_buildargv (args);
+ back_to = make_cleanup ((void (*) (void *)) freeargv, argv);
+ for (i = 0; argv[i] != NULL; i++)
+ {
+ if (strlen (argv[i]) * 2 + 1 + len >= get_remote_packet_size ())
+ error (_("Argument list too long for run packet"));
+ rs->buf[len++] = ';';
+ len += 2 * bin2hex ((gdb_byte *) argv[i], rs->buf + len, 0);
+ }
+ do_cleanups (back_to);
+ }
+
+ rs->buf[len++] = '\0';
+
+ putpkt (rs->buf);
+ getpkt (&rs->buf, &rs->buf_size, 0);
+
+ if (packet_ok (rs->buf, &remote_protocol_packets[PACKET_vRun]) == PACKET_OK)
+ {
+ /* We have a wait response; we don't need it, though. All is well. */
+ return 0;
+ }
+ else if (remote_protocol_packets[PACKET_vRun].support == PACKET_DISABLE)
+ /* It wasn't disabled before, but it is now. */
+ return -1;
+ else
+ {
+ if (remote_exec_file[0] == '\0')
+ error (_("Running the default executable on the remote target failed; "
+ "try \"set remote exec-file\"?"));
+ else
+ error (_("Running \"%s\" on the remote target failed"),
+ remote_exec_file);
+ }
+}
+
+/* In the extended protocol we want to be able to do things like
+ "run" and have them basically work as expected. So we need
+ a special create_inferior function. We support changing the
+ executable file and the command line arguments, but not the
+ environment. */
+
+static void
+extended_remote_create_inferior_1 (char *exec_file, char *args,
+ char **env, int from_tty)
+{
+ /* If running asynchronously, register the target file descriptor
+ with the event loop. */
+ if (target_can_async_p ())
+ target_async (inferior_event_handler, 0);
+
+ /* Now restart the remote server. */
+ if (extended_remote_run (args) == -1)
+ {
+ /* vRun was not supported. Fail if we need it to do what the
+ user requested. */
+ if (remote_exec_file[0])
+ error (_("Remote target does not support \"set remote exec-file\""));
+ if (args[0])
+ error (_("Remote target does not support \"set args\" or run <ARGS>"));
+
+ /* Fall back to "R". */
+ extended_remote_restart ();
+ }
+
+ if (!have_inferiors ())
+ {
+ /* Clean up from the last time we ran, before we mark the target
+ running again. This will mark breakpoints uninserted, and
+ get_offsets may insert breakpoints. */
+ init_thread_list ();
+ init_wait_for_inferior ();
+ }
+
+ /* Now mark the inferior as running before we do anything else. */
+ inferior_ptid = magic_null_ptid;
+
+ /* Now, if we have thread information, update inferior_ptid. */
+ inferior_ptid = remote_current_thread (inferior_ptid);
+
+ remote_add_inferior (ptid_get_pid (inferior_ptid), 0);
+ add_thread_silent (inferior_ptid);
+
+ /* Get updated offsets, if the stub uses qOffsets. */
+ get_offsets ();
+}
+
+static void
+extended_remote_create_inferior (struct target_ops *ops,
+ char *exec_file, char *args,
+ char **env, int from_tty)
+{
+ extended_remote_create_inferior_1 (exec_file, args, env, from_tty);
+}
+\f
+
+/* Insert a breakpoint. On targets that have software breakpoint
+ support, we ask the remote target to do the work; on targets
+ which don't, we insert a traditional memory breakpoint. */
+
+static int
+remote_insert_breakpoint (struct gdbarch *gdbarch,
+ struct bp_target_info *bp_tgt)
+{
+ /* 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_packets[PACKET_Z0].support != PACKET_DISABLE)
+ {
+ CORE_ADDR addr = bp_tgt->placed_address;
+ struct remote_state *rs;
+ char *p;
+ int bpsize;
+
+ gdbarch_remote_breakpoint_from_pc (gdbarch, &addr, &bpsize);
+
+ rs = get_remote_state ();
+ p = rs->buf;
+
+ *(p++) = 'Z';
+ *(p++) = '0';
+ *(p++) = ',';
+ addr = (ULONGEST) remote_address_masked (addr);
+ p += hexnumstr (p, addr);
+ sprintf (p, ",%d", bpsize);
+
+ putpkt (rs->buf);
+ getpkt (&rs->buf, &rs->buf_size, 0);
+
+ switch (packet_ok (rs->buf, &remote_protocol_packets[PACKET_Z0]))
+ {
+ case PACKET_ERROR:
+ return -1;
+ case PACKET_OK:
+ bp_tgt->placed_address = addr;
+ bp_tgt->placed_size = bpsize;
+ return 0;
+ case PACKET_UNKNOWN:
+ break;
+ }
+ }
+
+ return memory_insert_breakpoint (gdbarch, bp_tgt);
+}
+
+static int
+remote_remove_breakpoint (struct gdbarch *gdbarch,
+ struct bp_target_info *bp_tgt)
+{
+ CORE_ADDR addr = bp_tgt->placed_address;
+ struct remote_state *rs = get_remote_state ();
+
+ if (remote_protocol_packets[PACKET_Z0].support != PACKET_DISABLE)
+ {
+ char *p = rs->buf;
+
+ *(p++) = 'z';
+ *(p++) = '0';
+ *(p++) = ',';
+
+ addr = (ULONGEST) remote_address_masked (bp_tgt->placed_address);
+ p += hexnumstr (p, addr);
+ sprintf (p, ",%d", bp_tgt->placed_size);
+
+ putpkt (rs->buf);
+ getpkt (&rs->buf, &rs->buf_size, 0);
+
+ return (rs->buf[0] == 'E');
+ }
+
+ return memory_remove_breakpoint (gdbarch, bp_tgt);
+}
+
+static int
+watchpoint_to_Z_packet (int type)
+{
+ switch (type)
+ {
+ case hw_write:
+ return Z_PACKET_WRITE_WP;
+ break;
+ case hw_read:
+ return Z_PACKET_READ_WP;
+ break;
+ case hw_access:
+ return Z_PACKET_ACCESS_WP;
+ break;
+ default:
+ internal_error (__FILE__, __LINE__,
+ _("hw_bp_to_z: bad watchpoint type %d"), type);
+ }
+}
+
+static int
+remote_insert_watchpoint (CORE_ADDR addr, int len, int type,
+ struct expression *cond)
+{
+ struct remote_state *rs = get_remote_state ();
+ char *p;
+ enum Z_packet_type packet = watchpoint_to_Z_packet (type);
+
+ if (remote_protocol_packets[PACKET_Z0 + packet].support == PACKET_DISABLE)
+ return 1;
+
+ sprintf (rs->buf, "Z%x,", packet);
+ p = strchr (rs->buf, '\0');
+ addr = remote_address_masked (addr);
+ p += hexnumstr (p, (ULONGEST) addr);
+ sprintf (p, ",%x", len);
+
+ putpkt (rs->buf);
+ getpkt (&rs->buf, &rs->buf_size, 0);
+
+ switch (packet_ok (rs->buf, &remote_protocol_packets[PACKET_Z0 + packet]))
+ {
+ case PACKET_ERROR:
+ return -1;
+ case PACKET_UNKNOWN:
+ return 1;
+ case PACKET_OK:
+ return 0;
+ }
+ internal_error (__FILE__, __LINE__,
+ _("remote_insert_watchpoint: reached end of function"));
+}
+
+
+static int
+remote_remove_watchpoint (CORE_ADDR addr, int len, int type,
+ struct expression *cond)
+{
+ struct remote_state *rs = get_remote_state ();
+ char *p;
+ enum Z_packet_type packet = watchpoint_to_Z_packet (type);
+
+ if (remote_protocol_packets[PACKET_Z0 + packet].support == PACKET_DISABLE)
+ return -1;
+
+ sprintf (rs->buf, "z%x,", packet);
+ p = strchr (rs->buf, '\0');
+ addr = remote_address_masked (addr);
+ p += hexnumstr (p, (ULONGEST) addr);
+ sprintf (p, ",%x", len);
+ putpkt (rs->buf);
+ getpkt (&rs->buf, &rs->buf_size, 0);
+
+ switch (packet_ok (rs->buf, &remote_protocol_packets[PACKET_Z0 + packet]))
+ {
+ case PACKET_ERROR:
+ case PACKET_UNKNOWN:
+ return -1;
+ case PACKET_OK:
+ return 0;
+ }
+ internal_error (__FILE__, __LINE__,
+ _("remote_remove_watchpoint: reached end of function"));
+}
+
+
+int remote_hw_watchpoint_limit = -1;
+int remote_hw_breakpoint_limit = -1;
+
+static int
+remote_check_watch_resources (int type, int cnt, int ot)
+{
+ if (type == bp_hardware_breakpoint)
+ {
+ if (remote_hw_breakpoint_limit == 0)
+ return 0;
+ else if (remote_hw_breakpoint_limit < 0)
+ return 1;
+ else if (cnt <= remote_hw_breakpoint_limit)
+ return 1;
+ }
+ else
+ {
+ if (remote_hw_watchpoint_limit == 0)
+ return 0;
+ else if (remote_hw_watchpoint_limit < 0)
+ return 1;
+ else if (ot)
+ return -1;
+ else if (cnt <= remote_hw_watchpoint_limit)
+ return 1;
+ }
+ return -1;
+}
+
+static int
+remote_stopped_by_watchpoint (void)
+{
+ return remote_stopped_by_watchpoint_p;
+}
+
+static int
+remote_stopped_data_address (struct target_ops *target, CORE_ADDR *addr_p)
+{
+ int rc = 0;
+
+ if (remote_stopped_by_watchpoint ())
+ {
+ *addr_p = remote_watch_data_address;
+ rc = 1;
+ }
+
+ return rc;
+}
+
+
+static int
+remote_insert_hw_breakpoint (struct gdbarch *gdbarch,
+ struct bp_target_info *bp_tgt)
+{
+ CORE_ADDR addr;
+ struct remote_state *rs;
+ char *p;
+
+ /* The length field should be set to the size of a breakpoint
+ instruction, even though we aren't inserting one ourselves. */
+
+ gdbarch_remote_breakpoint_from_pc
+ (gdbarch, &bp_tgt->placed_address, &bp_tgt->placed_size);
+
+ if (remote_protocol_packets[PACKET_Z1].support == PACKET_DISABLE)
+ return -1;
+
+ rs = get_remote_state ();
+ p = rs->buf;
+
+ *(p++) = 'Z';
+ *(p++) = '1';
+ *(p++) = ',';
+
+ addr = remote_address_masked (bp_tgt->placed_address);
+ p += hexnumstr (p, (ULONGEST) addr);
+ sprintf (p, ",%x", bp_tgt->placed_size);
+
+ putpkt (rs->buf);
+ getpkt (&rs->buf, &rs->buf_size, 0);
+
+ switch (packet_ok (rs->buf, &remote_protocol_packets[PACKET_Z1]))
+ {
+ case PACKET_ERROR:
+ case PACKET_UNKNOWN:
+ return -1;
+ case PACKET_OK:
+ return 0;
+ }
+ internal_error (__FILE__, __LINE__,
+ _("remote_insert_hw_breakpoint: reached end of function"));
+}
+
+
+static int
+remote_remove_hw_breakpoint (struct gdbarch *gdbarch,
+ struct bp_target_info *bp_tgt)
+{
+ CORE_ADDR addr;
+ struct remote_state *rs = get_remote_state ();
+ char *p = rs->buf;
+
+ if (remote_protocol_packets[PACKET_Z1].support == PACKET_DISABLE)
+ return -1;
+
+ *(p++) = 'z';
+ *(p++) = '1';
+ *(p++) = ',';
+
+ addr = remote_address_masked (bp_tgt->placed_address);
+ p += hexnumstr (p, (ULONGEST) addr);
+ sprintf (p, ",%x", bp_tgt->placed_size);
+
+ putpkt (rs->buf);
+ getpkt (&rs->buf, &rs->buf_size, 0);
+
+ switch (packet_ok (rs->buf, &remote_protocol_packets[PACKET_Z1]))
+ {
+ case PACKET_ERROR:
+ case PACKET_UNKNOWN:
+ return -1;
+ case PACKET_OK:
+ return 0;
+ }
+ internal_error (__FILE__, __LINE__,
+ _("remote_remove_hw_breakpoint: reached end of function"));
+}
+
+/* Table used by the crc32 function to calcuate the checksum. */
+
+static unsigned long crc32_table[256] =
+{0, 0};
+
+static unsigned long
+crc32 (const unsigned char *buf, int len, unsigned int crc)
+{
+ if (!crc32_table[1])
+ {
+ /* Initialize the CRC table and the decoding table. */
+ int i, j;
+ unsigned int c;
+
+ for (i = 0; i < 256; i++)
+ {
+ for (c = i << 24, j = 8; j > 0; --j)
+ c = c & 0x80000000 ? (c << 1) ^ 0x04c11db7 : (c << 1);
+ crc32_table[i] = c;
+ }
+ }
+
+ while (len--)
+ {
+ crc = (crc << 8) ^ crc32_table[((crc >> 24) ^ *buf) & 255];
+ buf++;
+ }
+ return crc;
+}
+
+/* Verify memory using the "qCRC:" request. */
+
+static int
+remote_verify_memory (struct target_ops *ops,
+ const gdb_byte *data, CORE_ADDR lma, ULONGEST size)
+{
+ struct remote_state *rs = get_remote_state ();
+ unsigned long host_crc, target_crc;
+ char *tmp;
+
+ /* FIXME: assumes lma can fit into long. */
+ xsnprintf (rs->buf, get_remote_packet_size (), "qCRC:%lx,%lx",
+ (long) lma, (long) size);
+ putpkt (rs->buf);
+
+ /* Be clever; compute the host_crc before waiting for target
+ reply. */
+ host_crc = crc32 (data, size, 0xffffffff);
+
+ getpkt (&rs->buf, &rs->buf_size, 0);
+ if (rs->buf[0] == 'E')
+ return -1;
+
+ if (rs->buf[0] != 'C')
+ error (_("remote target does not support this operation"));
+
+ for (target_crc = 0, tmp = &rs->buf[1]; *tmp; tmp++)
+ target_crc = target_crc * 16 + fromhex (*tmp);
+
+ return (host_crc == target_crc);
+}
+
+/* compare-sections command
+
+ With no arguments, compares each loadable section in the exec bfd
+ with the same memory range on the target, and reports mismatches.
+ Useful for verifying the image on the target against the exec file. */
+
+static void
+compare_sections_command (char *args, int from_tty)
+{
+ asection *s;
+ struct cleanup *old_chain;
+ char *sectdata;
+ const char *sectname;
+ bfd_size_type size;
+ bfd_vma lma;
+ int matched = 0;
+ int mismatched = 0;
+ int res;
+
+ if (!exec_bfd)
+ error (_("command cannot be used without an exec file"));
+
+ for (s = exec_bfd->sections; s; s = s->next)
+ {
+ if (!(s->flags & SEC_LOAD))
+ continue; /* Skip non-loadable section. */
+
+ size = bfd_get_section_size (s);
+ if (size == 0)
+ continue; /* Skip zero-length section. */
+
+ sectname = bfd_get_section_name (exec_bfd, s);
+ if (args && strcmp (args, sectname) != 0)
+ continue; /* Not the section selected by user. */
+
+ matched = 1; /* Do this section. */
+ lma = s->lma;
+
+ sectdata = xmalloc (size);
+ old_chain = make_cleanup (xfree, sectdata);
+ bfd_get_section_contents (exec_bfd, s, sectdata, 0, size);
+
+ res = target_verify_memory (sectdata, lma, size);
+
+ if (res == -1)
+ error (_("target memory fault, section %s, range %s -- %s"), sectname,
+ paddress (target_gdbarch, lma),
+ paddress (target_gdbarch, lma + size));
+
+ printf_filtered ("Section %s, range %s -- %s: ", sectname,
+ paddress (target_gdbarch, lma),
+ paddress (target_gdbarch, lma + size));
+ if (res)
+ printf_filtered ("matched.\n");
+ else
+ {
+ printf_filtered ("MIS-MATCHED!\n");
+ mismatched++;
+ }
+
+ do_cleanups (old_chain);
+ }
+ if (mismatched > 0)
+ warning (_("One or more sections of the remote executable does not match\n\
+the loaded file\n"));
+ if (args && !matched)
+ printf_filtered (_("No loaded section named '%s'.\n"), args);
+}
+
+/* Write LEN bytes from WRITEBUF into OBJECT_NAME/ANNEX at OFFSET
+ into remote target. The number of bytes written to the remote
+ target is returned, or -1 for error. */
+
+static LONGEST
+remote_write_qxfer (struct target_ops *ops, const char *object_name,
+ const char *annex, const gdb_byte *writebuf,
+ ULONGEST offset, LONGEST len,
+ struct packet_config *packet)
+{
+ int i, buf_len;
+ ULONGEST n;
+ struct remote_state *rs = get_remote_state ();
+ int max_size = get_memory_write_packet_size ();
+
+ if (packet->support == PACKET_DISABLE)
+ return -1;
+
+ /* Insert header. */
+ i = snprintf (rs->buf, max_size,
+ "qXfer:%s:write:%s:%s:",
+ object_name, annex ? annex : "",
+ phex_nz (offset, sizeof offset));
+ max_size -= (i + 1);
+
+ /* Escape as much data as fits into rs->buf. */
+ buf_len = remote_escape_output
+ (writebuf, len, (rs->buf + i), &max_size, max_size);
+
+ if (putpkt_binary (rs->buf, i + buf_len) < 0
+ || getpkt_sane (&rs->buf, &rs->buf_size, 0) < 0
+ || packet_ok (rs->buf, packet) != PACKET_OK)
+ return -1;
+
+ unpack_varlen_hex (rs->buf, &n);
+ return n;
+}
+
+/* Read OBJECT_NAME/ANNEX from the remote target using a qXfer packet.
+ Data at OFFSET, of up to LEN bytes, is read into READBUF; the
+ number of bytes read is returned, or 0 for EOF, or -1 for error.
+ The number of bytes read may be less than LEN without indicating an
+ EOF. PACKET is checked and updated to indicate whether the remote
+ target supports this object. */
+
+static LONGEST
+remote_read_qxfer (struct target_ops *ops, const char *object_name,
+ const char *annex,
+ gdb_byte *readbuf, ULONGEST offset, LONGEST len,
+ struct packet_config *packet)
+{
+ static char *finished_object;
+ static char *finished_annex;
+ static ULONGEST finished_offset;
+
+ struct remote_state *rs = get_remote_state ();
+ LONGEST i, n, packet_len;
+
+ if (packet->support == PACKET_DISABLE)
+ return -1;
+
+ /* Check whether we've cached an end-of-object packet that matches
+ this request. */
+ if (finished_object)
+ {
+ if (strcmp (object_name, finished_object) == 0
+ && strcmp (annex ? annex : "", finished_annex) == 0
+ && offset == finished_offset)
+ return 0;
+
+ /* Otherwise, we're now reading something different. Discard
+ the cache. */
+ xfree (finished_object);
+ xfree (finished_annex);
+ finished_object = NULL;
+ finished_annex = NULL;
+ }
+
+ /* Request only enough to fit in a single packet. The actual data
+ may not, since we don't know how much of it will need to be escaped;
+ the target is free to respond with slightly less data. We subtract
+ five to account for the response type and the protocol frame. */
+ n = min (get_remote_packet_size () - 5, len);
+ snprintf (rs->buf, get_remote_packet_size () - 4, "qXfer:%s:read:%s:%s,%s",
+ object_name, annex ? annex : "",
+ phex_nz (offset, sizeof offset),
+ phex_nz (n, sizeof n));
+ i = putpkt (rs->buf);
+ if (i < 0)
+ return -1;
+
+ rs->buf[0] = '\0';
+ packet_len = getpkt_sane (&rs->buf, &rs->buf_size, 0);
+ if (packet_len < 0 || packet_ok (rs->buf, packet) != PACKET_OK)
+ return -1;
+
+ if (rs->buf[0] != 'l' && rs->buf[0] != 'm')
+ error (_("Unknown remote qXfer reply: %s"), rs->buf);
+
+ /* 'm' means there is (or at least might be) more data after this
+ batch. That does not make sense unless there's at least one byte
+ of data in this reply. */
+ if (rs->buf[0] == 'm' && packet_len == 1)
+ error (_("Remote qXfer reply contained no data."));
+
+ /* Got some data. */
+ i = remote_unescape_input (rs->buf + 1, packet_len - 1, readbuf, n);
+
+ /* 'l' is an EOF marker, possibly including a final block of data,
+ or possibly empty. If we have the final block of a non-empty
+ object, record this fact to bypass a subsequent partial read. */
+ if (rs->buf[0] == 'l' && offset + i > 0)
+ {
+ finished_object = xstrdup (object_name);
+ finished_annex = xstrdup (annex ? annex : "");
+ finished_offset = offset + i;
+ }
+
+ return i;
+}
+
+static LONGEST
+remote_xfer_partial (struct target_ops *ops, enum target_object object,
+ const char *annex, gdb_byte *readbuf,
+ const gdb_byte *writebuf, ULONGEST offset, LONGEST len)
+{
+ struct remote_state *rs;
+ int i;
+ char *p2;
+ char query_type;
+
+ set_remote_traceframe ();
+ set_general_thread (inferior_ptid);
+
+ rs = get_remote_state ();
+
+ /* Handle memory using the standard memory routines. */
+ if (object == TARGET_OBJECT_MEMORY)
+ {
+ int xfered;
+
+ errno = 0;
+
+ /* If the remote target is connected but not running, we should
+ pass this request down to a lower stratum (e.g. the executable
+ file). */
+ if (!target_has_execution)
+ return 0;
+
+ if (writebuf != NULL)
+ xfered = remote_write_bytes (offset, writebuf, len);
+ else
+ xfered = remote_read_bytes (offset, readbuf, len);
+
+ if (xfered > 0)
+ return xfered;
+ else if (xfered == 0 && errno == 0)
+ return 0;
+ else
+ return -1;
+ }
+
+ /* Handle SPU memory using qxfer packets. */
+ if (object == TARGET_OBJECT_SPU)
+ {
+ if (readbuf)
+ return remote_read_qxfer (ops, "spu", annex, readbuf, offset, len,
+ &remote_protocol_packets
+ [PACKET_qXfer_spu_read]);
+ else
+ return remote_write_qxfer (ops, "spu", annex, writebuf, offset, len,
+ &remote_protocol_packets
+ [PACKET_qXfer_spu_write]);
+ }
+
+ /* Handle extra signal info using qxfer packets. */
+ if (object == TARGET_OBJECT_SIGNAL_INFO)
+ {
+ if (readbuf)
+ return remote_read_qxfer (ops, "siginfo", annex, readbuf, offset, len,
+ &remote_protocol_packets
+ [PACKET_qXfer_siginfo_read]);
+ else
+ return remote_write_qxfer (ops, "siginfo", annex,
+ writebuf, offset, len,
+ &remote_protocol_packets
+ [PACKET_qXfer_siginfo_write]);
+ }
+
+ if (object == TARGET_OBJECT_STATIC_TRACE_DATA)
+ {
+ if (readbuf)
+ return remote_read_qxfer (ops, "statictrace", annex,
+ readbuf, offset, len,
+ &remote_protocol_packets
+ [PACKET_qXfer_statictrace_read]);
+ else
+ return -1;
+ }
+
+ /* Only handle flash writes. */
+ if (writebuf != NULL)
+ {
+ LONGEST xfered;
+
+ switch (object)
+ {
+ case TARGET_OBJECT_FLASH:
+ xfered = remote_flash_write (ops, offset, len, writebuf);
+
+ if (xfered > 0)
+ return xfered;
+ else if (xfered == 0 && errno == 0)
+ return 0;
+ else
+ return -1;
+
+ default:
+ return -1;
+ }
+ }
+
+ /* Map pre-existing objects onto letters. DO NOT do this for new
+ objects!!! Instead specify new query packets. */
+ switch (object)
+ {
+ case TARGET_OBJECT_AVR:
+ query_type = 'R';
+ break;
+
+ case TARGET_OBJECT_AUXV:
+ gdb_assert (annex == NULL);
+ return remote_read_qxfer (ops, "auxv", annex, readbuf, offset, len,
+ &remote_protocol_packets[PACKET_qXfer_auxv]);
+
+ case TARGET_OBJECT_AVAILABLE_FEATURES:
+ return remote_read_qxfer
+ (ops, "features", annex, readbuf, offset, len,
+ &remote_protocol_packets[PACKET_qXfer_features]);
+
+ case TARGET_OBJECT_LIBRARIES:
+ return remote_read_qxfer
+ (ops, "libraries", annex, readbuf, offset, len,
+ &remote_protocol_packets[PACKET_qXfer_libraries]);
+
+ case TARGET_OBJECT_MEMORY_MAP:
+ gdb_assert (annex == NULL);
+ return remote_read_qxfer (ops, "memory-map", annex, readbuf, offset, len,
+ &remote_protocol_packets[PACKET_qXfer_memory_map]);
+
+ case TARGET_OBJECT_OSDATA:
+ /* Should only get here if we're connected. */
+ gdb_assert (remote_desc);
+ return remote_read_qxfer
+ (ops, "osdata", annex, readbuf, offset, len,
+ &remote_protocol_packets[PACKET_qXfer_osdata]);
+
+ case TARGET_OBJECT_THREADS:
+ gdb_assert (annex == NULL);
+ return remote_read_qxfer (ops, "threads", annex, readbuf, offset, len,
+ &remote_protocol_packets[PACKET_qXfer_threads]);
+
+ case TARGET_OBJECT_TRACEFRAME_INFO:
+ gdb_assert (annex == NULL);
+ return remote_read_qxfer
+ (ops, "traceframe-info", annex, readbuf, offset, len,
+ &remote_protocol_packets[PACKET_qXfer_traceframe_info]);
+ default:
+ return -1;
+ }
+
+ /* Note: a zero OFFSET and LEN can be used to query the minimum
+ buffer size. */
+ if (offset == 0 && len == 0)
+ return (get_remote_packet_size ());
+ /* Minimum outbuf size is get_remote_packet_size (). If LEN is not
+ large enough let the caller deal with it. */
+ if (len < get_remote_packet_size ())
+ return -1;
+ len = get_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"));
+
+ gdb_assert (annex != NULL);
+ gdb_assert (readbuf != NULL);
+
+ p2 = rs->buf;
+ *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 < (get_remote_packet_size () - 8)))
+ {
+ /* Bad caller may have sent forbidden characters. */
+ gdb_assert (isprint (annex[i]) && annex[i] != '$' && annex[i] != '#');
+ *p2++ = annex[i];
+ i++;
+ }
+ *p2 = '\0';
+ gdb_assert (annex[i] == '\0');
+
+ i = putpkt (rs->buf);
+ if (i < 0)
+ return i;
+
+ getpkt (&rs->buf, &rs->buf_size, 0);
+ strcpy ((char *) readbuf, rs->buf);
+
+ return strlen ((char *) readbuf);
+}
+
+static int
+remote_search_memory (struct target_ops* ops,
+ CORE_ADDR start_addr, ULONGEST search_space_len,
+ const gdb_byte *pattern, ULONGEST pattern_len,
+ CORE_ADDR *found_addrp)
+{
+ int addr_size = gdbarch_addr_bit (target_gdbarch) / 8;
+ struct remote_state *rs = get_remote_state ();
+ int max_size = get_memory_write_packet_size ();
+ struct packet_config *packet =
+ &remote_protocol_packets[PACKET_qSearch_memory];
+ /* Number of packet bytes used to encode the pattern;
+ this could be more than PATTERN_LEN due to escape characters. */
+ int escaped_pattern_len;
+ /* Amount of pattern that was encodable in the packet. */
+ int used_pattern_len;
+ int i;
+ int found;
+ ULONGEST found_addr;
+
+ /* Don't go to the target if we don't have to.
+ This is done before checking packet->support to avoid the possibility that
+ a success for this edge case means the facility works in general. */
+ if (pattern_len > search_space_len)
+ return 0;
+ if (pattern_len == 0)
+ {
+ *found_addrp = start_addr;
+ return 1;
+ }
+
+ /* If we already know the packet isn't supported, fall back to the simple
+ way of searching memory. */
+
+ if (packet->support == PACKET_DISABLE)
+ {
+ /* Target doesn't provided special support, fall back and use the
+ standard support (copy memory and do the search here). */
+ return simple_search_memory (ops, start_addr, search_space_len,
+ pattern, pattern_len, found_addrp);
+ }
+
+ /* Insert header. */
+ i = snprintf (rs->buf, max_size,
+ "qSearch:memory:%s;%s;",
+ phex_nz (start_addr, addr_size),
+ phex_nz (search_space_len, sizeof (search_space_len)));
+ max_size -= (i + 1);
+
+ /* Escape as much data as fits into rs->buf. */
+ escaped_pattern_len =
+ remote_escape_output (pattern, pattern_len, (rs->buf + i),
+ &used_pattern_len, max_size);
+
+ /* Bail if the pattern is too large. */
+ if (used_pattern_len != pattern_len)
+ error (_("Pattern is too large to transmit to remote target."));
+
+ if (putpkt_binary (rs->buf, i + escaped_pattern_len) < 0
+ || getpkt_sane (&rs->buf, &rs->buf_size, 0) < 0
+ || packet_ok (rs->buf, packet) != PACKET_OK)
+ {
+ /* The request may not have worked because the command is not
+ supported. If so, fall back to the simple way. */
+ if (packet->support == PACKET_DISABLE)
+ {
+ return simple_search_memory (ops, start_addr, search_space_len,
+ pattern, pattern_len, found_addrp);
+ }
+ return -1;
+ }
+
+ if (rs->buf[0] == '0')
+ found = 0;
+ else if (rs->buf[0] == '1')
+ {
+ found = 1;
+ if (rs->buf[1] != ',')
+ error (_("Unknown qSearch:memory reply: %s"), rs->buf);
+ unpack_varlen_hex (rs->buf + 2, &found_addr);
+ *found_addrp = found_addr;
+ }
+ else
+ error (_("Unknown qSearch:memory reply: %s"), rs->buf);
+
+ return found;
+}
+
+static void
+remote_rcmd (char *command,
+ struct ui_file *outbuf)
+{
+ struct remote_state *rs = get_remote_state ();
+ char *p = rs->buf;
+
+ 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 (rs->buf, "qRcmd,");
+ p = strchr (rs->buf, '\0');
+
+ if ((strlen (rs->buf) + strlen (command) * 2 + 8/*misc*/)
+ > get_remote_packet_size ())
+ error (_("\"monitor\" command ``%s'' is too long."), command);
+
+ /* Encode the actual command. */
+ bin2hex ((gdb_byte *) command, p, 0);
+
+ if (putpkt (rs->buf) < 0)
+ error (_("Communication problem with target."));
+
+ /* get/display the response */
+ while (1)
+ {
+ char *buf;
+
+ /* XXX - see also remote_get_noisy_reply(). */
+ rs->buf[0] = '\0';
+ getpkt (&rs->buf, &rs->buf_size, 0);
+ buf = rs->buf;
+ if (buf[0] == '\0')
+ error (_("Target does not support this command."));
+ if (buf[0] == 'O' && buf[1] != 'K')
+ {
+ remote_console_output (buf + 1); /* 'O' message from stub. */
+ continue;
+ }
+ if (strcmp (buf, "OK") == 0)
+ break;
+ if (strlen (buf) == 3 && buf[0] == 'E'
+ && isdigit (buf[1]) && isdigit (buf[2]))
+ {
+ error (_("Protocol error with Rcmd"));
+ }
+ for (p = buf; p[0] != '\0' && p[1] != '\0'; p += 2)
+ {
+ char c = (fromhex (p[0]) << 4) + fromhex (p[1]);
+
+ fputc_unfiltered (c, outbuf);
+ }
+ break;
+ }
+}
+
+static VEC(mem_region_s) *
+remote_memory_map (struct target_ops *ops)
+{
+ VEC(mem_region_s) *result = NULL;
+ char *text = target_read_stralloc (¤t_target,
+ TARGET_OBJECT_MEMORY_MAP, NULL);
+
+ if (text)
+ {
+ struct cleanup *back_to = make_cleanup (xfree, text);
+
+ result = parse_memory_map (text);
+ do_cleanups (back_to);
+ }
+
+ return result;
+}
+
+static void
+packet_command (char *args, int from_tty)
+{
+ struct remote_state *rs = get_remote_state ();
+
+ if (!remote_desc)
+ error (_("command can only be used with remote target"));
+
+ if (!args)
+ error (_("remote-packet command requires packet text as argument"));
+
+ puts_filtered ("sending: ");
+ print_packet (args);
+ puts_filtered ("\n");
+ putpkt (args);
+
+ getpkt (&rs->buf, &rs->buf_size, 0);
+ puts_filtered ("received: ");
+ print_packet (rs->buf);
+ puts_filtered ("\n");
+}
+
+#if 0
+/* --------- UNIT_TEST for THREAD oriented PACKETS ------------------- */
+
+static void display_thread_info (struct gdb_ext_thread_info *info);
+
+static void threadset_test_cmd (char *cmd, int tty);
+
+static void threadalive_test (char *cmd, int tty);
+
+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)
+{
+ int sample_thread = SAMPLE_THREAD;
+
+ printf_filtered (_("Remote threadset test\n"));
+ set_general_thread (sample_thread);
+}
+
+
+static void
+threadalive_test (char *cmd, int tty)
+{
+ int sample_thread = SAMPLE_THREAD;
+ int pid = ptid_get_pid (inferior_ptid);
+ ptid_t ptid = ptid_build (pid, 0, sample_thread);
+
+ if (remote_thread_alive (ptid))
+ printf_filtered ("PASS: Thread alive test\n");
+ else
+ 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]));
+}
+
+static void
+threadlist_test_cmd (char *cmd, int tty)
+{
+ int startflag = 1;
+ threadref nextthread;
+ int done, result_count;
+ threadref threadlist[3];
+
+ printf_filtered ("Remote Threadlist test\n");
+ if (!remote_get_threadlist (startflag, &nextthread, 3, &done,
+ &result_count, &threadlist[0]))
+ printf_filtered ("FAIL: threadlist test\n");
+ else
+ {
+ threadref *scan = threadlist;
+ threadref *limit = scan + result_count;
+
+ while (scan < limit)
+ output_threadid (" thread ", scan++);
}
}
-/* Come here after finding the start of the frame. Collect the rest
- into BUF, verifying the checksum, length, and handling run-length
- compression. No more than sizeof_buf-1 characters are read so that
- the buffer can be NUL terminated.
+void
+display_thread_info (struct gdb_ext_thread_info *info)
+{
+ output_threadid ("Threadid: ", &info->threadid);
+ printf_filtered ("Name: %s\n ", info->shortname);
+ printf_filtered ("State: %s\n", info->display);
+ printf_filtered ("other: %s\n\n", info->more_display);
+}
+
+int
+get_and_display_threadinfo (threadref *ref)
+{
+ int result;
+ int set;
+ struct gdb_ext_thread_info threadinfo;
+
+ set = TAG_THREADID | TAG_EXISTS | TAG_THREADNAME
+ | TAG_MOREDISPLAY | TAG_DISPLAY;
+ if (0 != (result = remote_get_threadinfo (ref, set, &threadinfo)))
+ display_thread_info (&threadinfo);
+ return result;
+}
+
+static void
+threadinfo_test_cmd (char *cmd, int tty)
+{
+ int athread = SAMPLE_THREAD;
+ threadref thread;
+ int set;
- 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). */
+ int_to_threadref (&thread, athread);
+ printf_filtered ("Remote Threadinfo test\n");
+ if (!get_and_display_threadinfo (&thread))
+ printf_filtered ("FAIL cannot get thread info\n");
+}
-static long
-read_frame (char *buf,
- long sizeof_buf)
+static int
+thread_display_step (threadref *ref, void *context)
{
- unsigned char csum;
- long bc;
- int c;
+ /* output_threadid(" threadstep ",ref); *//* simple test */
+ return get_and_display_threadinfo (ref);
+}
- csum = 0;
- bc = 0;
+static void
+threadlist_update_test_cmd (char *cmd, int tty)
+{
+ printf_filtered ("Remote Threadlist update test\n");
+ remote_threadlist_iterator (thread_display_step, 0, CRAZY_MAX_THREADS);
+}
- while (1)
- {
- /* ASSERT (bc < sizeof_buf - 1) - space for trailing NUL */
- c = readchar (remote_timeout);
- switch (c)
- {
- case SERIAL_TIMEOUT:
- if (remote_debug)
- fputs_filtered ("Timeout in mid-packet, retrying\n", gdb_stdlog);
- return -1;
- case '$':
- 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;
- int check_0 = 0;
- int check_1 = 0;
+static void
+init_remote_threadtests (void)
+{
+ add_com ("tlist", class_obscure, threadlist_test_cmd,
+ _("Fetch and print the remote list of "
+ "thread identifiers, one pkt only"));
+ add_com ("tinfo", class_obscure, threadinfo_test_cmd,
+ _("Fetch and display info about one thread"));
+ add_com ("tset", class_obscure, threadset_test_cmd,
+ _("Test setting to a different thread"));
+ add_com ("tupd", class_obscure, threadlist_update_test_cmd,
+ _("Iterate through updating all remote thread info"));
+ add_com ("talive", class_obscure, threadalive_test,
+ _(" Remote thread alive test "));
+}
- buf[bc] = '\0';
+#endif /* 0 */
- check_0 = readchar (remote_timeout);
- if (check_0 >= 0)
- check_1 = readchar (remote_timeout);
+/* Convert a thread ID to a string. Returns the string in a static
+ buffer. */
- 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;
- }
+static char *
+remote_pid_to_str (struct target_ops *ops, ptid_t ptid)
+{
+ static char buf[64];
+ struct remote_state *rs = get_remote_state ();
- pktcsum = (fromhex (check_0) << 4) | fromhex (check_1);
- if (csum == pktcsum)
- return bc;
+ if (ptid_is_pid (ptid))
+ {
+ /* Printing an inferior target id. */
+
+ /* When multi-process extensions are off, there's no way in the
+ remote protocol to know the remote process id, if there's any
+ at all. There's one exception --- when we're connected with
+ target extended-remote, and we manually attached to a process
+ with "attach PID". We don't record anywhere a flag that
+ allows us to distinguish that case from the case of
+ connecting with extended-remote and the stub already being
+ attached to a process, and reporting yes to qAttached, hence
+ no smart special casing here. */
+ if (!remote_multi_process_p (rs))
+ {
+ xsnprintf (buf, sizeof buf, "Remote target");
+ return buf;
+ }
- if (remote_debug)
- {
- fprintf_filtered (gdb_stdlog,
- "Bad checksum, sentsum=0x%x, csum=0x%x, buf=",
- pktcsum, csum);
- fputs_filtered (buf, gdb_stdlog);
- fputs_filtered ("\n", gdb_stdlog);
- }
- /* Number of characters in buffer ignoring trailing
- NUL. */
- return -1;
- }
- case '*': /* Run length encoding */
- {
- int repeat;
- csum += c;
+ return normal_pid_to_str (ptid);
+ }
+ else
+ {
+ if (ptid_equal (magic_null_ptid, ptid))
+ xsnprintf (buf, sizeof buf, "Thread <main>");
+ else if (remote_multi_process_p (rs))
+ xsnprintf (buf, sizeof buf, "Thread %d.%ld",
+ ptid_get_pid (ptid), ptid_get_tid (ptid));
+ else
+ xsnprintf (buf, sizeof buf, "Thread %ld",
+ ptid_get_tid (ptid));
+ return buf;
+ }
+}
- c = readchar (remote_timeout);
- csum += c;
- repeat = c - ' ' + 3; /* Compute repeat count */
+/* Get the address of the thread local variable in OBJFILE which is
+ stored at OFFSET within the thread local storage for thread PTID. */
- /* The character before ``*'' is repeated. */
+static CORE_ADDR
+remote_get_thread_local_address (struct target_ops *ops,
+ ptid_t ptid, CORE_ADDR lm, CORE_ADDR offset)
+{
+ if (remote_protocol_packets[PACKET_qGetTLSAddr].support != PACKET_DISABLE)
+ {
+ struct remote_state *rs = get_remote_state ();
+ char *p = rs->buf;
+ char *endp = rs->buf + get_remote_packet_size ();
+ enum packet_result result;
+
+ strcpy (p, "qGetTLSAddr:");
+ p += strlen (p);
+ p = write_ptid (p, endp, ptid);
+ *p++ = ',';
+ p += hexnumstr (p, offset);
+ *p++ = ',';
+ p += hexnumstr (p, lm);
+ *p++ = '\0';
+
+ putpkt (rs->buf);
+ getpkt (&rs->buf, &rs->buf_size, 0);
+ result = packet_ok (rs->buf,
+ &remote_protocol_packets[PACKET_qGetTLSAddr]);
+ if (result == PACKET_OK)
+ {
+ ULONGEST result;
- if (repeat > 0 && repeat <= 255
- && bc > 0
- && bc + repeat - 1 < sizeof_buf - 1)
- {
- memset (&buf[bc], buf[bc - 1], repeat);
- bc += repeat;
- continue;
- }
+ unpack_varlen_hex (rs->buf, &result);
+ return result;
+ }
+ else if (result == PACKET_UNKNOWN)
+ throw_error (TLS_GENERIC_ERROR,
+ _("Remote target doesn't support qGetTLSAddr packet"));
+ else
+ throw_error (TLS_GENERIC_ERROR,
+ _("Remote target failed to process qGetTLSAddr request"));
+ }
+ else
+ throw_error (TLS_GENERIC_ERROR,
+ _("TLS not supported or disabled on this target"));
+ /* Not reached. */
+ return 0;
+}
- buf[bc] = '\0';
- printf_filtered ("Repeat count %d too large for buffer: ", repeat);
- puts_filtered (buf);
- puts_filtered ("\n");
- return -1;
- }
- default:
- if (bc < sizeof_buf - 1)
- {
- buf[bc++] = c;
- csum += c;
- continue;
- }
+/* Provide thread local base, i.e. Thread Information Block address.
+ Returns 1 if ptid is found and thread_local_base is non zero. */
- buf[bc] = '\0';
- puts_filtered ("Remote packet too long: ");
- puts_filtered (buf);
- puts_filtered ("\n");
+int
+remote_get_tib_address (ptid_t ptid, CORE_ADDR *addr)
+{
+ if (remote_protocol_packets[PACKET_qGetTIBAddr].support != PACKET_DISABLE)
+ {
+ struct remote_state *rs = get_remote_state ();
+ char *p = rs->buf;
+ char *endp = rs->buf + get_remote_packet_size ();
+ enum packet_result result;
+
+ strcpy (p, "qGetTIBAddr:");
+ p += strlen (p);
+ p = write_ptid (p, endp, ptid);
+ *p++ = '\0';
+
+ putpkt (rs->buf);
+ getpkt (&rs->buf, &rs->buf_size, 0);
+ result = packet_ok (rs->buf,
+ &remote_protocol_packets[PACKET_qGetTIBAddr]);
+ if (result == PACKET_OK)
+ {
+ ULONGEST result;
- return -1;
+ unpack_varlen_hex (rs->buf, &result);
+ if (addr)
+ *addr = (CORE_ADDR) result;
+ return 1;
}
+ else if (result == PACKET_UNKNOWN)
+ error (_("Remote target doesn't support qGetTIBAddr packet"));
+ else
+ error (_("Remote target failed to process qGetTIBAddr request"));
}
+ else
+ error (_("qGetTIBAddr not supported or disabled on this target"));
+ /* Not reached. */
+ return 0;
+}
+
+/* Support for inferring a target description based on the current
+ architecture and the size of a 'g' packet. While the 'g' packet
+ can have any size (since optional registers can be left off the
+ end), some sizes are easily recognizable given knowledge of the
+ approximate architecture. */
+
+struct remote_g_packet_guess
+{
+ int bytes;
+ const struct target_desc *tdesc;
+};
+typedef struct remote_g_packet_guess remote_g_packet_guess_s;
+DEF_VEC_O(remote_g_packet_guess_s);
+
+struct remote_g_packet_data
+{
+ VEC(remote_g_packet_guess_s) *guesses;
+};
+
+static struct gdbarch_data *remote_g_packet_data_handle;
+
+static void *
+remote_g_packet_data_init (struct obstack *obstack)
+{
+ return OBSTACK_ZALLOC (obstack, struct remote_g_packet_data);
}
-/* Read a packet from the remote machine, with error checking, and
- store it in BUF. If FOREVER, wait forever rather than timing out;
- this is used (in synchronous mode) to wait for a target that is is
- executing user code to stop. */
-/* 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,
- int forever)
+register_remote_g_packet_guess (struct gdbarch *gdbarch, int bytes,
+ const struct target_desc *tdesc)
{
- int timed_out;
+ struct remote_g_packet_data *data
+ = gdbarch_data (gdbarch, remote_g_packet_data_handle);
+ struct remote_g_packet_guess new_guess, *guess;
+ int ix;
- timed_out = getpkt_sane (buf, sizeof_buf, forever);
+ gdb_assert (tdesc != NULL);
+
+ for (ix = 0;
+ VEC_iterate (remote_g_packet_guess_s, data->guesses, ix, guess);
+ ix++)
+ if (guess->bytes == bytes)
+ internal_error (__FILE__, __LINE__,
+ _("Duplicate g packet description added for size %d"),
+ bytes);
+
+ new_guess.bytes = bytes;
+ new_guess.tdesc = tdesc;
+ VEC_safe_push (remote_g_packet_guess_s, data->guesses, &new_guess);
}
+/* Return 1 if remote_read_description would do anything on this target
+ and architecture, 0 otherwise. */
-/* Read a packet from the remote machine, with error checking, and
- store it in BUF. If FOREVER, wait forever rather than timing out;
- 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,
- int forever)
+remote_read_description_p (struct target_ops *target)
{
- int c;
- int tries;
- int timeout;
- int val;
+ struct remote_g_packet_data *data
+ = gdbarch_data (target_gdbarch, remote_g_packet_data_handle);
- strcpy (buf, "timeout");
+ if (!VEC_empty (remote_g_packet_guess_s, data->guesses))
+ return 1;
- if (forever)
- {
- timeout = watchdog > 0 ? watchdog : -1;
- }
+ return 0;
+}
- else
- timeout = remote_timeout;
+static const struct target_desc *
+remote_read_description (struct target_ops *target)
+{
+ struct remote_g_packet_data *data
+ = gdbarch_data (target_gdbarch, remote_g_packet_data_handle);
-#define MAX_TRIES 3
+ /* Do not try this during initial connection, when we do not know
+ whether there is a running but stopped thread. */
+ if (!target_has_execution || ptid_equal (inferior_ptid, null_ptid))
+ return NULL;
- for (tries = 1; tries <= MAX_TRIES; tries++)
+ if (!VEC_empty (remote_g_packet_guess_s, data->guesses))
{
- /* 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. */
+ struct remote_g_packet_guess *guess;
+ int ix;
+ int bytes = send_g_packet ();
+
+ for (ix = 0;
+ VEC_iterate (remote_g_packet_guess_s, data->guesses, ix, guess);
+ ix++)
+ if (guess->bytes == bytes)
+ return guess->tdesc;
+
+ /* We discard the g packet. A minor optimization would be to
+ hold on to it, and fill the register cache once we have selected
+ an architecture, but it's too tricky to do safely. */
+ }
- /* 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. */
+ return NULL;
+}
- do
- {
- c = readchar (timeout);
+/* Remote file transfer support. This is host-initiated I/O, not
+ target-initiated; for target-initiated, see remote-fileio.c. */
- if (c == SERIAL_TIMEOUT)
- {
- if (forever) /* Watchdog went off? Kill the target. */
- {
- QUIT;
- target_mourn_inferior ();
- error ("Watchdog has expired. Target detached.\n");
- }
- if (remote_debug)
- fputs_filtered ("Timed out.\n", gdb_stdlog);
- goto retry;
- }
- }
- while (c != '$');
+/* If *LEFT is at least the length of STRING, copy STRING to
+ *BUFFER, update *BUFFER to point to the new end of the buffer, and
+ decrease *LEFT. Otherwise raise an error. */
- /* We've found the start of a packet, now collect the data. */
+static void
+remote_buffer_add_string (char **buffer, int *left, char *string)
+{
+ int len = strlen (string);
- val = read_frame (buf, sizeof_buf);
+ if (len > *left)
+ error (_("Packet too long for target."));
- if (val >= 0)
- {
- if (remote_debug)
- {
- fprintf_unfiltered (gdb_stdlog, "Packet received: ");
- fputstr_unfiltered (buf, 0, gdb_stdlog);
- fprintf_unfiltered (gdb_stdlog, "\n");
- }
- serial_write (remote_desc, "+", 1);
- return 0;
- }
+ memcpy (*buffer, string, len);
+ *buffer += len;
+ *left -= len;
- /* Try the whole thing again. */
- retry:
- serial_write (remote_desc, "-", 1);
- }
+ /* NUL-terminate the buffer as a convenience, if there is
+ room. */
+ if (*left)
+ **buffer = '\0';
+}
- /* We have tried hard enough, and just can't receive the packet. Give up. */
+/* If *LEFT is large enough, hex encode LEN bytes from BYTES into
+ *BUFFER, update *BUFFER to point to the new end of the buffer, and
+ decrease *LEFT. Otherwise raise an error. */
- printf_unfiltered ("Ignoring packet error, continuing...\n");
- serial_write (remote_desc, "+", 1);
- return 1;
-}
-\f
static void
-remote_kill (void)
+remote_buffer_add_bytes (char **buffer, int *left, const gdb_byte *bytes,
+ int len)
{
- /* For some mysterious reason, wait_for_inferior calls kill instead of
- mourn after it gets TARGET_WAITKIND_SIGNALLED. Work around it. */
- if (kill_kludge)
- {
- kill_kludge = 0;
- target_mourn_inferior ();
- return;
- }
+ if (2 * len > *left)
+ error (_("Packet too long for target."));
- /* 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);
+ bin2hex (bytes, *buffer, len);
+ *buffer += 2 * len;
+ *left -= 2 * len;
- /* Don't wait for it to die. I'm not really sure it matters whether
- we do or not. For the existing stubs, kill is a noop. */
- target_mourn_inferior ();
+ /* NUL-terminate the buffer as a convenience, if there is
+ room. */
+ if (*left)
+ **buffer = '\0';
}
-/* Async version of remote_kill. */
+/* If *LEFT is large enough, convert VALUE to hex and add it to
+ *BUFFER, update *BUFFER to point to the new end of the buffer, and
+ decrease *LEFT. Otherwise raise an error. */
+
static void
-remote_async_kill (void)
+remote_buffer_add_int (char **buffer, int *left, ULONGEST value)
{
- /* Unregister the file descriptor from the event loop. */
- if (target_is_async_p ())
- serial_async (remote_desc, NULL, 0);
+ int len = hexnumlen (value);
- /* For some mysterious reason, wait_for_inferior calls kill instead of
- mourn after it gets TARGET_WAITKIND_SIGNALLED. Work around it. */
- if (kill_kludge)
- {
- kill_kludge = 0;
- target_mourn_inferior ();
- return;
- }
+ if (len > *left)
+ error (_("Packet too long for target."));
- /* 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);
+ hexnumstr (*buffer, value);
+ *buffer += len;
+ *left -= len;
- /* Don't wait for it to die. I'm not really sure it matters whether
- we do or not. For the existing stubs, kill is a noop. */
- target_mourn_inferior ();
+ /* NUL-terminate the buffer as a convenience, if there is
+ room. */
+ if (*left)
+ **buffer = '\0';
}
-static void
-remote_mourn (void)
-{
- remote_mourn_1 (&remote_ops);
-}
+/* Parse an I/O result packet from BUFFER. Set RETCODE to the return
+ value, *REMOTE_ERRNO to the remote error number or zero if none
+ was included, and *ATTACHMENT to point to the start of the annex
+ if any. The length of the packet isn't needed here; there may
+ be NUL bytes in BUFFER, but they will be after *ATTACHMENT.
-static void
-remote_async_mourn (void)
-{
- remote_mourn_1 (&remote_async_ops);
-}
+ Return 0 if the packet could be parsed, -1 if it could not. If
+ -1 is returned, the other variables may not be initialized. */
-static void
-extended_remote_mourn (void)
+static int
+remote_hostio_parse_result (char *buffer, int *retcode,
+ int *remote_errno, char **attachment)
{
- /* We do _not_ want to mourn the target like this; this will
- remove the extended remote target from the target stack,
- and the next time the user says "run" it'll fail.
+ char *p, *p2;
- FIXME: What is the right thing to do here? */
-#if 0
- remote_mourn_1 (&extended_remote_ops);
-#endif
+ *remote_errno = 0;
+ *attachment = NULL;
+
+ if (buffer[0] != 'F')
+ return -1;
+
+ errno = 0;
+ *retcode = strtol (&buffer[1], &p, 16);
+ if (errno != 0 || p == &buffer[1])
+ return -1;
+
+ /* Check for ",errno". */
+ if (*p == ',')
+ {
+ errno = 0;
+ *remote_errno = strtol (p + 1, &p2, 16);
+ if (errno != 0 || p + 1 == p2)
+ return -1;
+ p = p2;
+ }
+
+ /* Check for ";attachment". If there is no attachment, the
+ packet should end here. */
+ if (*p == ';')
+ {
+ *attachment = p + 1;
+ return 0;
+ }
+ else if (*p == '\0')
+ return 0;
+ else
+ return -1;
}
-/* Worker function for remote_mourn. */
-static void
-remote_mourn_1 (struct target_ops *target)
+/* Send a prepared I/O packet to the target and read its response.
+ The prepared packet is in the global RS->BUF before this function
+ is called, and the answer is there when we return.
+
+ COMMAND_BYTES is the length of the request to send, which may include
+ binary data. WHICH_PACKET is the packet configuration to check
+ before attempting a packet. If an error occurs, *REMOTE_ERRNO
+ is set to the error number and -1 is returned. Otherwise the value
+ returned by the function is returned.
+
+ ATTACHMENT and ATTACHMENT_LEN should be non-NULL if and only if an
+ attachment is expected; an error will be reported if there's a
+ mismatch. If one is found, *ATTACHMENT will be set to point into
+ the packet buffer and *ATTACHMENT_LEN will be set to the
+ attachment's length. */
+
+static int
+remote_hostio_send_command (int command_bytes, int which_packet,
+ int *remote_errno, char **attachment,
+ int *attachment_len)
{
- unpush_target (target);
- generic_mourn_inferior ();
-}
+ struct remote_state *rs = get_remote_state ();
+ int ret, bytes_read;
+ char *attachment_tmp;
+
+ if (!remote_desc
+ || remote_protocol_packets[which_packet].support == PACKET_DISABLE)
+ {
+ *remote_errno = FILEIO_ENOSYS;
+ return -1;
+ }
-/* In the extended protocol we want to be able to do things like
- "run" and have them basically work as expected. So we need
- a special create_inferior function.
+ putpkt_binary (rs->buf, command_bytes);
+ bytes_read = getpkt_sane (&rs->buf, &rs->buf_size, 0);
- FIXME: One day add support for changing the exec file
- we're debugging, arguments and an environment. */
+ /* If it timed out, something is wrong. Don't try to parse the
+ buffer. */
+ if (bytes_read < 0)
+ {
+ *remote_errno = FILEIO_EINVAL;
+ return -1;
+ }
-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. */
- remove_breakpoints ();
+ switch (packet_ok (rs->buf, &remote_protocol_packets[which_packet]))
+ {
+ case PACKET_ERROR:
+ *remote_errno = FILEIO_EINVAL;
+ return -1;
+ case PACKET_UNKNOWN:
+ *remote_errno = FILEIO_ENOSYS;
+ return -1;
+ case PACKET_OK:
+ break;
+ }
- /* Now restart the remote server. */
- extended_remote_restart ();
+ if (remote_hostio_parse_result (rs->buf, &ret, remote_errno,
+ &attachment_tmp))
+ {
+ *remote_errno = FILEIO_EINVAL;
+ return -1;
+ }
- /* Now put the breakpoints back in. This way we're safe if the
- restart function works via a unix fork on the remote side. */
- insert_breakpoints ();
+ /* Make sure we saw an attachment if and only if we expected one. */
+ if ((attachment_tmp == NULL && attachment != NULL)
+ || (attachment_tmp != NULL && attachment == NULL))
+ {
+ *remote_errno = FILEIO_EINVAL;
+ return -1;
+ }
- /* Clean up from the last time we were running. */
- clear_proceed_status ();
+ /* If an attachment was found, it must point into the packet buffer;
+ work out how many bytes there were. */
+ if (attachment_tmp != NULL)
+ {
+ *attachment = attachment_tmp;
+ *attachment_len = bytes_read - (*attachment - rs->buf);
+ }
- /* Let the remote process run. */
- proceed (-1, TARGET_SIGNAL_0, 0);
+ return ret;
}
-/* Async version of extended_remote_create_inferior. */
-static void
-extended_remote_async_create_inferior (char *exec_file, char *args, char **env,
- int from_tty)
+/* Open FILENAME on the remote target, using FLAGS and MODE. Return a
+ remote file descriptor, or -1 if an error occurs (and set
+ *REMOTE_ERRNO). */
+
+static int
+remote_hostio_open (const char *filename, int flags, int mode,
+ int *remote_errno)
{
- /* Rip out the breakpoints; we'll reinsert them after restarting
- the remote server. */
- remove_breakpoints ();
+ struct remote_state *rs = get_remote_state ();
+ char *p = rs->buf;
+ int left = get_remote_packet_size () - 1;
- /* If running asynchronously, register the target file descriptor
- with the event loop. */
- if (target_can_async_p ())
- target_async (inferior_event_handler, 0);
+ remote_buffer_add_string (&p, &left, "vFile:open:");
- /* Now restart the remote server. */
- extended_remote_restart ();
+ remote_buffer_add_bytes (&p, &left, (const gdb_byte *) filename,
+ strlen (filename));
+ remote_buffer_add_string (&p, &left, ",");
- /* Now put the breakpoints back in. This way we're safe if the
- restart function works via a unix fork on the remote side. */
- insert_breakpoints ();
+ remote_buffer_add_int (&p, &left, flags);
+ remote_buffer_add_string (&p, &left, ",");
- /* Clean up from the last time we were running. */
- clear_proceed_status ();
+ remote_buffer_add_int (&p, &left, mode);
- /* Let the remote process run. */
- proceed (-1, TARGET_SIGNAL_0, 0);
+ return remote_hostio_send_command (p - rs->buf, PACKET_vFile_open,
+ remote_errno, NULL, NULL);
}
-\f
-/* On some machines, e.g. 68k, we may use a different breakpoint
- instruction than other targets; in those use
- DEPRECATED_REMOTE_BREAKPOINT instead of just BREAKPOINT_FROM_PC.
- Also, bi-endian targets may define
- DEPRECATED_LITTLE_REMOTE_BREAKPOINT and
- DEPRECATED_BIG_REMOTE_BREAKPOINT. If none of these are defined, we
- just call the standard routines that are in mem-break.c. */
+/* Write up to LEN bytes from WRITE_BUF to FD on the remote target.
+ Return the number of bytes written, or -1 if an error occurs (and
+ set *REMOTE_ERRNO). */
-/* NOTE: cagney/2003-06-08: This is silly. A remote and simulator
- target should use an identical BREAKPOINT_FROM_PC. As for native,
- the ARCH-OS-tdep.c code can override the default. */
+static int
+remote_hostio_pwrite (int fd, const gdb_byte *write_buf, int len,
+ ULONGEST offset, int *remote_errno)
+{
+ struct remote_state *rs = get_remote_state ();
+ char *p = rs->buf;
+ int left = get_remote_packet_size ();
+ int out_len;
-#if defined (DEPRECATED_LITTLE_REMOTE_BREAKPOINT) && defined (DEPRECATED_BIG_REMOTE_BREAKPOINT) && !defined(DEPRECATED_REMOTE_BREAKPOINT)
-#define DEPRECATED_REMOTE_BREAKPOINT
-#endif
+ remote_buffer_add_string (&p, &left, "vFile:pwrite:");
-#ifdef DEPRECATED_REMOTE_BREAKPOINT
+ remote_buffer_add_int (&p, &left, fd);
+ remote_buffer_add_string (&p, &left, ",");
-/* If the target isn't bi-endian, just pretend it is. */
-#if !defined (DEPRECATED_LITTLE_REMOTE_BREAKPOINT) && !defined (DEPRECATED_BIG_REMOTE_BREAKPOINT)
-#define DEPRECATED_LITTLE_REMOTE_BREAKPOINT DEPRECATED_REMOTE_BREAKPOINT
-#define DEPRECATED_BIG_REMOTE_BREAKPOINT DEPRECATED_REMOTE_BREAKPOINT
-#endif
+ remote_buffer_add_int (&p, &left, offset);
+ remote_buffer_add_string (&p, &left, ",");
-static unsigned char big_break_insn[] = DEPRECATED_BIG_REMOTE_BREAKPOINT;
-static unsigned char little_break_insn[] = DEPRECATED_LITTLE_REMOTE_BREAKPOINT;
+ p += remote_escape_output (write_buf, len, p, &out_len,
+ get_remote_packet_size () - (p - rs->buf));
-#endif /* DEPRECATED_REMOTE_BREAKPOINT */
+ return remote_hostio_send_command (p - rs->buf, PACKET_vFile_pwrite,
+ remote_errno, NULL, NULL);
+}
-/* Insert a breakpoint on targets that don't have any better
- breakpoint support. We read the contents of the target location
- and stash it, then overwrite it with a breakpoint instruction.
- ADDR is the target location in the target machine. CONTENTS_CACHE
- is a pointer to memory allocated for saving the target contents.
- It is guaranteed by the caller to be long enough to save the number
- of bytes returned by BREAKPOINT_FROM_PC. */
+/* Read up to LEN bytes FD on the remote target into READ_BUF
+ Return the number of bytes read, or -1 if an error occurs (and
+ set *REMOTE_ERRNO). */
static int
-remote_insert_breakpoint (CORE_ADDR addr, char *contents_cache)
+remote_hostio_pread (int fd, gdb_byte *read_buf, int len,
+ ULONGEST offset, int *remote_errno)
{
struct remote_state *rs = get_remote_state ();
-#ifdef DEPRECATED_REMOTE_BREAKPOINT
- int val;
-#endif
- int bp_size;
+ char *p = rs->buf;
+ char *attachment;
+ int left = get_remote_packet_size ();
+ int ret, attachment_len;
+ int read_len;
- /* 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. */
+ remote_buffer_add_string (&p, &left, "vFile:pread:");
- if (remote_protocol_Z[Z_PACKET_SOFTWARE_BP].support != PACKET_DISABLE)
- {
- char *buf = alloca (rs->remote_packet_size);
- char *p = buf;
+ remote_buffer_add_int (&p, &left, fd);
+ remote_buffer_add_string (&p, &left, ",");
- addr = remote_address_masked (addr);
- *(p++) = 'Z';
- *(p++) = '0';
- *(p++) = ',';
- p += hexnumstr (p, (ULONGEST) addr);
- BREAKPOINT_FROM_PC (&addr, &bp_size);
- sprintf (p, ",%d", bp_size);
+ remote_buffer_add_int (&p, &left, len);
+ remote_buffer_add_string (&p, &left, ",");
- putpkt (buf);
- getpkt (buf, (rs->remote_packet_size), 0);
+ remote_buffer_add_int (&p, &left, offset);
- switch (packet_ok (buf, &remote_protocol_Z[Z_PACKET_SOFTWARE_BP]))
- {
- case PACKET_ERROR:
- return -1;
- case PACKET_OK:
- return 0;
- case PACKET_UNKNOWN:
- break;
- }
- }
+ ret = remote_hostio_send_command (p - rs->buf, PACKET_vFile_pread,
+ remote_errno, &attachment,
+ &attachment_len);
-#ifdef DEPRECATED_REMOTE_BREAKPOINT
- val = target_read_memory (addr, contents_cache, sizeof big_break_insn);
+ if (ret < 0)
+ return ret;
- if (val == 0)
- {
- if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG)
- val = target_write_memory (addr, (char *) big_break_insn,
- sizeof big_break_insn);
- else
- val = target_write_memory (addr, (char *) little_break_insn,
- sizeof little_break_insn);
- }
+ read_len = remote_unescape_input (attachment, attachment_len,
+ read_buf, len);
+ if (read_len != ret)
+ error (_("Read returned %d, but %d bytes."), ret, (int) read_len);
- return val;
-#else
- return memory_insert_breakpoint (addr, contents_cache);
-#endif /* DEPRECATED_REMOTE_BREAKPOINT */
+ return ret;
}
+/* Close FD on the remote target. Return 0, or -1 if an error occurs
+ (and set *REMOTE_ERRNO). */
+
static int
-remote_remove_breakpoint (CORE_ADDR addr, char *contents_cache)
+remote_hostio_close (int fd, int *remote_errno)
{
struct remote_state *rs = get_remote_state ();
- int bp_size;
+ char *p = rs->buf;
+ int left = get_remote_packet_size () - 1;
- if (remote_protocol_Z[Z_PACKET_SOFTWARE_BP].support != PACKET_DISABLE)
- {
- char *buf = alloca (rs->remote_packet_size);
- char *p = buf;
+ remote_buffer_add_string (&p, &left, "vFile:close:");
- *(p++) = 'z';
- *(p++) = '0';
- *(p++) = ',';
+ remote_buffer_add_int (&p, &left, fd);
- addr = remote_address_masked (addr);
- p += hexnumstr (p, (ULONGEST) addr);
- BREAKPOINT_FROM_PC (&addr, &bp_size);
- sprintf (p, ",%d", bp_size);
+ return remote_hostio_send_command (p - rs->buf, PACKET_vFile_close,
+ remote_errno, NULL, NULL);
+}
- putpkt (buf);
- getpkt (buf, (rs->remote_packet_size), 0);
+/* Unlink FILENAME on the remote target. Return 0, or -1 if an error
+ occurs (and set *REMOTE_ERRNO). */
- return (buf[0] == 'E');
- }
+static int
+remote_hostio_unlink (const char *filename, int *remote_errno)
+{
+ struct remote_state *rs = get_remote_state ();
+ char *p = rs->buf;
+ int left = get_remote_packet_size () - 1;
-#ifdef DEPRECATED_REMOTE_BREAKPOINT
- return target_write_memory (addr, contents_cache, sizeof big_break_insn);
-#else
- return memory_remove_breakpoint (addr, contents_cache);
-#endif /* DEPRECATED_REMOTE_BREAKPOINT */
+ remote_buffer_add_string (&p, &left, "vFile:unlink:");
+
+ remote_buffer_add_bytes (&p, &left, (const gdb_byte *) filename,
+ strlen (filename));
+
+ return remote_hostio_send_command (p - rs->buf, PACKET_vFile_unlink,
+ remote_errno, NULL, NULL);
}
static int
-watchpoint_to_Z_packet (int type)
+remote_fileio_errno_to_host (int errnum)
{
- switch (type)
+ switch (errnum)
{
- case hw_write:
- return 2;
- break;
- case hw_read:
- return 3;
- break;
- case hw_access:
- return 4;
- break;
- default:
- internal_error (__FILE__, __LINE__,
- "hw_bp_to_z: bad watchpoint type %d", type);
+ case FILEIO_EPERM:
+ return EPERM;
+ case FILEIO_ENOENT:
+ return ENOENT;
+ case FILEIO_EINTR:
+ return EINTR;
+ case FILEIO_EIO:
+ return EIO;
+ case FILEIO_EBADF:
+ return EBADF;
+ case FILEIO_EACCES:
+ return EACCES;
+ case FILEIO_EFAULT:
+ return EFAULT;
+ case FILEIO_EBUSY:
+ return EBUSY;
+ case FILEIO_EEXIST:
+ return EEXIST;
+ case FILEIO_ENODEV:
+ return ENODEV;
+ case FILEIO_ENOTDIR:
+ return ENOTDIR;
+ case FILEIO_EISDIR:
+ return EISDIR;
+ case FILEIO_EINVAL:
+ return EINVAL;
+ case FILEIO_ENFILE:
+ return ENFILE;
+ case FILEIO_EMFILE:
+ return EMFILE;
+ case FILEIO_EFBIG:
+ return EFBIG;
+ case FILEIO_ENOSPC:
+ return ENOSPC;
+ case FILEIO_ESPIPE:
+ return ESPIPE;
+ case FILEIO_EROFS:
+ return EROFS;
+ case FILEIO_ENOSYS:
+ return ENOSYS;
+ case FILEIO_ENAMETOOLONG:
+ return ENAMETOOLONG;
}
+ return -1;
}
-static int
-remote_insert_watchpoint (CORE_ADDR addr, int len, int type)
+static char *
+remote_hostio_error (int errnum)
{
- struct remote_state *rs = get_remote_state ();
- char *buf = alloca (rs->remote_packet_size);
- char *p;
- enum Z_packet_type packet = watchpoint_to_Z_packet (type);
+ int host_error = remote_fileio_errno_to_host (errnum);
- if (remote_protocol_Z[packet].support == PACKET_DISABLE)
- error ("Can't set hardware watchpoints without the '%s' (%s) packet\n",
- remote_protocol_Z[packet].name,
- remote_protocol_Z[packet].title);
-
- sprintf (buf, "Z%x,", packet);
- p = strchr (buf, '\0');
- addr = remote_address_masked (addr);
- p += hexnumstr (p, (ULONGEST) addr);
- sprintf (p, ",%x", len);
+ if (host_error == -1)
+ error (_("Unknown remote I/O error %d"), errnum);
+ else
+ error (_("Remote I/O error: %s"), safe_strerror (host_error));
+}
- putpkt (buf);
- getpkt (buf, (rs->remote_packet_size), 0);
+static void
+remote_hostio_close_cleanup (void *opaque)
+{
+ int fd = *(int *) opaque;
+ int remote_errno;
- switch (packet_ok (buf, &remote_protocol_Z[packet]))
- {
- case PACKET_ERROR:
- case PACKET_UNKNOWN:
- return -1;
- case PACKET_OK:
- return 0;
- }
- internal_error (__FILE__, __LINE__,
- "remote_insert_watchpoint: reached end of function");
+ remote_hostio_close (fd, &remote_errno);
}
-static int
-remote_remove_watchpoint (CORE_ADDR addr, int len, int type)
+static void *
+remote_bfd_iovec_open (struct bfd *abfd, void *open_closure)
{
- struct remote_state *rs = get_remote_state ();
- char *buf = alloca (rs->remote_packet_size);
- char *p;
- enum Z_packet_type packet = watchpoint_to_Z_packet (type);
+ const char *filename = bfd_get_filename (abfd);
+ int fd, remote_errno;
+ int *stream;
- if (remote_protocol_Z[packet].support == PACKET_DISABLE)
- error ("Can't clear hardware watchpoints without the '%s' (%s) packet\n",
- remote_protocol_Z[packet].name,
- remote_protocol_Z[packet].title);
-
- sprintf (buf, "z%x,", packet);
- p = strchr (buf, '\0');
- addr = remote_address_masked (addr);
- p += hexnumstr (p, (ULONGEST) addr);
- sprintf (p, ",%x", len);
- putpkt (buf);
- getpkt (buf, (rs->remote_packet_size), 0);
+ gdb_assert (remote_filename_p (filename));
- switch (packet_ok (buf, &remote_protocol_Z[packet]))
+ fd = remote_hostio_open (filename + 7, FILEIO_O_RDONLY, 0, &remote_errno);
+ if (fd == -1)
{
- case PACKET_ERROR:
- case PACKET_UNKNOWN:
- return -1;
- case PACKET_OK:
- return 0;
+ errno = remote_fileio_errno_to_host (remote_errno);
+ bfd_set_error (bfd_error_system_call);
+ return NULL;
}
- internal_error (__FILE__, __LINE__,
- "remote_remove_watchpoint: reached end of function");
+
+ stream = xmalloc (sizeof (int));
+ *stream = fd;
+ return stream;
}
+static int
+remote_bfd_iovec_close (struct bfd *abfd, void *stream)
+{
+ int fd = *(int *)stream;
+ int remote_errno;
+
+ xfree (stream);
-int remote_hw_watchpoint_limit = -1;
-int remote_hw_breakpoint_limit = -1;
+ /* Ignore errors on close; these may happen if the remote
+ connection was already torn down. */
+ remote_hostio_close (fd, &remote_errno);
-static int
-remote_check_watch_resources (int type, int cnt, int ot)
+ return 1;
+}
+
+static file_ptr
+remote_bfd_iovec_pread (struct bfd *abfd, void *stream, void *buf,
+ file_ptr nbytes, file_ptr offset)
{
- if (type == bp_hardware_breakpoint)
- {
- if (remote_hw_breakpoint_limit == 0)
- return 0;
- else if (remote_hw_breakpoint_limit < 0)
- return 1;
- else if (cnt <= remote_hw_breakpoint_limit)
- return 1;
- }
- else
+ int fd = *(int *)stream;
+ int remote_errno;
+ file_ptr pos, bytes;
+
+ pos = 0;
+ while (nbytes > pos)
{
- if (remote_hw_watchpoint_limit == 0)
- return 0;
- else if (remote_hw_watchpoint_limit < 0)
- return 1;
- else if (ot)
- return -1;
- else if (cnt <= remote_hw_watchpoint_limit)
- return 1;
+ bytes = remote_hostio_pread (fd, (char *)buf + pos, nbytes - pos,
+ offset + pos, &remote_errno);
+ if (bytes == 0)
+ /* Success, but no bytes, means end-of-file. */
+ break;
+ if (bytes == -1)
+ {
+ errno = remote_fileio_errno_to_host (remote_errno);
+ bfd_set_error (bfd_error_system_call);
+ return -1;
+ }
+
+ pos += bytes;
}
- return -1;
+
+ return pos;
}
static int
-remote_stopped_by_watchpoint (void)
+remote_bfd_iovec_stat (struct bfd *abfd, void *stream, struct stat *sb)
{
- return remote_stopped_by_watchpoint_p;
+ /* FIXME: We should probably implement remote_hostio_stat. */
+ sb->st_size = INT_MAX;
+ return 0;
}
-extern int stepped_after_stopped_by_watchpoint;
+int
+remote_filename_p (const char *filename)
+{
+ return strncmp (filename, "remote:", 7) == 0;
+}
-static int
-remote_stopped_data_address (struct target_ops *target, CORE_ADDR *addr_p)
+bfd *
+remote_bfd_open (const char *remote_file, const char *target)
{
- int rc = 0;
- if (remote_stopped_by_watchpoint ()
- || stepped_after_stopped_by_watchpoint)
+ return bfd_openr_iovec (remote_file, target,
+ remote_bfd_iovec_open, NULL,
+ remote_bfd_iovec_pread,
+ remote_bfd_iovec_close,
+ remote_bfd_iovec_stat);
+}
+
+void
+remote_file_put (const char *local_file, const char *remote_file, int from_tty)
+{
+ struct cleanup *back_to, *close_cleanup;
+ int retcode, fd, remote_errno, bytes, io_size;
+ FILE *file;
+ gdb_byte *buffer;
+ int bytes_in_buffer;
+ int saw_eof;
+ ULONGEST offset;
+
+ if (!remote_desc)
+ error (_("command can only be used with remote target"));
+
+ file = fopen (local_file, "rb");
+ if (file == NULL)
+ perror_with_name (local_file);
+ back_to = make_cleanup_fclose (file);
+
+ fd = remote_hostio_open (remote_file, (FILEIO_O_WRONLY | FILEIO_O_CREAT
+ | FILEIO_O_TRUNC),
+ 0700, &remote_errno);
+ if (fd == -1)
+ remote_hostio_error (remote_errno);
+
+ /* Send up to this many bytes at once. They won't all fit in the
+ remote packet limit, so we'll transfer slightly fewer. */
+ io_size = get_remote_packet_size ();
+ buffer = xmalloc (io_size);
+ make_cleanup (xfree, buffer);
+
+ close_cleanup = make_cleanup (remote_hostio_close_cleanup, &fd);
+
+ bytes_in_buffer = 0;
+ saw_eof = 0;
+ offset = 0;
+ while (bytes_in_buffer || !saw_eof)
{
- *addr_p = remote_watch_data_address;
- rc = 1;
+ if (!saw_eof)
+ {
+ bytes = fread (buffer + bytes_in_buffer, 1,
+ io_size - bytes_in_buffer,
+ file);
+ if (bytes == 0)
+ {
+ if (ferror (file))
+ error (_("Error reading %s."), local_file);
+ else
+ {
+ /* EOF. Unless there is something still in the
+ buffer from the last iteration, we are done. */
+ saw_eof = 1;
+ if (bytes_in_buffer == 0)
+ break;
+ }
+ }
+ }
+ else
+ bytes = 0;
+
+ bytes += bytes_in_buffer;
+ bytes_in_buffer = 0;
+
+ retcode = remote_hostio_pwrite (fd, buffer, bytes,
+ offset, &remote_errno);
+
+ if (retcode < 0)
+ remote_hostio_error (remote_errno);
+ else if (retcode == 0)
+ error (_("Remote write of %d bytes returned 0!"), bytes);
+ else if (retcode < bytes)
+ {
+ /* Short write. Save the rest of the read data for the next
+ write. */
+ bytes_in_buffer = bytes - retcode;
+ memmove (buffer, buffer + retcode, bytes_in_buffer);
+ }
+
+ offset += retcode;
}
- return rc;
-}
+ discard_cleanups (close_cleanup);
+ if (remote_hostio_close (fd, &remote_errno))
+ remote_hostio_error (remote_errno);
+ if (from_tty)
+ printf_filtered (_("Successfully sent file \"%s\".\n"), local_file);
+ do_cleanups (back_to);
+}
-static int
-remote_insert_hw_breakpoint (CORE_ADDR addr, char *shadow)
+void
+remote_file_get (const char *remote_file, const char *local_file, int from_tty)
{
- int len = 0;
- struct remote_state *rs = get_remote_state ();
- char *buf = alloca (rs->remote_packet_size);
- char *p = buf;
-
- /* The length field should be set to the size of a breakpoint
- instruction. */
+ struct cleanup *back_to, *close_cleanup;
+ int fd, remote_errno, bytes, io_size;
+ FILE *file;
+ gdb_byte *buffer;
+ ULONGEST offset;
- BREAKPOINT_FROM_PC (&addr, &len);
+ if (!remote_desc)
+ error (_("command can only be used with remote target"));
- if (remote_protocol_Z[Z_PACKET_HARDWARE_BP].support == PACKET_DISABLE)
- error ("Can't set hardware breakpoint without the '%s' (%s) packet\n",
- remote_protocol_Z[Z_PACKET_HARDWARE_BP].name,
- remote_protocol_Z[Z_PACKET_HARDWARE_BP].title);
+ fd = remote_hostio_open (remote_file, FILEIO_O_RDONLY, 0, &remote_errno);
+ if (fd == -1)
+ remote_hostio_error (remote_errno);
- *(p++) = 'Z';
- *(p++) = '1';
- *(p++) = ',';
+ file = fopen (local_file, "wb");
+ if (file == NULL)
+ perror_with_name (local_file);
+ back_to = make_cleanup_fclose (file);
- addr = remote_address_masked (addr);
- p += hexnumstr (p, (ULONGEST) addr);
- sprintf (p, ",%x", len);
+ /* Send up to this many bytes at once. They won't all fit in the
+ remote packet limit, so we'll transfer slightly fewer. */
+ io_size = get_remote_packet_size ();
+ buffer = xmalloc (io_size);
+ make_cleanup (xfree, buffer);
- putpkt (buf);
- getpkt (buf, (rs->remote_packet_size), 0);
+ close_cleanup = make_cleanup (remote_hostio_close_cleanup, &fd);
- switch (packet_ok (buf, &remote_protocol_Z[Z_PACKET_HARDWARE_BP]))
+ offset = 0;
+ while (1)
{
- case PACKET_ERROR:
- case PACKET_UNKNOWN:
- return -1;
- case PACKET_OK:
- return 0;
+ bytes = remote_hostio_pread (fd, buffer, io_size, offset, &remote_errno);
+ if (bytes == 0)
+ /* Success, but no bytes, means end-of-file. */
+ break;
+ if (bytes == -1)
+ remote_hostio_error (remote_errno);
+
+ offset += bytes;
+
+ bytes = fwrite (buffer, 1, bytes, file);
+ if (bytes == 0)
+ perror_with_name (local_file);
}
- internal_error (__FILE__, __LINE__,
- "remote_insert_hw_breakpoint: reached end of function");
+
+ discard_cleanups (close_cleanup);
+ if (remote_hostio_close (fd, &remote_errno))
+ remote_hostio_error (remote_errno);
+
+ if (from_tty)
+ printf_filtered (_("Successfully fetched file \"%s\".\n"), remote_file);
+ do_cleanups (back_to);
}
+void
+remote_file_delete (const char *remote_file, int from_tty)
+{
+ int retcode, remote_errno;
-static int
-remote_remove_hw_breakpoint (CORE_ADDR addr, char *shadow)
+ if (!remote_desc)
+ error (_("command can only be used with remote target"));
+
+ retcode = remote_hostio_unlink (remote_file, &remote_errno);
+ if (retcode == -1)
+ remote_hostio_error (remote_errno);
+
+ if (from_tty)
+ printf_filtered (_("Successfully deleted file \"%s\".\n"), remote_file);
+}
+
+static void
+remote_put_command (char *args, int from_tty)
{
- int len;
- struct remote_state *rs = get_remote_state ();
- char *buf = alloca (rs->remote_packet_size);
- char *p = buf;
+ struct cleanup *back_to;
+ char **argv;
- /* The length field should be set to the size of a breakpoint
- instruction. */
+ if (args == NULL)
+ error_no_arg (_("file to put"));
- BREAKPOINT_FROM_PC (&addr, &len);
+ argv = gdb_buildargv (args);
+ back_to = make_cleanup_freeargv (argv);
+ if (argv[0] == NULL || argv[1] == NULL || argv[2] != NULL)
+ error (_("Invalid parameters to remote put"));
- if (remote_protocol_Z[Z_PACKET_HARDWARE_BP].support == PACKET_DISABLE)
- error ("Can't clear hardware breakpoint without the '%s' (%s) packet\n",
- remote_protocol_Z[Z_PACKET_HARDWARE_BP].name,
- remote_protocol_Z[Z_PACKET_HARDWARE_BP].title);
+ remote_file_put (argv[0], argv[1], from_tty);
- *(p++) = 'z';
- *(p++) = '1';
- *(p++) = ',';
+ do_cleanups (back_to);
+}
- addr = remote_address_masked (addr);
- p += hexnumstr (p, (ULONGEST) addr);
- sprintf (p, ",%x", len);
+static void
+remote_get_command (char *args, int from_tty)
+{
+ struct cleanup *back_to;
+ char **argv;
- putpkt(buf);
- getpkt (buf, (rs->remote_packet_size), 0);
+ if (args == NULL)
+ error_no_arg (_("file to get"));
- switch (packet_ok (buf, &remote_protocol_Z[Z_PACKET_HARDWARE_BP]))
- {
- case PACKET_ERROR:
- case PACKET_UNKNOWN:
- return -1;
- case PACKET_OK:
- return 0;
- }
- internal_error (__FILE__, __LINE__,
- "remote_remove_hw_breakpoint: reached end of function");
+ argv = gdb_buildargv (args);
+ back_to = make_cleanup_freeargv (argv);
+ if (argv[0] == NULL || argv[1] == NULL || argv[2] != NULL)
+ error (_("Invalid parameters to remote get"));
+
+ remote_file_get (argv[0], argv[1], from_tty);
+
+ do_cleanups (back_to);
}
-/* Some targets are only capable of doing downloads, and afterwards
- they switch to the remote serial protocol. This function provides
- a clean way to get from the download target to the remote target.
- It's basically just a wrapper so that we don't have to expose any
- of the internal workings of remote.c.
+static void
+remote_delete_command (char *args, int from_tty)
+{
+ struct cleanup *back_to;
+ char **argv;
- Prior to calling this routine, you should shutdown the current
- target code, else you will get the "A program is being debugged
- already..." message. Usually a call to pop_target() suffices. */
+ if (args == NULL)
+ error_no_arg (_("file to delete"));
-void
-push_remote_target (char *name, int from_tty)
-{
- printf_filtered ("Switching to remote protocol\n");
- remote_open (name, from_tty);
-}
+ argv = gdb_buildargv (args);
+ back_to = make_cleanup_freeargv (argv);
+ if (argv[0] == NULL || argv[1] != NULL)
+ error (_("Invalid parameters to remote delete"));
-/* Table used by the crc32 function to calcuate the checksum. */
+ remote_file_delete (argv[0], from_tty);
-static unsigned long crc32_table[256] =
-{0, 0};
+ do_cleanups (back_to);
+}
-static unsigned long
-crc32 (unsigned char *buf, int len, unsigned int crc)
+static void
+remote_command (char *args, int from_tty)
{
- if (!crc32_table[1])
- {
- /* Initialize the CRC table and the decoding table. */
- int i, j;
- unsigned int c;
+ help_list (remote_cmdlist, "remote ", -1, gdb_stdout);
+}
- for (i = 0; i < 256; i++)
- {
- for (c = i << 24, j = 8; j > 0; --j)
- c = c & 0x80000000 ? (c << 1) ^ 0x04c11db7 : (c << 1);
- crc32_table[i] = c;
- }
- }
+static int
+remote_can_execute_reverse (void)
+{
+ if (remote_protocol_packets[PACKET_bs].support == PACKET_ENABLE
+ || remote_protocol_packets[PACKET_bc].support == PACKET_ENABLE)
+ return 1;
+ else
+ return 0;
+}
- while (len--)
- {
- crc = (crc << 8) ^ crc32_table[((crc >> 24) ^ *buf) & 255];
- buf++;
- }
- return crc;
+static int
+remote_supports_non_stop (void)
+{
+ return 1;
}
-/* compare-sections command
+static int
+remote_supports_multi_process (void)
+{
+ struct remote_state *rs = get_remote_state ();
- With no arguments, compares each loadable section in the exec bfd
- with the same memory range on the target, and reports mismatches.
- Useful for verifying the image on the target against the exec file.
- Depends on the target understanding the new "qCRC:" request. */
+ return remote_multi_process_p (rs);
+}
+
+int
+remote_supports_cond_tracepoints (void)
+{
+ struct remote_state *rs = get_remote_state ();
-/* 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. */
+ return rs->cond_tracepoints;
+}
-static void
-compare_sections_command (char *args, int from_tty)
+int
+remote_supports_fast_tracepoints (void)
{
struct remote_state *rs = get_remote_state ();
- asection *s;
- unsigned long host_crc, target_crc;
- extern bfd *exec_bfd;
- struct cleanup *old_chain;
- char *tmp;
- char *sectdata;
- const char *sectname;
- char *buf = alloca (rs->remote_packet_size);
- bfd_size_type size;
- bfd_vma lma;
- int matched = 0;
- int mismatched = 0;
- if (!exec_bfd)
- error ("command cannot be used without an exec file");
- if (!current_target.to_shortname ||
- strcmp (current_target.to_shortname, "remote") != 0)
- error ("command can only be used with remote target");
+ return rs->fast_tracepoints;
+}
- for (s = exec_bfd->sections; s; s = s->next)
- {
- if (!(s->flags & SEC_LOAD))
- continue; /* skip non-loadable section */
+static int
+remote_supports_static_tracepoints (void)
+{
+ struct remote_state *rs = get_remote_state ();
- size = bfd_get_section_size (s);
- if (size == 0)
- continue; /* skip zero-length section */
+ return rs->static_tracepoints;
+}
- sectname = bfd_get_section_name (exec_bfd, s);
- if (args && strcmp (args, sectname) != 0)
- continue; /* not the section selected by user */
+static int
+remote_supports_enable_disable_tracepoint (void)
+{
+ struct remote_state *rs = get_remote_state ();
- 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);
+ return rs->enable_disable_tracepoints;
+}
- /* 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);
- host_crc = crc32 ((unsigned char *) sectdata, size, 0xffffffff);
+static void
+remote_trace_init (void)
+{
+ putpkt ("QTinit");
+ remote_get_noisy_reply (&target_buf, &target_buf_size);
+ if (strcmp (target_buf, "OK") != 0)
+ error (_("Target does not support this command."));
+}
- getpkt (buf, (rs->remote_packet_size), 0);
- if (buf[0] == 'E')
- error ("target memory fault, section %s, range 0x%s -- 0x%s",
- sectname, paddr (lma), paddr (lma + size));
- if (buf[0] != 'C')
- error ("remote target does not support this operation");
+static void free_actions_list (char **actions_list);
+static void free_actions_list_cleanup_wrapper (void *);
+static void
+free_actions_list_cleanup_wrapper (void *al)
+{
+ free_actions_list (al);
+}
- for (target_crc = 0, tmp = &buf[1]; *tmp; tmp++)
- target_crc = target_crc * 16 + fromhex (*tmp);
+static void
+free_actions_list (char **actions_list)
+{
+ int ndx;
- printf_filtered ("Section %s, range 0x%s -- 0x%s: ",
- sectname, paddr (lma), paddr (lma + size));
- if (host_crc == target_crc)
- printf_filtered ("matched.\n");
- else
- {
- printf_filtered ("MIS-MATCHED!\n");
- mismatched++;
- }
+ if (actions_list == 0)
+ return;
- do_cleanups (old_chain);
- }
- if (mismatched > 0)
- warning ("One or more sections of the remote executable does not match\n\
-the loaded file\n");
- if (args && !matched)
- printf_filtered ("No loaded section named '%s'.\n", args);
+ for (ndx = 0; actions_list[ndx]; ndx++)
+ xfree (actions_list[ndx]);
+
+ xfree (actions_list);
}
-static LONGEST
-remote_xfer_partial (struct target_ops *ops, enum target_object object,
- const char *annex, void *readbuf, const void *writebuf,
- ULONGEST offset, LONGEST len)
+/* Recursive routine to walk through command list including loops, and
+ download packets for each command. */
+
+static void
+remote_download_command_source (int num, ULONGEST addr,
+ struct command_line *cmds)
{
struct remote_state *rs = get_remote_state ();
- int i;
- char *buf2 = alloca (rs->remote_packet_size);
- char *p2 = &buf2[0];
- char query_type;
+ struct command_line *cmd;
- /* Handle memory using remote_xfer_memory. */
- if (object == TARGET_OBJECT_MEMORY)
+ for (cmd = cmds; cmd; cmd = cmd->next)
{
- int xfered;
- errno = 0;
-
- if (writebuf != NULL)
+ QUIT; /* Allow user to bail out with ^C. */
+ strcpy (rs->buf, "QTDPsrc:");
+ encode_source_string (num, addr, "cmd", cmd->line,
+ rs->buf + strlen (rs->buf),
+ rs->buf_size - strlen (rs->buf));
+ putpkt (rs->buf);
+ remote_get_noisy_reply (&target_buf, &target_buf_size);
+ if (strcmp (target_buf, "OK"))
+ warning (_("Target does not support source download."));
+
+ if (cmd->control_type == while_control
+ || cmd->control_type == while_stepping_control)
{
- void *buffer = xmalloc (len);
- struct cleanup *cleanup = make_cleanup (xfree, buffer);
- memcpy (buffer, writebuf, len);
- xfered = remote_xfer_memory (offset, buffer, len, 1, NULL, ops);
- do_cleanups (cleanup);
+ remote_download_command_source (num, addr, *cmd->body_list);
+
+ QUIT; /* Allow user to bail out with ^C. */
+ strcpy (rs->buf, "QTDPsrc:");
+ encode_source_string (num, addr, "cmd", "end",
+ rs->buf + strlen (rs->buf),
+ rs->buf_size - strlen (rs->buf));
+ putpkt (rs->buf);
+ remote_get_noisy_reply (&target_buf, &target_buf_size);
+ if (strcmp (target_buf, "OK"))
+ warning (_("Target does not support source download."));
}
- else
- xfered = remote_xfer_memory (offset, readbuf, len, 0, NULL, ops);
-
- if (xfered > 0)
- return xfered;
- else if (xfered == 0 && errno == 0)
- return 0;
- else
- return -1;
}
+}
- /* Only handle reads. */
- if (writebuf != NULL || readbuf == NULL)
- return -1;
-
- /* Map pre-existing objects onto letters. DO NOT do this for new
- objects!!! Instead specify new query packets. */
- switch (object)
+static void
+remote_download_tracepoint (struct breakpoint *t)
+{
+ struct bp_location *loc;
+ CORE_ADDR tpaddr;
+ char addrbuf[40];
+ char buf[2048];
+ char **tdp_actions;
+ char **stepping_actions;
+ int ndx;
+ struct cleanup *old_chain = NULL;
+ struct agent_expr *aexpr;
+ struct cleanup *aexpr_chain = NULL;
+ char *pkt;
+
+ /* Iterate over all the tracepoint locations. It's up to the target to
+ notice multiple tracepoint packets with the same number but different
+ addresses, and treat them as multiple locations. */
+ for (loc = t->loc; loc; loc = loc->next)
{
- case TARGET_OBJECT_KOD:
- query_type = 'K';
- break;
- case TARGET_OBJECT_AVR:
- query_type = 'R';
- break;
-
- case TARGET_OBJECT_AUXV:
- if (remote_protocol_qPart_auxv.support != PACKET_DISABLE)
+ encode_actions (t, loc, &tdp_actions, &stepping_actions);
+ old_chain = make_cleanup (free_actions_list_cleanup_wrapper,
+ tdp_actions);
+ (void) make_cleanup (free_actions_list_cleanup_wrapper,
+ stepping_actions);
+
+ tpaddr = loc->address;
+ sprintf_vma (addrbuf, tpaddr);
+ sprintf (buf, "QTDP:%x:%s:%c:%lx:%x", t->number,
+ addrbuf, /* address */
+ (t->enable_state == bp_enabled ? 'E' : 'D'),
+ t->step_count, t->pass_count);
+ /* Fast tracepoints are mostly handled by the target, but we can
+ tell the target how big of an instruction block should be moved
+ around. */
+ if (t->type == bp_fast_tracepoint)
{
- unsigned int total = 0;
- while (len > 0)
+ /* Only test for support at download time; we may not know
+ target capabilities at definition time. */
+ if (remote_supports_fast_tracepoints ())
{
- LONGEST n = min ((rs->remote_packet_size - 2) / 2, len);
- snprintf (buf2, rs->remote_packet_size,
- "qPart:auxv:read::%s,%s",
- phex_nz (offset, sizeof offset),
- phex_nz (n, sizeof n));
- i = putpkt (buf2);
- if (i < 0)
- return total > 0 ? total : i;
- buf2[0] = '\0';
- getpkt (buf2, rs->remote_packet_size, 0);
- if (packet_ok (buf2, &remote_protocol_qPart_auxv) != PACKET_OK)
- return total > 0 ? total : -1;
- if (buf2[0] == 'O' && buf2[1] == 'K' && buf2[2] == '\0')
- break; /* Got EOF indicator. */
- /* Got some data. */
- i = hex2bin (buf2, readbuf, len);
- if (i > 0)
- {
- readbuf = (void *) ((char *) readbuf + i);
- offset += i;
- len -= i;
- total += i;
- }
+ int isize;
+
+ if (gdbarch_fast_tracepoint_valid_at (target_gdbarch,
+ tpaddr, &isize, NULL))
+ sprintf (buf + strlen (buf), ":F%x", isize);
+ else
+ /* If it passed validation at definition but fails now,
+ something is very wrong. */
+ internal_error (__FILE__, __LINE__,
+ _("Fast tracepoint not "
+ "valid during download"));
}
- return total;
+ else
+ /* Fast tracepoints are functionally identical to regular
+ tracepoints, so don't take lack of support as a reason to
+ give up on the trace run. */
+ warning (_("Target does not support fast tracepoints, "
+ "downloading %d as regular tracepoint"), t->number);
}
- return -1;
-
- default:
- return -1;
- }
+ else if (t->type == bp_static_tracepoint)
+ {
+ /* Only test for support at download time; we may not know
+ target capabilities at definition time. */
+ if (remote_supports_static_tracepoints ())
+ {
+ struct static_tracepoint_marker marker;
- /* Note: a zero OFFSET and LEN can be used to query the minimum
- buffer size. */
- if (offset == 0 && len == 0)
- return (rs->remote_packet_size);
- /* Minimum outbuf size is (rs->remote_packet_size) - if bufsiz is
- not large enough let the caller. */
- if (len < (rs->remote_packet_size))
- return -1;
- len = rs->remote_packet_size;
+ if (target_static_tracepoint_marker_at (tpaddr, &marker))
+ strcat (buf, ":S");
+ else
+ error (_("Static tracepoint not valid during download"));
+ }
+ else
+ /* Fast tracepoints are functionally identical to regular
+ tracepoints, so don't take lack of support as a reason
+ to give up on the trace run. */
+ error (_("Target does not support static tracepoints"));
+ }
+ /* If the tracepoint has a conditional, make it into an agent
+ expression and append to the definition. */
+ if (loc->cond)
+ {
+ /* Only test support at download time, we may not know target
+ capabilities at definition time. */
+ if (remote_supports_cond_tracepoints ())
+ {
+ aexpr = gen_eval_for_expr (tpaddr, loc->cond);
+ aexpr_chain = make_cleanup_free_agent_expr (aexpr);
+ sprintf (buf + strlen (buf), ":X%x,", aexpr->len);
+ pkt = buf + strlen (buf);
+ for (ndx = 0; ndx < aexpr->len; ++ndx)
+ pkt = pack_hex_byte (pkt, aexpr->buf[ndx]);
+ *pkt = '\0';
+ do_cleanups (aexpr_chain);
+ }
+ else
+ warning (_("Target does not support conditional tracepoints, "
+ "ignoring tp %d cond"), t->number);
+ }
- /* except for querying the minimum buffer size, target must be open */
- if (!remote_desc)
- error ("remote query is only available after target open");
+ if (t->commands || *default_collect)
+ strcat (buf, "-");
+ putpkt (buf);
+ remote_get_noisy_reply (&target_buf, &target_buf_size);
+ if (strcmp (target_buf, "OK"))
+ error (_("Target does not support tracepoints."));
- gdb_assert (annex != NULL);
- gdb_assert (readbuf != NULL);
+ /* do_single_steps (t); */
+ if (tdp_actions)
+ {
+ for (ndx = 0; tdp_actions[ndx]; ndx++)
+ {
+ QUIT; /* Allow user to bail out with ^C. */
+ sprintf (buf, "QTDP:-%x:%s:%s%c",
+ t->number, addrbuf, /* address */
+ tdp_actions[ndx],
+ ((tdp_actions[ndx + 1] || stepping_actions)
+ ? '-' : 0));
+ putpkt (buf);
+ remote_get_noisy_reply (&target_buf,
+ &target_buf_size);
+ if (strcmp (target_buf, "OK"))
+ error (_("Error on target while setting tracepoints."));
+ }
+ }
+ if (stepping_actions)
+ {
+ for (ndx = 0; stepping_actions[ndx]; ndx++)
+ {
+ QUIT; /* Allow user to bail out with ^C. */
+ sprintf (buf, "QTDP:-%x:%s:%s%s%s",
+ t->number, addrbuf, /* address */
+ ((ndx == 0) ? "S" : ""),
+ stepping_actions[ndx],
+ (stepping_actions[ndx + 1] ? "-" : ""));
+ putpkt (buf);
+ remote_get_noisy_reply (&target_buf,
+ &target_buf_size);
+ if (strcmp (target_buf, "OK"))
+ error (_("Error on target while setting tracepoints."));
+ }
+ }
- *p2++ = 'q';
- *p2++ = query_type;
+ if (remote_protocol_packets[PACKET_TracepointSource].support
+ == PACKET_ENABLE)
+ {
+ if (t->addr_string)
+ {
+ strcpy (buf, "QTDPsrc:");
+ encode_source_string (t->number, loc->address,
+ "at", t->addr_string, buf + strlen (buf),
+ 2048 - strlen (buf));
+
+ putpkt (buf);
+ remote_get_noisy_reply (&target_buf, &target_buf_size);
+ if (strcmp (target_buf, "OK"))
+ warning (_("Target does not support source download."));
+ }
+ if (t->cond_string)
+ {
+ strcpy (buf, "QTDPsrc:");
+ encode_source_string (t->number, loc->address,
+ "cond", t->cond_string, buf + strlen (buf),
+ 2048 - strlen (buf));
+ putpkt (buf);
+ remote_get_noisy_reply (&target_buf, &target_buf_size);
+ if (strcmp (target_buf, "OK"))
+ warning (_("Target does not support source download."));
+ }
+ remote_download_command_source (t->number, loc->address,
+ breakpoint_commands (t));
+ }
- /* 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)))
- {
- /* Bad caller may have sent forbidden characters. */
- gdb_assert (isprint (annex[i]) && annex[i] != '$' && annex[i] != '#');
- *p2++ = annex[i];
- i++;
+ do_cleanups (old_chain);
}
- *p2 = '\0';
- gdb_assert (annex[i] == '\0');
-
- i = putpkt (buf2);
- if (i < 0)
- return i;
-
- getpkt (readbuf, len, 0);
-
- return strlen (readbuf);
}
static void
-remote_rcmd (char *command,
- struct ui_file *outbuf)
+remote_download_trace_state_variable (struct trace_state_variable *tsv)
{
struct remote_state *rs = get_remote_state ();
- int i;
- char *buf = alloca (rs->remote_packet_size);
- char *p = buf;
-
- 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);
+ char *p;
- /* Encode the actual command */
- bin2hex (command, p, 0);
+ sprintf (rs->buf, "QTDV:%x:%s:%x:",
+ tsv->number, phex ((ULONGEST) tsv->initial_value, 8), tsv->builtin);
+ p = rs->buf + strlen (rs->buf);
+ if ((p - rs->buf) + strlen (tsv->name) * 2 >= get_remote_packet_size ())
+ error (_("Trace state variable name too long for tsv definition packet"));
+ p += 2 * bin2hex ((gdb_byte *) (tsv->name), p, 0);
+ *p++ = '\0';
+ putpkt (rs->buf);
+ remote_get_noisy_reply (&target_buf, &target_buf_size);
+ if (*target_buf == '\0')
+ error (_("Target does not support this command."));
+ if (strcmp (target_buf, "OK") != 0)
+ error (_("Error on target while downloading trace state variable."));
+}
- if (putpkt (buf) < 0)
- error ("Communication problem with target\n");
+static void
+remote_enable_tracepoint (struct bp_location *location)
+{
+ struct remote_state *rs = get_remote_state ();
+ char addr_buf[40];
- /* 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)
- break;
- if (strlen (buf) == 3 && buf[0] == 'E'
- && isdigit (buf[1]) && isdigit (buf[2]))
- {
- error ("Protocol error with Rcmd");
- }
- for (p = buf; p[0] != '\0' && p[1] != '\0'; p += 2)
- {
- char c = (fromhex (p[0]) << 4) + fromhex (p[1]);
- fputc_unfiltered (c, outbuf);
- }
- break;
- }
+ sprintf_vma (addr_buf, location->address);
+ sprintf (rs->buf, "QTEnable:%x:%s", location->owner->number, addr_buf);
+ putpkt (rs->buf);
+ remote_get_noisy_reply (&rs->buf, &rs->buf_size);
+ if (*rs->buf == '\0')
+ error (_("Target does not support enabling tracepoints while a trace run is ongoing."));
+ if (strcmp (rs->buf, "OK") != 0)
+ error (_("Error on target while enabling tracepoint."));
}
static void
-packet_command (char *args, int from_tty)
+remote_disable_tracepoint (struct bp_location *location)
{
struct remote_state *rs = get_remote_state ();
- char *buf = alloca (rs->remote_packet_size);
+ char addr_buf[40];
- if (!remote_desc)
- error ("command can only be used with remote target");
+ sprintf_vma (addr_buf, location->address);
+ sprintf (rs->buf, "QTDisable:%x:%s", location->owner->number, addr_buf);
+ putpkt (rs->buf);
+ remote_get_noisy_reply (&rs->buf, &rs->buf_size);
+ if (*rs->buf == '\0')
+ error (_("Target does not support disabling tracepoints while a trace run is ongoing."));
+ if (strcmp (rs->buf, "OK") != 0)
+ error (_("Error on target while disabling tracepoint."));
+}
- if (!args)
- error ("remote-packet command requires packet text as argument");
+static void
+remote_trace_set_readonly_regions (void)
+{
+ asection *s;
+ bfd_size_type size;
+ bfd_vma vma;
+ int anysecs = 0;
- puts_filtered ("sending: ");
- print_packet (args);
- puts_filtered ("\n");
- putpkt (args);
+ if (!exec_bfd)
+ return; /* No information to give. */
- getpkt (buf, (rs->remote_packet_size), 0);
- puts_filtered ("received: ");
- print_packet (buf);
- puts_filtered ("\n");
-}
+ strcpy (target_buf, "QTro");
+ for (s = exec_bfd->sections; s; s = s->next)
+ {
+ char tmp1[40], tmp2[40];
-#if 0
-/* --------- UNIT_TEST for THREAD oriented PACKETS ------------------------- */
+ if ((s->flags & SEC_LOAD) == 0 ||
+ /* (s->flags & SEC_CODE) == 0 || */
+ (s->flags & SEC_READONLY) == 0)
+ continue;
+
+ anysecs = 1;
+ vma = bfd_get_section_vma (,s);
+ size = bfd_get_section_size (s);
+ sprintf_vma (tmp1, vma);
+ sprintf_vma (tmp2, vma + size);
+ sprintf (target_buf + strlen (target_buf),
+ ":%s,%s", tmp1, tmp2);
+ }
+ if (anysecs)
+ {
+ putpkt (target_buf);
+ getpkt (&target_buf, &target_buf_size, 0);
+ }
+}
-static void display_thread_info (struct gdb_ext_thread_info *info);
+static void
+remote_trace_start (void)
+{
+ putpkt ("QTStart");
+ remote_get_noisy_reply (&target_buf, &target_buf_size);
+ if (*target_buf == '\0')
+ error (_("Target does not support this command."));
+ if (strcmp (target_buf, "OK") != 0)
+ error (_("Bogus reply from target: %s"), target_buf);
+}
-static void threadset_test_cmd (char *cmd, int tty);
+static int
+remote_get_trace_status (struct trace_status *ts)
+{
+ char *p;
+ /* FIXME we need to get register block size some other way. */
+ extern int trace_regblock_size;
-static void threadalive_test (char *cmd, int tty);
+ trace_regblock_size = get_remote_arch_state ()->sizeof_g_packet;
-static void threadlist_test_cmd (char *cmd, int tty);
+ putpkt ("qTStatus");
+ p = remote_get_noisy_reply (&target_buf, &target_buf_size);
-int get_and_display_threadinfo (threadref * ref);
+ /* If the remote target doesn't do tracing, flag it. */
+ if (*p == '\0')
+ return -1;
-static void threadinfo_test_cmd (char *cmd, int tty);
+ /* We're working with a live target. */
+ ts->from_file = 0;
-static int thread_display_step (threadref * ref, void *context);
+ /* Set some defaults. */
+ ts->running_known = 0;
+ ts->stop_reason = trace_stop_reason_unknown;
+ ts->traceframe_count = -1;
+ ts->buffer_free = 0;
-static void threadlist_update_test_cmd (char *cmd, int tty);
+ if (*p++ != 'T')
+ error (_("Bogus trace status reply from target: %s"), target_buf);
-static void init_remote_threadtests (void);
+ parse_trace_status (p, ts);
-#define SAMPLE_THREAD 0x05060708 /* Truncated 64 bit threadid */
+ return ts->running;
+}
static void
-threadset_test_cmd (char *cmd, int tty)
+remote_trace_stop (void)
{
- int sample_thread = SAMPLE_THREAD;
-
- printf_filtered ("Remote threadset test\n");
- set_thread (sample_thread, 1);
+ putpkt ("QTStop");
+ remote_get_noisy_reply (&target_buf, &target_buf_size);
+ if (*target_buf == '\0')
+ error (_("Target does not support this command."));
+ if (strcmp (target_buf, "OK") != 0)
+ error (_("Bogus reply from target: %s"), target_buf);
}
-
-static void
-threadalive_test (char *cmd, int tty)
+static int
+remote_trace_find (enum trace_find_type type, int num,
+ ULONGEST addr1, ULONGEST addr2,
+ int *tpp)
{
- int sample_thread = SAMPLE_THREAD;
-
- if (remote_thread_alive (pid_to_ptid (sample_thread)))
- printf_filtered ("PASS: Thread alive test\n");
- else
- printf_filtered ("FAIL: Thread alive test\n");
-}
+ struct remote_state *rs = get_remote_state ();
+ char *p, *reply;
+ int target_frameno = -1, target_tracept = -1;
+
+ /* Lookups other than by absolute frame number depend on the current
+ trace selected, so make sure it is correct on the remote end
+ first. */
+ if (type != tfind_number)
+ set_remote_traceframe ();
+
+ p = rs->buf;
+ strcpy (p, "QTFrame:");
+ p = strchr (p, '\0');
+ switch (type)
+ {
+ case tfind_number:
+ sprintf (p, "%x", num);
+ break;
+ case tfind_pc:
+ sprintf (p, "pc:%s", phex_nz (addr1, 0));
+ break;
+ case tfind_tp:
+ sprintf (p, "tdp:%x", num);
+ break;
+ case tfind_range:
+ sprintf (p, "range:%s:%s", phex_nz (addr1, 0), phex_nz (addr2, 0));
+ break;
+ case tfind_outside:
+ sprintf (p, "outside:%s:%s", phex_nz (addr1, 0), phex_nz (addr2, 0));
+ break;
+ default:
+ error (_("Unknown trace find type %d"), type);
+ }
-void output_threadid (char *title, threadref * ref);
+ putpkt (rs->buf);
+ reply = remote_get_noisy_reply (&(rs->buf), &sizeof_pkt);
+ if (*reply == '\0')
+ error (_("Target does not support this command."));
-void
-output_threadid (char *title, threadref *ref)
-{
- char hexid[20];
+ while (reply && *reply)
+ switch (*reply)
+ {
+ case 'F':
+ p = ++reply;
+ target_frameno = (int) strtol (p, &reply, 16);
+ if (reply == p)
+ error (_("Unable to parse trace frame number"));
+ /* Don't update our remote traceframe number cache on failure
+ to select a remote traceframe. */
+ if (target_frameno == -1)
+ return -1;
+ break;
+ case 'T':
+ p = ++reply;
+ target_tracept = (int) strtol (p, &reply, 16);
+ if (reply == p)
+ error (_("Unable to parse tracepoint number"));
+ break;
+ case 'O': /* "OK"? */
+ if (reply[1] == 'K' && reply[2] == '\0')
+ reply += 2;
+ else
+ error (_("Bogus reply from target: %s"), reply);
+ break;
+ default:
+ error (_("Bogus reply from target: %s"), reply);
+ }
+ if (tpp)
+ *tpp = target_tracept;
- pack_threadid (&hexid[0], ref); /* Convert threead id into hex */
- hexid[16] = 0;
- printf_filtered ("%s %s\n", title, (&hexid[0]));
+ remote_traceframe_number = target_frameno;
+ return target_frameno;
}
-static void
-threadlist_test_cmd (char *cmd, int tty)
+static int
+remote_get_trace_state_variable_value (int tsvnum, LONGEST *val)
{
- int startflag = 1;
- threadref nextthread;
- int done, result_count;
- threadref threadlist[3];
+ struct remote_state *rs = get_remote_state ();
+ char *reply;
+ ULONGEST uval;
- printf_filtered ("Remote Threadlist test\n");
- if (!remote_get_threadlist (startflag, &nextthread, 3, &done,
- &result_count, &threadlist[0]))
- printf_filtered ("FAIL: threadlist test\n");
- else
- {
- threadref *scan = threadlist;
- threadref *limit = scan + result_count;
+ set_remote_traceframe ();
- while (scan < limit)
- output_threadid (" thread ", scan++);
+ sprintf (rs->buf, "qTV:%x", tsvnum);
+ putpkt (rs->buf);
+ reply = remote_get_noisy_reply (&target_buf, &target_buf_size);
+ if (reply && *reply)
+ {
+ if (*reply == 'V')
+ {
+ unpack_varlen_hex (reply + 1, &uval);
+ *val = (LONGEST) uval;
+ return 1;
+ }
}
+ return 0;
}
-void
-display_thread_info (struct gdb_ext_thread_info *info)
+static int
+remote_save_trace_data (const char *filename)
{
- output_threadid ("Threadid: ", &info->threadid);
- printf_filtered ("Name: %s\n ", info->shortname);
- printf_filtered ("State: %s\n", info->display);
- printf_filtered ("other: %s\n\n", info->more_display);
+ struct remote_state *rs = get_remote_state ();
+ char *p, *reply;
+
+ p = rs->buf;
+ strcpy (p, "QTSave:");
+ p += strlen (p);
+ if ((p - rs->buf) + strlen (filename) * 2 >= get_remote_packet_size ())
+ error (_("Remote file name too long for trace save packet"));
+ p += 2 * bin2hex ((gdb_byte *) filename, p, 0);
+ *p++ = '\0';
+ putpkt (rs->buf);
+ reply = remote_get_noisy_reply (&target_buf, &target_buf_size);
+ if (*reply != '\0')
+ error (_("Target does not support this command."));
+ if (strcmp (reply, "OK") != 0)
+ error (_("Bogus reply from target: %s"), reply);
+ return 0;
}
-int
-get_and_display_threadinfo (threadref *ref)
+/* This is basically a memory transfer, but needs to be its own packet
+ because we don't know how the target actually organizes its trace
+ memory, plus we want to be able to ask for as much as possible, but
+ not be unhappy if we don't get as much as we ask for. */
+
+static LONGEST
+remote_get_raw_trace_data (gdb_byte *buf, ULONGEST offset, LONGEST len)
{
- int result;
- int set;
- struct gdb_ext_thread_info threadinfo;
+ struct remote_state *rs = get_remote_state ();
+ char *reply;
+ char *p;
+ int rslt;
- set = TAG_THREADID | TAG_EXISTS | TAG_THREADNAME
- | TAG_MOREDISPLAY | TAG_DISPLAY;
- if (0 != (result = remote_get_threadinfo (ref, set, &threadinfo)))
- display_thread_info (&threadinfo);
- return result;
+ p = rs->buf;
+ strcpy (p, "qTBuffer:");
+ p += strlen (p);
+ p += hexnumstr (p, offset);
+ *p++ = ',';
+ p += hexnumstr (p, len);
+ *p++ = '\0';
+
+ putpkt (rs->buf);
+ reply = remote_get_noisy_reply (&target_buf, &target_buf_size);
+ if (reply && *reply)
+ {
+ /* 'l' by itself means we're at the end of the buffer and
+ there is nothing more to get. */
+ if (*reply == 'l')
+ return 0;
+
+ /* Convert the reply into binary. Limit the number of bytes to
+ convert according to our passed-in buffer size, rather than
+ what was returned in the packet; if the target is
+ unexpectedly generous and gives us a bigger reply than we
+ asked for, we don't want to crash. */
+ rslt = hex2bin (target_buf, buf, len);
+ return rslt;
+ }
+
+ /* Something went wrong, flag as an error. */
+ return -1;
}
static void
-threadinfo_test_cmd (char *cmd, int tty)
+remote_set_disconnected_tracing (int val)
{
- int athread = SAMPLE_THREAD;
- threadref thread;
- int set;
+ struct remote_state *rs = get_remote_state ();
- int_to_threadref (&thread, athread);
- printf_filtered ("Remote Threadinfo test\n");
- if (!get_and_display_threadinfo (&thread))
- printf_filtered ("FAIL cannot get thread info\n");
+ if (rs->disconnected_tracing)
+ {
+ char *reply;
+
+ sprintf (rs->buf, "QTDisconnected:%x", val);
+ putpkt (rs->buf);
+ reply = remote_get_noisy_reply (&target_buf, &target_buf_size);
+ if (*reply == '\0')
+ error (_("Target does not support this command."));
+ if (strcmp (reply, "OK") != 0)
+ error (_("Bogus reply from target: %s"), reply);
+ }
+ else if (val)
+ warning (_("Target does not support disconnected tracing."));
}
static int
-thread_display_step (threadref *ref, void *context)
+remote_core_of_thread (struct target_ops *ops, ptid_t ptid)
{
- /* output_threadid(" threadstep ",ref); *//* simple test */
- return get_and_display_threadinfo (ref);
-}
+ struct thread_info *info = find_thread_ptid (ptid);
-static void
-threadlist_update_test_cmd (char *cmd, int tty)
-{
- printf_filtered ("Remote Threadlist update test\n");
- remote_threadlist_iterator (thread_display_step, 0, CRAZY_MAX_THREADS);
+ if (info && info->private)
+ return info->private->core;
+ return -1;
}
static void
-init_remote_threadtests (void)
+remote_set_circular_trace_buffer (int val)
{
- add_com ("tlist", class_obscure, threadlist_test_cmd,
- "Fetch and print the remote list of thread identifiers, one pkt only");
- add_com ("tinfo", class_obscure, threadinfo_test_cmd,
- "Fetch and display info about one thread");
- add_com ("tset", class_obscure, threadset_test_cmd,
- "Test setting to a different thread");
- add_com ("tupd", class_obscure, threadlist_update_test_cmd,
- "Iterate through updating all remote thread info");
- add_com ("talive", class_obscure, threadalive_test,
- " Remote thread alive test ");
+ struct remote_state *rs = get_remote_state ();
+ char *reply;
+
+ sprintf (rs->buf, "QTBuffer:circular:%x", val);
+ putpkt (rs->buf);
+ reply = remote_get_noisy_reply (&target_buf, &target_buf_size);
+ if (*reply == '\0')
+ error (_("Target does not support this command."));
+ if (strcmp (reply, "OK") != 0)
+ error (_("Bogus reply from target: %s"), reply);
}
-#endif /* 0 */
+static struct traceframe_info *
+remote_traceframe_info (void)
+{
+ char *text;
-/* Convert a thread ID to a string. Returns the string in a static
- buffer. */
+ text = target_read_stralloc (¤t_target,
+ TARGET_OBJECT_TRACEFRAME_INFO, NULL);
+ if (text != NULL)
+ {
+ struct traceframe_info *info;
+ struct cleanup *back_to = make_cleanup (xfree, text);
-static char *
-remote_pid_to_str (ptid_t ptid)
-{
- static char buf[30];
+ info = parse_traceframe_info (text);
+ do_cleanups (back_to);
+ return info;
+ }
- sprintf (buf, "Thread %d", PIDGET (ptid));
- return buf;
+ return NULL;
}
static void
remote_ops.to_kill = remote_kill;
remote_ops.to_load = generic_load;
remote_ops.to_mourn_inferior = remote_mourn;
+ remote_ops.to_pass_signals = remote_pass_signals;
remote_ops.to_thread_alive = remote_thread_alive;
remote_ops.to_find_new_threads = remote_threads_info;
remote_ops.to_pid_to_str = remote_pid_to_str;
remote_ops.to_extra_thread_info = remote_threads_extra_info;
+ remote_ops.to_get_ada_task_ptid = remote_get_ada_task_ptid;
remote_ops.to_stop = remote_stop;
remote_ops.to_xfer_partial = remote_xfer_partial;
remote_ops.to_rcmd = remote_rcmd;
+ remote_ops.to_log_command = serial_log_command;
+ remote_ops.to_get_thread_local_address = remote_get_thread_local_address;
remote_ops.to_stratum = process_stratum;
- remote_ops.to_has_all_memory = 1;
- remote_ops.to_has_memory = 1;
- remote_ops.to_has_stack = 1;
- remote_ops.to_has_registers = 1;
- remote_ops.to_has_execution = 1;
- remote_ops.to_has_thread_control = tc_schedlock; /* can lock scheduler */
+ remote_ops.to_has_all_memory = default_child_has_all_memory;
+ remote_ops.to_has_memory = default_child_has_memory;
+ remote_ops.to_has_stack = default_child_has_stack;
+ remote_ops.to_has_registers = default_child_has_registers;
+ remote_ops.to_has_execution = default_child_has_execution;
+ remote_ops.to_has_thread_control = tc_schedlock; /* can lock scheduler */
+ remote_ops.to_can_execute_reverse = remote_can_execute_reverse;
remote_ops.to_magic = OPS_MAGIC;
+ remote_ops.to_memory_map = remote_memory_map;
+ remote_ops.to_flash_erase = remote_flash_erase;
+ remote_ops.to_flash_done = remote_flash_done;
+ remote_ops.to_read_description = remote_read_description;
+ remote_ops.to_search_memory = remote_search_memory;
+ remote_ops.to_can_async_p = remote_can_async_p;
+ remote_ops.to_is_async_p = remote_is_async_p;
+ remote_ops.to_async = remote_async;
+ remote_ops.to_terminal_inferior = remote_terminal_inferior;
+ remote_ops.to_terminal_ours = remote_terminal_ours;
+ remote_ops.to_supports_non_stop = remote_supports_non_stop;
+ remote_ops.to_supports_multi_process = remote_supports_multi_process;
+ remote_ops.to_supports_enable_disable_tracepoint = remote_supports_enable_disable_tracepoint;
+ remote_ops.to_trace_init = remote_trace_init;
+ remote_ops.to_download_tracepoint = remote_download_tracepoint;
+ remote_ops.to_download_trace_state_variable
+ = remote_download_trace_state_variable;
+ remote_ops.to_enable_tracepoint = remote_enable_tracepoint;
+ remote_ops.to_disable_tracepoint = remote_disable_tracepoint;
+ remote_ops.to_trace_set_readonly_regions = remote_trace_set_readonly_regions;
+ remote_ops.to_trace_start = remote_trace_start;
+ remote_ops.to_get_trace_status = remote_get_trace_status;
+ remote_ops.to_trace_stop = remote_trace_stop;
+ remote_ops.to_trace_find = remote_trace_find;
+ remote_ops.to_get_trace_state_variable_value
+ = remote_get_trace_state_variable_value;
+ remote_ops.to_save_trace_data = remote_save_trace_data;
+ remote_ops.to_upload_tracepoints = remote_upload_tracepoints;
+ remote_ops.to_upload_trace_state_variables
+ = remote_upload_trace_state_variables;
+ remote_ops.to_get_raw_trace_data = remote_get_raw_trace_data;
+ remote_ops.to_set_disconnected_tracing = remote_set_disconnected_tracing;
+ remote_ops.to_set_circular_trace_buffer = remote_set_circular_trace_buffer;
+ remote_ops.to_core_of_thread = remote_core_of_thread;
+ remote_ops.to_verify_memory = remote_verify_memory;
+ remote_ops.to_get_tib_address = remote_get_tib_address;
+ remote_ops.to_set_permissions = remote_set_permissions;
+ remote_ops.to_static_tracepoint_marker_at
+ = remote_static_tracepoint_marker_at;
+ remote_ops.to_static_tracepoint_markers_by_strid
+ = remote_static_tracepoint_markers_by_strid;
+ remote_ops.to_traceframe_info = remote_traceframe_info;
}
/* Set up the extended remote vector by making a copy of the standard
"Extended remote serial target in gdb-specific protocol";
extended_remote_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).",
- extended_remote_ops.to_open = extended_remote_open;
+Specify the serial device it is connected to (e.g. /dev/ttya).";
+ extended_remote_ops.to_open = extended_remote_open;
extended_remote_ops.to_create_inferior = extended_remote_create_inferior;
extended_remote_ops.to_mourn_inferior = extended_remote_mourn;
+ extended_remote_ops.to_detach = extended_remote_detach;
+ extended_remote_ops.to_attach = extended_remote_attach;
+ extended_remote_ops.to_kill = extended_remote_kill;
}
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);
+ if (!target_async_permitted)
+ /* We only enable async when the user specifically asks for it. */
+ return 0;
+
+ /* We're async whenever the serial device is. */
+ return 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);
+ if (!target_async_permitted)
+ /* We only enable async when the user specifically asks for it. */
+ return 0;
+
+ /* We're async whenever the serial device is. */
+ return 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;
}
static void
-remote_async (void (*callback) (enum inferior_event_type event_type, void *context), void *context)
+remote_async_inferior_event_handler (gdb_client_data data)
{
- if (current_target.to_async_mask_value == 0)
- internal_error (__FILE__, __LINE__,
- "Calling remote_async when async is masked");
+ inferior_event_handler (INF_REG_EVENT, NULL);
+}
+
+static void
+remote_async_get_pending_events_handler (gdb_client_data data)
+{
+ remote_get_pending_stop_replies ();
+}
+static void
+remote_async (void (*callback) (enum inferior_event_type event_type,
+ void *context), void *context)
+{
if (callback != NULL)
{
serial_async (remote_desc, remote_async_serial_handler, NULL);
serial_async (remote_desc, NULL, NULL);
}
-/* Target async and target extended-async.
-
- 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)
+set_remote_cmd (char *args, int from_tty)
{
- 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).";
- remote_async_ops.to_open = remote_async_open;
- remote_async_ops.to_close = remote_close;
- remote_async_ops.to_detach = remote_detach;
- remote_async_ops.to_disconnect = remote_disconnect;
- remote_async_ops.to_resume = remote_async_resume;
- remote_async_ops.to_wait = remote_async_wait;
- remote_async_ops.to_fetch_registers = remote_fetch_registers;
- remote_async_ops.to_store_registers = remote_store_registers;
- remote_async_ops.to_prepare_to_store = remote_prepare_to_store;
- remote_async_ops.deprecated_xfer_memory = remote_xfer_memory;
- remote_async_ops.to_files_info = remote_files_info;
- remote_async_ops.to_insert_breakpoint = remote_insert_breakpoint;
- remote_async_ops.to_remove_breakpoint = remote_remove_breakpoint;
- remote_async_ops.to_can_use_hw_breakpoint = remote_check_watch_resources;
- remote_async_ops.to_insert_hw_breakpoint = remote_insert_hw_breakpoint;
- remote_async_ops.to_remove_hw_breakpoint = remote_remove_hw_breakpoint;
- remote_async_ops.to_insert_watchpoint = remote_insert_watchpoint;
- remote_async_ops.to_remove_watchpoint = remote_remove_watchpoint;
- remote_async_ops.to_stopped_by_watchpoint = remote_stopped_by_watchpoint;
- remote_async_ops.to_stopped_data_address = remote_stopped_data_address;
- remote_async_ops.to_terminal_inferior = remote_async_terminal_inferior;
- remote_async_ops.to_terminal_ours = remote_async_terminal_ours;
- remote_async_ops.to_kill = remote_async_kill;
- remote_async_ops.to_load = generic_load;
- remote_async_ops.to_mourn_inferior = remote_async_mourn;
- remote_async_ops.to_thread_alive = remote_thread_alive;
- remote_async_ops.to_find_new_threads = remote_threads_info;
- remote_async_ops.to_pid_to_str = remote_pid_to_str;
- remote_async_ops.to_extra_thread_info = remote_threads_extra_info;
- remote_async_ops.to_stop = remote_stop;
- remote_async_ops.to_xfer_partial = remote_xfer_partial;
- remote_async_ops.to_rcmd = remote_rcmd;
- remote_async_ops.to_stratum = process_stratum;
- remote_async_ops.to_has_all_memory = 1;
- remote_async_ops.to_has_memory = 1;
- remote_async_ops.to_has_stack = 1;
- remote_async_ops.to_has_registers = 1;
- remote_async_ops.to_has_execution = 1;
- remote_async_ops.to_has_thread_control = tc_schedlock; /* can lock scheduler */
- remote_async_ops.to_can_async_p = remote_can_async_p;
- remote_async_ops.to_is_async_p = remote_is_async_p;
- remote_async_ops.to_async = remote_async;
- remote_async_ops.to_async_mask_value = 1;
- remote_async_ops.to_magic = OPS_MAGIC;
-}
-
-/* Set up the async extended remote vector by making a copy of the standard
- remote vector and adding to it. */
+ help_list (remote_set_cmdlist, "set remote ", -1, gdb_stdout);
+}
static void
-init_extended_async_remote_ops (void)
+show_remote_cmd (char *args, int from_tty)
{
- extended_async_remote_ops = remote_async_ops;
+ /* We can't just use cmd_show_list here, because we want to skip
+ the redundant "show remote Z-packet" and the legacy aliases. */
+ struct cleanup *showlist_chain;
+ struct cmd_list_element *list = remote_show_cmdlist;
+
+ showlist_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "showlist");
+ for (; list != NULL; list = list->next)
+ if (strcmp (list->name, "Z-packet") == 0)
+ continue;
+ else if (list->type == not_set_cmd)
+ /* Alias commands are exactly like the original, except they
+ don't have the normal type. */
+ continue;
+ else
+ {
+ struct cleanup *option_chain
+ = make_cleanup_ui_out_tuple_begin_end (uiout, "option");
- extended_async_remote_ops.to_shortname = "extended-async";
- extended_async_remote_ops.to_longname =
- "Extended remote serial target in async gdb-specific protocol";
- extended_async_remote_ops.to_doc =
- "Use a remote computer via a serial line, using an async gdb-specific protocol.\n\
-Specify the serial device it is connected to (e.g. /dev/ttya).",
- extended_async_remote_ops.to_open = extended_remote_async_open;
- extended_async_remote_ops.to_create_inferior = extended_remote_async_create_inferior;
- extended_async_remote_ops.to_mourn_inferior = extended_remote_mourn;
-}
+ ui_out_field_string (uiout, "name", list->name);
+ ui_out_text (uiout, ": ");
+ if (list->type == show_cmd)
+ do_setshow_command ((char *) NULL, from_tty, list);
+ else
+ cmd_func (list, NULL, from_tty);
+ /* Close the tuple. */
+ do_cleanups (option_chain);
+ }
-static void
-set_remote_cmd (char *args, int from_tty)
-{
+ /* Close the tuple. */
+ do_cleanups (showlist_chain);
}
+
+/* Function to be called whenever a new objfile (shlib) is detected. */
static void
-show_remote_cmd (char *args, int from_tty)
+remote_new_objfile (struct objfile *objfile)
{
- /* FIXME: cagney/2002-06-15: This function should iterate over
- remote_show_cmdlist for a list of sub commands to show. */
- show_remote_protocol_Z_packet_cmd (args, from_tty, NULL);
- show_remote_protocol_P_packet_cmd (args, from_tty, NULL);
- show_remote_protocol_p_packet_cmd (args, from_tty, NULL);
- show_remote_protocol_qSymbol_packet_cmd (args, from_tty, NULL);
- show_remote_protocol_vcont_packet_cmd (args, from_tty, NULL);
- show_remote_protocol_binary_download_cmd (args, from_tty, NULL);
- show_remote_protocol_qPart_auxv_packet_cmd (args, from_tty, NULL);
+ if (remote_desc != 0) /* Have a remote connection. */
+ remote_check_symbols (objfile);
}
-static void
-build_remote_gdbarch_data (void)
+/* Pull all the tracepoints defined on the target and create local
+ data structures representing them. We don't want to create real
+ tracepoints yet, we don't want to mess up the user's existing
+ collection. */
+
+static int
+remote_upload_tracepoints (struct uploaded_tp **utpp)
{
- remote_address_size = TARGET_ADDR_BIT;
-}
+ struct remote_state *rs = get_remote_state ();
+ char *p;
-/* Saved pointer to previous owner of the new_objfile event. */
-static void (*remote_new_objfile_chain) (struct objfile *);
+ /* Ask for a first packet of tracepoint definition. */
+ putpkt ("qTfP");
+ getpkt (&rs->buf, &rs->buf_size, 0);
+ p = rs->buf;
+ while (*p && *p != 'l')
+ {
+ parse_tracepoint_definition (p, utpp);
+ /* Ask for another packet of tracepoint definition. */
+ putpkt ("qTsP");
+ getpkt (&rs->buf, &rs->buf_size, 0);
+ p = rs->buf;
+ }
+ return 0;
+}
-/* Function to be called whenever a new objfile (shlib) is detected. */
-static void
-remote_new_objfile (struct objfile *objfile)
+static int
+remote_upload_trace_state_variables (struct uploaded_tsv **utsvp)
{
- if (remote_desc != 0) /* Have a remote connection */
+ struct remote_state *rs = get_remote_state ();
+ char *p;
+
+ /* Ask for a first packet of variable definition. */
+ putpkt ("qTfV");
+ getpkt (&rs->buf, &rs->buf_size, 0);
+ p = rs->buf;
+ while (*p && *p != 'l')
{
- remote_check_symbols (objfile);
+ parse_tsv_definition (p, utsvp);
+ /* Ask for another packet of variable definition. */
+ putpkt ("qTsV");
+ getpkt (&rs->buf, &rs->buf_size, 0);
+ p = rs->buf;
}
- /* Call predecessor on chain, if any. */
- if (remote_new_objfile_chain != 0 &&
- remote_desc == 0)
- remote_new_objfile_chain (objfile);
+ return 0;
}
void
_initialize_remote (void)
{
- static struct cmd_list_element *remote_set_cmdlist;
- static struct cmd_list_element *remote_show_cmdlist;
- struct cmd_list_element *tmpcmd;
+ struct remote_state *rs;
+ struct cmd_list_element *cmd;
+ char *cmd_name;
/* 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. */
- DEPRECATED_REGISTER_GDBARCH_SWAP (remote_address_size);
- deprecated_register_gdbarch_swap (NULL, 0, build_remote_gdbarch_data);
+ remote_gdbarch_data_handle =
+ gdbarch_data_register_post_init (init_remote_state);
+ remote_g_packet_data_handle =
+ gdbarch_data_register_pre_init (remote_g_packet_data_init);
+
+ /* Initialize the per-target state. At the moment there is only one
+ of these, not one per target. Only one target is active at a
+ time. The default buffer size is unimportant; it will be expanded
+ whenever a larger buffer is needed. */
+ rs = get_remote_state_raw ();
+ rs->buf_size = 400;
+ rs->buf = xmalloc (rs->buf_size);
init_remote_ops ();
add_target (&remote_ops);
init_extended_remote_ops ();
add_target (&extended_remote_ops);
- init_remote_async_ops ();
- add_target (&remote_async_ops);
-
- init_extended_async_remote_ops ();
- add_target (&extended_async_remote_ops);
-
/* Hook into new objfile notification. */
- remote_new_objfile_chain = deprecated_target_new_objfile_hook;
- deprecated_target_new_objfile_hook = remote_new_objfile;
+ observer_attach_new_objfile (remote_new_objfile);
+
+ /* Set up signal handlers. */
+ sigint_remote_token =
+ create_async_signal_handler (async_remote_interrupt, NULL);
+ sigint_remote_twice_token =
+ create_async_signal_handler (async_remote_interrupt_twice, NULL);
#if 0
init_remote_threadtests ();
#endif
- /* set/show remote ... */
+ /* set/show remote ... */
- add_prefix_cmd ("remote", class_maintenance, set_remote_cmd, "\
+ 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",
+the packets being used"),
&remote_set_cmdlist, "set remote ",
- 0/*allow-unknown*/, &setlist);
- add_prefix_cmd ("remote", class_maintenance, show_remote_cmd, "\
+ 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",
+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\
-Argument is a single section name (default: all loaded sections).",
+ add_cmd ("compare-sections", class_obscure, compare_sections_command, _("\
+Compare section data on target to the exec file.\n\
+Argument is a single section name (default: all loaded sections)."),
&cmdlist);
- add_cmd ("packet", class_maintenance, packet_command,
- "Send an arbitrary packet to a remote target.\n\
+ add_cmd ("packet", class_maintenance, packet_command, _("\
+Send an arbitrary packet to a remote target.\n\
maintenance packet TEXT\n\
If GDB is talking to an inferior via the GDB serial protocol, then\n\
this command sends the string TEXT to the inferior, and displays the\n\
response packet. GDB supplies the initial `$' character, and the\n\
-terminating `#' character and checksum.",
+terminating `#' character and checksum."),
&maintenancelist);
- add_setshow_boolean_cmd ("remotebreak", no_class, &remote_break, "\
-Set whether to send break if interrupted.", "\
-Show whether to send break if interrupted.", "\
-If set, a break, instead of a cntrl-c, is sent to the remote target.", "\
-Whether to send break if interrupted is %s.",
- NULL, NULL,
+ add_setshow_boolean_cmd ("remotebreak", no_class, &remote_break, _("\
+Set whether to send break if interrupted."), _("\
+Show whether to send break if interrupted."), _("\
+If set, a break, instead of a cntrl-c, is sent to the remote target."),
+ set_remotebreak, show_remotebreak,
&setlist, &showlist);
+ cmd_name = "remotebreak";
+ cmd = lookup_cmd (&cmd_name, setlist, "", -1, 1);
+ deprecate_cmd (cmd, "set remote interrupt-sequence");
+ cmd_name = "remotebreak"; /* needed because lookup_cmd updates the pointer */
+ cmd = lookup_cmd (&cmd_name, showlist, "", -1, 1);
+ deprecate_cmd (cmd, "show remote interrupt-sequence");
+
+ add_setshow_enum_cmd ("interrupt-sequence", class_support,
+ interrupt_sequence_modes, &interrupt_sequence_mode,
+ _("\
+Set interrupt sequence to remote target."), _("\
+Show interrupt sequence to remote target."), _("\
+Valid value is \"Ctrl-C\", \"BREAK\" or \"BREAK-g\". The default is \"Ctrl-C\"."),
+ NULL, show_interrupt_sequence,
+ &remote_set_cmdlist,
+ &remote_show_cmdlist);
+
+ add_setshow_boolean_cmd ("interrupt-on-connect", class_support,
+ &interrupt_on_connect, _("\
+Set whether interrupt-sequence is sent to remote target when gdb connects to."), _(" \
+Show whether interrupt-sequence is sent to remote target when gdb connects to."), _(" \
+If set, interrupt sequence is sent to remote target."),
+ NULL, NULL,
+ &remote_set_cmdlist, &remote_show_cmdlist);
- /* 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",
+ add_cmd ("remotewritesize", no_class, set_memory_write_packet_size, _("\
+Set the maximum number of bytes per memory write packet (deprecated)."),
&setlist);
- add_cmd ("remotewritesize", no_class, show_memory_write_packet_size,
- "Show the maximum number of bytes per memory write packet (deprecated).\n",
+ add_cmd ("remotewritesize", no_class, show_memory_write_packet_size, _("\
+Show the maximum number of bytes per memory write packet (deprecated)."),
&showlist);
add_cmd ("memory-write-packet-size", no_class,
- set_memory_write_packet_size,
- "Set the maximum number of bytes per memory-write packet.\n"
- "Specify the number of bytes in a packet or 0 (zero) for the\n"
- "default packet size. The actual limit is further reduced\n"
- "dependent on the target. Specify ``fixed'' to disable the\n"
- "further restriction and ``limit'' to enable that restriction\n",
+ set_memory_write_packet_size, _("\
+Set the maximum number of bytes per memory-write packet.\n\
+Specify the number of bytes in a packet or 0 (zero) for the\n\
+default packet size. The actual limit is further reduced\n\
+dependent on the target. Specify ``fixed'' to disable the\n\
+further restriction and ``limit'' to enable that restriction."),
&remote_set_cmdlist);
add_cmd ("memory-read-packet-size", no_class,
- set_memory_read_packet_size,
- "Set the maximum number of bytes per memory-read packet.\n"
- "Specify the number of bytes in a packet or 0 (zero) for the\n"
- "default packet size. The actual limit is further reduced\n"
- "dependent on the target. Specify ``fixed'' to disable the\n"
- "further restriction and ``limit'' to enable that restriction\n",
+ set_memory_read_packet_size, _("\
+Set the maximum number of bytes per memory-read packet.\n\
+Specify the number of bytes in a packet or 0 (zero) for the\n\
+default packet size. The actual limit is further reduced\n\
+dependent on the target. Specify ``fixed'' to disable the\n\
+further restriction and ``limit'' to enable that restriction."),
&remote_set_cmdlist);
add_cmd ("memory-write-packet-size", no_class,
show_memory_write_packet_size,
- "Show the maximum number of bytes per memory-write packet.\n",
+ _("Show the maximum number of bytes per memory-write packet."),
&remote_show_cmdlist);
add_cmd ("memory-read-packet-size", no_class,
show_memory_read_packet_size,
- "Show the maximum number of bytes per memory-read packet.\n",
+ _("Show the maximum number of bytes per memory-read packet."),
&remote_show_cmdlist);
add_setshow_zinteger_cmd ("hardware-watchpoint-limit", no_class,
- &remote_hw_watchpoint_limit, "\
-Set the maximum number of target hardware watchpoints.", "\
-Show the maximum number of target hardware watchpoints.", "\
-Specify a negative limit for unlimited.", "\
-The maximum number of target hardware watchpoints is %s.",
- NULL, NULL,
+ &remote_hw_watchpoint_limit, _("\
+Set the maximum number of target hardware watchpoints."), _("\
+Show the maximum number of target hardware watchpoints."), _("\
+Specify a negative limit for unlimited."),
+ NULL, NULL, /* FIXME: i18n: The maximum
+ number of target hardware
+ watchpoints is %s. */
&remote_set_cmdlist, &remote_show_cmdlist);
add_setshow_zinteger_cmd ("hardware-breakpoint-limit", no_class,
- &remote_hw_breakpoint_limit, "\
-Set the maximum number of target hardware breakpoints.", "\
-Show the maximum number of target hardware breakpoints.", "\
-Specify a negative limit for unlimited.", "\
-The maximum number of target hardware breakpoints is %s.",
- NULL, NULL,
+ &remote_hw_breakpoint_limit, _("\
+Set the maximum number of target hardware breakpoints."), _("\
+Show the maximum number of target hardware breakpoints."), _("\
+Specify a negative limit for unlimited."),
+ NULL, NULL, /* FIXME: i18n: The maximum
+ number of target hardware
+ breakpoints is %s. */
&remote_set_cmdlist, &remote_show_cmdlist);
- deprecated_add_show_from_set
- (add_set_cmd ("remoteaddresssize", class_obscure,
- var_integer, (char *) &remote_address_size,
- "Set the maximum size of the address (in bits) \
-in a memory packet.\n",
- &setlist),
- &showlist);
-
- add_packet_config_cmd (&remote_protocol_binary_download,
- "X", "binary-download",
- set_remote_protocol_binary_download_cmd,
- show_remote_protocol_binary_download_cmd,
- &remote_set_cmdlist, &remote_show_cmdlist,
- 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,
- "Set binary downloads.\n", &setlist),
- &showlist);
-#endif
+ add_setshow_integer_cmd ("remoteaddresssize", class_obscure,
+ &remote_address_size, _("\
+Set the maximum size of the address (in bits) in a memory packet."), _("\
+Show the maximum size of the address (in bits) in a memory packet."), NULL,
+ NULL,
+ NULL, /* FIXME: i18n: */
+ &setlist, &showlist);
- add_packet_config_cmd (&remote_protocol_vcont,
- "vCont", "verbose-resume",
- set_remote_protocol_vcont_packet_cmd,
- show_remote_protocol_vcont_packet_cmd,
- &remote_set_cmdlist, &remote_show_cmdlist,
- 0);
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_X],
+ "X", "binary-download", 1);
- add_packet_config_cmd (&remote_protocol_qSymbol,
- "qSymbol", "symbol-lookup",
- set_remote_protocol_qSymbol_packet_cmd,
- show_remote_protocol_qSymbol_packet_cmd,
- &remote_set_cmdlist, &remote_show_cmdlist,
- 0);
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_vCont],
+ "vCont", "verbose-resume", 0);
- add_packet_config_cmd (&remote_protocol_P,
- "P", "set-register",
- set_remote_protocol_P_packet_cmd,
- show_remote_protocol_P_packet_cmd,
- &remote_set_cmdlist, &remote_show_cmdlist,
- 1);
-
- add_packet_config_cmd (&remote_protocol_p,
- "p", "fetch-register",
- set_remote_protocol_p_packet_cmd,
- show_remote_protocol_p_packet_cmd,
- &remote_set_cmdlist, &remote_show_cmdlist,
- 1);
-
- add_packet_config_cmd (&remote_protocol_Z[Z_PACKET_SOFTWARE_BP],
- "Z0", "software-breakpoint",
- set_remote_protocol_Z_software_bp_packet_cmd,
- show_remote_protocol_Z_software_bp_packet_cmd,
- &remote_set_cmdlist, &remote_show_cmdlist,
- 0);
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_QPassSignals],
+ "QPassSignals", "pass-signals", 0);
- add_packet_config_cmd (&remote_protocol_Z[Z_PACKET_HARDWARE_BP],
- "Z1", "hardware-breakpoint",
- set_remote_protocol_Z_hardware_bp_packet_cmd,
- show_remote_protocol_Z_hardware_bp_packet_cmd,
- &remote_set_cmdlist, &remote_show_cmdlist,
- 0);
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_qSymbol],
+ "qSymbol", "symbol-lookup", 0);
- add_packet_config_cmd (&remote_protocol_Z[Z_PACKET_WRITE_WP],
- "Z2", "write-watchpoint",
- set_remote_protocol_Z_write_wp_packet_cmd,
- show_remote_protocol_Z_write_wp_packet_cmd,
- &remote_set_cmdlist, &remote_show_cmdlist,
- 0);
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_P],
+ "P", "set-register", 1);
- add_packet_config_cmd (&remote_protocol_Z[Z_PACKET_READ_WP],
- "Z3", "read-watchpoint",
- set_remote_protocol_Z_read_wp_packet_cmd,
- show_remote_protocol_Z_read_wp_packet_cmd,
- &remote_set_cmdlist, &remote_show_cmdlist,
- 0);
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_p],
+ "p", "fetch-register", 1);
+
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_Z0],
+ "Z0", "software-breakpoint", 0);
+
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_Z1],
+ "Z1", "hardware-breakpoint", 0);
+
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_Z2],
+ "Z2", "write-watchpoint", 0);
+
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_Z3],
+ "Z3", "read-watchpoint", 0);
+
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_Z4],
+ "Z4", "access-watchpoint", 0);
+
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_qXfer_auxv],
+ "qXfer:auxv:read", "read-aux-vector", 0);
+
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_qXfer_features],
+ "qXfer:features:read", "target-features", 0);
+
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_qXfer_libraries],
+ "qXfer:libraries:read", "library-info", 0);
+
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_qXfer_memory_map],
+ "qXfer:memory-map:read", "memory-map", 0);
+
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_qXfer_spu_read],
+ "qXfer:spu:read", "read-spu-object", 0);
+
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_qXfer_spu_write],
+ "qXfer:spu:write", "write-spu-object", 0);
- add_packet_config_cmd (&remote_protocol_Z[Z_PACKET_ACCESS_WP],
- "Z4", "access-watchpoint",
- set_remote_protocol_Z_access_wp_packet_cmd,
- show_remote_protocol_Z_access_wp_packet_cmd,
- &remote_set_cmdlist, &remote_show_cmdlist,
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_qXfer_osdata],
+ "qXfer:osdata:read", "osdata", 0);
+
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_qXfer_threads],
+ "qXfer:threads:read", "threads", 0);
+
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_qXfer_siginfo_read],
+ "qXfer:siginfo:read", "read-siginfo-object", 0);
+
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_qXfer_siginfo_write],
+ "qXfer:siginfo:write", "write-siginfo-object", 0);
+
+ add_packet_config_cmd
+ (&remote_protocol_packets[PACKET_qXfer_traceframe_info],
+ "qXfer:trace-frame-info:read", "traceframe-info", 0);
+
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_qGetTLSAddr],
+ "qGetTLSAddr", "get-thread-local-storage-address",
0);
- add_packet_config_cmd (&remote_protocol_qPart_auxv,
- "qPart_auxv", "read-aux-vector",
- set_remote_protocol_qPart_auxv_packet_cmd,
- show_remote_protocol_qPart_auxv_packet_cmd,
- &remote_set_cmdlist, &remote_show_cmdlist,
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_qGetTIBAddr],
+ "qGetTIBAddr", "get-thread-information-block-address",
0);
- /* Keep the old ``set remote Z-packet ...'' working. */
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_bc],
+ "bc", "reverse-continue", 0);
+
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_bs],
+ "bs", "reverse-step", 0);
+
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_qSupported],
+ "qSupported", "supported-packets", 0);
+
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_qSearch_memory],
+ "qSearch:memory", "search-memory", 0);
+
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_vFile_open],
+ "vFile:open", "hostio-open", 0);
+
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_vFile_pread],
+ "vFile:pread", "hostio-pread", 0);
+
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_vFile_pwrite],
+ "vFile:pwrite", "hostio-pwrite", 0);
+
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_vFile_close],
+ "vFile:close", "hostio-close", 0);
+
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_vFile_unlink],
+ "vFile:unlink", "hostio-unlink", 0);
+
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_vAttach],
+ "vAttach", "attach", 0);
+
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_vRun],
+ "vRun", "run", 0);
+
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_QStartNoAckMode],
+ "QStartNoAckMode", "noack", 0);
+
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_vKill],
+ "vKill", "kill", 0);
+
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_qAttached],
+ "qAttached", "query-attached", 0);
+
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_ConditionalTracepoints],
+ "ConditionalTracepoints",
+ "conditional-tracepoints", 0);
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_FastTracepoints],
+ "FastTracepoints", "fast-tracepoints", 0);
+
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_TracepointSource],
+ "TracepointSource", "TracepointSource", 0);
+
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_QAllow],
+ "QAllow", "allow", 0);
+
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_StaticTracepoints],
+ "StaticTracepoints", "static-tracepoints", 0);
+
+ add_packet_config_cmd (&remote_protocol_packets[PACKET_qXfer_statictrace_read],
+ "qXfer:statictrace:read", "read-sdata-object", 0);
+
+ /* Keep the old ``set remote Z-packet ...'' working. Each individual
+ Z sub-packet has its own set and show commands, but users may
+ have sets to this variable in their .gdbinit files (or in their
+ documentation). */
add_setshow_auto_boolean_cmd ("Z-packet", class_obscure,
- &remote_Z_packet_detect, "\
-Set use of remote protocol `Z' packets", "\
-Show use of remote protocol `Z' packets ", "\
+ &remote_Z_packet_detect, _("\
+Set use of remote protocol `Z' packets"), _("\
+Show use of remote protocol `Z' packets "), _("\
When set, GDB will attempt to use the remote breakpoint and watchpoint\n\
-packets.", "\
-Use of remote protocol `Z' packets is %s",
+packets."),
set_remote_protocol_Z_packet_cmd,
show_remote_protocol_Z_packet_cmd,
+ /* FIXME: i18n: Use of remote protocol
+ `Z' packets is %s. */
&remote_set_cmdlist, &remote_show_cmdlist);
+ add_prefix_cmd ("remote", class_files, remote_command, _("\
+Manipulate files on the remote system\n\
+Transfer files to and from the remote target system."),
+ &remote_cmdlist, "remote ",
+ 0 /* allow-unknown */, &cmdlist);
+
+ add_cmd ("put", class_files, remote_put_command,
+ _("Copy a local file to the remote system."),
+ &remote_cmdlist);
+
+ add_cmd ("get", class_files, remote_get_command,
+ _("Copy a remote file to the local system."),
+ &remote_cmdlist);
+
+ add_cmd ("delete", class_files, remote_delete_command,
+ _("Delete a remote file."),
+ &remote_cmdlist);
+
+ remote_exec_file = xstrdup ("");
+ add_setshow_string_noescape_cmd ("exec-file", class_files,
+ &remote_exec_file, _("\
+Set the remote pathname for \"run\""), _("\
+Show the remote pathname for \"run\""), NULL, NULL, NULL,
+ &remote_set_cmdlist, &remote_show_cmdlist);
+
/* Eventually initialize fileio. See fileio.c */
initialize_remote_fileio (remote_set_cmdlist, remote_show_cmdlist);
+
+ /* Take advantage of the fact that the LWP field is not used, to tag
+ special ptids with it set to != 0. */
+ magic_null_ptid = ptid_build (42000, 1, -1);
+ not_sent_ptid = ptid_build (42000, 1, -2);
+ any_thread_ptid = ptid_build (42000, 1, 0);
+
+ target_buf_size = 2048;
+ target_buf = xmalloc (target_buf_size);
}
+
projects / deliverable / binutils-gdb.git / blobdiff