sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arch/arm: Fix rebase error in arm_backtrace_thumb.c

Browse Source 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2021-12-29 17:09:00 +08:00 committed by archer
parent c15195b126
commit b92c90ee81
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm/src/common/arm_backtrace_thumb.c
View File

@ -319,7 +319,7 @@ __attribute__((no_sanitize_address))
static int backtrace_push(FAR void *limit, FAR void **sp, FAR void *pc,
FAR void **buffer, int size, FAR int *skip)
{
int i = 1;
int i = 0;
if (!in_code_region(pc))
{
@ -350,11 +350,6 @@ static int backtrace_push(FAR void *limit, FAR void **sp, FAR void *pc,
{
*buffer++ = pc;
}
if (ip)
{
ip = NULL;
}
}
return i;
@ -521,7 +516,7 @@ int up_backtrace(FAR struct tcb_s *tcb,
&g_intstacktop,
# endif /* CONFIG_SMP */
&sp, (FAR void *)up_backtrace + 10,
buffer, size);
buffer, size, &skip);
#else
ret = backtrace_push(rtcb->stack_base_ptr +
rtcb->adj_stack_size,