arch/risc-v/src/common/riscv_backtrace.c: Fix "error: pointer of type…

… 'void *' used in arithmetic" Signed-off-by: Jukka Laitinen <[email protected]>
apache · Jan 30, 2025 · 80e545a · 80e545a
1 parent 52dbfda
commit 80e545a
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/arch/risc-v/src/common/riscv_backtrace.c b/arch/risc-v/src/common/riscv_backtrace.c
@@ -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);
@@ -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);
             }
         }
@@ -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);