Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-29 04:19:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

arch/[arm|sparc]: replace INT32_ALIGN_* to STACK_ALIGN_*

Browse Source 
Signed-off-by: chao.an <anchao@xiaomi.com>
This commit is contained in:
chao.an
2022-04-13 18:04:41 +08:00
committed by Xiang Xiao
parent c2b69cc2c9
commit 0c79ad9d8d
2 changed files with 13 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/common/arm_checkstack.c
+7 -23
View File
@@ -38,22 +38,6 @@
#ifdef CONFIG_STACK_COLORATION #ifdef CONFIG_STACK_COLORATION
/****************************************************************************
* Pre-processor Macros
****************************************************************************/
/* 32bit alignment macros */
#define INT32_ALIGN_MASK (3)
#define INT32_ALIGN_DOWN(a) ((a) & ~INT32_ALIGN_MASK)
#define INT32_ALIGN_UP(a) (((a) + INT32_ALIGN_MASK) & ~INT32_ALIGN_MASK)
/****************************************************************************
* Private Function Prototypes
****************************************************************************/
static size_t do_stackcheck(FAR void *stackbase, size_t nbytes);
/**************************************************************************** /****************************************************************************
* Private Functions * Private Functions
****************************************************************************/ ****************************************************************************/
@@ -89,8 +73,8 @@ static size_t do_stackcheck(FAR void *stackbase, size_t nbytes)
/* Take extra care that we do not check outside the stack boundaries */ /* Take extra care that we do not check outside the stack boundaries */
start = INT32_ALIGN_UP((uintptr_t)stackbase); start = STACK_ALIGN_UP((uintptr_t)stackbase);
end = INT32_ALIGN_DOWN((uintptr_t)stackbase + nbytes); end = STACK_ALIGN_DOWN((uintptr_t)stackbase + nbytes);
/* Get the adjusted size based on the top and bottom of the stack */ /* Get the adjusted size based on the top and bottom of the stack */
@@ -172,8 +156,8 @@ void arm_stack_color(FAR void *stackbase, size_t nbytes)
/* Take extra care that we do not write outside the stack boundaries */ /* Take extra care that we do not write outside the stack boundaries */
start = INT32_ALIGN_UP((uintptr_t)stackbase); start = STACK_ALIGN_UP((uintptr_t)stackbase);
end = nbytes ? INT32_ALIGN_DOWN((uintptr_t)stackbase + nbytes) : end = nbytes ? STACK_ALIGN_DOWN((uintptr_t)stackbase + nbytes) :
(uintptr_t)&sp; /* 0: colorize the running stack */ (uintptr_t)&sp; /* 0: colorize the running stack */
/* Get the adjusted size based on the top and bottom of the stack */ /* Get the adjusted size based on the top and bottom of the stack */
@@ -230,16 +214,16 @@ size_t up_check_intstack(void)
{ {
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
return do_stackcheck((FAR void *)arm_intstack_alloc(), return do_stackcheck((FAR void *)arm_intstack_alloc(),
INT32_ALIGN_DOWN(CONFIG_ARCH_INTERRUPTSTACK)); STACK_ALIGN_DOWN(CONFIG_ARCH_INTERRUPTSTACK));
#else #else
return do_stackcheck((FAR void *)&g_intstackalloc, return do_stackcheck((FAR void *)&g_intstackalloc,
INT32_ALIGN_DOWN(CONFIG_ARCH_INTERRUPTSTACK)); STACK_ALIGN_DOWN(CONFIG_ARCH_INTERRUPTSTACK));
#endif #endif
} }
size_t up_check_intstack_remain(void) size_t up_check_intstack_remain(void)
{ {
return INT32_ALIGN_DOWN(CONFIG_ARCH_INTERRUPTSTACK) - up_check_intstack(); return STACK_ALIGN_DOWN(CONFIG_ARCH_INTERRUPTSTACK) - up_check_intstack();
} }
#endif #endif
arch/sparc/src/common/up_checkstack.c
+6 -22
View File
@@ -39,22 +39,6 @@
#ifdef CONFIG_STACK_COLORATION #ifdef CONFIG_STACK_COLORATION
/****************************************************************************
* Pre-processor Macros
****************************************************************************/
/* 32bit alignment macros */
#define INT32_ALIGN_MASK (3)
#define INT32_ALIGN_DOWN(a) ((a) & ~INT32_ALIGN_MASK)
#define INT32_ALIGN_UP(a) (((a) + INT32_ALIGN_MASK) & ~INT32_ALIGN_MASK)
/****************************************************************************
* Private Function Prototypes
****************************************************************************/
static size_t do_stackcheck(FAR void *stackbase, size_t nbytes);
/**************************************************************************** /****************************************************************************
* Private Functions * Private Functions
****************************************************************************/ ****************************************************************************/
@@ -90,8 +74,8 @@ static size_t do_stackcheck(FAR void *stackbase, size_t nbytes)
/* Take extra care that we do not check outside the stack boundaries */ /* Take extra care that we do not check outside the stack boundaries */
start = INT32_ALIGN_UP((uintptr_t)stackbase); start = STACK_ALIGN_UP((uintptr_t)stackbase);
end = INT32_ALIGN_DOWN((uintptr_t)stackbase + nbytes); end = STACK_ALIGN_DOWN((uintptr_t)stackbase + nbytes);
/* Get the adjusted size based on the top and bottom of the stack */ /* Get the adjusted size based on the top and bottom of the stack */
@@ -173,8 +157,8 @@ void up_stack_color(FAR void *stackbase, size_t nbytes)
/* Take extra care that we do not write outside the stack boundaries */ /* Take extra care that we do not write outside the stack boundaries */
start = INT32_ALIGN_UP((uintptr_t)stackbase); start = STACK_ALIGN_UP((uintptr_t)stackbase);
end = nbytes ? INT32_ALIGN_DOWN((uintptr_t)stackbase + nbytes) : end = nbytes ? STACK_ALIGN_DOWN((uintptr_t)stackbase + nbytes) :
(uintptr_t)&sp; /* 0: colorize the running stack */ (uintptr_t)&sp; /* 0: colorize the running stack */
/* Get the adjusted size based on the top and bottom of the stack */ /* Get the adjusted size based on the top and bottom of the stack */
@@ -230,12 +214,12 @@ ssize_t up_check_stack_remain(void)
size_t up_check_intstack(void) size_t up_check_intstack(void)
{ {
return do_stackcheck((uintptr_t)&g_intstackalloc, return do_stackcheck((uintptr_t)&g_intstackalloc,
(CONFIG_ARCH_INTERRUPTSTACK & ~3)); STACK_ALIGN_DOWN(CONFIG_ARCH_INTERRUPTSTACK));
} }
size_t up_check_intstack_remain(void) size_t up_check_intstack_remain(void)
{ {
return (CONFIG_ARCH_INTERRUPTSTACK & ~3) - up_check_intstack(); return STACK_ALIGN_DOWN(CONFIG_ARCH_INTERRUPTSTACK) - up_check_intstack();
} }
#endif #endif