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 <dbrownell@users.sourceforge.net>

diff --git a/src/target/arm926ejs.c b/src/target/arm926ejs.c
index 4ac92a249c6357173c79e5ca10572c3fb842d083..e099919b52c5855fca99322b7ae3d2aace7593da 100644 (file)
--- 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",
 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",
 
                .mode = COMMAND_EXEC,
                .help = "display information about target caches",
 

diff --git a/src/target/arm9tdmi.c b/src/target/arm9tdmi.c
index ae0c4e05edd30462e0e7667758e8e708e2de8984..823e962ed0be22f618567594d5b3fdcfd8af1d46 100644 (file)
--- 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,
                .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
 };
        },
        COMMAND_REGISTRATION_DONE
 };

diff --git a/src/target/armv4_5.c b/src/target/armv4_5.c
index 1c4923b9d20d5ee88650e519e61008ea81a7e498..c7b73676aff7ce906839d66508b86c7bb7004d9c 100644 (file)
--- 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",
 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",
                .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,
                .mode = COMMAND_EXEC,

-               .usage = "<arm | thumb>",
+               .usage = "['arm'|'thumb']",

                .help = "display/change ARM core state",
        },
        {
                .name = "disassemble",
                .help = "display/change ARM core state",
        },
        {
                .name = "disassemble",

-               .handler = &handle_armv4_5_disassemble_command,
+               .handler = handle_armv4_5_disassemble_command,

                .mode = COMMAND_EXEC,
                .mode = COMMAND_EXEC,

-               .usage = "<address> [<count> ['thumb']]",
+               .usage = "address [count ['thumb']]",

                .help = "disassemble instructions ",
        },
        {
                .help = "disassemble instructions ",
        },
        {