michaelh/zephyr
1
0
Fork 0
Code Releases Activity

arch: riscv: reorder fatal message

Browse source 
Print the backtrace message after the registers.

Signed-off-by: Yong Cong Sin <ycsin@meta.com>
This commit is contained in:
Yong Cong Sin 2024-05-13 13:16:25 +08:00 • committed by Alberto Escolar
commit 9a4698159d
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
arch/riscv/core/fatal.c
View file

@ -81,6 +81,10 @@ static void unwind_stack(const z_arch_esf_t *esf)
uintptr_t ra; uintptr_t ra;
struct stackframe *frame; struct stackframe *frame;
if (esf == NULL) {
return;
}
LOG_ERR("call trace:"); LOG_ERR("call trace:");
for (int i = 0; (i < MAX_STACK_FRAMES) && (fp != 0U) && in_stack_bound((uintptr_t)fp);) { for (int i = 0; (i < MAX_STACK_FRAMES) && (fp != 0U) && in_stack_bound((uintptr_t)fp);) {
@ -96,6 +100,8 @@ static void unwind_stack(const z_arch_esf_t *esf)
} }
fp = frame->fp; fp = frame->fp;
} }
LOG_ERR("");
} }
#endif /* CONFIG_RISCV_EXCEPTION_STACK_TRACE */ #endif /* CONFIG_RISCV_EXCEPTION_STACK_TRACE */
@ -144,9 +150,6 @@ FUNC_NORETURN void z_riscv_fatal_error_csf(unsigned int reason, const z_arch_esf
LOG_ERR(" mepc: " PR_REG, esf->mepc); LOG_ERR(" mepc: " PR_REG, esf->mepc);
LOG_ERR("mstatus: " PR_REG, esf->mstatus); LOG_ERR("mstatus: " PR_REG, esf->mstatus);
LOG_ERR(""); LOG_ERR("");
#ifdef CONFIG_RISCV_EXCEPTION_STACK_TRACE
unwind_stack(esf);
#endif /* CONFIG_RISCV_EXCEPTION_STACK_TRACE */
} }
if (csf != NULL) { if (csf != NULL) {
@ -163,6 +166,11 @@ FUNC_NORETURN void z_riscv_fatal_error_csf(unsigned int reason, const z_arch_esf
#endif /* CONFIG_RISCV_ISA_RV32E */ #endif /* CONFIG_RISCV_ISA_RV32E */
LOG_ERR(""); LOG_ERR("");
} }
#ifdef CONFIG_RISCV_EXCEPTION_STACK_TRACE
unwind_stack(esf);
#endif /* CONFIG_RISCV_EXCEPTION_STACK_TRACE */
#endif /* CONFIG_EXCEPTION_DEBUG */ #endif /* CONFIG_EXCEPTION_DEBUG */
z_fatal_error(reason, esf); z_fatal_error(reason, esf);
CODE_UNREACHABLE; CODE_UNREACHABLE;