interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

target: armv4_5: rewrite commands 'arm mcr/mrc' as COMMAND_HANDLER 

While there, add a check for target halted and check the number of
parameters accordingly to the command name.

Change-Id: I9e8bb109c35039561997d14782fac682267aee65
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/7491
Tested-by: jenkins
This commit is contained in:
Antonio Borneo 2022-12-19 13:02:59 +01:00
parent 21e6252965
commit c4f2337d02
1 changed files with 54 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
src/target/armv4_5.c
View File

@ -989,132 +989,106 @@ COMMAND_HANDLER(handle_arm_disassemble_command)
#endif #endif
} }
static int jim_mcrmrc(Jim_Interp *interp, int argc, Jim_Obj * const *argv) COMMAND_HANDLER(handle_armv4_5_mcrmrc)
{ {
struct command_context *context; bool is_mcr = false;
struct target *target; unsigned int arg_cnt = 5;
struct arm *arm;
int retval;
context = current_command_context(interp); if (!strcmp(CMD_NAME, "mcr")) {
assert(context); is_mcr = true;
arg_cnt = 6;
}
target = get_current_target(context); if (arg_cnt != CMD_ARGC)
return ERROR_COMMAND_SYNTAX_ERROR;
struct target *target = get_current_target(CMD_CTX);
if (!target) { if (!target) {
LOG_ERROR("%s: no current target", __func__); command_print(CMD, "no current target");
return JIM_ERR; return ERROR_FAIL;
} }
if (!target_was_examined(target)) { if (!target_was_examined(target)) {
LOG_ERROR("%s: not yet examined", target_name(target)); command_print(CMD, "%s: not yet examined", target_name(target));
return JIM_ERR; return ERROR_TARGET_NOT_EXAMINED;
}
arm = target_to_arm(target);
if (!is_arm(arm)) {
LOG_ERROR("%s: not an ARM", target_name(target));
return JIM_ERR;
} }
if ((argc < 6) || (argc > 7)) { struct arm *arm = target_to_arm(target);
/* FIXME use the command name to verify # params... */ if (!is_arm(arm)) {
LOG_ERROR("%s: wrong number of arguments", __func__); command_print(CMD, "%s: not an ARM", target_name(target));
return JIM_ERR; return ERROR_FAIL;
} }
if (target->state != TARGET_HALTED)
return ERROR_TARGET_NOT_HALTED;
int cpnum; int cpnum;
uint32_t op1; uint32_t op1;
uint32_t op2; uint32_t op2;
uint32_t crn; uint32_t crn;
uint32_t crm; uint32_t crm;
uint32_t value; uint32_t value;
long l;
/* NOTE: parameter sequence matches ARM instruction set usage: /* NOTE: parameter sequence matches ARM instruction set usage:
* MCR pNUM, op1, rX, CRn, CRm, op2 ; write CP from rX * MCR pNUM, op1, rX, CRn, CRm, op2 ; write CP from rX
* MRC pNUM, op1, rX, CRn, CRm, op2 ; read CP into rX * MRC pNUM, op1, rX, CRn, CRm, op2 ; read CP into rX
* The "rX" is necessarily omitted; it uses Tcl mechanisms. * The "rX" is necessarily omitted; it uses Tcl mechanisms.
*/ */
retval = Jim_GetLong(interp, argv[1], &l); COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], cpnum);
if (retval != JIM_OK) if (cpnum & ~0xf) {
return retval; command_print(CMD, "coprocessor %d out of range", cpnum);
if (l & ~0xf) { return ERROR_COMMAND_ARGUMENT_INVALID;
LOG_ERROR("%s: %s %d out of range", __func__,
"coprocessor", (int) l);
return JIM_ERR;
} }
cpnum = l;
retval = Jim_GetLong(interp, argv[2], &l); COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], op1);
if (retval != JIM_OK) if (op1 & ~0x7) {
return retval; command_print(CMD, "op1 %d out of range", op1);
if (l & ~0x7) { return ERROR_COMMAND_ARGUMENT_INVALID;
LOG_ERROR("%s: %s %d out of range", __func__,
"op1", (int) l);
return JIM_ERR;
} }
op1 = l;
retval = Jim_GetLong(interp, argv[3], &l); COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], crn);
if (retval != JIM_OK) if (crn & ~0xf) {
return retval; command_print(CMD, "CRn %d out of range", crn);
if (l & ~0xf) { return ERROR_COMMAND_ARGUMENT_INVALID;
LOG_ERROR("%s: %s %d out of range", __func__,
"CRn", (int) l);
return JIM_ERR;
} }
crn = l;
retval = Jim_GetLong(interp, argv[4], &l); COMMAND_PARSE_NUMBER(u32, CMD_ARGV[3], crm);
if (retval != JIM_OK) if (crm & ~0xf) {
return retval; command_print(CMD, "CRm %d out of range", crm);
if (l & ~0xf) { return ERROR_COMMAND_ARGUMENT_INVALID;
LOG_ERROR("%s: %s %d out of range", __func__,
"CRm", (int) l);
return JIM_ERR;
} }
crm = l;
retval = Jim_GetLong(interp, argv[5], &l); COMMAND_PARSE_NUMBER(u32, CMD_ARGV[4], op2);
if (retval != JIM_OK) if (op2 & ~0x7) {
return retval; command_print(CMD, "op2 %d out of range", op2);
if (l & ~0x7) { return ERROR_COMMAND_ARGUMENT_INVALID;
LOG_ERROR("%s: %s %d out of range", __func__,
"op2", (int) l);
return JIM_ERR;
} }
op2 = l;
value = 0; /*
/* FIXME don't assume "mrc" vs "mcr" from the number of params;
* that could easily be a typo! Check both...
*
* FIXME change the call syntax here ... simplest to just pass * FIXME change the call syntax here ... simplest to just pass
* the MRC() or MCR() instruction to be executed. That will also * the MRC() or MCR() instruction to be executed. That will also
* let us support the "mrc2" and "mcr2" opcodes (toggling one bit) * let us support the "mrc2" and "mcr2" opcodes (toggling one bit)
* if that's ever needed. * if that's ever needed.
*/ */
if (argc == 7) { if (is_mcr) {
retval = Jim_GetLong(interp, argv[6], &l); COMMAND_PARSE_NUMBER(u32, CMD_ARGV[5], value);
if (retval != JIM_OK)
return retval;
value = l;
/* NOTE: parameters reordered! */ /* NOTE: parameters reordered! */
/* ARMV4_5_MCR(cpnum, op1, 0, crn, crm, op2) */ /* ARMV4_5_MCR(cpnum, op1, 0, crn, crm, op2) */
retval = arm->mcr(target, cpnum, op1, op2, crn, crm, value); int retval = arm->mcr(target, cpnum, op1, op2, crn, crm, value);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return JIM_ERR; return retval;
} else { } else {
value = 0;
/* NOTE: parameters reordered! */ /* NOTE: parameters reordered! */
/* ARMV4_5_MRC(cpnum, op1, 0, crn, crm, op2) */ /* ARMV4_5_MRC(cpnum, op1, 0, crn, crm, op2) */
retval = arm->mrc(target, cpnum, op1, op2, crn, crm, &value); int retval = arm->mrc(target, cpnum, op1, op2, crn, crm, &value);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return JIM_ERR; return retval;
Jim_SetResult(interp, Jim_NewIntObj(interp, value)); command_print(CMD, "0x%" PRIx32, value);
} }
return JIM_OK; return ERROR_OK;
} }
static const struct command_registration arm_exec_command_handlers[] = { static const struct command_registration arm_exec_command_handlers[] = {
@ -1128,14 +1102,14 @@ static const struct command_registration arm_exec_command_handlers[] = {
{ {
.name = "mcr", .name = "mcr",
.mode = COMMAND_EXEC, .mode = COMMAND_EXEC,
.jim_handler = &jim_mcrmrc, .handler = handle_armv4_5_mcrmrc,
.help = "write coprocessor register", .help = "write coprocessor register",
.usage = "cpnum op1 CRn CRm op2 value", .usage = "cpnum op1 CRn CRm op2 value",
}, },
{ {
.name = "mrc", .name = "mrc",
.mode = COMMAND_EXEC, .mode = COMMAND_EXEC,
.jim_handler = &jim_mcrmrc, .handler = handle_armv4_5_mcrmrc,
.help = "read coprocessor register", .help = "read coprocessor register",
.usage = "cpnum op1 CRn CRm op2", .usage = "cpnum op1 CRn CRm op2",
}, },