1 files changed, 3 insertions, 86 deletions

diff --git a/src/target/arm920t.c b/src/target/arm920t.c
index c96975a..a45dc64 100644
--- a/src/target/arm920t.c
+++ b/src/target/arm920t.c
@@ -245,8 +245,8 @@ static int arm920t_read_cp15_interpreted(struct target *target,
 	uint32_t cp15_opcode, uint32_t address, uint32_t *value)
 {
 	struct arm *arm = target_to_arm(target);
-	uint32_t *regs_p[1];
-	uint32_t regs[2];
+	uint32_t *regs_p[16];
+	uint32_t regs[16];
 	uint32_t cp15c15 = 0x0;
 	struct reg *r = arm->core_cache->reg_list;
 
@@ -295,7 +295,7 @@ int arm920t_write_cp15_interpreted(struct target *target,
 {
 	uint32_t cp15c15 = 0x0;
 	struct arm *arm = target_to_arm(target);
-	uint32_t regs[2];
+	uint32_t regs[16];
 	struct reg *r = arm->core_cache->reg_list;
 
 	/* load value, address into R0, R1 */
@@ -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;
@@ -1641,15 +1567,6 @@ static const struct command_registration arm920t_exec_command_handlers[] = {
 		.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,
 		.mode = COMMAND_EXEC,