Skip to content

Commit f354d25

Browse files
committed
target/riscv: return ERROR_TARGET_NOT_HALTED
instead of ERROR_FAIL where appropriate. Change-Id: I1881c0c6c437355007c3844556489162666023dc Signed-off-by: Tomas Vanek <[email protected]> Reviewed-on: https://review.openocd.org/c/openocd/+/9171 Tested-by: jenkins Reviewed-by: Evgeniy Naydanov <[email protected]>
1 parent 6d764f5 commit f354d25

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/target/riscv/riscv-013.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2323,7 +2323,7 @@ static int prep_for_vector_access(struct target *target,
23232323
if (target->state != TARGET_HALTED) {
23242324
LOG_TARGET_ERROR(target,
23252325
"Unable to access vector register: target not halted");
2326-
return ERROR_FAIL;
2326+
return ERROR_TARGET_NOT_HALTED;
23272327
}
23282328
if (prep_for_register_access(target, orig_mstatus, GDB_REGNO_VL) != ERROR_OK)
23292329
return ERROR_FAIL;
@@ -5476,7 +5476,7 @@ static int riscv013_step_or_resume_current_hart(struct target *target,
54765476
{
54775477
if (target->state != TARGET_HALTED) {
54785478
LOG_TARGET_ERROR(target, "Hart is not halted!");
5479-
return ERROR_FAIL;
5479+
return ERROR_TARGET_NOT_HALTED;
54805480
}
54815481

54825482
LOG_TARGET_DEBUG(target, "resuming (operation=%s)",

src/target/riscv/riscv.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5425,7 +5425,7 @@ COMMAND_HANDLER(riscv_exec_progbuf)
54255425
if (target->state != TARGET_HALTED) {
54265426
LOG_TARGET_ERROR(target, "exec_progbuf: Can't execute "
54275427
"program buffer, target not halted.");
5428-
return ERROR_FAIL;
5428+
return ERROR_TARGET_NOT_HALTED;
54295429
}
54305430

54315431
if (riscv_progbuf_size(target) == 0) {
@@ -6039,7 +6039,7 @@ static int riscv_step_rtos_hart(struct target *target)
60396039

60406040
if (target->state != TARGET_HALTED) {
60416041
LOG_TARGET_ERROR(target, "Hart isn't halted before single step!");
6042-
return ERROR_FAIL;
6042+
return ERROR_TARGET_NOT_HALTED;
60436043
}
60446044
r->on_step(target);
60456045
if (r->step_current_hart(target) != ERROR_OK)
@@ -6229,7 +6229,7 @@ int riscv_enumerate_triggers(struct target *target)
62296229

62306230
if (target->state != TARGET_HALTED) {
62316231
LOG_TARGET_ERROR(target, "Unable to enumerate triggers: target not halted.");
6232-
return ERROR_FAIL;
6232+
return ERROR_TARGET_NOT_HALTED;
62336233
}
62346234

62356235
riscv_reg_t orig_tselect;

0 commit comments

Comments
 (0)