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

target/xtensa: fix clang analyzer warning 

Reworked xtensa_queue_exec_ins_wide() logic to properly handle endian issues while executing arbitrary instructions.

Signed-off-by: Ian Thompson <ianst@cadence.com>
Change-Id: I5752dd254ce8b8822886ffc7edecaa242a93cce8
Reviewed-on: https://review.openocd.org/c/openocd/+/7198
Tested-by: jenkins
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
This commit is contained in:
Ian Thompson 2022-09-15 16:24:33 -07:00 committed by Antonio Borneo
parent 9f024dbedc
commit 27e7f5df5f
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/target/xtensa/xtensa.c
View File

@ -498,17 +498,20 @@ static void xtensa_queue_exec_ins(struct xtensa *xtensa, uint32_t ins)
static void xtensa_queue_exec_ins_wide(struct xtensa *xtensa, uint8_t *ops, uint8_t oplen) static void xtensa_queue_exec_ins_wide(struct xtensa *xtensa, uint8_t *ops, uint8_t oplen)
{ {
if ((oplen > 0) && (oplen <= 64)) { const int max_oplen = 64; /* 8 DIRx regs: max width 64B */
uint32_t opsw[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }; /* 8 DIRx regs: max width 64B */ if ((oplen > 0) && (oplen <= max_oplen)) {
uint8_t oplenw = (oplen + 3) / 4; uint8_t ops_padded[max_oplen];
if (xtensa->target->endianness == TARGET_BIG_ENDIAN) memcpy(ops_padded, ops, oplen);
buf_bswap32((uint8_t *)opsw, ops, oplenw * 4); memset(ops_padded + oplen, 0, max_oplen - oplen);
else unsigned int oplenw = DIV_ROUND_UP(oplen, sizeof(uint32_t));
memcpy(opsw, ops, oplen);
for (int32_t i = oplenw - 1; i > 0; i--) for (int32_t i = oplenw - 1; i > 0; i--)
xtensa_queue_dbg_reg_write(xtensa, XDMREG_DIR0 + i, opsw[i]); xtensa_queue_dbg_reg_write(xtensa,
XDMREG_DIR0 + i,
target_buffer_get_u32(xtensa->target, &ops_padded[sizeof(uint32_t)*i]));
/* Write DIR0EXEC last */ /* Write DIR0EXEC last */
xtensa_queue_dbg_reg_write(xtensa, XDMREG_DIR0EXEC, opsw[0]); xtensa_queue_dbg_reg_write(xtensa,
XDMREG_DIR0EXEC,
target_buffer_get_u32(xtensa->target, &ops_padded[0]));
} }
} }