X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farmv7a.c;h=7f5b834927465ecac434cb1e1e0e545f8de3a0c8;hp=1e0e02f189f024fa0e639514de6dc3c32a38f80b;hb=23402315ce01071f30d7ec0c5ca7563ce41f1cc6;hpb=6a2fd7cad507ef24a7dc4ce3c5f8b5351dd12656

diff --git a/src/target/armv7a.c b/src/target/armv7a.c
index 1e0e02f189..7f5b834927 100644
--- a/src/target/armv7a.c
+++ b/src/target/armv7a.c
@@ -25,9 +25,7 @@
 #include "armv7a.h"
 #include "arm_disassembler.h"
 
-#include "target.h"
 #include "register.h"
-#include "log.h"
 #include "binarybuffer.h"
 #include "command.h"
 
@@ -35,25 +33,6 @@
 #include <string.h>
 #include <unistd.h>
 
-bitfield_desc_t armv7a_psr_bitfield_desc[] =
-{
-	{"M[4:0]", 5},
-	{"T", 1},
-	{"F", 1},
-	{"I", 1},
-	{"A", 1},
-	{"E", 1},
-	{"IT[7:2]", 6},
-	{"GE[3:0]", 4},
-	{"reserved(DNM)", 4},
-	{"J", 1},
-	{"IT[0:1]", 2},
-	{"Q", 1},
-	{"V", 1},
-	{"C", 1},
-	{"Z", 1},
-	{"N", 1},
-};
 
 char* armv7a_core_reg_list[] =
 {
@@ -82,7 +61,7 @@ char* armv7a_state_strings[] =
 	"ARM", "Thumb", "Jazelle", "ThumbEE"
 };
 
-armv7a_core_reg_t armv7a_core_reg_list_arch_info[] =
+struct armv7a_core_reg armv7a_core_reg_list_arch_info[] =
 {
 	{0, ARMV4_5_MODE_ANY, NULL, NULL},
 	{1, ARMV4_5_MODE_ANY, NULL, NULL},
@@ -165,21 +144,25 @@ int armv7a_core_reg_map[8][17] =
 	}
 };
 
+/* FIXME this dummy is IDENTICAL to the armv4_5, arm11, and armv7m
+ * ones... except for naming/scoping
+ */
 uint8_t armv7a_gdb_dummy_fp_value[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 
-reg_t armv7a_gdb_dummy_fp_reg =
+struct reg armv7a_gdb_dummy_fp_reg =
 {
-	"GDB dummy floating-point register", armv7a_gdb_dummy_fp_value,
-			0, 1, 96, NULL, 0, NULL, 0
+	.name = "GDB dummy floating-point register",
+	.value = armv7a_gdb_dummy_fp_value,
+	.dirty = 0,
+	.valid = 1,
+	.size = 96,
+	.arch_info = NULL,
 };
 
-void armv7a_show_fault_registers(target_t *target)
+void armv7a_show_fault_registers(struct target *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 *armv7a = target_to_armv7a(target);
 
 	armv7a->read_cp15(target, 0, 0, 5, 0, &dfsr);
 	armv7a->read_cp15(target, 0, 1, 5, 0, &ifsr);
@@ -193,20 +176,20 @@ void armv7a_show_fault_registers(target_t *target)
 
 }
 
-int armv7a_arch_state(struct target_s *target)
+int armv7a_arch_state(struct target *target)
 {
 	static const char *state[] =
 	{
 		"disabled", "enabled"
 	};
 
-	armv4_5_common_t *armv4_5 = target->arch_info;
-	armv7a_common_t *armv7a = armv4_5->arch_info;
+	struct armv7a_common *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)
+	if (armv7a->common_magic != ARMV7_COMMON_MAGIC)
 	{
-		LOG_ERROR("BUG: called for a non-ARMv4/5 target");
-		exit(-1);
+		LOG_ERROR("BUG: called for a non-ARMv7A target");
+		return ERROR_INVALID_ARGUMENTS;
 	}
 
 	LOG_USER("target halted in %s state due to %s, current mode: %s\n"
@@ -233,146 +216,66 @@ 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;
-	swjdp_common_t *swjdp = &armv7a->swjdp_info;
+	struct target *target = get_current_target(cmd_ctx);
+	struct armv7a_common *armv7a = target_to_armv7a(target);
+	struct swjdp_common *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;
-	swjdp_common_t *swjdp = &armv7a->swjdp_info;
+	struct target *target = get_current_target(cmd_ctx);
+	struct armv7a_common *armv7a = target_to_armv7a(target);
+	struct swjdp_common *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;
-	swjdp_common_t *swjdp = &armv7a->swjdp_info;
+	struct target *target = get_current_target(cmd_ctx);
+	struct armv7a_common *armv7a = target_to_armv7a(target);
+	struct swjdp_common *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;
-	swjdp_common_t *swjdp = &armv7a->swjdp_info;
+	struct target *target = get_current_target(cmd_ctx);
+	struct armv7a_common *armv7a = target_to_armv7a(target);
+	struct swjdp_common *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;
-	swjdp_common_t *swjdp = &armv7a->swjdp_info;
+	struct target *target = get_current_target(cmd_ctx);
+	struct armv7a_common *armv7a = target_to_armv7a(target);
+	struct swjdp_common *swjdp = &armv7a->swjdp_info;
 	uint32_t apsel;
 
-	apsel =  swjdp->apsel;
-	if (argc > 0)
-		apsel = strtoul(args[0], NULL, 0);
-
-	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)
-{
-	target_t *target = get_current_target(cmd_ctx);
-	armv4_5_common_t *armv4_5 = target->arch_info;
-	int thumb = 0;
-	int count = 1;
-	uint32_t address;
-	int i;
-
-	if (armv4_5->common_magic != ARMV4_5_COMMON_MAGIC) {
-		command_print(cmd_ctx, "current target isn't an ARM target");
-		return ERROR_OK;
-	}
-
-	/* REVISIT:  eventually support ThumbEE disassembly too;
-	 * some opcodes work differently.
-	 */
-
-	switch (argc) {
-	case 3:
-		if (strcmp(args[2], "thumb") != 0)
-			goto usage;
-		thumb = 1;
-		/* FALL THROUGH */
-	case 2:
-		count = strtoul(args[1], NULL, 0);
-		/* FALL THROUGH */
+	switch (CMD_ARGC) {
+	case 0:
+		apsel = swjdp->apsel;
+		break;
 	case 1:
-		address = strtoul(args[0], NULL, 0);
-		if (address & 0x01) {
-			if (!thumb) {
-				command_print(cmd_ctx, "Disassemble as Thumb");
-				thumb = 1;
-			}
-			address &= ~1;
-		}
+		COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], apsel);
 		break;
 	default:
-usage:
-		command_print(cmd_ctx,
-			"usage: armv4_5 disassemble <address> [<count> ['thumb']]");
-		return ERROR_OK;
+		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
-	for (i = 0; i < count; i++) {
-		arm_instruction_t cur_instruction;
-		int retval;
-
-		if (thumb) {
-			retval = thumb2_opcode(target, address, &cur_instruction);
-			if (retval != ERROR_OK)
-				return retval;
-
-			address += cur_instruction.instruction_size;
-		} else {
-			uint32_t opcode;
-
-			retval = target_read_u32(target, address, &opcode);
-			if (retval != ERROR_OK)
-				return retval;
-
-			retval = arm_evaluate_opcode(opcode, address,
-					&cur_instruction);
-			if (retval != ERROR_OK)
-				return retval;
-
-			address += 4;
-		}
-		command_print(cmd_ctx, "%s", cur_instruction.text);
-	}
-
-	return ERROR_OK;
+	return dap_info_command(cmd_ctx, swjdp, apsel);
 }
 
-int armv7a_register_commands(struct command_context_s *cmd_ctx)
+int armv7a_register_commands(struct command_context *cmd_ctx)
 {
-	command_t *arm_adi_v5_dap_cmd;
-	command_t *armv7a_cmd;
+	struct command *arm_adi_v5_dap_cmd;
 
 	arm_adi_v5_dap_cmd = register_command(cmd_ctx, NULL, "dap",
 			NULL, COMMAND_ANY,
@@ -398,13 +301,5 @@ int armv7a_register_commands(struct command_context_s *cmd_ctx)
 			"set/get number of extra tck for mem-ap memory "
 			"bus access [0-255]");
 
-	armv7a_cmd = register_command(cmd_ctx, NULL, "armv7a",
-			NULL, COMMAND_ANY,
-			"ARMv7-A specific commands");
-
-	register_command(cmd_ctx, armv7a_cmd, "disassemble",
-			handle_armv7a_disassemble_command, COMMAND_EXEC,
-			"disassemble instructions <address> [<count> ['thumb']]");
-
 	return ERROR_OK;
 }