Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

arch/risc-v/src/common/riscv_backtrace.c: Fix "error: pointer of type 'void *' used in arithmetic" #15725

Merged
merged 1 commit into from
Jan 30, 2025
Merged

arch/risc-v/src/common/riscv_backtrace.c: Fix "error: pointer of type 'void *' used in arithmetic" #15725

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions arch/risc-v/src/common/riscv_backtrace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,13 +157,15 @@ int up_backtrace(struct tcb_s *tcb, void **buffer, int size, int skip)
(void *)getfp(), NULL, buffer, size, &skip);
#else
ret = backtrace(rtcb->stack_base_ptr,
rtcb->stack_base_ptr + rtcb->adj_stack_size,
(uintptr_t *)((uintptr_t)rtcb->stack_base_ptr +
rtcb->adj_stack_size),
(void *)getfp(), NULL, buffer, size, &skip);
#endif
if (ret < size)
{
ret += backtrace(rtcb->stack_base_ptr,
rtcb->stack_base_ptr + rtcb->adj_stack_size,
ret += backtrace(rtcb->stack_base_ptr, (uintptr_t *)
((uintptr_t)rtcb->stack_base_ptr +
rtcb->adj_stack_size),
running_regs()[REG_FP],
running_regs()[REG_EPC],
&buffer[ret], size - ret, &skip);
Expand All @@ -174,16 +176,18 @@ int up_backtrace(struct tcb_s *tcb, void **buffer, int size, int skip)
#ifdef CONFIG_ARCH_KERNEL_STACK
if (rtcb->xcp.ustkptr != NULL)
{
ret = backtrace(rtcb->stack_base_ptr,
rtcb->stack_base_ptr + rtcb->adj_stack_size,
ret = backtrace(rtcb->stack_base_ptr, (uintptr_t *)
((uintptr_t)rtcb->stack_base_ptr +
rtcb->adj_stack_size),
(void *)*(rtcb->xcp.ustkptr + 1), NULL,
buffer, size, &skip);
}
else
#endif
{
ret = backtrace(rtcb->stack_base_ptr,
rtcb->stack_base_ptr + rtcb->adj_stack_size,
ret = backtrace(rtcb->stack_base_ptr, (uintptr_t *)
((uintptr_t)rtcb->stack_base_ptr +
rtcb->adj_stack_size),
(void *)getfp(), NULL, buffer, size, &skip);
}
}
Expand All @@ -194,15 +198,17 @@ int up_backtrace(struct tcb_s *tcb, void **buffer, int size, int skip)
if (tcb->xcp.ustkptr != NULL)
{
ret = backtrace(tcb->stack_base_ptr,
tcb->stack_base_ptr + tcb->adj_stack_size,
(uintptr_t *)((uintptr_t)tcb->stack_base_ptr +
tcb->adj_stack_size),
(void *)*(tcb->xcp.ustkptr + 1), NULL,
buffer, size, &skip);
}
else
#endif
{
ret = backtrace(tcb->stack_base_ptr,
tcb->stack_base_ptr + tcb->adj_stack_size,
(uintptr_t *)((uintptr_t)tcb->stack_base_ptr +
tcb->adj_stack_size),
(void *)tcb->xcp.regs[REG_FP],
(void *)tcb->xcp.regs[REG_EPC],
buffer, size, &skip);
Expand Down
Loading