This is an automated email from the ASF dual-hosted git repository. xiaoxiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 0c79ad9d8d16acbcb98108a4d673e13d19f06322 Author: chao.an <[email protected]> AuthorDate: Wed Apr 13 18:04:41 2022 +0800 arch/[arm|sparc]: replace INT32_ALIGN_* to STACK_ALIGN_* Signed-off-by: chao.an <[email protected]> --- arch/arm/src/common/arm_checkstack.c | 30 +++++++----------------------- arch/sparc/src/common/up_checkstack.c | 28 ++++++---------------------- 2 files changed, 13 insertions(+), 45 deletions(-) diff --git a/arch/arm/src/common/arm_checkstack.c b/arch/arm/src/common/arm_checkstack.c index 08dd03a0b4..54fc37917c 100644 --- a/arch/arm/src/common/arm_checkstack.c +++ b/arch/arm/src/common/arm_checkstack.c @@ -38,22 +38,6 @@ #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 ****************************************************************************/ @@ -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 */ - start = INT32_ALIGN_UP((uintptr_t)stackbase); - end = INT32_ALIGN_DOWN((uintptr_t)stackbase + nbytes); + start = STACK_ALIGN_UP((uintptr_t)stackbase); + end = STACK_ALIGN_DOWN((uintptr_t)stackbase + nbytes); /* 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 */ - start = INT32_ALIGN_UP((uintptr_t)stackbase); - end = nbytes ? INT32_ALIGN_DOWN((uintptr_t)stackbase + nbytes) : + start = STACK_ALIGN_UP((uintptr_t)stackbase); + end = nbytes ? STACK_ALIGN_DOWN((uintptr_t)stackbase + nbytes) : (uintptr_t)&sp; /* 0: colorize the running 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 return do_stackcheck((FAR void *)arm_intstack_alloc(), - INT32_ALIGN_DOWN(CONFIG_ARCH_INTERRUPTSTACK)); + STACK_ALIGN_DOWN(CONFIG_ARCH_INTERRUPTSTACK)); #else return do_stackcheck((FAR void *)&g_intstackalloc, - INT32_ALIGN_DOWN(CONFIG_ARCH_INTERRUPTSTACK)); + STACK_ALIGN_DOWN(CONFIG_ARCH_INTERRUPTSTACK)); #endif } 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 diff --git a/arch/sparc/src/common/up_checkstack.c b/arch/sparc/src/common/up_checkstack.c index b1d9cca520..ca80866696 100644 --- a/arch/sparc/src/common/up_checkstack.c +++ b/arch/sparc/src/common/up_checkstack.c @@ -39,22 +39,6 @@ #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 ****************************************************************************/ @@ -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 */ - start = INT32_ALIGN_UP((uintptr_t)stackbase); - end = INT32_ALIGN_DOWN((uintptr_t)stackbase + nbytes); + start = STACK_ALIGN_UP((uintptr_t)stackbase); + end = STACK_ALIGN_DOWN((uintptr_t)stackbase + nbytes); /* 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 */ - start = INT32_ALIGN_UP((uintptr_t)stackbase); - end = nbytes ? INT32_ALIGN_DOWN((uintptr_t)stackbase + nbytes) : + start = STACK_ALIGN_UP((uintptr_t)stackbase); + end = nbytes ? STACK_ALIGN_DOWN((uintptr_t)stackbase + nbytes) : (uintptr_t)&sp; /* 0: colorize the running 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) { return do_stackcheck((uintptr_t)&g_intstackalloc, - (CONFIG_ARCH_INTERRUPTSTACK & ~3)); + STACK_ALIGN_DOWN(CONFIG_ARCH_INTERRUPTSTACK)); } 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
