From c8ae0819794c027bd3368b2ea45a72dd45074a5b Mon Sep 17 00:00:00 2001 From: Farid Khaydari Date: Wed, 20 Nov 2024 18:12:36 +0300 Subject: [PATCH] target/riscv: fix memory access result type checker function return in case of assertion Fix memory access result type checker return in case of assertion Signed-off-by: Farid Khaydari --- src/target/riscv/riscv-013.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/target/riscv/riscv-013.c b/src/target/riscv/riscv-013.c index 4ab3357dc..477dc9507 100644 --- a/src/target/riscv/riscv-013.c +++ b/src/target/riscv/riscv-013.c @@ -3427,26 +3427,32 @@ bool is_mem_access_failed(mem_access_result_t status) { #define MEM_ACCESS_RESULT_HANDLER(name, kind, msg) \ case name: return kind == MEM_ACCESS_RESULT_TYPE_FAILED; + switch (status) { LIST_OF_MEM_ACCESS_RESULTS } + #undef MEM_ACCESS_RESULT_HANDLER + LOG_ERROR("Unknown memory access status: %d", status); - assert(false); - return false; + assert(false && "Unknown memory access status"); + return true; } bool is_mem_access_skipped(mem_access_result_t status) { #define MEM_ACCESS_RESULT_HANDLER(name, kind, msg) \ case name: return kind == MEM_ACCESS_RESULT_TYPE_SKIPPED; + switch (status) { LIST_OF_MEM_ACCESS_RESULTS } + #undef MEM_ACCESS_RESULT_HANDLER + LOG_ERROR("Unknown memory access status: %d", status); - assert(false); - return false; + assert(false && "Unknown memory access status"); + return true; } const char *mem_access_result_to_str(mem_access_result_t status)