X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Ftarget.c;h=88931b5badfb922ecafae90193e97cc8ea23703b;hp=4297258246ec0fb103746b96be6c8ff938073b9c;hb=177bbd8891ae737ea7f8c0791a6236f72cedee40;hpb=8e8a359af2a5ab3cc7c795e147aa0ca3ec06288f

diff --git a/src/target/target.c b/src/target/target.c
index 4297258246..88931b5bad 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -44,8 +44,6 @@
 #include "jtag.h"
 
 
-static int jim_mcrmrc(Jim_Interp *interp, int argc, Jim_Obj *const *argv);
-
 static int target_array2mem(Jim_Interp *interp, struct target *target, int argc, Jim_Obj *const *argv);
 static int target_mem2array(Jim_Interp *interp, struct target *target, int argc, Jim_Obj *const *argv);
 
@@ -449,12 +447,12 @@ int target_process_reset(struct command_context *cmd_ctx, enum target_reset_mode
 	jtag_poll_set_enabled(false);
 
 	sprintf(buf, "ocd_process_reset %s", n->name);
-	retval = Jim_Eval(interp, buf);
+	retval = Jim_Eval(cmd_ctx->interp, buf);
 
 	jtag_poll_set_enabled(save_poll);
 
 	if (retval != JIM_OK) {
-		Jim_PrintErrorMessage(interp);
+		Jim_PrintErrorMessage(cmd_ctx->interp);
 		return ERROR_FAIL;
 	}
 
@@ -665,84 +663,6 @@ static void target_reset_examined(struct target *target)
 	target->examined = false;
 }
 
-
-
-static int default_mrc(struct target *target, int cpnum, uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, uint32_t *value)
-{
-	LOG_ERROR("Not implemented: %s", __func__);
-	return ERROR_FAIL;
-}
-
-static int default_mcr(struct target *target, int cpnum, uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, uint32_t value)
-{
-	LOG_ERROR("Not implemented: %s", __func__);
-	return ERROR_FAIL;
-}
-
-static int arm_cp_check(struct target *target, int cpnum, uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm)
-{
-	/* basic check */
-	if (!target_was_examined(target))
-	{
-		LOG_ERROR("Target not examined yet");
-		return ERROR_FAIL;
-	}
-
-	if ((cpnum <0) || (cpnum > 15))
-	{
-		LOG_ERROR("Illegal co-processor %d", cpnum);
-		return ERROR_FAIL;
-	}
-
-	if (op1 > 7)
-	{
-		LOG_ERROR("Illegal op1");
-		return ERROR_FAIL;
-	}
-
-	if (op2 > 7)
-	{
-		LOG_ERROR("Illegal op2");
-		return ERROR_FAIL;
-	}
-
-	if (CRn > 15)
-	{
-		LOG_ERROR("Illegal CRn");
-		return ERROR_FAIL;
-	}
-
-	if (CRm > 15)
-	{
-		LOG_ERROR("Illegal CRm");
-		return ERROR_FAIL;
-	}
-
-	return ERROR_OK;
-}
-
-int target_mrc(struct target *target, int cpnum, uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, uint32_t *value)
-{
-	int retval;
-
-	retval = arm_cp_check(target, cpnum, op1, op2, CRn, CRm);
-	if (retval != ERROR_OK)
-		return retval;
-
-	return target->type->mrc(target, cpnum, op1, op2, CRn, CRm, value);
-}
-
-int target_mcr(struct target *target, int cpnum, uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, uint32_t value)
-{
-	int retval;
-
-	retval = arm_cp_check(target, cpnum, op1, op2, CRn, CRm);
-	if (retval != ERROR_OK)
-		return retval;
-
-	return target->type->mcr(target, cpnum, op1, op2, CRn, CRm, value);
-}
-
 static int
 err_read_phys_memory(struct target *target, uint32_t address,
 		uint32_t size, uint32_t count, uint8_t *buffer)
@@ -759,6 +679,8 @@ err_write_phys_memory(struct target *target, uint32_t address,
 	return ERROR_FAIL;
 }
 
+static int handle_target(void *priv);
+
 int target_init(struct command_context *cmd_ctx)
 {
 	struct target *target;
@@ -779,39 +701,6 @@ int target_init(struct command_context *cmd_ctx)
 			return retval;
 		}
 
-		/**
-		 * @todo MCR/MRC are ARM-specific; don't require them in
-		 * all targets, or for ARMs without coprocessors.
-		 */
-		if (target->type->mcr == NULL)
-		{
-			target->type->mcr = default_mcr;
-		} else
-		{
-			const struct command_registration mcr_cmd = {
-				.name = "mcr",
-				.mode = COMMAND_EXEC,
-				.jim_handler = &jim_mcrmrc,
-				.help = "write coprocessor",
-				.usage = "<cpnum> <op1> <op2> <CRn> <CRm> <value>",
-			};
-			register_command(cmd_ctx, NULL, &mcr_cmd);
-		}
-
-		if (target->type->mrc == NULL)
-		{
-			target->type->mrc = default_mrc;
-		} else
-		{
-			const struct command_registration mrc_cmd = {
-				.name = "mrc",
-				.jim_handler = &jim_mcrmrc,
-				.help = "read coprocessor",
-				.usage = "<cpnum> <op1> <op2> <CRn> <CRm>",
-			};
-			register_command(cmd_ctx, NULL, &mrc_cmd);
-		}
-
 
 		/**
 		 * @todo get rid of those *memory_imp() methods, now that all
@@ -876,7 +765,7 @@ int target_init(struct command_context *cmd_ctx)
 	{
 		if ((retval = target_register_user_commands(cmd_ctx)) != ERROR_OK)
 			return retval;
-		if ((retval = target_register_timer_callback(handle_target, 100, 1, NULL)) != ERROR_OK)
+		if ((retval = target_register_timer_callback(&handle_target, 100, 1, cmd_ctx->interp)) != ERROR_OK)
 			return retval;
 	}
 
@@ -1796,8 +1685,9 @@ static void target_call_event_callbacks_all(enum target_event e) {
 }
 
 /* process target state changes */
-int handle_target(void *priv)
+static int handle_target(void *priv)
 {
+	Jim_Interp *interp = (Jim_Interp *)priv;
 	int retval = ERROR_OK;
 
 	/* we do not want to recurse here... */
@@ -4880,92 +4770,6 @@ COMMAND_HANDLER(handle_fast_load_command)
 	return retval;
 }
 
-static int jim_mcrmrc(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
-{
-	struct command_context *context;
-	struct target *target;
-	int retval;
-
-	context = Jim_GetAssocData(interp, "context");
-	if (context == NULL) {
-		LOG_ERROR("array2mem: no command context");
-		return JIM_ERR;
-	}
-	target = get_current_target(context);
-	if (target == NULL) {
-		LOG_ERROR("array2mem: no current target");
-		return JIM_ERR;
-	}
-
-	if ((argc < 6) || (argc > 7))
-	{
-		return JIM_ERR;
-	}
-
-	int cpnum;
-	uint32_t op1;
-	uint32_t op2;
-	uint32_t CRn;
-	uint32_t CRm;
-	uint32_t value;
-
-	int e;
-	long l;
-	e = Jim_GetLong(interp, argv[1], &l);
-	if (e != JIM_OK) {
-		return e;
-	}
-	cpnum = l;
-
-	e = Jim_GetLong(interp, argv[2], &l);
-	if (e != JIM_OK) {
-		return e;
-	}
-	op1 = l;
-
-	e = Jim_GetLong(interp, argv[3], &l);
-	if (e != JIM_OK) {
-		return e;
-	}
-	CRn = l;
-
-	e = Jim_GetLong(interp, argv[4], &l);
-	if (e != JIM_OK) {
-		return e;
-	}
-	CRm = l;
-
-	e = Jim_GetLong(interp, argv[5], &l);
-	if (e != JIM_OK) {
-		return e;
-	}
-	op2 = l;
-
-	value = 0;
-
-	if (argc == 7)
-	{
-		e = Jim_GetLong(interp, argv[6], &l);
-		if (e != JIM_OK) {
-			return e;
-		}
-		value = l;
-
-		retval = target_mcr(target, cpnum, op1, op2, CRn, CRm, value);
-		if (retval != ERROR_OK)
-			return JIM_ERR;
-	} else
-	{
-		retval = target_mrc(target, cpnum, op1, op2, CRn, CRm, &value);
-		if (retval != ERROR_OK)
-			return JIM_ERR;
-
-		Jim_SetResult(interp, Jim_NewIntObj(interp, value));
-	}
-
-	return JIM_OK;
-}
-
 static const struct command_registration target_command_handlers[] = {
 	{
 		.name = "targets",