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 #1174 from fk-sc/fk-sc/checker-fix 

target/riscv: fix memory access result type checker function return in case of assertion
This commit is contained in:
Anatoly Parshintsev 2024-11-29 01:23:37 +03:00 committed by GitHub
parent eb1ecd7d10 c8ae081979
commit 0f0302b029
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/target/riscv/riscv-013.c
View File

@ -3439,26 +3439,32 @@ bool is_mem_access_failed(mem_access_result_t status)
{ {
#define MEM_ACCESS_RESULT_HANDLER(name, kind, msg) \ #define MEM_ACCESS_RESULT_HANDLER(name, kind, msg) \
case name: return kind == MEM_ACCESS_RESULT_TYPE_FAILED; case name: return kind == MEM_ACCESS_RESULT_TYPE_FAILED;
switch (status) { switch (status) {
LIST_OF_MEM_ACCESS_RESULTS LIST_OF_MEM_ACCESS_RESULTS
} }
#undef MEM_ACCESS_RESULT_HANDLER #undef MEM_ACCESS_RESULT_HANDLER
LOG_ERROR("Unknown memory access status: %d", status); LOG_ERROR("Unknown memory access status: %d", status);
assert(false); assert(false && "Unknown memory access status");
return false; return true;
} }
bool is_mem_access_skipped(mem_access_result_t status) bool is_mem_access_skipped(mem_access_result_t status)
{ {
#define MEM_ACCESS_RESULT_HANDLER(name, kind, msg) \ #define MEM_ACCESS_RESULT_HANDLER(name, kind, msg) \
case name: return kind == MEM_ACCESS_RESULT_TYPE_SKIPPED; case name: return kind == MEM_ACCESS_RESULT_TYPE_SKIPPED;
switch (status) { switch (status) {
LIST_OF_MEM_ACCESS_RESULTS LIST_OF_MEM_ACCESS_RESULTS
} }
#undef MEM_ACCESS_RESULT_HANDLER #undef MEM_ACCESS_RESULT_HANDLER
LOG_ERROR("Unknown memory access status: %d", status); LOG_ERROR("Unknown memory access status: %d", status);
assert(false); assert(false && "Unknown memory access status");
return false; return true;
} }
const char *mem_access_result_to_str(mem_access_result_t status) const char *mem_access_result_to_str(mem_access_result_t status)