#endif
extern int info_verbose;
+extern void (*readline_begin_hook) PARAMS ((char *, ...));
+extern char * (*readline_hook) PARAMS ((char *));
+extern void (*readline_end_hook) PARAMS ((void));
+extern void x_command PARAMS ((char *, int));
/* If this definition isn't overridden by the header files, assume
that isatty and fileno exist on this system. */
#define ISATTY(FP) (isatty (fileno (FP)))
#endif
+/*
+ Tracepoint.c:
+
+ This module defines the following debugger commands:
+ trace : set a tracepoint on a function, line, or address.
+ info trace : list all debugger-defined tracepoints.
+ delete trace : delete one or more tracepoints.
+ enable trace : enable one or more tracepoints.
+ disable trace : disable one or more tracepoints.
+ actions : specify actions to be taken at a tracepoint.
+ passcount : specify a pass count for a tracepoint.
+ tstart : start a trace experiment.
+ tstop : stop a trace experiment.
+ tstatus : query the status of a trace experiment.
+ tfind : find a trace frame in the trace buffer.
+ tdump : print everything collected at the current tracepoint.
+ save-tracepoints : write tracepoint setup into a file.
+
+ This module defines the following user-visible debugger variables:
+ $trace_frame : sequence number of trace frame currently being debugged.
+ $trace_line : source line of trace frame currently being debugged.
+ $trace_file : source file of trace frame currently being debugged.
+ $tracepoint : tracepoint number of trace frame currently being debugged.
+ */
+
+
+/* ======= Important global variables: ======= */
+
/* Chain of all tracepoints defined. */
struct tracepoint *tracepoint_chain;
/* Symtab and line for last traceframe collected */
static struct symtab_and_line traceframe_sal;
+/* Tracing command lists */
+static struct cmd_list_element *tfindlist;
+
+/* ======= Important command functions: ======= */
+static void trace_command PARAMS ((char *, int));
+static void tracepoints_info PARAMS ((char *, int));
+static void delete_trace_command PARAMS ((char *, int));
+static void enable_trace_command PARAMS ((char *, int));
+static void disable_trace_command PARAMS ((char *, int));
+static void trace_pass_command PARAMS ((char *, int));
+static void trace_actions_command PARAMS ((char *, int));
+static void trace_start_command PARAMS ((char *, int));
+static void trace_stop_command PARAMS ((char *, int));
+static void trace_status_command PARAMS ((char *, int));
+static void trace_find_command PARAMS ((char *, int));
+static void trace_find_pc_command PARAMS ((char *, int));
+static void trace_find_tracepoint_command PARAMS ((char *, int));
+static void trace_find_line_command PARAMS ((char *, int));
+static void trace_find_range_command PARAMS ((char *, int));
+static void trace_find_outside_command PARAMS ((char *, int));
+static void tracepoint_save_command PARAMS ((char *, int));
+static void trace_dump_command PARAMS ((char *, int));
+
+
/* Utility: returns true if "target remote" */
static int
target_is_remote ()
}
}
-/* Obsolete: collect regs from a trace frame */
-static void
-trace_receive_regs (buf)
- char *buf;
-{
- long regno, i;
- char regbuf[MAX_REGISTER_RAW_SIZE], *tmp, *p = buf;
-
- while (*p)
- {
- regno = strtol (p, &tmp, 16);
- if (p == tmp || *tmp++ != ':')
- error ("tracepoint.c: malformed 'R' packet");
- else p = tmp;
-
- for (i = 0; i < REGISTER_RAW_SIZE (regno); i++)
- {
- if (p[0] == 0 || p[1] == 0)
- warning ("Remote reply is too short: %s", buf);
- regbuf[i] = fromhex (p[0]) * 16 + fromhex (p[1]);
- p += 2;
- }
-
- if (*p++ != ';')
- error ("tracepoint.c: malformed 'R' packet");
-
- supply_register (regno, regbuf);
- }
-}
-
/* Utility: wait for reply from stub, while accepting "O" packets */
static char *
remote_get_noisy_reply (buf)
error ("Target does not support this command.");
else if (buf[0] == 'E')
trace_error (buf);
- else if (buf[0] == 'R')
- {
- flush_cached_frames ();
- registers_changed ();
- select_frame (get_current_frame (), 0);
- trace_receive_regs (buf);
- }
else if (buf[0] == 'O' &&
buf[1] != 'K')
remote_console_output (buf + 1); /* 'O' message from stub */
t->source_file = NULL;
else
{
+ char *p;
+
t->source_file = (char *) xmalloc (strlen (sal.symtab->filename) +
- strlen (sal.symtab->dirname) + 1);
+ strlen (sal.symtab->dirname) + 2);
strcpy (t->source_file, sal.symtab->dirname);
+ p = t->source_file;
+ while (*p)
+ p++;
+ if (*(--p) != '/') /* Will this work on Windows? */
+ strcat (t->source_file, "/");
strcat (t->source_file, sal.symtab->filename);
}
t->language = current_language->la_language;
t->input_radix = input_radix;
t->line_number = sal.line;
- t->enabled = enabled;
- t->next = 0;
- t->step_count = 0;
- t->pass_count = 0;
+ t->enabled = enabled;
+ t->next = 0;
+ t->step_count = 0;
+ t->pass_count = 0;
+ t->addr_string = NULL;
/* Add this tracepoint to the end of the chain
so that a list of tracepoints will come out in order
return t;
}
+/* Set a tracepoint according to ARG (function, linenum or *address) */
static void
trace_command (arg, from_tty)
char *arg;
struct symtabs_and_lines sals;
struct symtab_and_line sal;
struct tracepoint *t;
- char *addr_start = 0, *addr_end = 0, *cond_start = 0, *cond_end = 0;
+ char *addr_start = 0, *addr_end = 0;
int i;
if (!arg || !*arg)
t->addr_string = canonical[i];
else if (addr_start)
t->addr_string = savestring (addr_start, addr_end - addr_start);
- if (cond_start)
- t->cond_string = savestring (cond_start, cond_end - cond_start);
/* Let the UI know of any additions */
if (create_tracepoint_hook)
if (sals.nelts > 1)
{
printf_filtered ("Multiple tracepoints were set.\n");
- printf_filtered ("Use the \"delete\" command to delete unwanted tracepoints.\n");
+ printf_filtered ("Use 'delete trace' to delete unwanted tracepoints.\n");
}
}
+/* Print information on tracepoint number TPNUM_EXP, or all if omitted. */
+
static void
tracepoints_info (tpnum_exp, from_tty)
char *tpnum_exp;
enum tracepoint_opcode opcode;
{
struct tracepoint *t2;
- struct action_line *action, *next;
switch (opcode) {
case enable:
t->enabled = enabled;
+ if (modify_tracepoint_hook)
+ modify_tracepoint_hook (t);
break;
case disable:
t->enabled = disabled;
+ if (modify_tracepoint_hook)
+ modify_tracepoint_hook (t);
break;
case delete:
if (tracepoint_chain == t)
if (delete_tracepoint_hook)
delete_tracepoint_hook (t);
- if (t->cond_string)
- free (t->cond_string);
if (t->addr_string)
free (t->addr_string);
if (t->source_file)
free (t->source_file);
- for (action = t->actions; action; action = next)
- {
- next = action->next;
- if (action->action)
- free (action->action);
- free (action);
- }
+ if (t->actions)
+ free_actions (t);
+
free (t);
break;
}
int from_tty;
enum tracepoint_opcode opcode;
{
- struct tracepoint *t;
+ struct tracepoint *t, *tmp;
int tpnum;
char *cp;
if (args == 0 || *args == 0) /* do them all */
- ALL_TRACEPOINTS (t)
+ ALL_TRACEPOINTS_SAFE (t, tmp)
tracepoint_operation (t, from_tty, opcode);
else
while (*args)
}
}
+/* The 'enable trace' command enables tracepoints. Not supported by all targets. */
static void
enable_trace_command (args, from_tty)
char *args;
map_args_over_tracepoints (args, from_tty, enable);
}
+/* The 'disable trace' command enables tracepoints. Not supported by all targets. */
static void
disable_trace_command (args, from_tty)
char *args;
map_args_over_tracepoints (args, from_tty, disable);
}
+/* Remove a tracepoint (or all if no argument) */
static void
delete_trace_command (args, from_tty)
char *args;
map_args_over_tracepoints (args, from_tty, delete);
}
+/* Set passcount for tracepoint.
+
+ First command argument is passcount, second is tracepoint number.
+ If tracepoint number omitted, apply to most recently defined.
+ Also accepts special argument "all". */
+
static void
trace_pass_command (args, from_tty)
char *args;
if (t1 == (struct tracepoint *) -1 || t1 == t2)
{
t2->pass_count = count;
+ if (modify_tracepoint_hook)
+ modify_tracepoint_hook (t2);
if (from_tty)
printf_filtered ("Setting tracepoint %d's passcount to %d\n",
t2->number, count);
}
}
-/* ACTIONS ACTIONS ACTIONS */
-
-static void read_actions PARAMS((struct tracepoint *));
-static void free_actions PARAMS((struct tracepoint *));
-static int validate_actionline PARAMS((char *, struct tracepoint *));
+/* ACTIONS functions: */
+
+/* Prototypes for action-parsing utility commands */
+static void read_actions PARAMS((struct tracepoint *));
+static char *parse_and_eval_memrange PARAMS ((char *,
+ CORE_ADDR,
+ long *,
+ bfd_signed_vma *,
+ long *));
+
+/* The three functions:
+ collect_pseudocommand,
+ while_stepping_pseudocommand, and
+ end_actions_pseudocommand
+ are placeholders for "commands" that are actually ONLY to be used
+ within a tracepoint action list. If the actual function is ever called,
+ it means that somebody issued the "command" at the top level,
+ which is always an error. */
static void
-end_pseudocom (args, from_tty)
+end_actions_pseudocommand (args, from_tty)
+ char *args;
+ int from_tty;
{
error ("This command cannot be used at the top level.");
}
static void
-while_stepping_pseudocom (args, from_tty)
+while_stepping_pseudocommand (args, from_tty)
+ char *args;
+ int from_tty;
{
error ("This command can only be used in a tracepoint actions list.");
}
static void
-collect_pseudocom (args, from_tty)
+collect_pseudocommand (args, from_tty)
+ char *args;
+ int from_tty;
{
error ("This command can only be used in a tracepoint actions list.");
}
+/* Enter a list of actions for a tracepoint. */
static void
trace_actions_command (args, from_tty)
char *args;
{
struct tracepoint *t;
char *actions;
+ char tmpbuf[128];
+ char *end_msg = "End with a line saying just \"end\".";
if (t = get_tracepoint_by_number (&args))
{
+ sprintf (tmpbuf, "Enter actions for tracepoint %d, one per line.",
+ t->number);
+
if (from_tty)
- printf_filtered ("Enter actions for tracepoint %d, one per line.\n",
- t->number);
+ {
+ if (readline_begin_hook)
+ (*readline_begin_hook) ("%s %s\n", tmpbuf, end_msg);
+ else if (input_from_terminal_p ())
+ printf_filtered ("%s\n%s\n", tmpbuf, end_msg);
+ }
+
free_actions (t);
read_actions (t);
+
+ if (readline_end_hook)
+ (*readline_end_hook) ();
+
/* tracepoints_changed () */
}
/* else error, just return; */
STEPPING = 2,
};
+static enum actionline_type validate_actionline PARAMS((char **,
+ struct tracepoint *));
+
+/* worker function */
static void
read_actions (t)
struct tracepoint *t;
wrap_here ("");
gdb_flush (gdb_stdout);
gdb_flush (gdb_stderr);
- if (instream == stdin && ISATTY (instream))
- line = readline (prompt);
+
+ if (readline_hook && instream == NULL)
+ line = (*readline_hook) (prompt);
+ else if (instream == stdin && ISATTY (instream))
+ {
+ line = readline (prompt);
+ if (line && *line) /* add it to command history */
+ add_history (line);
+ }
else
line = gdb_readline (0);
- linetype = validate_actionline (line, t);
+ linetype = validate_actionline (&line, t);
if (linetype == BADLINE)
continue; /* already warned -- collect another line */
- temp = xmalloc (sizeof (struct action_line));
+ temp = (struct action_line *) xmalloc (sizeof (struct action_line));
temp->next = NULL;
temp->action = line;
discard_cleanups (old_chain);
}
-static char *
-parse_and_eval_memrange (arg, addr, typecode, offset, size)
- char *arg;
- CORE_ADDR addr;
- long *typecode, *size;
- bfd_signed_vma *offset;
-{
- char *start = arg;
- struct expression *exp;
-
- if (*arg++ != '$' || *arg++ != '(')
- error ("Internal: bad argument to validate_memrange: %s", start);
-
- if (*arg == '$') /* register for relative memrange? */
- {
- exp = parse_exp_1 (&arg, block_for_pc (addr), 1);
- if (exp->elts[0].opcode != OP_REGISTER)
- error ("Bad register operand for memrange: %s", start);
- if (*arg++ != ',')
- error ("missing comma for memrange: %s", start);
- *typecode = exp->elts[1].longconst;
- }
- else
- *typecode = 0;
-
-#if 0
- /* While attractive, this fails for a number of reasons:
- 1) parse_and_eval_address does not deal with trailing commas,
- close-parens etc.
- 2) There is no safeguard against the user trying to use
- an out-of-scope variable in an address expression (for instance).
- 2.5) If you are going to allow semi-arbitrary expressions, you
- would need to explain which expressions are allowed, and
- which are not (which would provoke endless questions).
- 3) If you are going to allow semi-arbitrary expressions in the
- offset and size fields, then the leading "$" of a register
- name no longer disambiguates the typecode field.
- */
-
- *offset = parse_and_eval_address (arg);
- if ((arg = strchr (arg, ',')) == NULL)
- error ("missing comma for memrange: %s", start);
- else
- arg++;
-
- *size = parse_and_eval_address (arg);
- if ((arg = strchr (arg, ')')) == NULL)
- error ("missing close-parenthesis for memrange: %s", start);
- else
- arg++;
-#else
-#if 0
- /* This, on the other hand, doesn't work because "-1" is an
- expression, not an OP_LONG! Fall back to using strtol for now. */
-
- exp = parse_exp_1 (&arg, block_for_pc (addr), 1);
- if (exp->elts[0].opcode != OP_LONG)
- error ("Bad offset operand for memrange: %s", start);
- *offset = exp->elts[2].longconst;
-
- if (*arg++ != ',')
- error ("missing comma for memrange: %s", start);
-
- exp = parse_exp_1 (&arg, block_for_pc (addr), 1);
- if (exp->elts[0].opcode != OP_LONG)
- error ("Bad size operand for memrange: %s", start);
- *size = exp->elts[2].longconst;
-
- if (*size <= 0)
- error ("invalid size in memrange: %s", start);
-
- if (*arg++ != ')')
- error ("missing close-parenthesis for memrange: %s", start);
-#else
- *offset = strtol (arg, &arg, 0);
- if (*arg++ != ',')
- error ("missing comma for memrange: %s", start);
- *size = strtol (arg, &arg, 0);
- if (*size <= 0)
- error ("invalid size in memrange: %s", start);
- if (*arg++ != ')')
- error ("missing close-parenthesis for memrange: %s", start);
-#endif
-#endif
- if (info_verbose)
- printf_filtered ("Collecting memrange: (0x%x,0x%x,0x%x)\n",
- *typecode, *offset, *size);
-
- return arg;
-}
-
+/* worker function */
static enum actionline_type
validate_actionline (line, t)
- char *line;
+ char **line;
struct tracepoint *t;
{
- char *p;
+ struct cmd_list_element *c;
struct expression *exp;
value_ptr temp, temp2;
+ char *p;
- for (p = line; isspace (*p); )
+ for (p = *line; isspace (*p); )
p++;
/* symbol lookup etc. */
if (*p == '\0') /* empty line: just prompt for another line. */
return BADLINE;
- else if (0 == strncasecmp (p, "collect", 7))
+
+ if (*p == '#') /* comment line */
+ return GENERIC;
+
+ c = lookup_cmd (&p, cmdlist, "", -1, 1);
+ if (c == 0)
+ {
+ warning ("'%s' is not an action that I know, or is ambiguous.", p);
+ return BADLINE;
+ }
+
+ if (c->function.cfunc == collect_pseudocommand)
{
- p += 7;
do { /* repeat over a comma-separated list */
while (isspace (*p))
p++;
p = strchr (p, ',');
else if (p[1] == '(') /* literal memrange */
- p = parse_and_eval_memrange (p, t->address,
- &typecode, &offset, &size);
+ {
+ char *temp, *newline;
+
+ newline = malloc (strlen (*line) + 32);
+ strcpy (newline, *line);
+ newline[p - *line] = '\0';
+ /* newline is now a copy of line, up to "p" (the memrange) */
+ temp = parse_and_eval_memrange (p, t->address,
+ &typecode, &offset, &size) + 1;
+ /* now compose the memrange as a literal value */
+ if (typecode == -1)
+ sprintf (newline + strlen (newline),
+ "$(0x%x, %d)",
+ offset, size);
+ else
+ sprintf (newline + strlen (newline),
+ "$($%s, 0x%x, %d)",
+ reg_names[typecode], offset, size);
+ /* now add the remainder of the old line to the new one */
+ p = newline + strlen (newline);
+ if (temp && *temp)
+ strcat (newline, temp);
+ free (*line);
+ *line = newline;
+ }
}
else
{
exp = parse_exp_1 (&p, block_for_pc (t->address), 1);
if (exp->elts[0].opcode != OP_VAR_VALUE &&
+ exp->elts[0].opcode != UNOP_MEMVAL &&
/*exp->elts[0].opcode != OP_LONG && */
/*exp->elts[0].opcode != UNOP_CAST && */
exp->elts[0].opcode != OP_REGISTER)
{
- warning ("collect: enter variable name or register.\n");
+ warning ("collect requires a variable or register name.\n");
return BADLINE;
}
if (exp->elts[0].opcode == OP_VAR_VALUE)
} while (p && *p++ == ',');
return GENERIC;
}
- else if (0 == strncasecmp (p, "while-stepping", 14))
+ else if (c->function.cfunc == while_stepping_pseudocommand)
{
char *steparg; /* in case warning is necessary */
- p += 14;
while (isspace (*p))
p++;
steparg = p;
t->step_count = -1;
return STEPPING;
}
- else if (0 == strncasecmp (p, "end", 3))
+ else if (c->function.cfunc == end_actions_pseudocommand)
return END;
else
{
- warning ("'%s' is not a supported tracepoint action.", p);
+ warning ("'%s' is not a supported tracepoint action.", *line);
return BADLINE;
}
}
-static void
+/* worker function */
+void
free_actions (t)
struct tracepoint *t;
{
for (line = t->actions; line; line = next)
{
next = line->next;
+ if (line->action)
+ free (line->action);
free (line);
}
t->actions = NULL;
struct memrange *list;
} tracepoint_list, stepping_list;
+/* MEMRANGE functions: */
+
+/* parse a memrange spec from command input */
+static char *
+parse_and_eval_memrange (arg, addr, typecode, offset, size)
+ char *arg;
+ CORE_ADDR addr;
+ long *typecode, *size;
+ bfd_signed_vma *offset;
+{
+ char *start = arg;
+ struct expression *exp;
+ value_ptr val;
+
+ if (*arg++ != '$' || *arg++ != '(')
+ error ("Internal: bad argument to parse_and_eval_memrange: %s", start);
+
+ if (*arg == '$') /* register for relative memrange? */
+ {
+ exp = parse_exp_1 (&arg, block_for_pc (addr), 1);
+ if (exp->elts[0].opcode != OP_REGISTER)
+ error ("Bad register operand for memrange: %s", start);
+ if (*arg++ != ',')
+ error ("missing comma for memrange: %s", start);
+ *typecode = exp->elts[1].longconst;
+ }
+ else
+ *typecode = -1; /* absolute memrange; */
+
+ exp = parse_exp_1 (&arg, 0, 1);
+ *offset = value_as_pointer (evaluate_expression (exp));
+
+ /* now parse the size */
+ if (*arg++ != ',')
+ error ("missing comma for memrange: %s", start);
+
+ exp = parse_exp_1 (&arg, 0, 0);
+ *size = value_as_long (evaluate_expression (exp));
+
+ if (info_verbose)
+ printf_filtered ("Collecting memrange: (0x%x,0x%x,0x%x)\n",
+ *typecode, *offset, *size);
+
+ return arg;
+}
+
+/* compare memranges for qsort */
static int
-memrange_cmp (a, b)
- struct memrange *a, *b;
+memrange_cmp (voidpa, voidpb)
+ void *voidpa, *voidpb;
{
+ struct memrange *a, *b;
+
+ a = (struct memrange *) voidpa;
+ b = (struct memrange *) voidpb;
+
if (a->type < b->type) return -1;
if (a->type > b->type) return 1;
if (a->type == 0)
return 0;
}
+/* Sort the memrange list using qsort, and merge adjacent memranges */
static void
memrange_sortmerge (memranges)
struct collection_list *memranges;
memranges->list[b].start - memranges->list[a].end <=
MAX_REGISTER_VIRTUAL_SIZE)
{
- memranges->list[a].end = memranges->list[b].end;
+ /* memrange b starts before memrange a ends; merge them. */
+ if (memranges->list[b].end > memranges->list[a].end)
+ memranges->list[a].end = memranges->list[b].end;
continue; /* next b, same a */
}
a++; /* next a */
}
}
+/* Add a register to a collection list */
void
add_register (collection, regno)
struct collection_list *collection;
collection->regs_mask [regno / 8] |= 1 << (regno % 8);
}
+/* Add a memrange to a collection list */
static void
add_memrange (memranges, type, base, len)
struct collection_list *memranges;
if (memranges->next_memrange >= memranges->listsize)
{
memranges->listsize *= 2;
- memranges->list = xrealloc (memranges->list,
+ memranges->list = (struct memrange *) xrealloc (memranges->list,
memranges->listsize);
}
- if (type != 0) /* better collect the base register! */
+ if (type != -1) /* better collect the base register! */
add_register (memranges, type);
}
+/* Add a symbol to a collection list */
static void
collect_symbol (collect, sym)
struct collection_list *collect;
case LOC_STATIC:
offset = SYMBOL_VALUE_ADDRESS (sym);
if (info_verbose)
- printf_filtered ("LOC_STATIC %s: collect %d bytes "
- "at 0x%08x\n",
+ printf_filtered ("LOC_STATIC %s: collect %d bytes at 0x%08x\n",
SYMBOL_NAME (sym), len, offset);
- add_memrange (collect, 0, offset, len); /* 0 == memory */
+ add_memrange (collect, -1, offset, len); /* 0 == memory */
break;
case LOC_REGISTER:
case LOC_REGPARM:
}
}
+/* Add all locals (or args) symbols to collection list */
static void
add_local_symbols (collect, pc, type)
struct collection_list *collect;
warning ("No %s found in scope.", type == 'L' ? "locals" : "args");
}
+/* worker function */
static void
clear_collection_list (list)
struct collection_list *list;
memset (list->regs_mask, 0, sizeof (list->regs_mask));
}
+/* reduce a collection list to string form (for gdb protocol) */
static char *
stringify_collection_list (list, string)
struct collection_list *list;
return string;
}
+/* render all actions into gdb protocol */
static void
encode_actions (t, tdp_actions, step_count, stepping_actions)
struct tracepoint *t;
unsigned long *step_count;
char **stepping_actions;
{
- struct expression *exp;
static char tdp_buff[2048], step_buff[2048];
- struct action_line *action;
char *action_exp;
+ struct expression *exp;
+ struct action_line *action;
bfd_signed_vma offset;
long i;
- struct collection_list *collect;
+ value_ptr tempval;
+ struct collection_list *collect;
+ struct cmd_list_element *cmd;
clear_collection_list (&tracepoint_list);
clear_collection_list (&stepping_list);
while (isspace (*action_exp))
action_exp++;
- if (0 == strncasecmp (action_exp, "collect", 7))
+ if (*action_exp == '#') /* comment line */
+ return;
+
+ cmd = lookup_cmd (&action_exp, cmdlist, "", -1, 1);
+ if (cmd == 0)
+ error ("Bad action list item: %s", action_exp);
+
+ if (cmd->function.cfunc == collect_pseudocommand)
{
- action_exp = action_exp + 7;
do { /* repeat over a comma-separated list */
while (isspace (*action_exp))
action_exp++;
printf_filtered ("OP_REGISTER: ");
add_register (collect, i);
break;
+
+ case UNOP_MEMVAL:
+ /* safe because we know it's a simple expression */
+ tempval = evaluate_expression (exp);
+ addr = VALUE_ADDRESS (tempval) + VALUE_OFFSET (tempval);
+ len = TYPE_LENGTH (check_typedef (exp->elts[1].type));
+ add_memrange (collect, -1, addr, len);
+ break;
+
case OP_VAR_VALUE:
collect_symbol (collect, exp->elts[2].symbol);
break;
else
len = 4;
- add_memrange (collect, 0, addr, len);
+ add_memrange (collect, -1, addr, len);
break;
#endif
}
}
} while (action_exp && *action_exp++ == ',');
}
- else if (0 == strncasecmp (action_exp, "while-stepping", 14))
+ else if (cmd->function.cfunc == while_stepping_pseudocommand)
{
collect = &stepping_list;
}
- else if (0 == strncasecmp (action_exp, "end", 3))
+ else if (cmd->function.cfunc == end_actions_pseudocommand)
{
if (collect == &stepping_list) /* end stepping actions */
collect = &tracepoint_list;
memrange_sortmerge (&tracepoint_list);
memrange_sortmerge (&stepping_list);
- *tdp_actions = stringify_collection_list (&tracepoint_list, &tdp_buff);
- *stepping_actions = stringify_collection_list (&stepping_list, &step_buff);
+ *tdp_actions = stringify_collection_list (&tracepoint_list, tdp_buff);
+ *stepping_actions = stringify_collection_list (&stepping_list, step_buff);
}
static char target_buf[2048];
+/* tstart command:
+
+ Tell target to lear any previous trace experiment.
+ Walk the list of tracepoints, and send them (and their actions)
+ to the target. If no errors,
+ Tell target to start a new trace experiment. */
+
static void
trace_start_command (args, from_tty)
char *args;
if (tdp_actions)
{
if (strlen (buf) + strlen (tdp_actions) >= sizeof (buf))
- error ("Actions for tracepoint %d too complex; "
- "please simplify.", t->number);
+ error ("Actions for tracepoint %d too complex; please simplify.",
+ t->number);
strcat (buf, tdp_actions);
}
if (stepping_actions)
{
strcat (buf, "S");
if (strlen (buf) + strlen (stepping_actions) >= sizeof (buf))
- error ("Actions for tracepoint %d too complex; "
- "please simplify.", t->number);
+ error ("Actions for tracepoint %d too complex; please simplify.",
+ t->number);
strcat (buf, stepping_actions);
}
}
set_traceframe_num (-1); /* all old traceframes invalidated */
set_tracepoint_num (-1);
set_traceframe_context(-1);
+ trace_running_p = 1;
}
else
printf_filtered ("Trace can only be run on remote targets.\n");
}
+/* tstop command */
static void
trace_stop_command (args, from_tty)
char *args;
remote_get_noisy_reply (target_buf);
if (strcmp (target_buf, "OK"))
error ("Bogus reply from target: %s", target_buf);
+ trace_running_p = 0;
}
else
error ("Trace can only be run on remote targets.");
}
+unsigned long trace_running_p;
+
+/* tstatus command */
static void
trace_status_command (args, from_tty)
char *args;
{
putpkt ("qTStatus");
remote_get_noisy_reply (target_buf);
- if (strcmp (target_buf, "OK"))
- error ("Bogus reply from target: %s", target_buf);
+
+ if (target_buf[0] != 'T' ||
+ (target_buf[1] != '0' && target_buf[1] != '1'))
+ error ("Bogus reply from target: %s", target_buf);
+
+ /* exported for use by the GUI */
+ trace_running_p = (target_buf[1] == '1');
}
else
error ("Trace can only be run on remote targets.");
}
+/* Worker function for the various flavors of the tfind command */
static void
-trace_buff_command (args, from_tty)
- char *args;
- int from_tty;
-{ /* STUB_COMM NOT_IMPLEMENTED */
- if (args == 0 || *args == 0)
- printf_filtered ("TBUFFER command requires argument (on or off)\n");
- else if (strcasecmp (args, "on") == 0)
- printf_filtered ("tbuffer overflow on.\n");
- else if (strcasecmp (args, "off") == 0)
- printf_filtered ("tbuffer overflow off.\n");
- else
- printf_filtered ("TBUFFER: unknown argument (use on or off)\n");
-}
-
-static void
-trace_limit_command (args, from_tty)
- char *args;
- int from_tty;
-{ /* STUB_COMM NOT_IMPLEMENTED */
- printf_filtered ("Limit it to what?\n");
-}
-
-static void
-finish_tfind_command (reply, from_tty)
- char *reply;
+finish_tfind_command (msg, from_tty)
+ char *msg;
int from_tty;
{
int target_frameno = -1, target_tracept = -1;
+ CORE_ADDR old_frame_addr;
+ struct symbol *old_func;
+ char *reply;
+
+ old_frame_addr = FRAME_FP (get_current_frame ());
+ old_func = find_pc_function (read_pc ());
+
+ putpkt (msg);
+ reply = remote_get_noisy_reply (msg);
while (reply && *reply)
switch (*reply) {
case 'F':
if ((target_frameno = strtol (++reply, &reply, 16)) == -1)
- error ("Target failed to find requested trace frame.");
+ {
+ /* A request for a non-existant trace frame has failed.
+ Our response will be different, depending on FROM_TTY:
+
+ If FROM_TTY is true, meaning that this command was
+ typed interactively by the user, then give an error
+ and DO NOT change the state of traceframe_number etc.
+
+ However if FROM_TTY is false, meaning that we're either
+ in a script, a loop, or a user-defined command, then
+ DON'T give an error, but DO change the state of
+ traceframe_number etc. to invalid.
+
+ The rationalle is that if you typed the command, you
+ might just have committed a typo or something, and you'd
+ like to NOT lose your current debugging state. However
+ if you're in a user-defined command or especially in a
+ loop, then you need a way to detect that the command
+ failed WITHOUT aborting. This allows you to write
+ scripts that search thru the trace buffer until the end,
+ and then continue on to do something else. */
+
+ if (from_tty)
+ error ("Target failed to find requested trace frame.");
+ else
+ {
+ if (info_verbose)
+ printf_filtered ("End of trace buffer.\n");
+ /* The following will not recurse, since it's special-cased */
+ trace_find_command ("-1", from_tty);
+ reply = NULL; /* break out of loop,
+ (avoid recursive nonsense) */
+ }
+ }
break;
case 'T':
if ((target_tracept = strtol (++reply, &reply, 16)) == -1)
select_frame (get_current_frame (), 0);
set_traceframe_num (target_frameno);
set_tracepoint_num (target_tracept);
- set_traceframe_context ((get_current_frame ())->pc);
+ if (target_frameno == -1)
+ set_traceframe_context (-1);
+ else
+ set_traceframe_context (read_pc ());
if (from_tty)
- print_stack_frame (selected_frame, selected_frame_level, 1);
+ {
+ int source_only;
+
+ /* NOTE: in immitation of the step command, try to determine
+ whether we have made a transition from one function to another.
+ If so, we'll print the "stack frame" (ie. the new function and
+ it's arguments) -- otherwise we'll just show the new source line.
+
+ This determination is made by checking (1) whether the current
+ function has changed, and (2) whether the current FP has changed.
+ Hack: if the FP wasn't collected, either at the current or the
+ previous frame, assume that the FP has NOT changed. */
+
+ if (old_func == find_pc_function (read_pc ()) &&
+ (old_frame_addr == 0 ||
+ FRAME_FP (get_current_frame ()) == 0 ||
+ old_frame_addr == FRAME_FP (get_current_frame ())))
+ source_only = -1;
+ else
+ source_only = 1;
+
+ print_stack_frame (selected_frame, selected_frame_level, source_only);
+ do_displays ();
+ }
}
/* trace_find_command takes a trace frame number n,
T<hexnum> (gives the selected tracepoint number)
*/
+/* tfind command */
static void
trace_find_command (args, from_tty)
char *args;
{
if (traceframe_number == -1)
error ("not debugging trace buffer");
- else if (traceframe_number == 0)
+ else if (from_tty && traceframe_number == 0)
error ("already at start of trace buffer");
frameno = traceframe_number - 1;
}
-#if 0
- else if (0 == strcasecmp (args, "start"))
- frameno = 0;
- else if (0 == strcasecmp (args, "none") ||
- 0 == strcasecmp (args, "end"))
- frameno = -1;
-#endif
else
frameno = parse_and_eval_address (args);
sprintf (target_buf, "QTFrame:%x", frameno);
+#if 0
putpkt (target_buf);
tmp = remote_get_noisy_reply (target_buf);
if (frameno == -1) /* end trace debugging */
{ /* hopefully the stub has complied! */
- if (0 != strcmp (tmp, "F-1"))
+ if (0 != strcmp (tmp, "OK"))
error ("Bogus response from target: %s", tmp);
- flush_cached_frames ();
- registers_changed ();
- select_frame (get_current_frame (), 0);
- set_traceframe_num (-1);
- set_tracepoint_num (-1);
- set_traceframe_context (-1);
-
- if (from_tty)
- print_stack_frame (selected_frame, selected_frame_level, 1);
+ finish_tfind_command (NULL, from_tty);
}
else
finish_tfind_command (tmp, from_tty);
+#else
+ finish_tfind_command (target_buf, from_tty);
+#endif
}
else
error ("Trace can only be run on remote targets.");
}
+/* tfind end */
static void
trace_find_end_command (args, from_tty)
char *args;
trace_find_command ("-1", from_tty);
}
+/* tfind none */
static void
trace_find_none_command (args, from_tty)
char *args;
trace_find_command ("-1", from_tty);
}
+/* tfind start */
static void
trace_find_start_command (args, from_tty)
char *args;
trace_find_command ("0", from_tty);
}
+/* tfind pc command */
static void
trace_find_pc_command (args, from_tty)
char *args;
pc = parse_and_eval_address (args);
sprintf (target_buf, "QTFrame:pc:%x", pc);
+#if 0
putpkt (target_buf);
tmp = remote_get_noisy_reply (target_buf);
finish_tfind_command (tmp, from_tty);
+#else
+ finish_tfind_command (target_buf, from_tty);
+#endif
}
else
error ("Trace can only be run on remote targets.");
}
+/* tfind tracepoint command */
static void
trace_find_tracepoint_command (args, from_tty)
char *args;
tdp = parse_and_eval_address (args);
sprintf (target_buf, "QTFrame:tdp:%x", tdp);
+#if 0
putpkt (target_buf);
tmp = remote_get_noisy_reply (target_buf);
finish_tfind_command (tmp, from_tty);
+#else
+ finish_tfind_command (target_buf, from_tty);
+#endif
}
else
error ("Trace can only be run on remote targets.");
}
/* TFIND LINE command:
- *
- * This command will take a sourceline for argument, just like BREAK
- * or TRACE (ie. anything that "decode_line_1" can handle).
- *
- * With no argument, this command will find the next trace frame
- * corresponding to a source line OTHER THAN THE CURRENT ONE.
- */
+
+ This command will take a sourceline for argument, just like BREAK
+ or TRACE (ie. anything that "decode_line_1" can handle).
+
+ With no argument, this command will find the next trace frame
+ corresponding to a source line OTHER THAN THE CURRENT ONE. */
static void
trace_find_line_command (args, from_tty)
sprintf (target_buf, "QTFrame:range:%x:%x", start_pc, end_pc - 1);
else /* find OUTSIDE OF range of CURRENT line */
sprintf (target_buf, "QTFrame:outside:%x:%x", start_pc, end_pc - 1);
+#if 0
putpkt (target_buf);
tmp = remote_get_noisy_reply (target_buf);
finish_tfind_command (tmp, from_tty);
+#else
+ finish_tfind_command (target_buf, from_tty);
+#endif
do_cleanups (old_chain);
}
else
error ("Trace can only be run on remote targets.");
}
+/* tfind range command */
static void
trace_find_range_command (args, from_tty)
char *args;
}
sprintf (target_buf, "QTFrame:range:%x:%x", start, stop);
+#if 0
putpkt (target_buf);
tmp = remote_get_noisy_reply (target_buf);
finish_tfind_command (tmp, from_tty);
+#else
+ finish_tfind_command (target_buf, from_tty);
+#endif
}
else
error ("Trace can only be run on remote targets.");
}
+/* tfind outside command */
static void
trace_find_outside_command (args, from_tty)
char *args;
}
sprintf (target_buf, "QTFrame:outside:%x:%x", start, stop);
+#if 0
putpkt (target_buf);
tmp = remote_get_noisy_reply (target_buf);
finish_tfind_command (tmp, from_tty);
+#else
+ finish_tfind_command (target_buf, from_tty);
+#endif
}
else
error ("Trace can only be run on remote targets.");
}
+/* save-tracepoints command */
static void
tracepoint_save_command (args, from_tty)
char *args;
indent = i1;
for (line = tp->actions; line; line = line->next)
{
+ struct cmd_list_element *cmd;
+
actionline = line->action;
while (isspace(*actionline))
actionline++;
fprintf (fp, "%s%s\n", indent, actionline);
- if (0 == strncasecmp (actionline, "while-stepping", 14))
- indent = i2;
- else if (0 == strncasecmp (actionline, "end", 3))
- indent = i1;
+ if (*actionline != '#') /* skip for comment lines */
+ {
+ cmd = lookup_cmd (&actionline, cmdlist, "", -1, 1);
+ if (cmd == 0)
+ error ("Bad action list item: %s", actionline);
+ if (cmd->function.cfunc == while_stepping_pseudocommand)
+ indent = i2;
+ else if (cmd->function.cfunc == end_actions_pseudocommand)
+ indent = i1;
+ }
}
}
}
return;
}
+/* info scope command: list the locals for a scope. */
static void
scope_info (args, from_tty)
char *args;
save_args);
}
+/* worker function (cleanup) */
static void
replace_comma (comma)
char *comma;
*comma = ',';
}
+/* tdump command */
static void
trace_dump_command (args, from_tty)
char *args;
for (action = t->actions; action; action = action->next)
{
+ struct cmd_list_element *cmd;
+
action_exp = action->action;
while (isspace (*action_exp))
action_exp++;
/* The collection actions to be done while stepping are
bracketed by the commands "while-stepping" and "end". */
- if (0 == strncasecmp (action_exp, "while-stepping", 14))
+ if (*action_exp == '#') /* comment line */
+ continue;
+
+ cmd = lookup_cmd (&action_exp, cmdlist, "", -1, 1);
+ if (cmd == 0)
+ error ("Bad action list item: %s", action_exp);
+
+ if (cmd->function.cfunc == while_stepping_pseudocommand)
stepping_actions = 1;
- else if (0 == strncasecmp (action_exp, "end", 3))
+ else if (cmd->function.cfunc == end_actions_pseudocommand)
stepping_actions = 0;
- else if (0 == strncasecmp (action_exp, "collect", 7))
+ else if (cmd->function.cfunc == collect_pseudocommand)
{
/* Display the collected data.
For the trap frame, display only what was collected at the trap.
STEPPING_FRAME and STEPPING_ACTIONS should be equal. */
if (stepping_frame == stepping_actions)
{
- action_exp += 7;
do { /* repeat over a comma-separated list */
QUIT;
if (*action_exp == ',')
action_exp++;
next_comma = strchr (action_exp, ',');
- if (next_comma)
- {
- make_cleanup (replace_comma, next_comma);
- *next_comma = '\0';
- }
if (0 == strncasecmp (action_exp, "$reg", 4))
registers_info (NULL, from_tty);
locals_info (NULL, from_tty);
else if (0 == strncasecmp (action_exp, "$arg", 4))
args_info (NULL, from_tty);
+ else if (action_exp[0] == '$' && action_exp[1] == '(')
+ { /* memrange */
+ long typecode, size;
+ bfd_signed_vma offset;
+ char fmt[40];
+
+ action_exp = parse_and_eval_memrange (action_exp,
+ read_pc (),
+ &typecode,
+ &offset,
+ &size);
+ if (typecode != 0 && typecode != -1)
+ offset += read_register (typecode);
+ sprintf (fmt, "/%dxb 0x%x", size, offset);
+ x_command (fmt, from_tty);
+ next_comma = strchr (action_exp, ',');
+ }
else
- {
+ { /* variable */
+ if (next_comma)
+ {
+ make_cleanup (replace_comma, next_comma);
+ *next_comma = '\0';
+ }
printf_filtered ("%s = ", action_exp);
output_command (action_exp, from_tty);
printf_filtered ("\n");
discard_cleanups (old_cleanups);
}
-
-
-static struct cmd_list_element *tfindlist;
-static struct cmd_list_element *tracelist;
-
+/* module initialization */
void
_initialize_tracepoint ()
{
if (tracepoint_list.list == NULL)
{
tracepoint_list.listsize = 128;
- tracepoint_list.list = xmalloc
+ tracepoint_list.list = (struct memrange *) xmalloc
(tracepoint_list.listsize * sizeof (struct memrange));
}
if (stepping_list.list == NULL)
{
stepping_list.listsize = 128;
- stepping_list.list = xmalloc
+ stepping_list.list = (struct memrange *) xmalloc
(stepping_list.listsize * sizeof (struct memrange));
}
Usage: passcount COUNT TPNUM, where TPNUM may also be \"all\";\n\
if TPNUM is omitted, passcount refers to the last tracepoint defined.");
- add_com ("end", class_trace, end_pseudocom,
+ add_com ("end", class_trace, end_actions_pseudocommand,
"Ends a list of commands or actions.\n\
Several GDB commands allow you to enter a list of commands or actions.\n\
Entering \"end\" on a line by itself is the normal way to terminate\n\
such a list.\n\n\
Note: the \"end\" command cannot be used at the gdb prompt.");
- add_com ("while-stepping", class_trace, while_stepping_pseudocom,
+ add_com ("while-stepping", class_trace, while_stepping_pseudocommand,
"Specify single-stepping behavior at a tracepoint.\n\
Argument is number of instructions to trace in single-step mode\n\
following the tracepoint. This command is normally followed by\n\
while single-stepping.\n\n\
Note: this command can only be used in a tracepoint \"actions\" list.");
- add_com ("collect", class_trace, collect_pseudocom,
+ add_com_alias ("ws", "while-stepping", class_alias, 0);
+ add_com_alias ("stepping", "while-stepping", class_alias, 0);
+
+ add_com ("collect", class_trace, collect_pseudocommand,
"Specify one or more data items to be collected at a tracepoint.\n\
Accepts a comma-separated list of (one or more) arguments.\n\
Things that may be collected include registers, variables, plus\n\