zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target/arm946e: rewrite jim_arm946e_cp15 to arm945e_handle_cp15 

jim_arm946e_cp15() used command_print() in the jim handler.

Change-Id: I0a258aad5a60f45672b9b6fa6819691507d4f0f6
Signed-off-by: Tomas Vanek <vanekt@fbl.cz>
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/5000
Tested-by: jenkins
bscan_optimization
Tomas Vanek 2019-03-26 11:55:37 +01:00
parent 1ce51507a1
commit 5e027407e3
1 changed files with 27 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/target/arm946e.c
View File

@ -549,70 +549,54 @@ int arm946e_read_memory(struct target *target, target_addr_t address,
return ERROR_OK; return ERROR_OK;
} }
static int jim_arm946e_cp15(Jim_Interp *interp, int argc, Jim_Obj * const *argv) COMMAND_HANDLER(arm946e_handle_cp15)
{ {
/* one or two arguments, access a single register (write if second argument is given) */ /* one or two arguments, access a single register (write if second argument is given) */
if (argc < 2 || argc > 3) { if (CMD_ARGC < 1 || CMD_ARGC > 2)
Jim_WrongNumArgs(interp, 1, argv, "addr [value]"); return ERROR_COMMAND_SYNTAX_ERROR;
return JIM_ERR;
}
struct command_context *cmd_ctx = current_command_context(interp); struct target *target = get_current_target(CMD_CTX);
assert(cmd_ctx != NULL);
struct target *target = get_current_target(cmd_ctx);
if (target == NULL) {
LOG_ERROR("arm946e: no current target");
return JIM_ERR;
}
struct arm946e_common *arm946e = target_to_arm946(target); struct arm946e_common *arm946e = target_to_arm946(target);
int retval = arm946e_verify_pointer(cmd_ctx, arm946e); int retval = arm946e_verify_pointer(CMD_CTX, arm946e);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return JIM_ERR;
if (target->state != TARGET_HALTED) {
command_print(cmd_ctx, "target %s must be stopped for \"cp15\" command", target_name(target));
return JIM_ERR;
}
long l;
uint32_t address;
retval = Jim_GetLong(interp, argv[1], &l);
address = l;
if (JIM_OK != retval)
return retval; return retval;
if (argc == 2) { if (target->state != TARGET_HALTED) {
command_print(CMD_CTX, "target must be stopped for \"%s\" command", CMD_NAME);
return ERROR_TARGET_NOT_HALTED;
}
uint32_t address;
COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], address);
if (CMD_ARGC == 1) {
uint32_t value; uint32_t value;
retval = arm946e_read_cp15(target, address, &value); retval = arm946e_read_cp15(target, address, &value);
if (retval != ERROR_OK) { if (retval != ERROR_OK) {
command_print(cmd_ctx, "%s cp15 reg %" PRIi32 " access failed", target_name(target), address); command_print(CMD_CTX, "%s cp15 reg %" PRIi32 " access failed", target_name(target), address);
return JIM_ERR; return retval;
} }
retval = jtag_execute_queue(); retval = jtag_execute_queue();
if (retval != ERROR_OK) if (retval != ERROR_OK)
return JIM_ERR;
char buf[20];
sprintf(buf, "0x%08" PRIx32, value);
/* Return value in hex format */
Jim_SetResultString(interp, buf, -1);
} else if (argc == 3) {
uint32_t value;
retval = Jim_GetLong(interp, argv[2], &l);
value = l;
if (JIM_OK != retval)
return retval; return retval;
/* Return value in hex format */
command_print(CMD_CTX, "0x%08" PRIx32, value);
} else if (CMD_ARGC == 2) {
uint32_t value;
COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], value);
retval = arm946e_write_cp15(target, address, value); retval = arm946e_write_cp15(target, address, value);
if (retval != ERROR_OK) { if (retval != ERROR_OK) {
command_print(cmd_ctx, "%s cp15 reg %" PRIi32 " access failed", target_name(target), address); command_print(CMD_CTX, "%s cp15 reg %" PRIi32 " access failed", target_name(target), address);
return JIM_ERR; return retval;
} }
if (address == CP15_CTL) if (address == CP15_CTL)
arm946e_update_cp15_caches(target, value); arm946e_update_cp15_caches(target, value);
} }
return JIM_OK; return ERROR_OK;
} }
COMMAND_HANDLER(arm946e_handle_idcache) COMMAND_HANDLER(arm946e_handle_idcache)
@ -703,7 +687,7 @@ COMMAND_HANDLER(arm946e_handle_idcache)
static const struct command_registration arm946e_exec_command_handlers[] = { static const struct command_registration arm946e_exec_command_handlers[] = {
{ {
.name = "cp15", .name = "cp15",
.jim_handler = jim_arm946e_cp15, .handler = arm946e_handle_cp15,
.mode = COMMAND_EXEC, .mode = COMMAND_EXEC,
.usage = "regnum [value]", .usage = "regnum [value]",
.help = "read/modify cp15 register", .help = "read/modify cp15 register",