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. */
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\n"), buf);
+ from = ul;
+
+ p = pp + 1;
+ pp = 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
else
{
struct packet_reg *r = &rsa->regs[regnum];
+
gdb_assert (r->regnum == regnum);
return r;
}
packet_reg_from_pnum (struct remote_arch_state *rsa, LONGEST pnum)
{
int i;
+
for (i = 0; i < gdbarch_num_regs (target_gdbarch); i++)
{
struct packet_reg *r = &rsa->regs[i];
+
if (r->pnum == pnum)
return r;
}
{
int fixed_p = config->fixed_p;
long size = config->size;
+
if (args == NULL)
error (_("Argument required (integer, `fixed' or `limited')."));
else if (strcmp (args, "hard") == 0
else
{
char *end;
+
size = strtoul (args, &end, 0);
if (args == end)
error (_("Invalid %s (bad syntax)."), config->name);
get_memory_read_packet_size (void)
{
long size = get_memory_packet_size (&memory_read_packet_config);
+
/* FIXME: cagney/1999-11-07: Functions like getpkt() need to get an
extra buffer size argument before the memory read size can be
increased beyond this. */
show_packet_config_cmd (struct packet_config *config)
{
char *support = "internal-error";
+
switch (config->support)
{
case PACKET_ENABLE:
if (legacy)
{
char *legacy_name;
+
legacy_name = xstrprintf ("%s-packet", name);
add_alias_cmd (legacy_name, cmd_name, class_obscure, 0,
&remote_set_cmdlist);
struct cmd_list_element *c)
{
int i;
+
for (i = 0; i < NR_Z_PACKET_TYPES; i++)
{
remote_protocol_packets[PACKET_Z0 + i].detect = remote_Z_packet_detect;
const char *value)
{
int i;
+
for (i = 0; i < NR_Z_PACKET_TYPES; i++)
{
show_packet_config_cmd (&remote_protocol_packets[PACKET_Z0 + i]);
{ 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
/*
{
struct gdb_xml_parser *parser;
struct threads_parsing_context context;
- struct cleanup *back_to = make_cleanup (null_cleanup, NULL);
+ struct cleanup *clear_parsing_context;
context.items = 0;
+ /* Note: this parser cleanup is already guarded by BACK_TO
+ above. */
parser = gdb_xml_create_parser_and_cleanup (_("threads"),
threads_elements,
&context);
gdb_xml_use_dtd (parser, "threads.dtd");
+ clear_parsing_context
+ = make_cleanup (clear_threads_parsing_context, &context);
+
if (gdb_xml_parse (parser, xml) == 0)
{
int i;
info = demand_private_info (item->ptid);
info->core = item->core;
info->extra = item->extra;
- item->extra = 0;
+ item->extra = NULL;
}
- xfree (item->extra);
}
}
- VEC_free (thread_item_t, context.items);
+ do_cleanups (clear_parsing_context);
}
do_cleanups (back_to);
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
init_all_packet_configs (void)
{
int i;
+
for (i = 0; i < PACKET_MAX; i++)
update_packet_config (&remote_protocol_packets[i]);
}
enum packet_support support, const char *value)
{
struct remote_state *rs = get_remote_state ();
+
rs->multi_process_aware = (support == PACKET_ENABLE);
}
enum packet_support support, const char *value)
{
struct remote_state *rs = get_remote_state ();
+
rs->non_stop_aware = (support == PACKET_ENABLE);
}
const char *value)
{
struct remote_state *rs = get_remote_state ();
+
rs->cond_tracepoints = (support == PACKET_ENABLE);
}
const char *value)
{
struct remote_state *rs = get_remote_state ();
+
rs->fast_tracepoints = (support == PACKET_ENABLE);
}
const char *value)
{
struct remote_state *rs = get_remote_state ();
+
rs->disconnected_tracing = (support == PACKET_ENABLE);
}
while ((p = strtok (NULL, ",")) != NULL);
xfree (copy);
- p = concat (remote_support_xml, ",", xml, (char *) NULL);
- xfree (remote_support_xml);
- remote_support_xml = p;
+ remote_support_xml = reconcat (remote_support_xml,
+ remote_support_xml, ",", xml,
+ (char *) NULL);
}
#endif
}
remote_query_supported_append (char *msg, const char *append)
{
if (msg)
- {
- char *p = concat (msg, ";", append, (char *) NULL);
- xfree (msg);
- return p;
- }
+ return reconcat (msg, msg, ";", append, (char *) NULL);
else
return xstrdup (append);
}
if (remote_protocol_packets[PACKET_qSupported].support != PACKET_DISABLE)
{
char *q = NULL;
- const char *qsupported = gdbarch_qsupported (target_gdbarch);
+ struct cleanup *old_chain = make_cleanup (free_current_contents, &q);
if (rs->extended)
q = remote_query_supported_append (q, "multiprocess+");
-
- if (qsupported)
- q = remote_query_supported_append (q, qsupported);
if (remote_support_xml)
q = remote_query_supported_append (q, remote_support_xml);
- if (q)
- {
- char *p = concat ("qSupported:", q, (char *) NULL);
- xfree (q);
- putpkt (p);
- xfree (p);
- }
- else
- putpkt ("qSupported");
+ 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);
bin2hex (const gdb_byte *bin, char *hex, int count)
{
int i;
+
/* May use a length, or a nul-terminated string as input. */
if (count == 0)
count = strlen ((char *) bin);
remote_async_terminal_ours_p = 1;
}
-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);
stop_reply_xmalloc (void)
{
struct stop_reply *r = XMALLOC (struct stop_reply);
+
r->next = NULL;
return r;
}
do_stop_reply_xfree (void *arg)
{
struct stop_reply *r = arg;
+
stop_reply_xfree (r);
}
else if (strncmp (p, "core", p1 - p) == 0)
{
ULONGEST c;
+
p = unpack_varlen_hex (++p1, &c);
event->core = c;
}
"process:", sizeof ("process:") - 1) == 0)
{
ULONGEST upid;
+
p += sizeof ("process:") - 1;
unpack_varlen_hex (p, &upid);
pid = upid;
struct target_waitstatus *status)
{
ptid_t ptid;
- struct thread_info *info;
*status = stop_reply->ws;
ptid = stop_reply->ptid;
p += 2;
}
- {
- int i;
- for (i = 0; i < gdbarch_num_regs (gdbarch); i++)
- {
- struct packet_reg *r = &rsa->regs[i];
- if (r->in_g_packet)
- {
- 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);
- }
- }
- }
+ for (i = 0; i < gdbarch_num_regs (gdbarch); i++)
+ {
+ struct packet_reg *r = &rsa->regs[i];
+
+ if (r->in_g_packet)
+ {
+ 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);
+ }
+ }
}
static void
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 -
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);
}
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
hexnumstr (char *buf, ULONGEST num)
{
int len = hexnumlen (num);
+
return hexnumnstr (buf, num, len);
}
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);
/* 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;
}
{
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);
{
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';
restore_remote_timeout (void *p)
{
int value = *(int *)p;
+
remote_timeout = value;
}
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",
case '*': /* Run length encoding. */
{
int repeat;
- csum += c;
+ csum += c;
c = readchar (remote_timeout);
csum += c;
repeat = c - ' ' + 3; /* Compute repeat count. */
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;
if (object == TARGET_OBJECT_MEMORY)
{
int xfered;
+
errno = 0;
/* If the remote target is connected but not running, we should
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;
if (text)
{
struct cleanup *back_to = make_cleanup (xfree, text);
+
result = parse_memory_map (text);
do_cleanups (back_to);
}
remote_supports_multi_process (void)
{
struct remote_state *rs = get_remote_state ();
+
return remote_multi_process_p (rs);
}
remote_supports_cond_tracepoints (void)
{
struct remote_state *rs = get_remote_state ();
+
return rs->cond_tracepoints;
}
remote_supports_fast_tracepoints (void)
{
struct remote_state *rs = get_remote_state ();
+
return rs->fast_tracepoints;
}
static int
remote_get_trace_status (struct trace_status *ts)
{
- char *p, *p1, *p_temp;
- ULONGEST val;
+ char *p;
/* FIXME we need to get register block size some other way */
extern int trace_regblock_size;
+
trace_regblock_size = get_remote_arch_state ()->sizeof_g_packet;
putpkt ("qTStatus");
remote_core_of_thread (struct target_ops *ops, ptid_t ptid)
{
struct thread_info *info = find_thread_ptid (ptid);
+
if (info && info->private)
return info->private->core;
return -1;
remote_async_mask (int new_mask)
{
int curr_mask = remote_async_mask_value;
+
remote_async_mask_value = new_mask;
return curr_mask;
}
{
struct cleanup *option_chain
= make_cleanup_ui_out_tuple_begin_end (uiout, "option");
+
ui_out_field_string (uiout, "name", list->name);
ui_out_text (uiout, ": ");
if (list->type == show_cmd)