aboutsummaryrefslogtreecommitdiff
path: root/sim/common/sim-watch.c
diff options
context:
space:
mode:
authorAndrew Cagney <cagney@redhat.com>1997-09-10 22:47:12 +0000
committerAndrew Cagney <cagney@redhat.com>1997-09-10 22:47:12 +0000
commitcad7297e805c8c4ed5c45196f0c8c0ee1b7b0bfa (patch)
tree4092626d810685e0ae5038e32d19ada0a89562ee /sim/common/sim-watch.c
parent43898c918f3ed9bd3391c5f63ed1e29beb778c4c (diff)
downloadfsf-binutils-gdb-cad7297e805c8c4ed5c45196f0c8c0ee1b7b0bfa.zip
fsf-binutils-gdb-cad7297e805c8c4ed5c45196f0c8c0ee1b7b0bfa.tar.gz
fsf-binutils-gdb-cad7297e805c8c4ed5c45196f0c8c0ee1b7b0bfa.tar.bz2
o Wordwrap usage messages from sim-options
o Clarify how to use alias options o use in sim-watch (better usage message) o Don't pass something on the stack into the watch-point interrupt hander.
Diffstat (limited to 'sim/common/sim-watch.c')
-rw-r--r--sim/common/sim-watch.c43
1 files changed, 34 insertions, 9 deletions
diff --git a/sim/common/sim-watch.c b/sim/common/sim-watch.c
index 5df898b..d1643b6 100644
--- a/sim/common/sim-watch.c
+++ b/sim/common/sim-watch.c
@@ -228,7 +228,7 @@ handle_watchpoint (SIM_DESC sd, void *data)
if (point->interrupt_nr == watch->nr_interrupts)
sim_engine_halt (sd, NULL, NULL, NULL_CIA, sim_stopped, SIGINT);
else
- watch->interrupt_handler (sd, &interrupt_nr);
+ watch->interrupt_handler (sd, &watch->interrupt_names[interrupt_nr]);
}
@@ -388,12 +388,6 @@ static const OPTION watchpoint_options[] =
{ {NULL, no_argument, NULL, 0}, '\0', NULL, NULL, NULL }
};
-static const OPTION template_int_option = {
- { NULL, required_argument, NULL, 0 },
- '\0', "VALUE", "Create the specified watchpoint",
- watchpoint_option_handler,
-};
-
static char *default_interrupt_names[] = { "int", 0, };
@@ -421,17 +415,48 @@ sim_watchpoint_install (SIM_DESC sd)
watchpoint_type type;
for (type = 0; type < nr_watchpoint_types; type++)
{
+ char *name;
int nr = interrupt_nr * nr_watchpoint_types + type;
OPTION *option = &int_options[nr];
- char *name;
- *option = template_int_option;
asprintf (&name, "watch-%s-%s",
watchpoint_type_to_str (sd, type),
interrupt_nr_to_str (sd, interrupt_nr));
option->opt.name = name;
+ option->opt.has_arg = required_argument;
option->opt.val = type_to_option (sd, type, interrupt_nr);
+ option->doc = "";
+ option->doc_name = "";
}
}
+ /* adjust first few entries so that they contain real
+ documentation, the first entry includes a list of actions. */
+ {
+ char *prefix =
+ "Watch the simulator, take ACTION in COUNT cycles (`+' for every COUNT cycles), ACTION is";
+ char *doc;
+ int len = strlen (prefix) + 1;
+ for (interrupt_nr = 0; interrupt_nr <= watch->nr_interrupts; interrupt_nr++)
+ len += strlen (interrupt_nr_to_str (sd, interrupt_nr)) + 1;
+ doc = NZALLOC (char, len);
+ strcpy (doc, prefix);
+ for (interrupt_nr = 0; interrupt_nr <= watch->nr_interrupts; interrupt_nr++)
+ {
+ strcat (doc, " ");
+ strcat (doc, interrupt_nr_to_str (sd, interrupt_nr));
+ }
+ int_options[0].doc_name = "watch-cycles-ACTION";
+ int_options[0].arg = "[+]COUNT";
+ int_options[0].doc = doc;
+ }
+ int_options[1].doc_name = "watch-pc-ACTION";
+ int_options[1].arg = "[!]ADDRESS";
+ int_options[1].doc =
+ "Watch the PC, take ACTION when matches ADDRESS (in range ADDRESS,ADDRESS), `!' negates test";
+ int_options[2].doc_name = "watch-clock-ACTION";
+ int_options[2].arg = "[+]MILLISECONDS";
+ int_options[2].doc =
+ "Watch the clock, take ACTION after MILLISECONDS (`+' for every MILLISECONDS)";
+
sim_add_option_table (sd, int_options);
}
return SIM_RC_OK;