Mon Dec 8 14:28:49 1997 Michael Snyder (msnyder@cleaver.cygnus.com)
* tracepoint.c (memrange_sortmerge): allow for memranges that overlap. (collect_pseudocommand etc.) cleanup decls.
This commit is contained in:
parent
0c4f6dc21a
commit
5d187fd318
|
@ -1,3 +1,8 @@
|
||||||
|
Mon Dec 8 14:28:49 1997 Michael Snyder (msnyder@cleaver.cygnus.com)
|
||||||
|
|
||||||
|
* tracepoint.c (memrange_sortmerge): allow for memranges
|
||||||
|
that overlap. (collect_pseudocommand etc.) cleanup decls.
|
||||||
|
|
||||||
Fri Dec 5 10:31:23 1997 Keith Seitz <keiths@pizza.cygnus.com>
|
Fri Dec 5 10:31:23 1997 Keith Seitz <keiths@pizza.cygnus.com>
|
||||||
|
|
||||||
* gdbtk.c (gdbtk_init): add gdb_find_file to interpreter
|
* gdbtk.c (gdbtk_init): add gdb_find_file to interpreter
|
||||||
|
|
|
@ -733,18 +733,24 @@ static char *parse_and_eval_memrange PARAMS ((char *,
|
||||||
|
|
||||||
static void
|
static void
|
||||||
end_actions_pseudocommand (args, from_tty)
|
end_actions_pseudocommand (args, from_tty)
|
||||||
|
char *args;
|
||||||
|
int from_tty;
|
||||||
{
|
{
|
||||||
error ("This command cannot be used at the top level.");
|
error ("This command cannot be used at the top level.");
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
while_stepping_pseudocommand (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.");
|
error ("This command can only be used in a tracepoint actions list.");
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
collect_pseudocommand (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.");
|
error ("This command can only be used in a tracepoint actions list.");
|
||||||
}
|
}
|
||||||
|
@ -884,6 +890,9 @@ validate_actionline (line, t)
|
||||||
if (*p == '\0') /* empty line: just prompt for another line. */
|
if (*p == '\0') /* empty line: just prompt for another line. */
|
||||||
return BADLINE;
|
return BADLINE;
|
||||||
|
|
||||||
|
if (*p == '#') /* comment line */
|
||||||
|
return GENERIC;
|
||||||
|
|
||||||
c = lookup_cmd (&p, cmdlist, "", -1, 1);
|
c = lookup_cmd (&p, cmdlist, "", -1, 1);
|
||||||
if (c == 0)
|
if (c == 0)
|
||||||
{
|
{
|
||||||
|
@ -1130,6 +1139,8 @@ memrange_sortmerge (memranges)
|
||||||
memranges->list[b].start - memranges->list[a].end <=
|
memranges->list[b].start - memranges->list[a].end <=
|
||||||
MAX_REGISTER_VIRTUAL_SIZE)
|
MAX_REGISTER_VIRTUAL_SIZE)
|
||||||
{
|
{
|
||||||
|
/* 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;
|
memranges->list[a].end = memranges->list[b].end;
|
||||||
continue; /* next b, same a */
|
continue; /* next b, same a */
|
||||||
}
|
}
|
||||||
|
@ -1405,6 +1416,9 @@ encode_actions (t, tdp_actions, step_count, stepping_actions)
|
||||||
while (isspace (*action_exp))
|
while (isspace (*action_exp))
|
||||||
action_exp++;
|
action_exp++;
|
||||||
|
|
||||||
|
if (*action_exp == '#') /* comment line */
|
||||||
|
return;
|
||||||
|
|
||||||
cmd = lookup_cmd (&action_exp, cmdlist, "", -1, 1);
|
cmd = lookup_cmd (&action_exp, cmdlist, "", -1, 1);
|
||||||
if (cmd == 0)
|
if (cmd == 0)
|
||||||
error ("Bad action list item: %s", action_exp);
|
error ("Bad action list item: %s", action_exp);
|
||||||
|
@ -2106,6 +2120,8 @@ tracepoint_save_command (args, from_tty)
|
||||||
actionline++;
|
actionline++;
|
||||||
|
|
||||||
fprintf (fp, "%s%s\n", indent, actionline);
|
fprintf (fp, "%s%s\n", indent, actionline);
|
||||||
|
if (*actionline != '#') /* skip for comment lines */
|
||||||
|
{
|
||||||
cmd = lookup_cmd (&actionline, cmdlist, "", -1, 1);
|
cmd = lookup_cmd (&actionline, cmdlist, "", -1, 1);
|
||||||
if (cmd == 0)
|
if (cmd == 0)
|
||||||
error ("Bad action list item: %s", actionline);
|
error ("Bad action list item: %s", actionline);
|
||||||
|
@ -2116,6 +2132,7 @@ tracepoint_save_command (args, from_tty)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
fclose (fp);
|
fclose (fp);
|
||||||
if (from_tty)
|
if (from_tty)
|
||||||
printf_filtered ("Tracepoints saved to file '%s'.\n", args);
|
printf_filtered ("Tracepoints saved to file '%s'.\n", args);
|
||||||
|
@ -2316,6 +2333,9 @@ trace_dump_command (args, from_tty)
|
||||||
/* The collection actions to be done while stepping are
|
/* The collection actions to be done while stepping are
|
||||||
bracketed by the commands "while-stepping" and "end". */
|
bracketed by the commands "while-stepping" and "end". */
|
||||||
|
|
||||||
|
if (*action_exp == '#') /* comment line */
|
||||||
|
continue;
|
||||||
|
|
||||||
cmd = lookup_cmd (&action_exp, cmdlist, "", -1, 1);
|
cmd = lookup_cmd (&action_exp, cmdlist, "", -1, 1);
|
||||||
if (cmd == 0)
|
if (cmd == 0)
|
||||||
error ("Bad action list item: %s", action_exp);
|
error ("Bad action list item: %s", action_exp);
|
||||||
|
|
Loading…
Reference in New Issue