target/arm920t: remove command 'arm920t cp15i' deprecated in v0.4.0

The command 'arm920t cp15i' was marked as deprecated in release
v0.4.0, almost 11 years ago.
We can reasonably expect that in these years any user of OpenOCD
has already migrated to v0.4.0 or to some newer release, thus has
already updated any local/personal script.
There is no run-time warning about the deprecation, but it is
reported in the help and in the documentation.

Drop the command already deprecated in v0.4.0.

Change-Id: I755c4283e13e125558fcd73b15fe20498eae95ca
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/6083
Tested-by: jenkins
Reviewed-by: Tarek BOCHKATI <tarek.bouchkati@gmail.com>
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>

diff --git a/doc/openocd.texi b/doc/openocd.texi
index 934c37e5dabad739f0e2b3ef37447198a3077194..640687da51ac3494fa1c6c37533e91acf0980bf0 100644 (file)
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -9167,18 +9167,6 @@ shown in bits 38..33 of table 9-9 in the ARM920T TRM.
 (Not all registers can be written.)
 @end deffn
 
-@deffn Command {arm920t cp15i} opcode [value [address]]
-@emph{DEPRECATED -- avoid using this.
-Use the @command{arm mrc} or @command{arm mcr} commands instead.}
-
-Interpreted access using ARM instruction @var{opcode}, which should
-be the value of either an MRC or MCR instruction
-(as shown tables 9-11, 9-12, and 9-13 in the ARM920T TRM).
-If no @var{value} is provided, the result is displayed.
-Else if that value is written using the specified @var{address},
-or using zero if no other address is provided.
-@end deffn
-
 @deffn Command {arm920t read_cache} filename
 Dump the content of ICache and DCache to a file named @file{filename}.
 @end deffn

diff --git a/src/target/arm920t.c b/src/target/arm920t.c
index c96975a77c380a3f60b927b2a1925137ebda492e..80f6d7045e398e1d70b57bcaa03225deeb83dfbe 100644 (file)
--- a/src/target/arm920t.c
+++ b/src/target/arm920t.c
@@ -1511,80 +1511,6 @@ COMMAND_HANDLER(arm920t_handle_cp15_command)
        return ERROR_OK;
 }
 
-COMMAND_HANDLER(arm920t_handle_cp15i_command)
-{
-       int retval;
-       struct target *target = get_current_target(CMD_CTX);
-       struct arm920t_common *arm920t = target_to_arm920(target);
-
-       retval = arm920t_verify_pointer(CMD, arm920t);
-       if (retval != ERROR_OK)
-               return retval;
-
-
-       if (target->state != TARGET_HALTED) {
-               command_print(CMD, "target must be stopped for "
-                       "\"%s\" command", CMD_NAME);
-               return ERROR_OK;
-       }
-
-       /* one argument, read a register.
-        * two arguments, write it.
-        */
-       if (CMD_ARGC >= 1) {
-               uint32_t opcode;
-               COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], opcode);
-
-               if (CMD_ARGC == 1) {
-                       uint32_t value;
-                       retval = arm920t_read_cp15_interpreted(target,
-                                       opcode, 0x0, &value);
-                       if (retval != ERROR_OK) {
-                               command_print(CMD,
-                                       "couldn't execute %8.8" PRIx32,
-                                       opcode);
-                               /* REVISIT why lie? "return retval"? */
-                               return ERROR_OK;
-                       }
-
-                       command_print(CMD, "%8.8" PRIx32 ": %8.8" PRIx32,
-                               opcode, value);
-               } else if (CMD_ARGC == 2) {
-                       uint32_t value;
-                       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], value);
-                       retval = arm920t_write_cp15_interpreted(target,
-                                       opcode, value, 0);
-                       if (retval != ERROR_OK) {
-                               command_print(CMD,
-                                       "couldn't execute %8.8" PRIx32,
-                                       opcode);
-                               /* REVISIT why lie? "return retval"? */
-                               return ERROR_OK;
-                       }
-                       command_print(CMD, "%8.8" PRIx32 ": %8.8" PRIx32,
-                               opcode, value);
-               } else if (CMD_ARGC == 3) {
-                       uint32_t value;
-                       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], value);
-                       uint32_t address;
-                       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], address);
-                       retval = arm920t_write_cp15_interpreted(target,
-                                       opcode, value, address);
-                       if (retval != ERROR_OK) {
-                               command_print(CMD,
-                                       "couldn't execute %8.8" PRIx32, opcode);
-                               /* REVISIT why lie? "return retval"? */
-                               return ERROR_OK;
-                       }
-                       command_print(CMD, "%8.8" PRIx32 ": %8.8" PRIx32
-                               " %8.8" PRIx32, opcode, value, address);
-               }
-       } else
-               return ERROR_COMMAND_SYNTAX_ERROR;
-
-       return ERROR_OK;
-}
-
 COMMAND_HANDLER(arm920t_handle_cache_info_command)
 {
        int retval;
@@ -1640,15 +1566,6 @@ static const struct command_registration arm920t_exec_command_handlers[] = {
                .help = "display/modify cp15 register",
                .usage = "regnum [value]",
        },
-       {
-               .name = "cp15i",
-               .handler = arm920t_handle_cp15i_command,
-               .mode = COMMAND_EXEC,
-               /* prefer using less error-prone "arm mcr" or "arm mrc" */
-               .help = "display/modify cp15 register using ARM opcode"
-                       " (DEPRECATED)",
-               .usage = "instruction [value [address]]",
-       },
        {
                .name = "cache_info",
                .handler = arm920t_handle_cache_info_command,