From e0b6e5deef2d7b0054058116b6ddf9c684053739 Mon Sep 17 00:00:00 2001 From: David Brownell Date: Thu, 7 Jan 2010 16:25:03 -0800 Subject: [PATCH] ARM720: help/usage updates Deprecate the "pass an instruction opcode" flavor of cp15 access in favor of the "arm mcr ..." and "arm mrc ..." commands, which offer fewer ways to break things. Use the same EBNF syntax in the code as for the user's guide. Signed-off-by: David Brownell --- doc/openocd.texi | 8 ++++++-- src/target/arm720t.c | 6 ++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/doc/openocd.texi b/doc/openocd.texi index a6fb97071..ea23bf722 100644 --- a/doc/openocd.texi +++ b/doc/openocd.texi @@ -5921,9 +5921,13 @@ which are implementations of the ARMv4T architecture based on the ARM7TDMI-S integer core. They are available in addition to the ARM and ARM7/ARM9 commands. -@deffn Command {arm720t cp15} regnum [value] -Display cp15 register @var{regnum}; +@deffn Command {arm720t cp15} opcode [value] +@emph{DEPRECATED -- avoid using this. +Use the @command{arm mrc} or @command{arm mcr} commands instead.} + +Display cp15 register returned by the ARM instruction @var{opcode}; else if a @var{value} is provided, that value is written to that register. +The @var{opcode} should be the value of either an MRC or MCR instruction. @end deffn @subsection ARM9 specific commands diff --git a/src/target/arm720t.c b/src/target/arm720t.c index 84c66b8d8..2f5169974 100644 --- a/src/target/arm720t.c +++ b/src/target/arm720t.c @@ -516,8 +516,10 @@ static const struct command_registration arm720t_exec_command_handlers[] = { .name = "cp15", .handler = arm720t_handle_cp15_command, .mode = COMMAND_EXEC, - .usage = " [value]", - .help = "display/modify cp15 register", + /* prefer using less error-prone "arm mcr" or "arm mrc" */ + .help = "display/modify cp15 register using ARM opcode" + " (DEPRECATED)", + .usage = "instruction [value]", }, COMMAND_REGISTRATION_DONE };