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

Merge pull request #1200 from JanMatCodasip/jm-codasip/semihosting-3-warn-if-encountered-but-disabled 

RISC-V Semihosting 3 of 3: Warn if encountered but disabled
This commit is contained in:
Evgeniy Naydanov 2025-01-27 15:54:57 +03:00 committed by GitHub
parent 1d623819e9 b7d9ab5d1e
commit 77b85757c5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/target/riscv/riscv_semihosting.c
View File

@ -110,11 +110,6 @@ enum semihosting_result riscv_semihosting(struct target *target, int *retval)
struct semihosting *semihosting = target->semihosting; struct semihosting *semihosting = target->semihosting;
assert(semihosting); assert(semihosting);
if (!semihosting->is_active) {
LOG_TARGET_DEBUG(target, "Semihosting outcome: NONE (semihosting not enabled)");
return SEMIHOSTING_NONE;
}
riscv_reg_t pc; riscv_reg_t pc;
int result = riscv_reg_get(target, &pc, GDB_REGNO_PC); int result = riscv_reg_get(target, &pc, GDB_REGNO_PC);
if (result != ERROR_OK) { if (result != ERROR_OK) {
@ -122,20 +117,37 @@ enum semihosting_result riscv_semihosting(struct target *target, int *retval)
return SEMIHOSTING_ERROR; return SEMIHOSTING_ERROR;
} }
bool sequence_found; bool sequence_found = false;
*retval = riscv_semihosting_detect_magic_sequence(target, pc, &sequence_found); *retval = riscv_semihosting_detect_magic_sequence(target, pc, &sequence_found);
if (*retval != ERROR_OK) { if (*retval != ERROR_OK) {
LOG_TARGET_DEBUG(target, "Semihosting outcome: ERROR (during magic seq. detection)"); LOG_TARGET_DEBUG(target, "Semihosting outcome: ERROR (during magic seq. detection)");
return SEMIHOSTING_ERROR; return SEMIHOSTING_ERROR;
} }
if (!semihosting->is_active) {
if (sequence_found) {
// If semihositing is encountered but disabled, provide an additional hint to the user.
LOG_TARGET_WARNING(target, "RISC-V semihosting call encountered in the program "
"but semihosting is disabled!");
LOG_TARGET_WARNING(target, "The target will remain halted (PC = 0x%" TARGET_PRIxADDR ").", pc);
LOG_TARGET_WARNING(target, "Hint: Restart your debug session and enable semihosting "
"by command 'arm semihosting enable'.");
// TODO: This can be improved: The ebreak halt cause detection and riscv_semihosting() call
// can be added also to "arm semihosting enable", which would allow the user to continue
// without restart of the debug session.
}
LOG_TARGET_DEBUG(target, "Semihosting outcome: NONE (semihosting not enabled)");
return SEMIHOSTING_NONE;
}
if (!sequence_found) { if (!sequence_found) {
LOG_TARGET_DEBUG(target, "Semihosting outcome: NONE (no magic sequence)"); LOG_TARGET_DEBUG(target, "Semihosting outcome: NONE (no magic sequence)");
return SEMIHOSTING_NONE; return SEMIHOSTING_NONE;
} }
/* Otherwise we have a semihosting call (and semihosting is enabled). /* Otherwise we have a semihosting call (and semihosting is enabled).
* Proceed with the semihosting. */ * Proceed with the handling of semihosting. */
/* /*
* Perform semihosting call if we are not waiting on a fileio * Perform semihosting call if we are not waiting on a fileio