X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farmv7a.c;h=eb5bfa9ee2d955b3a40209c79417da8ead476260;hb=6c965a3da9cd6f5b2cf1b177d38723356c83d923;hp=1583e995f63efa78bcef52f8beab6a0017cc428c;hpb=3dd5c59d7d4d4dc13ebd3fc870bd4bc695c9fda8;p=openocd.git

diff --git a/src/target/armv7a.c b/src/target/armv7a.c
index 1583e995f6..eb5bfa9ee2 100644
--- a/src/target/armv7a.c
+++ b/src/target/armv7a.c
@@ -176,10 +176,7 @@ reg_t armv7a_gdb_dummy_fp_reg =
 void armv7a_show_fault_registers(target_t *target)
 {
 	uint32_t dfsr, ifsr, dfar, ifar;
-
-	/* get pointers to arch-specific information */
-	armv4_5_common_t *armv4_5 = target->arch_info;
-	armv7a_common_t *armv7a = armv4_5->arch_info;
+	struct armv7a_common_s *armv7a = target_to_armv7a(target);
 
 	armv7a->read_cp15(target, 0, 0, 5, 0, &dfsr);
 	armv7a->read_cp15(target, 0, 1, 5, 0, &ifsr);
@@ -200,8 +197,8 @@ int armv7a_arch_state(struct target_s *target)
 		"disabled", "enabled"
 	};
 
-	armv4_5_common_t *armv4_5 = target->arch_info;
-	armv7a_common_t *armv7a = armv4_5->arch_info;
+	struct armv7a_common_s *armv7a = target_to_armv7a(target);
+	struct armv4_5_common_s *armv4_5 = &armv7a->armv4_5_common;
 
 	if (armv4_5->common_magic != ARMV4_5_COMMON_MAGIC)
 	{
@@ -233,56 +230,46 @@ int armv7a_arch_state(struct target_s *target)
 }
 
 
-static int handle_dap_baseaddr_command(struct command_context_s *cmd_ctx,
-		char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_dap_baseaddr_command)
 {
 	target_t *target = get_current_target(cmd_ctx);
-	armv4_5_common_t *armv4_5 = target->arch_info;
-	armv7a_common_t *armv7a = armv4_5->arch_info;
+	struct armv7a_common_s *armv7a = target_to_armv7a(target);
 	swjdp_common_t *swjdp = &armv7a->swjdp_info;
 
-	return dap_baseaddr_command(cmd_ctx, swjdp, args, argc);
+	return CALL_COMMAND_HANDLER(dap_baseaddr_command, swjdp);
 }
 
-static int handle_dap_memaccess_command(struct command_context_s *cmd_ctx,
-		char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_dap_memaccess_command)
 {
 	target_t *target = get_current_target(cmd_ctx);
-	armv4_5_common_t *armv4_5 = target->arch_info;
-	armv7a_common_t *armv7a = armv4_5->arch_info;
+	struct armv7a_common_s *armv7a = target_to_armv7a(target);
 	swjdp_common_t *swjdp = &armv7a->swjdp_info;
 
-	return dap_memaccess_command(cmd_ctx, swjdp, args, argc);
+	return CALL_COMMAND_HANDLER(dap_memaccess_command, swjdp);
 }
 
-static int handle_dap_apsel_command(struct command_context_s *cmd_ctx,
-		char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_dap_apsel_command)
 {
 	target_t *target = get_current_target(cmd_ctx);
-	armv4_5_common_t *armv4_5 = target->arch_info;
-	armv7a_common_t *armv7a = armv4_5->arch_info;
+	struct armv7a_common_s *armv7a = target_to_armv7a(target);
 	swjdp_common_t *swjdp = &armv7a->swjdp_info;
 
-	return dap_apsel_command(cmd_ctx, swjdp, args, argc);
+	return CALL_COMMAND_HANDLER(dap_apsel_command, swjdp);
 }
 
-static int handle_dap_apid_command(struct command_context_s *cmd_ctx,
-		char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_dap_apid_command)
 {
 	target_t *target = get_current_target(cmd_ctx);
-	armv4_5_common_t *armv4_5 = target->arch_info;
-	armv7a_common_t *armv7a = armv4_5->arch_info;
+	struct armv7a_common_s *armv7a = target_to_armv7a(target);
 	swjdp_common_t *swjdp = &armv7a->swjdp_info;
 
-	return dap_apid_command(cmd_ctx, swjdp, args, argc);
+	return CALL_COMMAND_HANDLER(dap_apid_command, swjdp);
 }
 
-static int handle_dap_info_command(struct command_context_s *cmd_ctx,
-		char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_dap_info_command)
 {
 	target_t *target = get_current_target(cmd_ctx);
-	armv4_5_common_t *armv4_5 = target->arch_info;
-	armv7a_common_t *armv7a = armv4_5->arch_info;
+	struct armv7a_common_s *armv7a = target_to_armv7a(target);
 	swjdp_common_t *swjdp = &armv7a->swjdp_info;
 	uint32_t apsel;
 
@@ -300,12 +287,10 @@ static int handle_dap_info_command(struct command_context_s *cmd_ctx,
 	return dap_info_command(cmd_ctx, swjdp, apsel);
 }
 
-static int
-handle_armv7a_disassemble_command(struct command_context_s *cmd_ctx,
-		char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_armv7a_disassemble_command)
 {
 	target_t *target = get_current_target(cmd_ctx);
-	armv4_5_common_t *armv4_5 = target->arch_info;
+	struct armv4_5_common_s *armv4_5 = target_to_armv4_5(target);
 	int thumb = 0;
 	int count = 1;
 	uint32_t address;
@@ -342,7 +327,7 @@ handle_armv7a_disassemble_command(struct command_context_s *cmd_ctx,
 	default:
 usage:
 		command_print(cmd_ctx,
-			"usage: armv4_5 disassemble <address> [<count> ['thumb']]");
+			"usage: armv7a disassemble <address> [<count> ['thumb']]");
 		return ERROR_OK;
 	}