X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm9tdmi.c;h=38b2284b680beb61c64286ac805573671bb188f8;hp=b582eae3319ea3cff8efe2d4a29a1965c64d623b;hb=69c751956293e822faa6cf844f2864d81c36a578;hpb=7bf1a86e473a12882bf6f71cb4d0d416394b69d4

diff --git a/src/target/arm9tdmi.c b/src/target/arm9tdmi.c
index b582eae331..38b2284b68 100644
--- a/src/target/arm9tdmi.c
+++ b/src/target/arm9tdmi.c
@@ -754,7 +754,6 @@ static void arm9tdmi_build_reg_cache(struct target *target)
 	struct armv4_5_common_s *armv4_5 = target_to_armv4_5(target);
 
 	(*cache_p) = armv4_5_build_reg_cache(target, armv4_5);
-	armv4_5->core_cache = (*cache_p);
 }
 
 int arm9tdmi_init_target(struct command_context *cmd_ctx,
@@ -831,7 +830,7 @@ static int arm9tdmi_target_create(struct target *target, Jim_Interp *interp)
 
 COMMAND_HANDLER(handle_arm9tdmi_catch_vectors_command)
 {
-	struct target *target = get_current_target(cmd_ctx);
+	struct target *target = get_current_target(CMD_CTX);
 	struct arm7_9_common *arm7_9 = target_to_arm7_9(target);
 	struct reg *vector_catch;
 	uint32_t vector_catch_value;
@@ -839,7 +838,7 @@ COMMAND_HANDLER(handle_arm9tdmi_catch_vectors_command)
 	/* it's uncommon, but some ARM7 chips can support this */
 	if (arm7_9->common_magic != ARM7_9_COMMON_MAGIC
 			|| !arm7_9->has_vector_catch) {
-		command_print(cmd_ctx, "target doesn't have EmbeddedICE "
+		command_print(CMD_CTX, "target doesn't have EmbeddedICE "
 				"with vector_catch");
 		return ERROR_TARGET_INVALID;
 	}
@@ -856,11 +855,11 @@ COMMAND_HANDLER(handle_arm9tdmi_catch_vectors_command)
 	if (CMD_ARGC > 0)
 	{
 		vector_catch_value = 0x0;
-		if (strcmp(args[0], "all") == 0)
+		if (strcmp(CMD_ARGV[0], "all") == 0)
 		{
 			vector_catch_value = 0xdf;
 		}
-		else if (strcmp(args[0], "none") == 0)
+		else if (strcmp(CMD_ARGV[0], "none") == 0)
 		{
 			/* do nothing */
 		}
@@ -872,7 +871,7 @@ COMMAND_HANDLER(handle_arm9tdmi_catch_vectors_command)
 				unsigned j;
 				for (j = 0; arm9tdmi_vectors[j].name; j++)
 				{
-					if (strcmp(args[i], arm9tdmi_vectors[j].name) == 0)
+					if (strcmp(CMD_ARGV[i], arm9tdmi_vectors[j].name) == 0)
 					{
 						vector_catch_value |= arm9tdmi_vectors[j].value;
 						break;
@@ -882,7 +881,7 @@ COMMAND_HANDLER(handle_arm9tdmi_catch_vectors_command)
 				/* complain if vector wasn't found */
 				if (!arm9tdmi_vectors[j].name)
 				{
-					command_print(cmd_ctx, "vector '%s' not found, leaving current setting unchanged", args[i]);
+					command_print(CMD_CTX, "vector '%s' not found, leaving current setting unchanged", CMD_ARGV[i]);
 
 					/* reread current setting */
 					vector_catch_value = buf_get_u32(
@@ -901,7 +900,7 @@ COMMAND_HANDLER(handle_arm9tdmi_catch_vectors_command)
 
 	/* output current settings */
 	for (unsigned i = 0; arm9tdmi_vectors[i].name; i++) {
-		command_print(cmd_ctx, "%s: %s", arm9tdmi_vectors[i].name,
+		command_print(CMD_CTX, "%s: %s", arm9tdmi_vectors[i].name,
 			(vector_catch_value & arm9tdmi_vectors[i].value)
 				? "catch" : "don't catch");
 	}