X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farmv8.c;h=76a2d98af8c9639765beb9017da5a2ada110bddf;hp=cee837f584b25d4d64a31786b0e96b01eef0d86f;hb=db429c34d047ac40dadf0087f3b3434551c855d4;hpb=21687eb983a4d5e30cd9c4050b9ebce2f3b280c7

diff --git a/src/target/armv8.c b/src/target/armv8.c
index cee837f584..76a2d98af8 100644
--- a/src/target/armv8.c
+++ b/src/target/armv8.c
@@ -1013,6 +1013,72 @@ int armv8_mmu_translate_va_pa(struct target *target, target_addr_t va,
 	return retval;
 }
 
+COMMAND_HANDLER(armv8_handle_exception_catch_command)
+{
+	struct target *target = get_current_target(CMD_CTX);
+	struct armv8_common *armv8 = target_to_armv8(target);
+	uint32_t edeccr = 0;
+	unsigned int argp = 0;
+	int retval;
+
+	static const Jim_Nvp nvp_ecatch_modes[] = {
+		{ .name = "off",       .value = 0 },
+		{ .name = "nsec_el1",  .value = (1 << 5) },
+		{ .name = "nsec_el2",  .value = (2 << 5) },
+		{ .name = "nsec_el12", .value = (3 << 5) },
+		{ .name = "sec_el1",   .value = (1 << 1) },
+		{ .name = "sec_el3",   .value = (4 << 1) },
+		{ .name = "sec_el13",  .value = (5 << 1) },
+		{ .name = NULL, .value = -1 },
+	};
+	const Jim_Nvp *n;
+
+	if (CMD_ARGC == 0) {
+		const char *sec = NULL, *nsec = NULL;
+
+		retval = mem_ap_read_atomic_u32(armv8->debug_ap,
+					armv8->debug_base + CPUV8_DBG_ECCR, &edeccr);
+		if (retval != ERROR_OK)
+			return retval;
+
+		n = Jim_Nvp_value2name_simple(nvp_ecatch_modes, edeccr & 0x0f);
+		if (n->name != NULL)
+			sec = n->name;
+
+		n = Jim_Nvp_value2name_simple(nvp_ecatch_modes, edeccr & 0xf0);
+		if (n->name != NULL)
+			nsec = n->name;
+
+		if (sec == NULL || nsec == NULL) {
+			LOG_WARNING("Exception Catch: unknown exception catch configuration: EDECCR = %02x", edeccr & 0xff);
+			return ERROR_FAIL;
+		}
+
+		command_print(CMD_CTX, "Exception Catch: Secure: %s, Non-Secure: %s", sec, nsec);
+		return ERROR_OK;
+	}
+
+	while (CMD_ARGC > argp) {
+		n = Jim_Nvp_name2value_simple(nvp_ecatch_modes, CMD_ARGV[argp]);
+		if (n->name == NULL) {
+			LOG_ERROR("Unknown option: %s", CMD_ARGV[argp]);
+			return ERROR_FAIL;
+		}
+
+		LOG_DEBUG("found: %s", n->name);
+
+		edeccr |= n->value;
+		argp++;
+	}
+
+	retval = mem_ap_write_atomic_u32(armv8->debug_ap,
+				armv8->debug_base + CPUV8_DBG_ECCR, edeccr);
+	if (retval != ERROR_OK)
+		return retval;
+
+	return ERROR_OK;
+}
+
 int armv8_handle_cache_info_command(struct command_context *cmd_ctx,
 	struct armv8_cache_common *armv8_cache)
 {
@@ -1675,6 +1741,13 @@ void armv8_free_reg_cache(struct target *target)
 }
 
 const struct command_registration armv8_command_handlers[] = {
+	{
+		.name = "catch_exc",
+		.handler = armv8_handle_exception_catch_command,
+		.mode = COMMAND_EXEC,
+		.help = "configure exception catch",
+		.usage = "[(nsec_el1,nsec_el2,sec_el1,sec_el3)+,off]",
+	},
 	COMMAND_REGISTRATION_DONE
 };