From 12c143d5948355b3b54c9c0decc779177b22d5d9 Mon Sep 17 00:00:00 2001 From: David Brownell Date: Thu, 7 Jan 2010 16:41:42 -0800 Subject: [PATCH] misc ARM help/usage updates Usage syntax messages have the same EBNF as the User's Guide; there should be no angle brackets in either place. Uupdate some helptext to be more accurate. Don't use "&function"; functions are like arrays, their address is their name. Signed-off-by: David Brownell --- src/target/arm926ejs.c | 2 +- src/target/arm9tdmi.c | 4 +++- src/target/armv4_5.c | 10 +++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/target/arm926ejs.c b/src/target/arm926ejs.c index 4ac92a24..e099919b 100644 --- a/src/target/arm926ejs.c +++ b/src/target/arm926ejs.c @@ -757,7 +757,7 @@ static int arm926ejs_mmu(struct target *target, int *enabled) static const struct command_registration arm926ejs_exec_command_handlers[] = { { .name = "cache_info", - .handler = &arm926ejs_handle_cache_info_command, + .handler = arm926ejs_handle_cache_info_command, .mode = COMMAND_EXEC, .help = "display information about target caches", diff --git a/src/target/arm9tdmi.c b/src/target/arm9tdmi.c index ae0c4e05..823e962e 100644 --- a/src/target/arm9tdmi.c +++ b/src/target/arm9tdmi.c @@ -918,7 +918,9 @@ static const struct command_registration arm9tdmi_exec_command_handlers[] = { .name = "vector_catch", .handler = handle_arm9tdmi_catch_vectors_command, .mode = COMMAND_EXEC, - .usage = "[all|none|reset|undef|swi|pabt|dabt|irq|fiq] ...", + .help = "Display, after optionally updating, configuration " + "of vector catch unit.", + .usage = "[all|none|(reset|undef|swi|pabt|dabt|irq|fiq)*]", }, COMMAND_REGISTRATION_DONE }; diff --git a/src/target/armv4_5.c b/src/target/armv4_5.c index 1c4923b9..c7b73676 100644 --- a/src/target/armv4_5.c +++ b/src/target/armv4_5.c @@ -928,22 +928,22 @@ static int jim_mcrmrc(Jim_Interp *interp, int argc, Jim_Obj *const *argv) static const struct command_registration arm_exec_command_handlers[] = { { .name = "reg", - .handler = &handle_armv4_5_reg_command, + .handler = handle_armv4_5_reg_command, .mode = COMMAND_EXEC, .help = "display ARM core registers", }, { .name = "core_state", - .handler = &handle_armv4_5_core_state_command, + .handler = handle_armv4_5_core_state_command, .mode = COMMAND_EXEC, - .usage = "", + .usage = "['arm'|'thumb']", .help = "display/change ARM core state", }, { .name = "disassemble", - .handler = &handle_armv4_5_disassemble_command, + .handler = handle_armv4_5_disassemble_command, .mode = COMMAND_EXEC, - .usage = "
[ ['thumb']]", + .usage = "address [count ['thumb']]", .help = "disassemble instructions ", }, { -- 2.39.5