binutils-gdb/gdb/gdbserver/ax.c

1349 lines
30 KiB
C
Raw Normal View History

/* Agent expression code for remote server.
Copyright (C) 2009-2013 Free Software Foundation, Inc.
This file is part of GDB.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "server.h"
#include "ax.h"
Add target-side support for dynamic printf. * NEWS: Mention the additional style. * breakpoint.h (struct bp_target_info): New fields tcommands, persist. (struct bp_location): New field cmd_bytecode. * breakpoint.c: Include format.h. (disconnected_dprintf): New global. (parse_cmd_to_aexpr): New function. (build_target_command_list): New function. (insert_bp_location): Call it. (remove_breakpoints_pid): Skip dprintf breakpoints. (print_one_breakpoint_location): Ditto. (dprintf_style_agent): New global. (dprintf_style_enums): Add dprintf_style_agent. (update_dprintf_command_list): Add agent case. (agent_printf_command): New function. (_initialize_breakpoint): Add new commands. * common/ax.def (printf): New bytecode. * ax.h (ax_string): Declare. * ax-gdb.h (gen_printf): Declare. * ax-gdb.c: Include cli-utils.h, format.h. (gen_printf): New function. (maint_agent_print_command): New function. (_initialize_ax_gdb): Add maint agent-printf command. * ax-general.c (ax_string): New function. (ax_print): Add printf disassembly. * Makefile.in (SFILES): Add format.c (COMMON_OBS): Add format.o. * common/format.h: New file. * common/format.c: New file. * printcmd.c: Include format.h. (ui_printf): Call parse_format_string. * remote.c (remote_state): New field breakpoint_commands. (PACKET_BreakpointCommands): New enum. (remote_breakpoint_commands_feature): New function. (remote_protocol_features): Add new BreakpointCommands entry. (remote_can_run_breakpoint_commands): New function. (remote_add_target_side_commands): New function. (remote_insert_breakpoint): Call it. (remote_insert_hw_breakpoint): Ditto. (_initialize_remote): Add new packet configuration for target-side breakpoint commands. * target.h (struct target_ops): New field to_can_run_breakpoint_commands. (target_can_run_breakpoint_commands): New macro. * target.c (update_current_target): Handle to_can_run_breakpoint_commands. [gdbserver] * Makefile.in (WARN_CFLAGS_NO_FORMAT): Define. (ax.o): Add it to build rule. (ax-ipa.o): Ditto. (OBS): Add format.o. (IPA_OBS): Add format.o. * server.c (handle_query): Claim support for breakpoint commands. (process_point_options): Add command case. (process_serial_event): Leave running if there are printfs in effect. * mem-break.h (any_persistent_commands): Declare. (add_breakpoint_commands): Declare. (gdb_no_commands_at_breakpoint): Declare. (run_breakpoint_commands): Declare. * mem-break.c (struct point_command_list): New struct. (struct breakpoint): New field command_list. (any_persistent_commands): New function. (add_commands_to_breakpoint): New function. (add_breakpoint_commands): New function. (gdb_no_commands_at_breakpoint): New function. (run_breakpoint_commands): New function. * linux-low.c (linux_wait_1): Test for and run breakpoint commands locally. * ax.c: Include format.h. (ax_printf): New function. (gdb_eval_agent_expr): Add printf opcode. [doc] * gdb.texinfo (Dynamic Printf): Mention agent style and disconnected dprintf. (Maintenance Commands): Describe maint agent-printf. (General Query Packets): Mention BreakpointCommands feature. (Packets): Document commands extension to Z0 packet. * agentexpr.texi (Bytecode Descriptions): Document printf bytecode. [testsuite] * gdb.base/dprintf.exp: Add agent style tests.
2012-07-02 23:29:39 +08:00
#include "format.h"
#include "tracepoint.h"
static void ax_vdebug (const char *, ...) ATTRIBUTE_PRINTF (1, 2);
#ifdef IN_PROCESS_AGENT
int debug_agent = 0;
#endif
static void
ax_vdebug (const char *fmt, ...)
{
char buf[1024];
va_list ap;
va_start (ap, fmt);
vsprintf (buf, fmt, ap);
fprintf (stderr, PROG "/ax: %s\n", buf);
va_end (ap);
}
#define ax_debug_1(level, fmt, args...) \
do { \
if (level <= debug_threads) \
ax_vdebug ((fmt), ##args); \
} while (0)
#define ax_debug(FMT, args...) \
ax_debug_1 (1, FMT, ##args)
/* This enum must exactly match what is documented in
gdb/doc/agentexpr.texi, including all the numerical values. */
enum gdb_agent_op
{
#define DEFOP(NAME, SIZE, DATA_SIZE, CONSUMED, PRODUCED, VALUE) \
gdb_agent_op_ ## NAME = VALUE,
#include "ax.def"
#undef DEFOP
gdb_agent_op_last
};
static const char *gdb_agent_op_names [gdb_agent_op_last] =
{
"?undef?"
#define DEFOP(NAME, SIZE, DATA_SIZE, CONSUMED, PRODUCED, VALUE) , # NAME
#include "ax.def"
#undef DEFOP
};
static const unsigned char gdb_agent_op_sizes [gdb_agent_op_last] =
{
0
#define DEFOP(NAME, SIZE, DATA_SIZE, CONSUMED, PRODUCED, VALUE) , SIZE
#include "ax.def"
#undef DEFOP
};
/* A wrapper for gdb_agent_op_names that does some bounds-checking. */
static const char *
gdb_agent_op_name (int op)
{
if (op < 0 || op >= gdb_agent_op_last || gdb_agent_op_names[op] == NULL)
return "?undef?";
return gdb_agent_op_names[op];
}
#ifndef IN_PROCESS_AGENT
/* The packet form of an agent expression consists of an 'X', number
of bytes in expression, a comma, and then the bytes. */
struct agent_expr *
gdb_parse_agent_expr (char **actparm)
{
char *act = *actparm;
ULONGEST xlen;
struct agent_expr *aexpr;
++act; /* skip the X */
act = unpack_varlen_hex (act, &xlen);
++act; /* skip a comma */
aexpr = xmalloc (sizeof (struct agent_expr));
aexpr->length = xlen;
aexpr->bytes = xmalloc (xlen);
convert_ascii_to_int (act, aexpr->bytes, xlen);
*actparm = act + (xlen * 2);
return aexpr;
}
/* Convert the bytes of an agent expression back into hex digits, so
they can be printed or uploaded. This allocates the buffer,
callers should free when they are done with it. */
char *
gdb_unparse_agent_expr (struct agent_expr *aexpr)
{
char *rslt;
rslt = xmalloc (2 * aexpr->length + 1);
convert_int_to_ascii (aexpr->bytes, rslt, aexpr->length);
return rslt;
}
/* Bytecode compilation. */
CORE_ADDR current_insn_ptr;
int emit_error;
struct bytecode_address
{
int pc;
CORE_ADDR address;
int goto_pc;
/* Offset and size of field to be modified in the goto block. */
int from_offset, from_size;
struct bytecode_address *next;
} *bytecode_address_table;
void
emit_prologue (void)
{
target_emit_ops ()->emit_prologue ();
}
void
emit_epilogue (void)
{
target_emit_ops ()->emit_epilogue ();
}
static void
emit_add (void)
{
target_emit_ops ()->emit_add ();
}
static void
emit_sub (void)
{
target_emit_ops ()->emit_sub ();
}
static void
emit_mul (void)
{
target_emit_ops ()->emit_mul ();
}
static void
emit_lsh (void)
{
target_emit_ops ()->emit_lsh ();
}
static void
emit_rsh_signed (void)
{
target_emit_ops ()->emit_rsh_signed ();
}
static void
emit_rsh_unsigned (void)
{
target_emit_ops ()->emit_rsh_unsigned ();
}
static void
emit_ext (int arg)
{
target_emit_ops ()->emit_ext (arg);
}
static void
emit_log_not (void)
{
target_emit_ops ()->emit_log_not ();
}
static void
emit_bit_and (void)
{
target_emit_ops ()->emit_bit_and ();
}
static void
emit_bit_or (void)
{
target_emit_ops ()->emit_bit_or ();
}
static void
emit_bit_xor (void)
{
target_emit_ops ()->emit_bit_xor ();
}
static void
emit_bit_not (void)
{
target_emit_ops ()->emit_bit_not ();
}
static void
emit_equal (void)
{
target_emit_ops ()->emit_equal ();
}
static void
emit_less_signed (void)
{
target_emit_ops ()->emit_less_signed ();
}
static void
emit_less_unsigned (void)
{
target_emit_ops ()->emit_less_unsigned ();
}
static void
emit_ref (int size)
{
target_emit_ops ()->emit_ref (size);
}
static void
emit_if_goto (int *offset_p, int *size_p)
{
target_emit_ops ()->emit_if_goto (offset_p, size_p);
}
static void
emit_goto (int *offset_p, int *size_p)
{
target_emit_ops ()->emit_goto (offset_p, size_p);
}
static void
write_goto_address (CORE_ADDR from, CORE_ADDR to, int size)
{
target_emit_ops ()->write_goto_address (from, to, size);
}
static void
emit_const (LONGEST num)
{
target_emit_ops ()->emit_const (num);
}
static void
emit_reg (int reg)
{
target_emit_ops ()->emit_reg (reg);
}
static void
emit_pop (void)
{
target_emit_ops ()->emit_pop ();
}
static void
emit_stack_flush (void)
{
target_emit_ops ()->emit_stack_flush ();
}
static void
emit_zero_ext (int arg)
{
target_emit_ops ()->emit_zero_ext (arg);
}
static void
emit_swap (void)
{
target_emit_ops ()->emit_swap ();
}
static void
emit_stack_adjust (int n)
{
target_emit_ops ()->emit_stack_adjust (n);
}
/* FN's prototype is `LONGEST(*fn)(int)'. */
static void
emit_int_call_1 (CORE_ADDR fn, int arg1)
{
target_emit_ops ()->emit_int_call_1 (fn, arg1);
}
/* FN's prototype is `void(*fn)(int,LONGEST)'. */
static void
emit_void_call_2 (CORE_ADDR fn, int arg1)
{
target_emit_ops ()->emit_void_call_2 (fn, arg1);
}
static void
emit_eq_goto (int *offset_p, int *size_p)
{
target_emit_ops ()->emit_eq_goto (offset_p, size_p);
}
static void
emit_ne_goto (int *offset_p, int *size_p)
{
target_emit_ops ()->emit_ne_goto (offset_p, size_p);
}
static void
emit_lt_goto (int *offset_p, int *size_p)
{
target_emit_ops ()->emit_lt_goto (offset_p, size_p);
}
static void
emit_ge_goto (int *offset_p, int *size_p)
{
target_emit_ops ()->emit_ge_goto (offset_p, size_p);
}
static void
emit_gt_goto (int *offset_p, int *size_p)
{
target_emit_ops ()->emit_gt_goto (offset_p, size_p);
}
static void
emit_le_goto (int *offset_p, int *size_p)
{
target_emit_ops ()->emit_le_goto (offset_p, size_p);
}
/* Scan an agent expression for any evidence that the given PC is the
target of a jump bytecode in the expression. */
int
is_goto_target (struct agent_expr *aexpr, int pc)
{
int i;
unsigned char op;
for (i = 0; i < aexpr->length; i += 1 + gdb_agent_op_sizes[op])
{
op = aexpr->bytes[i];
if (op == gdb_agent_op_goto || op == gdb_agent_op_if_goto)
{
int target = (aexpr->bytes[i + 1] << 8) + aexpr->bytes[i + 2];
if (target == pc)
return 1;
}
}
return 0;
}
/* Given an agent expression, turn it into native code. */
enum eval_result_type
compile_bytecodes (struct agent_expr *aexpr)
{
int pc = 0;
int done = 0;
unsigned char op, next_op;
int arg;
/* This is only used to build 64-bit value for constants. */
ULONGEST top;
struct bytecode_address *aentry, *aentry2;
#define UNHANDLED \
do \
{ \
ax_debug ("Cannot compile op 0x%x\n", op); \
return expr_eval_unhandled_opcode; \
} while (0)
if (aexpr->length == 0)
{
ax_debug ("empty agent expression\n");
return expr_eval_empty_expression;
}
bytecode_address_table = NULL;
while (!done)
{
op = aexpr->bytes[pc];
ax_debug ("About to compile op 0x%x, pc=%d\n", op, pc);
/* Record the compiled-code address of the bytecode, for use by
jump instructions. */
aentry = xmalloc (sizeof (struct bytecode_address));
aentry->pc = pc;
aentry->address = current_insn_ptr;
aentry->goto_pc = -1;
aentry->from_offset = aentry->from_size = 0;
aentry->next = bytecode_address_table;
bytecode_address_table = aentry;
++pc;
emit_error = 0;
switch (op)
{
case gdb_agent_op_add:
emit_add ();
break;
case gdb_agent_op_sub:
emit_sub ();
break;
case gdb_agent_op_mul:
emit_mul ();
break;
case gdb_agent_op_div_signed:
UNHANDLED;
break;
case gdb_agent_op_div_unsigned:
UNHANDLED;
break;
case gdb_agent_op_rem_signed:
UNHANDLED;
break;
case gdb_agent_op_rem_unsigned:
UNHANDLED;
break;
case gdb_agent_op_lsh:
emit_lsh ();
break;
case gdb_agent_op_rsh_signed:
emit_rsh_signed ();
break;
case gdb_agent_op_rsh_unsigned:
emit_rsh_unsigned ();
break;
case gdb_agent_op_trace:
UNHANDLED;
break;
case gdb_agent_op_trace_quick:
UNHANDLED;
break;
case gdb_agent_op_log_not:
emit_log_not ();
break;
case gdb_agent_op_bit_and:
emit_bit_and ();
break;
case gdb_agent_op_bit_or:
emit_bit_or ();
break;
case gdb_agent_op_bit_xor:
emit_bit_xor ();
break;
case gdb_agent_op_bit_not:
emit_bit_not ();
break;
case gdb_agent_op_equal:
next_op = aexpr->bytes[pc];
if (next_op == gdb_agent_op_if_goto
&& !is_goto_target (aexpr, pc)
&& target_emit_ops ()->emit_eq_goto)
{
ax_debug ("Combining equal & if_goto");
pc += 1;
aentry->pc = pc;
arg = aexpr->bytes[pc++];
arg = (arg << 8) + aexpr->bytes[pc++];
aentry->goto_pc = arg;
emit_eq_goto (&(aentry->from_offset), &(aentry->from_size));
}
else if (next_op == gdb_agent_op_log_not
&& (aexpr->bytes[pc + 1] == gdb_agent_op_if_goto)
&& !is_goto_target (aexpr, pc + 1)
&& target_emit_ops ()->emit_ne_goto)
{
ax_debug ("Combining equal & log_not & if_goto");
pc += 2;
aentry->pc = pc;
arg = aexpr->bytes[pc++];
arg = (arg << 8) + aexpr->bytes[pc++];
aentry->goto_pc = arg;
emit_ne_goto (&(aentry->from_offset), &(aentry->from_size));
}
else
emit_equal ();
break;
case gdb_agent_op_less_signed:
next_op = aexpr->bytes[pc];
if (next_op == gdb_agent_op_if_goto
&& !is_goto_target (aexpr, pc))
{
ax_debug ("Combining less_signed & if_goto");
pc += 1;
aentry->pc = pc;
arg = aexpr->bytes[pc++];
arg = (arg << 8) + aexpr->bytes[pc++];
aentry->goto_pc = arg;
emit_lt_goto (&(aentry->from_offset), &(aentry->from_size));
}
else if (next_op == gdb_agent_op_log_not
&& !is_goto_target (aexpr, pc)
&& (aexpr->bytes[pc + 1] == gdb_agent_op_if_goto)
&& !is_goto_target (aexpr, pc + 1))
{
ax_debug ("Combining less_signed & log_not & if_goto");
pc += 2;
aentry->pc = pc;
arg = aexpr->bytes[pc++];
arg = (arg << 8) + aexpr->bytes[pc++];
aentry->goto_pc = arg;
emit_ge_goto (&(aentry->from_offset), &(aentry->from_size));
}
else
emit_less_signed ();
break;
case gdb_agent_op_less_unsigned:
emit_less_unsigned ();
break;
case gdb_agent_op_ext:
arg = aexpr->bytes[pc++];
if (arg < (sizeof (LONGEST) * 8))
emit_ext (arg);
break;
case gdb_agent_op_ref8:
emit_ref (1);
break;
case gdb_agent_op_ref16:
emit_ref (2);
break;
case gdb_agent_op_ref32:
emit_ref (4);
break;
case gdb_agent_op_ref64:
emit_ref (8);
break;
case gdb_agent_op_if_goto:
arg = aexpr->bytes[pc++];
arg = (arg << 8) + aexpr->bytes[pc++];
aentry->goto_pc = arg;
emit_if_goto (&(aentry->from_offset), &(aentry->from_size));
break;
case gdb_agent_op_goto:
arg = aexpr->bytes[pc++];
arg = (arg << 8) + aexpr->bytes[pc++];
aentry->goto_pc = arg;
emit_goto (&(aentry->from_offset), &(aentry->from_size));
break;
case gdb_agent_op_const8:
emit_stack_flush ();
top = aexpr->bytes[pc++];
emit_const (top);
break;
case gdb_agent_op_const16:
emit_stack_flush ();
top = aexpr->bytes[pc++];
top = (top << 8) + aexpr->bytes[pc++];
emit_const (top);
break;
case gdb_agent_op_const32:
emit_stack_flush ();
top = aexpr->bytes[pc++];
top = (top << 8) + aexpr->bytes[pc++];
top = (top << 8) + aexpr->bytes[pc++];
top = (top << 8) + aexpr->bytes[pc++];
emit_const (top);
break;
case gdb_agent_op_const64:
emit_stack_flush ();
top = aexpr->bytes[pc++];
top = (top << 8) + aexpr->bytes[pc++];
top = (top << 8) + aexpr->bytes[pc++];
top = (top << 8) + aexpr->bytes[pc++];
top = (top << 8) + aexpr->bytes[pc++];
top = (top << 8) + aexpr->bytes[pc++];
top = (top << 8) + aexpr->bytes[pc++];
top = (top << 8) + aexpr->bytes[pc++];
emit_const (top);
break;
case gdb_agent_op_reg:
emit_stack_flush ();
arg = aexpr->bytes[pc++];
arg = (arg << 8) + aexpr->bytes[pc++];
emit_reg (arg);
break;
case gdb_agent_op_end:
ax_debug ("At end of expression\n");
/* Assume there is one stack element left, and that it is
cached in "top" where emit_epilogue can get to it. */
emit_stack_adjust (1);
done = 1;
break;
case gdb_agent_op_dup:
/* In our design, dup is equivalent to stack flushing. */
emit_stack_flush ();
break;
case gdb_agent_op_pop:
emit_pop ();
break;
case gdb_agent_op_zero_ext:
arg = aexpr->bytes[pc++];
if (arg < (sizeof (LONGEST) * 8))
emit_zero_ext (arg);
break;
case gdb_agent_op_swap:
next_op = aexpr->bytes[pc];
/* Detect greater-than comparison sequences. */
if (next_op == gdb_agent_op_less_signed
&& !is_goto_target (aexpr, pc)
&& (aexpr->bytes[pc + 1] == gdb_agent_op_if_goto)
&& !is_goto_target (aexpr, pc + 1))
{
ax_debug ("Combining swap & less_signed & if_goto");
pc += 2;
aentry->pc = pc;
arg = aexpr->bytes[pc++];
arg = (arg << 8) + aexpr->bytes[pc++];
aentry->goto_pc = arg;
emit_gt_goto (&(aentry->from_offset), &(aentry->from_size));
}
else if (next_op == gdb_agent_op_less_signed
&& !is_goto_target (aexpr, pc)
&& (aexpr->bytes[pc + 1] == gdb_agent_op_log_not)
&& !is_goto_target (aexpr, pc + 1)
&& (aexpr->bytes[pc + 2] == gdb_agent_op_if_goto)
&& !is_goto_target (aexpr, pc + 2))
{
ax_debug ("Combining swap & less_signed & log_not & if_goto");
pc += 3;
aentry->pc = pc;
arg = aexpr->bytes[pc++];
arg = (arg << 8) + aexpr->bytes[pc++];
aentry->goto_pc = arg;
emit_le_goto (&(aentry->from_offset), &(aentry->from_size));
}
else
emit_swap ();
break;
case gdb_agent_op_getv:
emit_stack_flush ();
arg = aexpr->bytes[pc++];
arg = (arg << 8) + aexpr->bytes[pc++];
emit_int_call_1 (get_get_tsv_func_addr (),
arg);
break;
case gdb_agent_op_setv:
arg = aexpr->bytes[pc++];
arg = (arg << 8) + aexpr->bytes[pc++];
emit_void_call_2 (get_set_tsv_func_addr (),
arg);
break;
case gdb_agent_op_tracev:
UNHANDLED;
break;
/* GDB never (currently) generates any of these ops. */
case gdb_agent_op_float:
case gdb_agent_op_ref_float:
case gdb_agent_op_ref_double:
case gdb_agent_op_ref_long_double:
case gdb_agent_op_l_to_d:
case gdb_agent_op_d_to_l:
case gdb_agent_op_trace16:
UNHANDLED;
break;
default:
ax_debug ("Agent expression op 0x%x not recognized\n", op);
/* Don't struggle on, things will just get worse. */
return expr_eval_unrecognized_opcode;
}
/* This catches errors that occur in target-specific code
emission. */
if (emit_error)
{
ax_debug ("Error %d while emitting code for %s\n",
emit_error, gdb_agent_op_name (op));
return expr_eval_unhandled_opcode;
}
ax_debug ("Op %s compiled\n", gdb_agent_op_name (op));
}
/* Now fill in real addresses as goto destinations. */
for (aentry = bytecode_address_table; aentry; aentry = aentry->next)
{
int written = 0;
if (aentry->goto_pc < 0)
continue;
/* Find the location that we are going to, and call back into
target-specific code to write the actual address or
displacement. */
for (aentry2 = bytecode_address_table; aentry2; aentry2 = aentry2->next)
{
if (aentry2->pc == aentry->goto_pc)
{
ax_debug ("Want to jump from %s to %s\n",
paddress (aentry->address),
paddress (aentry2->address));
write_goto_address (aentry->address + aentry->from_offset,
aentry2->address, aentry->from_size);
written = 1;
break;
}
}
/* Error out if we didn't find a destination. */
if (!written)
{
ax_debug ("Destination of goto %d not found\n",
aentry->goto_pc);
return expr_eval_invalid_goto;
}
}
return expr_eval_no_error;
}
#endif
Add target-side support for dynamic printf. * NEWS: Mention the additional style. * breakpoint.h (struct bp_target_info): New fields tcommands, persist. (struct bp_location): New field cmd_bytecode. * breakpoint.c: Include format.h. (disconnected_dprintf): New global. (parse_cmd_to_aexpr): New function. (build_target_command_list): New function. (insert_bp_location): Call it. (remove_breakpoints_pid): Skip dprintf breakpoints. (print_one_breakpoint_location): Ditto. (dprintf_style_agent): New global. (dprintf_style_enums): Add dprintf_style_agent. (update_dprintf_command_list): Add agent case. (agent_printf_command): New function. (_initialize_breakpoint): Add new commands. * common/ax.def (printf): New bytecode. * ax.h (ax_string): Declare. * ax-gdb.h (gen_printf): Declare. * ax-gdb.c: Include cli-utils.h, format.h. (gen_printf): New function. (maint_agent_print_command): New function. (_initialize_ax_gdb): Add maint agent-printf command. * ax-general.c (ax_string): New function. (ax_print): Add printf disassembly. * Makefile.in (SFILES): Add format.c (COMMON_OBS): Add format.o. * common/format.h: New file. * common/format.c: New file. * printcmd.c: Include format.h. (ui_printf): Call parse_format_string. * remote.c (remote_state): New field breakpoint_commands. (PACKET_BreakpointCommands): New enum. (remote_breakpoint_commands_feature): New function. (remote_protocol_features): Add new BreakpointCommands entry. (remote_can_run_breakpoint_commands): New function. (remote_add_target_side_commands): New function. (remote_insert_breakpoint): Call it. (remote_insert_hw_breakpoint): Ditto. (_initialize_remote): Add new packet configuration for target-side breakpoint commands. * target.h (struct target_ops): New field to_can_run_breakpoint_commands. (target_can_run_breakpoint_commands): New macro. * target.c (update_current_target): Handle to_can_run_breakpoint_commands. [gdbserver] * Makefile.in (WARN_CFLAGS_NO_FORMAT): Define. (ax.o): Add it to build rule. (ax-ipa.o): Ditto. (OBS): Add format.o. (IPA_OBS): Add format.o. * server.c (handle_query): Claim support for breakpoint commands. (process_point_options): Add command case. (process_serial_event): Leave running if there are printfs in effect. * mem-break.h (any_persistent_commands): Declare. (add_breakpoint_commands): Declare. (gdb_no_commands_at_breakpoint): Declare. (run_breakpoint_commands): Declare. * mem-break.c (struct point_command_list): New struct. (struct breakpoint): New field command_list. (any_persistent_commands): New function. (add_commands_to_breakpoint): New function. (add_breakpoint_commands): New function. (gdb_no_commands_at_breakpoint): New function. (run_breakpoint_commands): New function. * linux-low.c (linux_wait_1): Test for and run breakpoint commands locally. * ax.c: Include format.h. (ax_printf): New function. (gdb_eval_agent_expr): Add printf opcode. [doc] * gdb.texinfo (Dynamic Printf): Mention agent style and disconnected dprintf. (Maintenance Commands): Describe maint agent-printf. (General Query Packets): Mention BreakpointCommands feature. (Packets): Document commands extension to Z0 packet. * agentexpr.texi (Bytecode Descriptions): Document printf bytecode. [testsuite] * gdb.base/dprintf.exp: Add agent style tests.
2012-07-02 23:29:39 +08:00
/* Make printf-type calls using arguments supplied from the host. We
need to parse the format string ourselves, and call the formatting
function with one argument at a time, partly because there is no
safe portable way to construct a varargs call, and partly to serve
as a security barrier against bad format strings that might get
in. */
static void
* ada-lang.c (ada_read_renaming_var_value): Pass const pointer to expression string to parse_exp_1. (create_excep_cond_exprs): Likewise. * ax-gdb.c (agent_eval_command_one): Likewise. (maint_agent_printf_command): Likewise. Constify much of the string handling/parsing. * breakpoint.c (set_breakpoint_condition): Pass const pointer to expression string to parse_exp_1. (update_watchpoint): Likewise. (parse_cmd_to_aexpr): Constify string handling. Pass const pointer to parse_exp_1. (init_breakpoint_sal): Pass const pointer to parse_exp_1. (find_condition_and_thread): Likewise. Make TOK const. (watch_command_1): Make "arg" const. Constify string handling. Copy the expression string instead of changing the input string. (update_breakpoint_location): Pass const pointer to parse_exp_1. * eval.c (parse_and_eval_address): Make "exp" const. (parse_to_comma_and_eval): Make "expp" const. (parse_and_eval): Make "exp" const. * expression.h (parse_expression): Make argument const. (parse_exp_1): Make first argument const. * findcmd.c (parse_find_args): Treat "args" as const. * linespec.c (parse_linespec): Pass const pointer to linespec_expression_to_pc. (linespec_expression_to_pc): Make "exp_ptr" const. * parse.c (parse_exp_1): Make "stringptr" const. Make a copy of the expression to pass to parse_exp_in_context until this whole interface can be constified. (parse_expression): Make "string" const. * printcmd.c (ui_printf): Treat "arg" as const. Handle const strings. * tracepoint.c (validate_actionline): Pass const pointer to all calls to parse_exp_1. (encode_actions_1): Likewise. * value.h (parse_to_comma_and_eval): Make argument const. (parse_and_eval_address): Likewise. (parse_and_eval): Likewise. * varobj.c (varobj_create): Pass const pointer to parse_exp_1. (varobj_set_value): Likewise. * cli/cli-cmds.c (disassemble_command): Treat "arg" as const and constify string handling. Pass const pointers to parse_and_eval_address and parse_to_comman_and_eval. * cli/cli-utils.c (skip_to_space): Rename to ... (skip_to_space_const): ... this. Handle const strings. * cli/cli-utils.h (skip_to_space): Turn into macro which invokes skip_to_space_const. (skip_to_space_const): Declare. * common/format.c (parse_format_string): Make "arg" const. Handle const strings. * common/format.h (parse_format_string): Make "arg" const. * gdbserver/ax.c (ax_printf): Make "format" const. * python/python.c (gdbpy_parse_and_eval): Do not make a copy of the expression string.
2013-03-13 01:39:45 +08:00
ax_printf (CORE_ADDR fn, CORE_ADDR chan, const char *format,
Add target-side support for dynamic printf. * NEWS: Mention the additional style. * breakpoint.h (struct bp_target_info): New fields tcommands, persist. (struct bp_location): New field cmd_bytecode. * breakpoint.c: Include format.h. (disconnected_dprintf): New global. (parse_cmd_to_aexpr): New function. (build_target_command_list): New function. (insert_bp_location): Call it. (remove_breakpoints_pid): Skip dprintf breakpoints. (print_one_breakpoint_location): Ditto. (dprintf_style_agent): New global. (dprintf_style_enums): Add dprintf_style_agent. (update_dprintf_command_list): Add agent case. (agent_printf_command): New function. (_initialize_breakpoint): Add new commands. * common/ax.def (printf): New bytecode. * ax.h (ax_string): Declare. * ax-gdb.h (gen_printf): Declare. * ax-gdb.c: Include cli-utils.h, format.h. (gen_printf): New function. (maint_agent_print_command): New function. (_initialize_ax_gdb): Add maint agent-printf command. * ax-general.c (ax_string): New function. (ax_print): Add printf disassembly. * Makefile.in (SFILES): Add format.c (COMMON_OBS): Add format.o. * common/format.h: New file. * common/format.c: New file. * printcmd.c: Include format.h. (ui_printf): Call parse_format_string. * remote.c (remote_state): New field breakpoint_commands. (PACKET_BreakpointCommands): New enum. (remote_breakpoint_commands_feature): New function. (remote_protocol_features): Add new BreakpointCommands entry. (remote_can_run_breakpoint_commands): New function. (remote_add_target_side_commands): New function. (remote_insert_breakpoint): Call it. (remote_insert_hw_breakpoint): Ditto. (_initialize_remote): Add new packet configuration for target-side breakpoint commands. * target.h (struct target_ops): New field to_can_run_breakpoint_commands. (target_can_run_breakpoint_commands): New macro. * target.c (update_current_target): Handle to_can_run_breakpoint_commands. [gdbserver] * Makefile.in (WARN_CFLAGS_NO_FORMAT): Define. (ax.o): Add it to build rule. (ax-ipa.o): Ditto. (OBS): Add format.o. (IPA_OBS): Add format.o. * server.c (handle_query): Claim support for breakpoint commands. (process_point_options): Add command case. (process_serial_event): Leave running if there are printfs in effect. * mem-break.h (any_persistent_commands): Declare. (add_breakpoint_commands): Declare. (gdb_no_commands_at_breakpoint): Declare. (run_breakpoint_commands): Declare. * mem-break.c (struct point_command_list): New struct. (struct breakpoint): New field command_list. (any_persistent_commands): New function. (add_commands_to_breakpoint): New function. (add_breakpoint_commands): New function. (gdb_no_commands_at_breakpoint): New function. (run_breakpoint_commands): New function. * linux-low.c (linux_wait_1): Test for and run breakpoint commands locally. * ax.c: Include format.h. (ax_printf): New function. (gdb_eval_agent_expr): Add printf opcode. [doc] * gdb.texinfo (Dynamic Printf): Mention agent style and disconnected dprintf. (Maintenance Commands): Describe maint agent-printf. (General Query Packets): Mention BreakpointCommands feature. (Packets): Document commands extension to Z0 packet. * agentexpr.texi (Bytecode Descriptions): Document printf bytecode. [testsuite] * gdb.base/dprintf.exp: Add agent style tests.
2012-07-02 23:29:39 +08:00
int nargs, ULONGEST *args)
{
* ada-lang.c (ada_read_renaming_var_value): Pass const pointer to expression string to parse_exp_1. (create_excep_cond_exprs): Likewise. * ax-gdb.c (agent_eval_command_one): Likewise. (maint_agent_printf_command): Likewise. Constify much of the string handling/parsing. * breakpoint.c (set_breakpoint_condition): Pass const pointer to expression string to parse_exp_1. (update_watchpoint): Likewise. (parse_cmd_to_aexpr): Constify string handling. Pass const pointer to parse_exp_1. (init_breakpoint_sal): Pass const pointer to parse_exp_1. (find_condition_and_thread): Likewise. Make TOK const. (watch_command_1): Make "arg" const. Constify string handling. Copy the expression string instead of changing the input string. (update_breakpoint_location): Pass const pointer to parse_exp_1. * eval.c (parse_and_eval_address): Make "exp" const. (parse_to_comma_and_eval): Make "expp" const. (parse_and_eval): Make "exp" const. * expression.h (parse_expression): Make argument const. (parse_exp_1): Make first argument const. * findcmd.c (parse_find_args): Treat "args" as const. * linespec.c (parse_linespec): Pass const pointer to linespec_expression_to_pc. (linespec_expression_to_pc): Make "exp_ptr" const. * parse.c (parse_exp_1): Make "stringptr" const. Make a copy of the expression to pass to parse_exp_in_context until this whole interface can be constified. (parse_expression): Make "string" const. * printcmd.c (ui_printf): Treat "arg" as const. Handle const strings. * tracepoint.c (validate_actionline): Pass const pointer to all calls to parse_exp_1. (encode_actions_1): Likewise. * value.h (parse_to_comma_and_eval): Make argument const. (parse_and_eval_address): Likewise. (parse_and_eval): Likewise. * varobj.c (varobj_create): Pass const pointer to parse_exp_1. (varobj_set_value): Likewise. * cli/cli-cmds.c (disassemble_command): Treat "arg" as const and constify string handling. Pass const pointers to parse_and_eval_address and parse_to_comman_and_eval. * cli/cli-utils.c (skip_to_space): Rename to ... (skip_to_space_const): ... this. Handle const strings. * cli/cli-utils.h (skip_to_space): Turn into macro which invokes skip_to_space_const. (skip_to_space_const): Declare. * common/format.c (parse_format_string): Make "arg" const. Handle const strings. * common/format.h (parse_format_string): Make "arg" const. * gdbserver/ax.c (ax_printf): Make "format" const. * python/python.c (gdbpy_parse_and_eval): Do not make a copy of the expression string.
2013-03-13 01:39:45 +08:00
const char *f = format;
Add target-side support for dynamic printf. * NEWS: Mention the additional style. * breakpoint.h (struct bp_target_info): New fields tcommands, persist. (struct bp_location): New field cmd_bytecode. * breakpoint.c: Include format.h. (disconnected_dprintf): New global. (parse_cmd_to_aexpr): New function. (build_target_command_list): New function. (insert_bp_location): Call it. (remove_breakpoints_pid): Skip dprintf breakpoints. (print_one_breakpoint_location): Ditto. (dprintf_style_agent): New global. (dprintf_style_enums): Add dprintf_style_agent. (update_dprintf_command_list): Add agent case. (agent_printf_command): New function. (_initialize_breakpoint): Add new commands. * common/ax.def (printf): New bytecode. * ax.h (ax_string): Declare. * ax-gdb.h (gen_printf): Declare. * ax-gdb.c: Include cli-utils.h, format.h. (gen_printf): New function. (maint_agent_print_command): New function. (_initialize_ax_gdb): Add maint agent-printf command. * ax-general.c (ax_string): New function. (ax_print): Add printf disassembly. * Makefile.in (SFILES): Add format.c (COMMON_OBS): Add format.o. * common/format.h: New file. * common/format.c: New file. * printcmd.c: Include format.h. (ui_printf): Call parse_format_string. * remote.c (remote_state): New field breakpoint_commands. (PACKET_BreakpointCommands): New enum. (remote_breakpoint_commands_feature): New function. (remote_protocol_features): Add new BreakpointCommands entry. (remote_can_run_breakpoint_commands): New function. (remote_add_target_side_commands): New function. (remote_insert_breakpoint): Call it. (remote_insert_hw_breakpoint): Ditto. (_initialize_remote): Add new packet configuration for target-side breakpoint commands. * target.h (struct target_ops): New field to_can_run_breakpoint_commands. (target_can_run_breakpoint_commands): New macro. * target.c (update_current_target): Handle to_can_run_breakpoint_commands. [gdbserver] * Makefile.in (WARN_CFLAGS_NO_FORMAT): Define. (ax.o): Add it to build rule. (ax-ipa.o): Ditto. (OBS): Add format.o. (IPA_OBS): Add format.o. * server.c (handle_query): Claim support for breakpoint commands. (process_point_options): Add command case. (process_serial_event): Leave running if there are printfs in effect. * mem-break.h (any_persistent_commands): Declare. (add_breakpoint_commands): Declare. (gdb_no_commands_at_breakpoint): Declare. (run_breakpoint_commands): Declare. * mem-break.c (struct point_command_list): New struct. (struct breakpoint): New field command_list. (any_persistent_commands): New function. (add_commands_to_breakpoint): New function. (add_breakpoint_commands): New function. (gdb_no_commands_at_breakpoint): New function. (run_breakpoint_commands): New function. * linux-low.c (linux_wait_1): Test for and run breakpoint commands locally. * ax.c: Include format.h. (ax_printf): New function. (gdb_eval_agent_expr): Add printf opcode. [doc] * gdb.texinfo (Dynamic Printf): Mention agent style and disconnected dprintf. (Maintenance Commands): Describe maint agent-printf. (General Query Packets): Mention BreakpointCommands feature. (Packets): Document commands extension to Z0 packet. * agentexpr.texi (Bytecode Descriptions): Document printf bytecode. [testsuite] * gdb.base/dprintf.exp: Add agent style tests.
2012-07-02 23:29:39 +08:00
struct format_piece *fpieces;
int i, fp;
char *current_substring;
int nargs_wanted;
ax_debug ("Printf of \"%s\" with %d args", format, nargs);
fpieces = parse_format_string (&f);
nargs_wanted = 0;
for (fp = 0; fpieces[fp].string != NULL; fp++)
if (fpieces[fp].argclass != literal_piece)
++nargs_wanted;
if (nargs != nargs_wanted)
error (_("Wrong number of arguments for specified format-string"));
i = 0;
for (fp = 0; fpieces[fp].string != NULL; fp++)
{
current_substring = fpieces[fp].string;
ax_debug ("current substring is '%s', class is %d",
current_substring, fpieces[fp].argclass);
switch (fpieces[fp].argclass)
{
case string_arg:
{
gdb_byte *str;
CORE_ADDR tem;
int j;
tem = args[i];
/* This is a %s argument. Find the length of the string. */
for (j = 0;; j++)
{
gdb_byte c;
read_inferior_memory (tem + j, &c, 1);
if (c == 0)
break;
}
/* Copy the string contents into a string inside GDB. */
str = (gdb_byte *) alloca (j + 1);
if (j != 0)
read_inferior_memory (tem, str, j);
str[j] = 0;
printf (current_substring, (char *) str);
}
break;
case long_long_arg:
#if defined (CC_HAS_LONG_LONG) && defined (PRINTF_HAS_LONG_LONG)
{
long long val = args[i];
printf (current_substring, val);
break;
}
#else
error (_("long long not supported in agent printf"));
#endif
case int_arg:
{
int val = args[i];
printf (current_substring, val);
break;
}
case long_arg:
{
long val = args[i];
printf (current_substring, val);
break;
}
case literal_piece:
/* Print a portion of the format string that has no
directives. Note that this will not include any
ordinary %-specs, but it might include "%%". That is
why we use printf_filtered and not puts_filtered here.
Also, we pass a dummy argument because some platforms
have modified GCC to include -Wformat-security by
default, which will warn here if there is no
argument. */
printf (current_substring, 0);
break;
default:
error (_("Format directive in '%s' not supported in agent printf"),
current_substring);
}
/* Maybe advance to the next argument. */
if (fpieces[fp].argclass != literal_piece)
++i;
}
free_format_pieces (fpieces);
fflush (stdout);
Add target-side support for dynamic printf. * NEWS: Mention the additional style. * breakpoint.h (struct bp_target_info): New fields tcommands, persist. (struct bp_location): New field cmd_bytecode. * breakpoint.c: Include format.h. (disconnected_dprintf): New global. (parse_cmd_to_aexpr): New function. (build_target_command_list): New function. (insert_bp_location): Call it. (remove_breakpoints_pid): Skip dprintf breakpoints. (print_one_breakpoint_location): Ditto. (dprintf_style_agent): New global. (dprintf_style_enums): Add dprintf_style_agent. (update_dprintf_command_list): Add agent case. (agent_printf_command): New function. (_initialize_breakpoint): Add new commands. * common/ax.def (printf): New bytecode. * ax.h (ax_string): Declare. * ax-gdb.h (gen_printf): Declare. * ax-gdb.c: Include cli-utils.h, format.h. (gen_printf): New function. (maint_agent_print_command): New function. (_initialize_ax_gdb): Add maint agent-printf command. * ax-general.c (ax_string): New function. (ax_print): Add printf disassembly. * Makefile.in (SFILES): Add format.c (COMMON_OBS): Add format.o. * common/format.h: New file. * common/format.c: New file. * printcmd.c: Include format.h. (ui_printf): Call parse_format_string. * remote.c (remote_state): New field breakpoint_commands. (PACKET_BreakpointCommands): New enum. (remote_breakpoint_commands_feature): New function. (remote_protocol_features): Add new BreakpointCommands entry. (remote_can_run_breakpoint_commands): New function. (remote_add_target_side_commands): New function. (remote_insert_breakpoint): Call it. (remote_insert_hw_breakpoint): Ditto. (_initialize_remote): Add new packet configuration for target-side breakpoint commands. * target.h (struct target_ops): New field to_can_run_breakpoint_commands. (target_can_run_breakpoint_commands): New macro. * target.c (update_current_target): Handle to_can_run_breakpoint_commands. [gdbserver] * Makefile.in (WARN_CFLAGS_NO_FORMAT): Define. (ax.o): Add it to build rule. (ax-ipa.o): Ditto. (OBS): Add format.o. (IPA_OBS): Add format.o. * server.c (handle_query): Claim support for breakpoint commands. (process_point_options): Add command case. (process_serial_event): Leave running if there are printfs in effect. * mem-break.h (any_persistent_commands): Declare. (add_breakpoint_commands): Declare. (gdb_no_commands_at_breakpoint): Declare. (run_breakpoint_commands): Declare. * mem-break.c (struct point_command_list): New struct. (struct breakpoint): New field command_list. (any_persistent_commands): New function. (add_commands_to_breakpoint): New function. (add_breakpoint_commands): New function. (gdb_no_commands_at_breakpoint): New function. (run_breakpoint_commands): New function. * linux-low.c (linux_wait_1): Test for and run breakpoint commands locally. * ax.c: Include format.h. (ax_printf): New function. (gdb_eval_agent_expr): Add printf opcode. [doc] * gdb.texinfo (Dynamic Printf): Mention agent style and disconnected dprintf. (Maintenance Commands): Describe maint agent-printf. (General Query Packets): Mention BreakpointCommands feature. (Packets): Document commands extension to Z0 packet. * agentexpr.texi (Bytecode Descriptions): Document printf bytecode. [testsuite] * gdb.base/dprintf.exp: Add agent style tests.
2012-07-02 23:29:39 +08:00
}
/* The agent expression evaluator, as specified by the GDB docs. It
returns 0 if everything went OK, and a nonzero error code
otherwise. */
enum eval_result_type
gdb_eval_agent_expr (struct eval_agent_expr_context *ctx,
struct agent_expr *aexpr,
ULONGEST *rslt)
{
int pc = 0;
#define STACK_MAX 100
ULONGEST stack[STACK_MAX], top;
int sp = 0;
unsigned char op;
int arg;
/* This union is a convenient way to convert representations. For
now, assume a standard architecture where the hardware integer
types have 8, 16, 32, 64 bit types. A more robust solution would
be to import stdint.h from gnulib. */
union
{
union
{
unsigned char bytes[1];
unsigned char val;
} u8;
union
{
unsigned char bytes[2];
unsigned short val;
} u16;
union
{
unsigned char bytes[4];
unsigned int val;
} u32;
union
{
unsigned char bytes[8];
ULONGEST val;
} u64;
} cnv;
if (aexpr->length == 0)
{
ax_debug ("empty agent expression");
return expr_eval_empty_expression;
}
/* Cache the stack top in its own variable. Much of the time we can
operate on this variable, rather than dinking with the stack. It
needs to be copied to the stack when sp changes. */
top = 0;
while (1)
{
op = aexpr->bytes[pc++];
ax_debug ("About to interpret byte 0x%x", op);
switch (op)
{
case gdb_agent_op_add:
top += stack[--sp];
break;
case gdb_agent_op_sub:
top = stack[--sp] - top;
break;
case gdb_agent_op_mul:
top *= stack[--sp];
break;
case gdb_agent_op_div_signed:
if (top == 0)
{
ax_debug ("Attempted to divide by zero");
return expr_eval_divide_by_zero;
}
top = ((LONGEST) stack[--sp]) / ((LONGEST) top);
break;
case gdb_agent_op_div_unsigned:
if (top == 0)
{
ax_debug ("Attempted to divide by zero");
return expr_eval_divide_by_zero;
}
top = stack[--sp] / top;
break;
case gdb_agent_op_rem_signed:
if (top == 0)
{
ax_debug ("Attempted to divide by zero");
return expr_eval_divide_by_zero;
}
top = ((LONGEST) stack[--sp]) % ((LONGEST) top);
break;
case gdb_agent_op_rem_unsigned:
if (top == 0)
{
ax_debug ("Attempted to divide by zero");
return expr_eval_divide_by_zero;
}
top = stack[--sp] % top;
break;
case gdb_agent_op_lsh:
top = stack[--sp] << top;
break;
case gdb_agent_op_rsh_signed:
top = ((LONGEST) stack[--sp]) >> top;
break;
case gdb_agent_op_rsh_unsigned:
top = stack[--sp] >> top;
break;
case gdb_agent_op_trace:
agent_mem_read (ctx, NULL, (CORE_ADDR) stack[--sp],
(ULONGEST) top);
if (--sp >= 0)
top = stack[sp];
break;
case gdb_agent_op_trace_quick:
arg = aexpr->bytes[pc++];
agent_mem_read (ctx, NULL, (CORE_ADDR) top, (ULONGEST) arg);
break;
case gdb_agent_op_log_not:
top = !top;
break;
case gdb_agent_op_bit_and:
top &= stack[--sp];
break;
case gdb_agent_op_bit_or:
top |= stack[--sp];
break;
case gdb_agent_op_bit_xor:
top ^= stack[--sp];
break;
case gdb_agent_op_bit_not:
top = ~top;
break;
case gdb_agent_op_equal:
top = (stack[--sp] == top);
break;
case gdb_agent_op_less_signed:
top = (((LONGEST) stack[--sp]) < ((LONGEST) top));
break;
case gdb_agent_op_less_unsigned:
top = (stack[--sp] < top);
break;
case gdb_agent_op_ext:
arg = aexpr->bytes[pc++];
if (arg < (sizeof (LONGEST) * 8))
{
LONGEST mask = 1 << (arg - 1);
top &= ((LONGEST) 1 << arg) - 1;
top = (top ^ mask) - mask;
}
break;
case gdb_agent_op_ref8:
agent_mem_read (ctx, cnv.u8.bytes, (CORE_ADDR) top, 1);
top = cnv.u8.val;
break;
case gdb_agent_op_ref16:
agent_mem_read (ctx, cnv.u16.bytes, (CORE_ADDR) top, 2);
top = cnv.u16.val;
break;
case gdb_agent_op_ref32:
agent_mem_read (ctx, cnv.u32.bytes, (CORE_ADDR) top, 4);
top = cnv.u32.val;
break;
case gdb_agent_op_ref64:
agent_mem_read (ctx, cnv.u64.bytes, (CORE_ADDR) top, 8);
top = cnv.u64.val;
break;
case gdb_agent_op_if_goto:
if (top)
pc = (aexpr->bytes[pc] << 8) + (aexpr->bytes[pc + 1]);
else
pc += 2;
if (--sp >= 0)
top = stack[sp];
break;
case gdb_agent_op_goto:
pc = (aexpr->bytes[pc] << 8) + (aexpr->bytes[pc + 1]);
break;
case gdb_agent_op_const8:
/* Flush the cached stack top. */
stack[sp++] = top;
top = aexpr->bytes[pc++];
break;
case gdb_agent_op_const16:
/* Flush the cached stack top. */
stack[sp++] = top;
top = aexpr->bytes[pc++];
top = (top << 8) + aexpr->bytes[pc++];
break;
case gdb_agent_op_const32:
/* Flush the cached stack top. */
stack[sp++] = top;
top = aexpr->bytes[pc++];
top = (top << 8) + aexpr->bytes[pc++];
top = (top << 8) + aexpr->bytes[pc++];
top = (top << 8) + aexpr->bytes[pc++];
break;
case gdb_agent_op_const64:
/* Flush the cached stack top. */
stack[sp++] = top;
top = aexpr->bytes[pc++];
top = (top << 8) + aexpr->bytes[pc++];
top = (top << 8) + aexpr->bytes[pc++];
top = (top << 8) + aexpr->bytes[pc++];
top = (top << 8) + aexpr->bytes[pc++];
top = (top << 8) + aexpr->bytes[pc++];
top = (top << 8) + aexpr->bytes[pc++];
top = (top << 8) + aexpr->bytes[pc++];
break;
case gdb_agent_op_reg:
/* Flush the cached stack top. */
stack[sp++] = top;
arg = aexpr->bytes[pc++];
arg = (arg << 8) + aexpr->bytes[pc++];
{
int regnum = arg;
struct regcache *regcache = ctx->regcache;
[GDBserver] Multi-process + multi-arch This patch makes GDBserver support multi-process + biarch. Currently, if you're debugging more than one process at once with a single gdbserver (in extended-remote mode), then all processes must have the same architecture (e.g., 64-bit vs 32-bit). Otherwise, you see this: Added inferior 2 [Switching to inferior 2 [<null>] (<noexec>)] Reading symbols from /home/pedro/gdb/tests/main32...done. Temporary breakpoint 2 at 0x4004cf: main. (2 locations) Starting program: /home/pedro/gdb/tests/main32 warning: Selected architecture i386 is not compatible with reported target architecture i386:x86-64 warning: Architecture rejected target-supplied description Remote 'g' packet reply is too long: 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000090cfffff0000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000b042f7460000000000020000230000002b0000002b0000002b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007f03000000000000ffff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000801f00003b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 ... etc, etc ... Even though the process was running a 32-bit program, GDBserver sent back to GDB a register set in 64-bit layout. A patch (http://sourceware.org/ml/gdb-patches/2012-11/msg00228.html) a while ago made GDB track a target_gdbarch per inferior, and as consequence, fetch a target description per-inferior. This patch is the GDBserver counterpart, that makes GDBserver keep track of each process'es XML target description and register layout. So in the example above, GDBserver will send the correct register set in 32-bit layout to GDB. A new "struct target_desc" object (tdesc for short) is added, that holds the target description and register layout information about each process. Each `struct process_info' holds a pointer to a target description. The regcache also gains a pointer to a target description, mainly for convenience, and parallel with GDB (and possible future support for programs that flip processor modes). The low target's arch_setup routines are responsible for setting the process'es correct tdesc. This isn't that much different to how things were done before, except that instead of detecting the inferior process'es architecture and calling the corresponding init_registers_FOO routine, which would change the regcache layout globals and recreate the threads' regcaches, the regcache.c globals are gone, and the init_registers_$BAR routines now each initialize a separate global struct target_desc object (one for each arch variant GDBserver supports), and so all the init_registers_$BAR routines that are built into GDBserver are called early at GDBserver startup time (similarly to how GDB handles its built-in target descriptions), and then the arch_setup routine is responsible for making process_info->tdesc point to one of these target description globals. The regcache module is all parameterized to get the regcache's layout from the tdesc object instead of the old register_bytes, etc. globals. The threads' regcaches are now created lazily. The old scheme where we created each of them when we added a new thread doesn't work anymore, because we add the main thread/lwp before we see it stop for the first time, and it is only when we see the thread stop for the first time that we have a chance of determining the inferior's architecture (through the_low_target.arch_setup). Therefore when we add the main thread we don't know which architecture/tdesc its regcache should have. This patch makes the gdb.multi/multi-arch.exp test now pass against (extended-remote) GDBserver. It currently fails, without this patch. The IPA also uses the regcache, so it gains a new global struct target_desc pointer, which points at the description of the process it is loaded in. Re. the linux-low.c & friends changes. Since the register map etc. may differ between processes (64-bit vs 32-bit) etc., the linux_target_ops num_regs, regmap and regset_bitmap data fields are no longer sufficient. A new method is added in their place that returns a pointer to a new struct that includes all info linux-low.c needs to access registers of the current inferior. The patch/discussion that originally introduced linux-low.c:disabled_regsets mentions that the disabled_regsets set may be different per mode (in a biarch setup), and indeed that is cleared whenever we start a new (first) inferior, so that global is moved as well behind the new `struct regs_info'. On the x86 side: I simply replaced the i387-fp.c:num_xmm_registers global with a check for 64-bit or 32-bit process, which is equivalent to how the global was set. This avoided coming up with some more general mechanism that would work for all targets that use this module (GNU/Linux, Windows, etc.). Tested: GNU/Linux IA64 GNU/Linux MIPS64 GNU/Linux PowerPC (Fedora 16) GNU/Linux s390x (Fedora 16) GNU/Linux sparc64 (Debian) GNU/Linux x86_64, -m64 and -m32 (Fedora 17) Cross built, and smoke tested: i686-w64-mingw32, under Wine. GNU/Linux TI C6x, by Yao Qi. Cross built but otherwise not tested: aarch64-linux-gnu arm-linux-gnu m68k-linux nios2-linux-gnu sh-linux-gnu spu tilegx-unknown-linux-gnu Completely untested: GNU/Linux Blackfin GNU/Linux CRIS GNU/Linux CRISv32 GNU/Linux TI Xtensa GNU/Linux M32R LynxOS QNX NTO gdb/gdbserver/ 2013-06-07 Pedro Alves <palves@redhat.com> * Makefile.in (OBS): Add tdesc.o. (IPA_OBJS): Add tdesc-ipa.o. (tdesc-ipa.o): New rule. * ax.c (gdb_eval_agent_expr): Adjust register_size call to new interface. * linux-low.c (new_inferior): Delete. (disabled_regsets, num_regsets): Delete. (linux_add_process): Adjust to set the new per-process new_inferior flag. (linux_detach_one_lwp): Adjust to call regcache_invalidate_thread. (linux_wait_for_lwp): Adjust. Only call arch_setup if the event was a stop. When calling arch_setup, switch the current inferior to the thread that got an event. (linux_resume_one_lwp): Adjust to call regcache_invalidate_thread. (regsets_fetch_inferior_registers) (regsets_store_inferior_registers): New regsets_info parameter. Adjust to use it. (linux_register_in_regsets): New regs_info parameter. Adjust to use it. (register_addr, fetch_register, store_register): New usrregs_info parameter. Adjust to use it. (usr_fetch_inferior_registers, usr_store_inferior_registers): New parameter regs_info. Adjust to use it. (linux_fetch_registers): Get the current inferior's regs_info, and adjust to use it. (linux_store_registers): Ditto. [HAVE_LINUX_REGSETS] (initialize_regsets_info): New. (initialize_low): Don't initialize the target_regsets here. Call initialize_low_arch. * linux-low.h (target_regsets): Delete declaration. (struct regsets_info): New. (struct usrregs_info): New. (struct regs_info): New. (struct process_info_private) <new_inferior>: New field. (struct linux_target_ops): Delete the num_regs, regmap, and regset_bitmap fields. New field regs_info. [HAVE_LINUX_REGSETS] (initialize_regsets_info): Declare. * i387-fp.c (num_xmm_registers): Delete. (i387_cache_to_fsave, i387_fsave_to_cache): Adjust find_regno calls to new interface. (i387_cache_to_fxsave, i387_cache_to_xsave, i387_fxsave_to_cache) (i387_xsave_to_cache): Adjust find_regno calls to new interface. Infer the number of xmm registers from the regcache's target description. * i387-fp.h (num_xmm_registers): Delete. * inferiors.c (add_thread): Don't install the thread's regcache here. * proc-service.c (gregset_info): Fetch the current inferior's regs_info. Adjust to use it. * regcache.c: Include tdesc.h. (register_bytes, reg_defs, num_registers) (gdbserver_expedite_regs): Delete. (get_thread_regcache): If the thread doesn't have a regcache yet, create one, instead of aborting gdbserver. (regcache_invalidate_one): Rename to ... (regcache_invalidate_thread): ... this. (regcache_invalidate_one): New. (regcache_invalidate): Only invalidate registers of the current process. (init_register_cache): Add target_desc parameter, and use it. (new_register_cache): Ditto. Assert the target description has a non zero registers_size. (regcache_cpy): Add assertions. Adjust. (realloc_register_cache, set_register_cache): Delete. (registers_to_string, registers_from_string): Adjust. (find_register_by_name, find_regno, find_register_by_number) (register_cache_size): Add target_desc parameter, and use it. (free_register_cache_thread, free_register_cache_thread_one) (regcache_release, register_cache_size): New. (register_size): Add target_desc parameter, and use it. (register_data, supply_register, supply_register_zeroed) (supply_regblock, supply_register_by_name, collect_register) (collect_register_as_string, collect_register_by_name): Adjust. * regcache.h (struct target_desc): Forward declare. (struct regcache) <tdesc>: New field. (init_register_cache, new_register_cache): Add target_desc parameter. (regcache_invalidate_thread): Declare. (regcache_invalidate_one): Delete declaration. (regcache_release): Declare. (find_register_by_number, register_cache_size, register_size) (find_regno): Add target_desc parameter. (gdbserver_expedite_regs, gdbserver_xmltarget): Delete declarations. * remote-utils.c: Include tdesc.h. (outreg, prepare_resume_reply): Adjust. * server.c: Include tdesc.h. (gdbserver_xmltarget): Delete declaration. (get_features_xml, process_serial_event): Adjust. * server.h [IN_PROCESS_AGENT] (struct target_desc): Forward declare. (struct process_info) <tdesc>: New field. (ipa_tdesc): Declare. * tdesc.c: New file. * tdesc.h: New file. * tracepoint.c: Include tdesc.h. [IN_PROCESS_AGENT] (ipa_tdesc): Define. (get_context_regcache): Adjust to pass ipa_tdesc down. (do_action_at_tracepoint): Adjust to get the register cache size from the context regcache's description. (traceframe_walk_blocks): Adjust to get the register cache size from the current trace frame's description. (traceframe_get_pc): Adjust to get current trace frame's description and pass it down. (gdb_collect): Adjust to get the register cache size from the IPA's description. * linux-amd64-ipa.c (tdesc_amd64_linux): Declare. (gdbserver_xmltarget): Delete. (initialize_low_tracepoint): Set the ipa's target description. * linux-i386-ipa.c (tdesc_i386_linux): Declare. (initialize_low_tracepoint): Set the ipa's target description. * linux-x86-low.c: Include tdesc.h. [__x86_64__] (is_64bit_tdesc): New. (ps_get_thread_area, x86_get_thread_area): Use it. (i386_cannot_store_register): Rename to ... (x86_cannot_store_register): ... this. Use is_64bit_tdesc. (i386_cannot_fetch_register): Rename to ... (x86_cannot_fetch_register): ... this. Use is_64bit_tdesc. (x86_fill_gregset, x86_store_gregset): Adjust register_size calls to new interface. (target_regsets): Rename to ... (x86_regsets): ... this. (x86_get_pc, x86_set_pc): Adjust register_size calls to new interface. (x86_siginfo_fixup): Use is_64bit_tdesc. [__x86_64__] (tdesc_amd64_linux, tdesc_amd64_avx_linux) (tdesc_x32_avx_linux, tdesc_x32_linux) (tdesc_i386_linux, tdesc_i386_mmx_linux, tdesc_i386_avx_linux): Declare. (x86_linux_update_xmltarget): Delete. (I386_LINUX_XSAVE_XCR0_OFFSET): Define. (have_ptrace_getfpxregs, have_ptrace_getregset): New. (AMD64_LINUX_USER64_CS): New. (x86_linux_read_description): New, based on x86_linux_update_xmltarget. (same_process_callback): New. (x86_arch_setup_process_callback): New. (x86_linux_update_xmltarget): New. (x86_regsets_info): New. (amd64_linux_regs_info): New. (i386_linux_usrregs_info): New. (i386_linux_regs_info): New. (x86_linux_regs_info): New. (x86_arch_setup): Reimplement. (x86_install_fast_tracepoint_jump_pad): Use is_64bit_tdesc. (x86_emit_ops): Ditto. (the_low_target): Adjust. Install x86_linux_regs_info, x86_cannot_fetch_register, and x86_cannot_store_register. (initialize_low_arch): New. * linux-ia64-low.c (tdesc_ia64): Declare. (ia64_fetch_register): Adjust. (ia64_usrregs_info, regs_info): New globals. (ia64_regs_info): New function. (the_low_target): Adjust. (initialize_low_arch): New function. * linux-sparc-low.c (tdesc_sparc64): Declare. (sparc_fill_gregset_to_stack, sparc_store_gregset_from_stack): Adjust. (sparc_arch_setup): New function. (sparc_regsets_info, sparc_usrregs_info, regs_info): New globals. (the_low_target): Adjust. (initialize_low_arch): New function. * linux-ppc-low.c (tdesc_powerpc_32l, tdesc_powerpc_altivec32l) (tdesc_powerpc_cell32l, tdesc_powerpc_vsx32l) (tdesc_powerpc_isa205_32l, tdesc_powerpc_isa205_altivec32l) (tdesc_powerpc_isa205_vsx32l, tdesc_powerpc_e500l) (tdesc_powerpc_64l, tdesc_powerpc_altivec64l) (tdesc_powerpc_cell64l, tdesc_powerpc_vsx64l) (tdesc_powerpc_isa205_64l, tdesc_powerpc_isa205_altivec64l) (tdesc_powerpc_isa205_vsx64l): Declare. (ppc_cannot_store_register, ppc_collect_ptrace_register) (ppc_supply_ptrace_register, parse_spufs_run, ppc_get_pc) (ppc_set_pc, ppc_get_hwcap): Adjust. (ppc_usrregs_info): Forward declare. (!__powerpc64__) ppc_regmap_adjusted: New global. (ppc_arch_setup): Adjust to the current process'es target description. (ppc_fill_vsxregset, ppc_store_vsxregset, ppc_fill_vrregset) (ppc_store_vrregset, ppc_fill_evrregset, ppc_store_evrregse) (ppc_store_evrregset): Adjust. (target_regsets): Rename to ... (ppc_regsets): ... this, and make static. (ppc_usrregs_info, ppc_regsets_info, regs_info): New globals. (ppc_regs_info): New function. (the_low_target): Adjust. (initialize_low_arch): New function. * linux-s390-low.c (tdesc_s390_linux32, tdesc_s390_linux32v1) (tdesc_s390_linux32v2, tdesc_s390_linux64, tdesc_s390_linux64v1) (tdesc_s390_linux64v2, tdesc_s390x_linux64, tdesc_s390x_linux64v1) (tdesc_s390x_linux64v2): Declare. (s390_collect_ptrace_register, s390_supply_ptrace_register) (s390_fill_gregset, s390_store_last_break): Adjust. (target_regsets): Rename to ... (s390_regsets): ... this, and make static. (s390_get_pc, s390_set_pc): Adjust. (s390_get_hwcap): New target_desc parameter, and use it. [__s390x__] (have_hwcap_s390_high_gprs): New global. (s390_arch_setup): Adjust to set the current process'es target description. Don't adjust the regmap. (s390_usrregs_info, s390_regsets_info, regs_info): New globals. [__s390x__] (s390_usrregs_info_3264, s390_regsets_info_3264) (regs_info_3264): New globals. (s390_regs_info): New function. (the_low_target): Adjust. (initialize_low_arch): New function. * linux-mips-low.c (tdesc_mips_linux, tdesc_mips_dsp_linux) (tdesc_mips64_linux, tdesc_mips64_dsp_linux): Declare. [__mips64] (init_registers_mips_linux) (init_registers_mips_dsp_linux): Delete defines. [__mips64] (tdesc_mips_linux, tdesc_mips_dsp_linux): New defines. (have_dsp): New global. (mips_read_description): New, based on mips_arch_setup. (mips_arch_setup): Reimplement. (get_usrregs_info): New function. (mips_cannot_fetch_register, mips_cannot_store_register) (mips_get_pc, mips_set_pc, mips_fill_gregset, mips_store_gregset) (mips_fill_fpregset, mips_store_fpregset): Adjust. (target_regsets): Rename to ... (mips_regsets): ... this, and make static. (mips_regsets_info, mips_dsp_usrregs_info, mips_usrregs_info) (dsp_regs_info, regs_info): New globals. (mips_regs_info): New function. (the_low_target): Adjust. (initialize_low_arch): New function. * linux-arm-low.c (tdesc_arm, tdesc_arm_with_iwmmxt) (tdesc_arm_with_vfpv2, tdesc_arm_with_vfpv3, tdesc_arm_with_neon): Declare. (arm_fill_vfpregset, arm_store_vfpregset): Adjust. (arm_read_description): New, with bits factored from arm_arch_setup. (arm_arch_setup): Reimplement. (target_regsets): Rename to ... (arm_regsets): ... this, and make static. (arm_regsets_info, arm_usrregs_info, regs_info): New globals. (arm_regs_info): New function. (the_low_target): Adjust. (initialize_low_arch): New function. * linux-m68k-low.c (tdesc_m68k): Declare. (target_regsets): Rename to ... (m68k_regsets): ... this, and make static. (m68k_regsets_info, m68k_usrregs_info, regs_info): New globals. (m68k_regs_info): New function. (m68k_arch_setup): New function. (the_low_target): Adjust. (initialize_low_arch): New function. * linux-sh-low.c (tdesc_sharch): Declare. (target_regsets): Rename to ... (sh_regsets): ... this, and make static. (sh_regsets_info, sh_usrregs_info, regs_info): New globals. (sh_regs_info, sh_arch_setup): New functions. (the_low_target): Adjust. (initialize_low_arch): New function. * linux-bfin-low.c (tdesc_bfin): Declare. (bfin_arch_setup): New function. (bfin_usrregs_info, regs_info): New globals. (bfin_regs_info): New function. (the_low_target): Adjust. (initialize_low_arch): New function. * linux-cris-low.c (tdesc_cris): Declare. (cris_arch_setup): New function. (cris_usrregs_info, regs_info): New globals. (cris_regs_info): New function. (the_low_target): Adjust. (initialize_low_arch): New function. * linux-cris-low.c (tdesc_crisv32): Declare. (cris_arch_setup): New function. (cris_regsets_info, cris_usrregs_info, regs_info): New globals. (cris_regs_info): New function. (the_low_target): Adjust. (initialize_low_arch): New function. * linux-m32r-low.c (tdesc_m32r): Declare. (m32r_arch_setup): New function. (m32r_usrregs_info, regs_info): New globals. (m32r_regs_info): Adjust. (initialize_low_arch): New function. * linux-tic6x-low.c (tdesc_tic6x_c64xp_linux) (tdesc_tic6x_c64x_linux, tdesc_tic6x_c62x_linux): Declare. (tic6x_usrregs_info): Forward declare. (tic6x_read_description): New function, based on ... (tic6x_arch_setup): ... this. Reimplement. (target_regsets): Rename to ... (tic6x_regsets): ... this, and make static. (tic6x_regsets_info, tic6x_usrregs_info, regs_info): New globals. (tic6x_regs_info): New function. (the_low_target): Adjust. (initialize_low_arch): New function. * linux-xtensa-low.c (tdesc_xtensa): Declare. (xtensa_fill_gregset, xtensa_store_gregset): Adjust. (target_regsets): Rename to ... (xtensa_regsets): ... this, and make static. (xtensa_regsets_info, xtensa_usrregs_info, regs_info): New globals. (xtensa_arch_setup, xtensa_regs_info): New functions. (the_low_target): Adjust. (initialize_low_arch): New function. * linux-nios2-low.c (tdesc_nios2_linux): Declare. (nios2_arch_setup): Set the current process'es tdesc. (target_regsets): Rename to ... (nios2_regsets): ... this. (nios2_regsets_info, nios2_usrregs_info, regs_info): New globals. (nios2_regs_info): New function. (the_low_target): Adjust. (initialize_low_arch): New function. * linux-aarch64-low.c (tdesc_aarch64): Declare. (aarch64_arch_setup): Set the current process'es tdesc. (target_regsets): Rename to ... (aarch64_regsets): ... this. (aarch64_regsets_info, aarch64_usrregs_info, regs_info): New globals. (aarch64_regs_info): New function. (the_low_target): Adjust. (initialize_low_arch): New function. * linux-tile-low.c (tdesc_tilegx, tdesc_tilegx32): Declare globals. (target_regsets): Rename to ... (tile_regsets): ... this. (tile_regsets_info, tile_usrregs_info, regs_info): New globals. (tile_regs_info): New function. (tile_arch_setup): Set the current process'es tdesc. (the_low_target): Adjust. (initialize_low_arch): New function. * spu-low.c (tdesc_spu): Declare. (spu_create_inferior, spu_attach): Set the new process'es tdesc. * win32-arm-low.c (tdesc_arm): Declare. (arm_arch_setup): New function. (the_low_target): Install arm_arch_setup instead of init_registers_arm. * win32-i386-low.c (tdesc_i386, tdesc_amd64): Declare. (init_windows_x86): Rename to ... (i386_arch_setup): ... this. Set `win32_tdesc'. (the_low_target): Adjust. * win32-low.c (win32_tdesc): New global. (child_add_thread): Don't create the thread cache here. (do_initial_child_stuff): Set the new process'es tdesc. * win32-low.h (struct target_desc): Forward declare. (win32_tdesc): Declare. * lynx-i386-low.c (tdesc_i386): Declare global. (lynx_i386_arch_setup): Set `lynx_tdesc'. * lynx-low.c (lynx_tdesc): New global. (lynx_add_process): Set the new process'es tdesc. * lynx-low.h (struct target_desc): Forward declare. (lynx_tdesc): Declare global. * lynx-ppc-low.c (tdesc_powerpc_32): Declare global. (lynx_ppc_arch_setup): Set `lynx_tdesc'. * nto-low.c (nto_tdesc): New global. (do_attach): Set the new process'es tdesc. * nto-low.h (struct target_desc): Forward declare. (nto_tdesc): Declare. * nto-x86-low.c (tdesc_i386): Declare. (nto_x86_arch_setup): Set `nto_tdesc'. gdb/ 2013-06-07 Pedro Alves <palves@redhat.com> * regformats/regdat.sh: Output #include tdesc.h. Make globals static. Output a global target description pointer. (init_registers_${name}): Adjust to initialize a target description structure.
2013-06-07 18:46:59 +08:00
switch (register_size (regcache->tdesc, regnum))
{
case 8:
collect_register (regcache, regnum, cnv.u64.bytes);
top = cnv.u64.val;
break;
case 4:
collect_register (regcache, regnum, cnv.u32.bytes);
top = cnv.u32.val;
break;
case 2:
collect_register (regcache, regnum, cnv.u16.bytes);
top = cnv.u16.val;
break;
case 1:
collect_register (regcache, regnum, cnv.u8.bytes);
top = cnv.u8.val;
break;
default:
internal_error (__FILE__, __LINE__,
"unhandled register size");
}
}
break;
case gdb_agent_op_end:
ax_debug ("At end of expression, sp=%d, stack top cache=0x%s",
sp, pulongest (top));
if (rslt)
{
if (sp <= 0)
{
/* This should be an error */
ax_debug ("Stack is empty, nothing to return");
return expr_eval_empty_stack;
}
*rslt = top;
}
return expr_eval_no_error;
case gdb_agent_op_dup:
stack[sp++] = top;
break;
case gdb_agent_op_pop:
if (--sp >= 0)
top = stack[sp];
break;
case gdb_agent_op_pick:
arg = aexpr->bytes[pc++];
stack[sp] = top;
top = stack[sp - arg];
++sp;
break;
case gdb_agent_op_rot:
{
ULONGEST tem = stack[sp - 1];
stack[sp - 1] = stack[sp - 2];
stack[sp - 2] = top;
top = tem;
}
break;
case gdb_agent_op_zero_ext:
arg = aexpr->bytes[pc++];
if (arg < (sizeof (LONGEST) * 8))
top &= ((LONGEST) 1 << arg) - 1;
break;
case gdb_agent_op_swap:
/* Interchange top two stack elements, making sure top gets
copied back onto stack. */
stack[sp] = top;
top = stack[sp - 1];
stack[sp - 1] = stack[sp];
break;
case gdb_agent_op_getv:
/* Flush the cached stack top. */
stack[sp++] = top;
arg = aexpr->bytes[pc++];
arg = (arg << 8) + aexpr->bytes[pc++];
top = agent_get_trace_state_variable_value (arg);
break;
case gdb_agent_op_setv:
arg = aexpr->bytes[pc++];
arg = (arg << 8) + aexpr->bytes[pc++];
agent_set_trace_state_variable_value (arg, top);
/* Note that we leave the value on the stack, for the
benefit of later/enclosing expressions. */
break;
case gdb_agent_op_tracev:
arg = aexpr->bytes[pc++];
arg = (arg << 8) + aexpr->bytes[pc++];
agent_tsv_read (ctx, arg);
break;
case gdb_agent_op_tracenz:
agent_mem_read_string (ctx, NULL, (CORE_ADDR) stack[--sp],
(ULONGEST) top);
if (--sp >= 0)
top = stack[sp];
break;
Add target-side support for dynamic printf. * NEWS: Mention the additional style. * breakpoint.h (struct bp_target_info): New fields tcommands, persist. (struct bp_location): New field cmd_bytecode. * breakpoint.c: Include format.h. (disconnected_dprintf): New global. (parse_cmd_to_aexpr): New function. (build_target_command_list): New function. (insert_bp_location): Call it. (remove_breakpoints_pid): Skip dprintf breakpoints. (print_one_breakpoint_location): Ditto. (dprintf_style_agent): New global. (dprintf_style_enums): Add dprintf_style_agent. (update_dprintf_command_list): Add agent case. (agent_printf_command): New function. (_initialize_breakpoint): Add new commands. * common/ax.def (printf): New bytecode. * ax.h (ax_string): Declare. * ax-gdb.h (gen_printf): Declare. * ax-gdb.c: Include cli-utils.h, format.h. (gen_printf): New function. (maint_agent_print_command): New function. (_initialize_ax_gdb): Add maint agent-printf command. * ax-general.c (ax_string): New function. (ax_print): Add printf disassembly. * Makefile.in (SFILES): Add format.c (COMMON_OBS): Add format.o. * common/format.h: New file. * common/format.c: New file. * printcmd.c: Include format.h. (ui_printf): Call parse_format_string. * remote.c (remote_state): New field breakpoint_commands. (PACKET_BreakpointCommands): New enum. (remote_breakpoint_commands_feature): New function. (remote_protocol_features): Add new BreakpointCommands entry. (remote_can_run_breakpoint_commands): New function. (remote_add_target_side_commands): New function. (remote_insert_breakpoint): Call it. (remote_insert_hw_breakpoint): Ditto. (_initialize_remote): Add new packet configuration for target-side breakpoint commands. * target.h (struct target_ops): New field to_can_run_breakpoint_commands. (target_can_run_breakpoint_commands): New macro. * target.c (update_current_target): Handle to_can_run_breakpoint_commands. [gdbserver] * Makefile.in (WARN_CFLAGS_NO_FORMAT): Define. (ax.o): Add it to build rule. (ax-ipa.o): Ditto. (OBS): Add format.o. (IPA_OBS): Add format.o. * server.c (handle_query): Claim support for breakpoint commands. (process_point_options): Add command case. (process_serial_event): Leave running if there are printfs in effect. * mem-break.h (any_persistent_commands): Declare. (add_breakpoint_commands): Declare. (gdb_no_commands_at_breakpoint): Declare. (run_breakpoint_commands): Declare. * mem-break.c (struct point_command_list): New struct. (struct breakpoint): New field command_list. (any_persistent_commands): New function. (add_commands_to_breakpoint): New function. (add_breakpoint_commands): New function. (gdb_no_commands_at_breakpoint): New function. (run_breakpoint_commands): New function. * linux-low.c (linux_wait_1): Test for and run breakpoint commands locally. * ax.c: Include format.h. (ax_printf): New function. (gdb_eval_agent_expr): Add printf opcode. [doc] * gdb.texinfo (Dynamic Printf): Mention agent style and disconnected dprintf. (Maintenance Commands): Describe maint agent-printf. (General Query Packets): Mention BreakpointCommands feature. (Packets): Document commands extension to Z0 packet. * agentexpr.texi (Bytecode Descriptions): Document printf bytecode. [testsuite] * gdb.base/dprintf.exp: Add agent style tests.
2012-07-02 23:29:39 +08:00
case gdb_agent_op_printf:
{
int nargs, slen, i;
CORE_ADDR fn = 0, chan = 0;
/* Can't have more args than the entire size of the stack. */
ULONGEST args[STACK_MAX];
char *format;
nargs = aexpr->bytes[pc++];
slen = aexpr->bytes[pc++];
slen = (slen << 8) + aexpr->bytes[pc++];
format = (char *) &(aexpr->bytes[pc]);
pc += slen;
/* Pop function and channel. */
fn = top;
if (--sp >= 0)
top = stack[sp];
chan = top;
if (--sp >= 0)
top = stack[sp];
/* Pop arguments into a dedicated array. */
for (i = 0; i < nargs; ++i)
{
args[i] = top;
if (--sp >= 0)
top = stack[sp];
}
/* A bad format string means something is very wrong; give
up immediately. */
if (format[slen - 1] != '\0')
error (_("Unterminated format string in printf bytecode"));
ax_printf (fn, chan, format, nargs, args);
}
break;
/* GDB never (currently) generates any of these ops. */
case gdb_agent_op_float:
case gdb_agent_op_ref_float:
case gdb_agent_op_ref_double:
case gdb_agent_op_ref_long_double:
case gdb_agent_op_l_to_d:
case gdb_agent_op_d_to_l:
case gdb_agent_op_trace16:
ax_debug ("Agent expression op 0x%x valid, but not handled",
op);
/* If ever GDB generates any of these, we don't have the
option of ignoring. */
return 1;
default:
ax_debug ("Agent expression op 0x%x not recognized", op);
/* Don't struggle on, things will just get worse. */
return expr_eval_unrecognized_opcode;
}
/* Check for stack badness. */
if (sp >= (STACK_MAX - 1))
{
ax_debug ("Expression stack overflow");
return expr_eval_stack_overflow;
}
if (sp < 0)
{
ax_debug ("Expression stack underflow");
return expr_eval_stack_underflow;
}
ax_debug ("Op %s -> sp=%d, top=0x%s",
gdb_agent_op_name (op), sp, phex_nz (top, 0));
}
}