Merge pull request #1124 from SummerGGift/add_arm_8-byte_alignment

[libcpu]: add 8-byte alignment for arm architecture && optimize code …
This commit is contained in:
Bernard Xiong 2017-12-21 17:07:34 +08:00 committed by GitHub
commit d78f5eb674
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 325 additions and 298 deletions

View File

@ -30,31 +30,34 @@
* @return stack address * @return stack address
*/ */
rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter, rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter,
rt_uint8_t *stack_addr, void *texit) rt_uint8_t *stack_addr, void *texit)
{ {
unsigned long *stk; rt_uint32_t *stk;
stk = (unsigned long *)stack_addr; stack_addr += sizeof(rt_uint32_t);
*(stk) = (unsigned long)tentry; /* entry point */ stack_addr = (rt_uint8_t *)RT_ALIGN_DOWN((rt_uint32_t)stack_addr, 8);
*(--stk) = (unsigned long)texit; /* lr */ stk = (rt_uint32_t *)stack_addr;
*(--stk) = 0; /* r12 */
*(--stk) = 0; /* r11 */
*(--stk) = 0; /* r10 */
*(--stk) = 0; /* r9 */
*(--stk) = 0; /* r8 */
*(--stk) = 0; /* r7 */
*(--stk) = 0; /* r6 */
*(--stk) = 0; /* r5 */
*(--stk) = 0; /* r4 */
*(--stk) = 0; /* r3 */
*(--stk) = 0; /* r2 */
*(--stk) = 0; /* r1 */
*(--stk) = (unsigned long)parameter; /* r0 : argument */
*(--stk) = SVCMODE; /* cpsr */
*(--stk) = SVCMODE; /* spsr */
/* return task's current stack address */ *(--stk) = (rt_uint32_t)tentry; /* entry point */
return (rt_uint8_t *)stk; *(--stk) = (rt_uint32_t)texit; /* lr */
*(--stk) = 0xdeadbeef; /* r12 */
*(--stk) = 0xdeadbeef; /* r11 */
*(--stk) = 0xdeadbeef; /* r10 */
*(--stk) = 0xdeadbeef; /* r9 */
*(--stk) = 0xdeadbeef; /* r8 */
*(--stk) = 0xdeadbeef; /* r7 */
*(--stk) = 0xdeadbeef; /* r6 */
*(--stk) = 0xdeadbeef; /* r5 */
*(--stk) = 0xdeadbeef; /* r4 */
*(--stk) = 0xdeadbeef; /* r3 */
*(--stk) = 0xdeadbeef; /* r2 */
*(--stk) = 0xdeadbeef; /* r1 */
*(--stk) = (rt_uint32_t)parameter; /* r0 : argument */
*(--stk) = SVCMODE; /* cpsr */
*(--stk) = SVCMODE; /* spsr */
/* return task's current stack address */
return (rt_uint8_t *)stk;
} }
/*@}*/ /*@}*/

View File

@ -13,7 +13,7 @@
*/ */
#include <rtthread.h> #include <rtthread.h>
#define SVCMODE 0x13 #define SVCMODE 0x13
/** /**
* @addtogroup AT91SAM7 * @addtogroup AT91SAM7
@ -31,31 +31,33 @@
* @return stack address * @return stack address
*/ */
rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter, rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter,
rt_uint8_t *stack_addr, void *texit) rt_uint8_t *stack_addr, void *texit)
{ {
unsigned long *stk; rt_uint32_t *stk;
stk = (unsigned long *)stack_addr; stack_addr += sizeof(rt_uint32_t);
*(stk) = (unsigned long)tentry; /* entry point */ stack_addr = (rt_uint8_t *)RT_ALIGN_DOWN((rt_uint32_t)stack_addr, 8);
*(--stk) = (unsigned long)texit; /* lr */ stk = (rt_uint32_t *)stack_addr;
*(--stk) = 0; /* r12 */ *(--stk) = (rt_uint32_t)tentry; /* entry point */
*(--stk) = 0; /* r11 */ *(--stk) = (rt_uint32_t)texit; /* lr */
*(--stk) = 0; /* r10 */ *(--stk) = 0xdeadbeef; /* r12 */
*(--stk) = 0; /* r9 */ *(--stk) = 0xdeadbeef; /* r11 */
*(--stk) = 0; /* r8 */ *(--stk) = 0xdeadbeef; /* r10 */
*(--stk) = 0; /* r7 */ *(--stk) = 0xdeadbeef; /* r9 */
*(--stk) = 0; /* r6 */ *(--stk) = 0xdeadbeef; /* r8 */
*(--stk) = 0; /* r5 */ *(--stk) = 0xdeadbeef; /* r7 */
*(--stk) = 0; /* r4 */ *(--stk) = 0xdeadbeef; /* r6 */
*(--stk) = 0; /* r3 */ *(--stk) = 0xdeadbeef; /* r5 */
*(--stk) = 0; /* r2 */ *(--stk) = 0xdeadbeef; /* r4 */
*(--stk) = 0; /* r1 */ *(--stk) = 0xdeadbeef; /* r3 */
*(--stk) = (unsigned long)parameter; /* r0 : argument */ *(--stk) = 0xdeadbeef; /* r2 */
*(--stk) = SVCMODE; /* cpsr */ *(--stk) = 0xdeadbeef; /* r1 */
*(--stk) = SVCMODE; /* spsr */ *(--stk) = (rt_uint32_t)parameter; /* r0 : argument */
*(--stk) = SVCMODE; /* cpsr */
*(--stk) = SVCMODE; /* spsr */
/* return task's current stack address */ /* return task's current stack address */
return (rt_uint8_t *)stk; return (rt_uint8_t *)stk;
} }
/*@}*/ /*@}*/

View File

@ -24,42 +24,45 @@
* This function will initialize thread stack * This function will initialize thread stack
* *
* @param tentry the entry of thread * @param tentry the entry of thread
* @param parameter the parameter of entry * @param parameter the parameter of entry
* @param stack_addr the beginning stack address * @param stack_addr the beginning stack address
* @param texit the function will be called when thread exit * @param texit the function will be called when thread exit
* *
* @return stack address * @return stack address
*/ */
rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter, rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter,
rt_uint8_t *stack_addr, void *texit) rt_uint8_t *stack_addr, void *texit)
{ {
rt_uint32_t *stk; rt_uint32_t *stk;
stk = (rt_uint32_t*)stack_addr; stack_addr += sizeof(rt_uint32_t);
*(stk) = (rt_uint32_t)tentry; /* entry point */ stack_addr = (rt_uint8_t *)RT_ALIGN_DOWN((rt_uint32_t)stack_addr, 8);
*(--stk) = (rt_uint32_t)texit; /* lr */ stk = (rt_uint32_t *)stack_addr;
*(--stk) = 0; /* r12 */
*(--stk) = 0; /* r11 */
*(--stk) = 0; /* r10 */
*(--stk) = 0; /* r9 */
*(--stk) = 0; /* r8 */
*(--stk) = 0; /* r7 */
*(--stk) = 0; /* r6 */
*(--stk) = 0; /* r5 */
*(--stk) = 0; /* r4 */
*(--stk) = 0; /* r3 */
*(--stk) = 0; /* r2 */
*(--stk) = 0; /* r1 */
*(--stk) = (rt_uint32_t)parameter; /* r0 : argument */
/* cpsr */ *(--stk) = (rt_uint32_t)tentry; /* entry point */
if ((rt_uint32_t)tentry & 0x01) *(--stk) = (rt_uint32_t)texit; /* lr */
*(--stk) = SVCMODE | 0x20; /* thumb mode */ *(--stk) = 0xdeadbeef; /* r12 */
else *(--stk) = 0xdeadbeef; /* r11 */
*(--stk) = SVCMODE; /* arm mode */ *(--stk) = 0xdeadbeef; /* r10 */
*(--stk) = 0xdeadbeef; /* r9 */
*(--stk) = 0xdeadbeef; /* r8 */
*(--stk) = 0xdeadbeef; /* r7 */
*(--stk) = 0xdeadbeef; /* r6 */
*(--stk) = 0xdeadbeef; /* r5 */
*(--stk) = 0xdeadbeef; /* r4 */
*(--stk) = 0xdeadbeef; /* r3 */
*(--stk) = 0xdeadbeef; /* r2 */
*(--stk) = 0xdeadbeef; /* r1 */
*(--stk) = (rt_uint32_t)parameter; /* r0 : argument */
/* return task's current stack address */ /* cpsr */
return (rt_uint8_t *)stk; if ((rt_uint32_t)tentry & 0x01)
*(--stk) = SVCMODE | 0x20; /* thumb mode */
else
*(--stk) = SVCMODE; /* arm mode */
/* return task's current stack address */
return (rt_uint8_t *)stk;
} }
/*@}*/ /*@}*/

View File

@ -50,10 +50,9 @@ rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter,
{ {
rt_uint32_t *stk; rt_uint32_t *stk;
//stk = (rt_uint32_t*)stack_addr;
stack_addr += sizeof(rt_uint32_t); stack_addr += sizeof(rt_uint32_t);
stack_addr = (rt_uint8_t *)RT_ALIGN_DOWN((rt_uint32_t)stack_addr, 8); stack_addr = (rt_uint8_t *)RT_ALIGN_DOWN((rt_uint32_t)stack_addr, 8);
stk = (rt_uint32_t *)stack_addr; stk = (rt_uint32_t *)stack_addr;
*(--stk) = (rt_uint32_t)tentry; /* entry point */ *(--stk) = (rt_uint32_t)tentry; /* entry point */
*(--stk) = (rt_uint32_t)texit; /* lr */ *(--stk) = (rt_uint32_t)texit; /* lr */
@ -70,11 +69,11 @@ rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter,
*(--stk) = 0xdeadbeef; /* r2 */ *(--stk) = 0xdeadbeef; /* r2 */
*(--stk) = 0xdeadbeef; /* r1 */ *(--stk) = 0xdeadbeef; /* r1 */
*(--stk) = (rt_uint32_t)parameter; /* r0 : argument */ *(--stk) = (rt_uint32_t)parameter; /* r0 : argument */
/* cpsr */ /* cpsr */
if ((rt_uint32_t)tentry & 0x01) if ((rt_uint32_t)tentry & 0x01)
*(--stk) = SVCMODE | 0x20; /* thumb mode */ *(--stk) = SVCMODE | 0x20; /* thumb mode */
else else
*(--stk) = SVCMODE; /* arm mode */ *(--stk) = SVCMODE; /* arm mode */
/* return task's current stack address */ /* return task's current stack address */
return (rt_uint8_t *)stk; return (rt_uint8_t *)stk;

View File

@ -32,35 +32,37 @@
* @return stack address * @return stack address
*/ */
rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter, rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter,
rt_uint8_t *stack_addr, void *texit) rt_uint8_t *stack_addr, void *texit)
{ {
rt_uint32_t *stk; rt_uint32_t *stk;
stk = (rt_uint32_t*)stack_addr; stack_addr += sizeof(rt_uint32_t);
*(stk) = (rt_uint32_t)tentry; /* entry point */ stack_addr = (rt_uint8_t *)RT_ALIGN_DOWN((rt_uint32_t)stack_addr, 8);
*(--stk) = (rt_uint32_t)texit; /* lr */ stk = (rt_uint32_t *)stack_addr;
*(--stk) = 0; /* r12 */ *(--stk) = (rt_uint32_t)tentry; /* entry point */
*(--stk) = 0; /* r11 */ *(--stk) = (rt_uint32_t)texit; /* lr */
*(--stk) = 0; /* r10 */ *(--stk) = 0xdeadbeef; /* r12 */
*(--stk) = 0; /* r9 */ *(--stk) = 0xdeadbeef; /* r11 */
*(--stk) = 0; /* r8 */ *(--stk) = 0xdeadbeef; /* r10 */
*(--stk) = 0; /* r7 */ *(--stk) = 0xdeadbeef; /* r9 */
*(--stk) = 0; /* r6 */ *(--stk) = 0xdeadbeef; /* r8 */
*(--stk) = 0; /* r5 */ *(--stk) = 0xdeadbeef; /* r7 */
*(--stk) = 0; /* r4 */ *(--stk) = 0xdeadbeef; /* r6 */
*(--stk) = 0; /* r3 */ *(--stk) = 0xdeadbeef; /* r5 */
*(--stk) = 0; /* r2 */ *(--stk) = 0xdeadbeef; /* r4 */
*(--stk) = 0; /* r1 */ *(--stk) = 0xdeadbeef; /* r3 */
*(--stk) = (rt_uint32_t)parameter; /* r0 : argument */ *(--stk) = 0xdeadbeef; /* r2 */
*(--stk) = 0xdeadbeef; /* r1 */
*(--stk) = (rt_uint32_t)parameter; /* r0 : argument */
/* cpsr */ /* cpsr */
if ((rt_uint32_t)tentry & 0x01) if ((rt_uint32_t)tentry & 0x01)
*(--stk) = SVCMODE | 0x20; /* thumb mode */ *(--stk) = SVCMODE | 0x20; /* thumb mode */
else else
*(--stk) = SVCMODE; /* arm mode */ *(--stk) = SVCMODE; /* arm mode */
/* return task's current stack address */ /* return task's current stack address */
return (rt_uint8_t *)stk; return (rt_uint8_t *)stk;
} }
/*@}*/ /*@}*/

View File

@ -24,39 +24,41 @@
* This function will initialize thread stack * This function will initialize thread stack
* *
* @param tentry the entry of thread * @param tentry the entry of thread
* @param parameter the parameter of entry * @param parameter the parameter of entry
* @param stack_addr the beginning stack address * @param stack_addr the beginning stack address
* @param texit the function will be called when thread exit * @param texit the function will be called when thread exit
* *
* @return stack address * @return stack address
*/ */
rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter, rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter,
rt_uint8_t *stack_addr, void *texit) rt_uint8_t *stack_addr, void *texit)
{ {
unsigned long *stk; rt_uint32_t *stk;
stk = (unsigned long*)stack_addr; stack_addr += sizeof(rt_uint32_t);
*( stk) = (unsigned long) tentry; /* entry point */ stack_addr = (rt_uint8_t *)RT_ALIGN_DOWN((rt_uint32_t)stack_addr, 8);
*(--stk) = (unsigned long) texit; /* lr */ stk = (rt_uint32_t *)stack_addr;
*(--stk) = 0; /* r12 */ *(--stk) = (rt_uint32_t)tentry; /* entry point */
*(--stk) = 0; /* r11 */ *(--stk) = (rt_uint32_t)texit; /* lr */
*(--stk) = 0; /* r10 */ *(--stk) = 0xdeadbeef; /* r12 */
*(--stk) = 0; /* r9 */ *(--stk) = 0xdeadbeef; /* r11 */
*(--stk) = 0; /* r8 */ *(--stk) = 0xdeadbeef; /* r10 */
*(--stk) = 0; /* r7 */ *(--stk) = 0xdeadbeef; /* r9 */
*(--stk) = 0; /* r6 */ *(--stk) = 0xdeadbeef; /* r8 */
*(--stk) = 0; /* r5 */ *(--stk) = 0xdeadbeef; /* r7 */
*(--stk) = 0; /* r4 */ *(--stk) = 0xdeadbeef; /* r6 */
*(--stk) = 0; /* r3 */ *(--stk) = 0xdeadbeef; /* r5 */
*(--stk) = 0; /* r2 */ *(--stk) = 0xdeadbeef; /* r4 */
*(--stk) = 0; /* r1 */ *(--stk) = 0xdeadbeef; /* r3 */
*(--stk) = (unsigned long)parameter; /* r0 : argument */ *(--stk) = 0xdeadbeef; /* r2 */
*(--stk) = 0xdeadbeef; /* r1 */
*(--stk) = (rt_uint32_t)parameter; /* r0 : argument */
/* cpsr */ /* cpsr */
if ((rt_uint32_t)tentry & 0x01) if ((rt_uint32_t)tentry & 0x01)
*(--stk) = SVCMODE | 0x20; /* thumb mode */ *(--stk) = SVCMODE | 0x20; /* thumb mode */
else else
*(--stk) = SVCMODE; /* arm mode */ *(--stk) = SVCMODE; /* arm mode */
#if defined(__TI_VFP_SUPPORT__) || (defined (__VFP_FP__) && !defined(__SOFTFP__)) #if defined(__TI_VFP_SUPPORT__) || (defined (__VFP_FP__) && !defined(__SOFTFP__))
#ifndef RT_VFP_LAZY_STACKING #ifndef RT_VFP_LAZY_STACKING
@ -73,13 +75,13 @@ rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter,
*(--stk) = 0x40000000; *(--stk) = 0x40000000;
} }
#else #else
/* FPEXC. Disable the FVP by default. */ /* FPEXC. Disable the FVP by default. */
*(--stk) = 0x00000000; *(--stk) = 0x00000000;
#endif #endif
#endif #endif
/* return task's current stack address */ /* return task's current stack address */
return (rt_uint8_t *)stk; return (rt_uint8_t *)stk;
} }
/*@}*/ /*@}*/

View File

@ -26,54 +26,56 @@
/*****************************/ /*****************************/
/* CPU Mode */ /* CPU Mode */
/*****************************/ /*****************************/
#define USERMODE 0x10 #define USERMODE 0x10
#define FIQMODE 0x11 #define FIQMODE 0x11
#define IRQMODE 0x12 #define IRQMODE 0x12
#define SVCMODE 0x13 #define SVCMODE 0x13
#define ABORTMODE 0x17 #define ABORTMODE 0x17
#define UNDEFMODE 0x1b #define UNDEFMODE 0x1b
#define MODEMASK 0x1f #define MODEMASK 0x1f
#define NOINT 0xc0 #define NOINT 0xc0
/** /**
* This function will initialize thread stack * This function will initialize thread stack
* *
* @param tentry the entry of thread * @param tentry the entry of thread
* @param parameter the parameter of entry * @param parameter the parameter of entry
* @param stack_addr the beginning stack address * @param stack_addr the beginning stack address
* @param texit the function will be called when thread exit * @param texit the function will be called when thread exit
* *
* @return stack address * @return stack address
*/ */
rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter, rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter,
rt_uint8_t *stack_addr, void *texit) rt_uint8_t *stack_addr, void *texit)
{ {
rt_uint32_t *stk; rt_uint32_t *stk;
stk = (rt_uint32_t*)stack_addr; stack_addr += sizeof(rt_uint32_t);
*(stk) = (rt_uint32_t)tentry; /* entry point */ stack_addr = (rt_uint8_t *)RT_ALIGN_DOWN((rt_uint32_t)stack_addr, 8);
*(--stk) = (rt_uint32_t)texit; /* lr */ stk = (rt_uint32_t *)stack_addr;
*(--stk) = 0; /* r12 */ *(--stk) = (rt_uint32_t)tentry; /* entry point */
*(--stk) = 0; /* r11 */ *(--stk) = (rt_uint32_t)texit; /* lr */
*(--stk) = 0; /* r10 */ *(--stk) = 0xdeadbeef; /* r12 */
*(--stk) = 0; /* r9 */ *(--stk) = 0xdeadbeef; /* r11 */
*(--stk) = 0; /* r8 */ *(--stk) = 0xdeadbeef; /* r10 */
*(--stk) = 0; /* r7 */ *(--stk) = 0xdeadbeef; /* r9 */
*(--stk) = 0; /* r6 */ *(--stk) = 0xdeadbeef; /* r8 */
*(--stk) = 0; /* r5 */ *(--stk) = 0xdeadbeef; /* r7 */
*(--stk) = 0; /* r4 */ *(--stk) = 0xdeadbeef; /* r6 */
*(--stk) = 0; /* r3 */ *(--stk) = 0xdeadbeef; /* r5 */
*(--stk) = 0; /* r2 */ *(--stk) = 0xdeadbeef; /* r4 */
*(--stk) = 0; /* r1 */ *(--stk) = 0xdeadbeef; /* r3 */
*(--stk) = (rt_uint32_t)parameter; /* r0 : argument */ *(--stk) = 0xdeadbeef; /* r2 */
*(--stk) = 0xdeadbeef; /* r1 */
*(--stk) = (rt_uint32_t)parameter; /* r0 : argument */
/* cpsr */ /* cpsr */
if ((rt_uint32_t)tentry & 0x01) if ((rt_uint32_t)tentry & 0x01)
*(--stk) = SVCMODE | 0x20; /* thumb mode */ *(--stk) = SVCMODE | 0x20; /* thumb mode */
else else
*(--stk) = SVCMODE; /* arm mode */ *(--stk) = SVCMODE; /* arm mode */
/* return task's current stack address */ /* return task's current stack address */
return (rt_uint8_t *)stk; return (rt_uint8_t *)stk;
} }

View File

@ -23,42 +23,45 @@
* This function will initialize thread stack * This function will initialize thread stack
* *
* @param tentry the entry of thread * @param tentry the entry of thread
* @param parameter the parameter of entry * @param parameter the parameter of entry
* @param stack_addr the beginning stack address * @param stack_addr the beginning stack address
* @param texit the function will be called when thread exit * @param texit the function will be called when thread exit
* *
* @return stack address * @return stack address
*/ */
rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter, rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter,
rt_uint8_t *stack_addr, void *texit) rt_uint8_t *stack_addr, void *texit)
{ {
unsigned long *stk; rt_uint32_t *stk;
stk = (unsigned long *)stack_addr; stack_addr += sizeof(rt_uint32_t);
*(stk) = (unsigned long)tentry; /* entry point */ stack_addr = (rt_uint8_t *)RT_ALIGN_DOWN((rt_uint32_t)stack_addr, 8);
*(--stk) = (unsigned long)texit; /* lr */ stk = (rt_uint32_t *)stack_addr;
*(--stk) = 0; /* r12 */
*(--stk) = 0; /* r11 */
*(--stk) = 0; /* r10 */
*(--stk) = 0; /* r9 */
*(--stk) = 0; /* r8 */
*(--stk) = 0; /* r7 */
*(--stk) = 0; /* r6 */
*(--stk) = 0; /* r5 */
*(--stk) = 0; /* r4 */
*(--stk) = 0; /* r3 */
*(--stk) = 0; /* r2 */
*(--stk) = 0; /* r1 */
*(--stk) = (unsigned long)parameter; /* r0 : argument */
/* cpsr */ *(--stk) = (rt_uint32_t)tentry; /* entry point */
if ((rt_uint32_t)tentry & 0x01) *(--stk) = (rt_uint32_t)texit; /* lr */
*(--stk) = SVCMODE | 0x20; /* thumb mode */ *(--stk) = 0xdeadbeef; /* r12 */
else *(--stk) = 0xdeadbeef; /* r11 */
*(--stk) = SVCMODE; /* arm mode */ *(--stk) = 0xdeadbeef; /* r10 */
*(--stk) = 0xdeadbeef; /* r9 */
*(--stk) = 0xdeadbeef; /* r8 */
*(--stk) = 0xdeadbeef; /* r7 */
*(--stk) = 0xdeadbeef; /* r6 */
*(--stk) = 0xdeadbeef; /* r5 */
*(--stk) = 0xdeadbeef; /* r4 */
*(--stk) = 0xdeadbeef; /* r3 */
*(--stk) = 0xdeadbeef; /* r2 */
*(--stk) = 0xdeadbeef; /* r1 */
*(--stk) = (rt_uint32_t)parameter; /* r0 : argument */
/* return task's current stack address */ /* cpsr */
return (rt_uint8_t *)stk; if ((rt_uint32_t)tentry & 0x01)
*(--stk) = SVCMODE | 0x20; /* thumb mode */
else
*(--stk) = SVCMODE; /* arm mode */
/* return task's current stack address */
return (rt_uint8_t *)stk;
} }
/*@}*/ /*@}*/

View File

@ -24,42 +24,44 @@
* This function will initialize thread stack * This function will initialize thread stack
* *
* @param tentry the entry of thread * @param tentry the entry of thread
* @param parameter the parameter of entry * @param parameter the parameter of entry
* @param stack_addr the beginning stack address * @param stack_addr the beginning stack address
* @param texit the function will be called when thread exit * @param texit the function will be called when thread exit
* *
* @return stack address * @return stack address
*/ */
rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter, rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter,
rt_uint8_t *stack_addr, void *texit) rt_uint8_t *stack_addr, void *texit)
{ {
rt_uint32_t *stk; rt_uint32_t *stk;
stk = (rt_uint32_t*)stack_addr; stack_addr += sizeof(rt_uint32_t);
*(stk) = (rt_uint32_t)tentry; /* entry point */ stack_addr = (rt_uint8_t *)RT_ALIGN_DOWN((rt_uint32_t)stack_addr, 8);
*(--stk) = (rt_uint32_t)texit; /* lr */ stk = (rt_uint32_t *)stack_addr;
*(--stk) = 0; /* r12 */ *(--stk) = (rt_uint32_t)tentry; /* entry point */
*(--stk) = 0; /* r11 */ *(--stk) = (rt_uint32_t)texit; /* lr */
*(--stk) = 0; /* r10 */ *(--stk) = 0xdeadbeef; /* r12 */
*(--stk) = 0; /* r9 */ *(--stk) = 0xdeadbeef; /* r11 */
*(--stk) = 0; /* r8 */ *(--stk) = 0xdeadbeef; /* r10 */
*(--stk) = 0; /* r7 */ *(--stk) = 0xdeadbeef; /* r9 */
*(--stk) = 0; /* r6 */ *(--stk) = 0xdeadbeef; /* r8 */
*(--stk) = 0; /* r5 */ *(--stk) = 0xdeadbeef; /* r7 */
*(--stk) = 0; /* r4 */ *(--stk) = 0xdeadbeef; /* r6 */
*(--stk) = 0; /* r3 */ *(--stk) = 0xdeadbeef; /* r5 */
*(--stk) = 0; /* r2 */ *(--stk) = 0xdeadbeef; /* r4 */
*(--stk) = 0; /* r1 */ *(--stk) = 0xdeadbeef; /* r3 */
*(--stk) = (rt_uint32_t)parameter; /* r0 : argument */ *(--stk) = 0xdeadbeef; /* r2 */
*(--stk) = 0xdeadbeef; /* r1 */
*(--stk) = (rt_uint32_t)parameter; /* r0 : argument */
/* cpsr */ /* cpsr */
if ((rt_uint32_t)tentry & 0x01) if ((rt_uint32_t)tentry & 0x01)
*(--stk) = SVCMODE | 0x20; /* thumb mode */ *(--stk) = SVCMODE | 0x20; /* thumb mode */
else else
*(--stk) = SVCMODE; /* arm mode */ *(--stk) = SVCMODE; /* arm mode */
/* return task's current stack address */ /* return task's current stack address */
return (rt_uint8_t *)stk; return (rt_uint8_t *)stk;
} }
/*@}*/ /*@}*/

View File

@ -23,38 +23,41 @@
* This function will initialize thread stack * This function will initialize thread stack
* *
* @param tentry the entry of thread * @param tentry the entry of thread
* @param parameter the parameter of entry * @param parameter the parameter of entry
* @param stack_addr the beginning stack address * @param stack_addr the beginning stack address
* @param texit the function will be called when thread exit * @param texit the function will be called when thread exit
* *
* @return stack address * @return stack address
*/ */
rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter, rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter,
rt_uint8_t *stack_addr, void *texit) rt_uint8_t *stack_addr, void *texit)
{ {
rt_uint32_t *stk; rt_uint32_t *stk;
stk = (rt_uint32_t*)stack_addr; stack_addr += sizeof(rt_uint32_t);
*(stk) = (rt_uint32_t)tentry; /* entry point */ stack_addr = (rt_uint8_t *)RT_ALIGN_DOWN((rt_uint32_t)stack_addr, 8);
*(--stk) = (rt_uint32_t)texit; /* lr */ stk = (rt_uint32_t *)stack_addr;
*(--stk) = 0; /* r12 */
*(--stk) = 0; /* r11 */
*(--stk) = 0; /* r10 */
*(--stk) = 0; /* r9 */
*(--stk) = 0; /* r8 */
*(--stk) = 0; /* r7 */
*(--stk) = 0; /* r6 */
*(--stk) = 0; /* r5 */
*(--stk) = 0; /* r4 */
*(--stk) = 0; /* r3 */
*(--stk) = 0; /* r2 */
*(--stk) = 0; /* r1 */
*(--stk) = (rt_uint32_t)parameter; /* r0 : argument */
*(--stk) = SVCMODE; /* cpsr */
*(--stk) = SVCMODE; /* spsr */
/* return task's current stack address */ *(--stk) = (rt_uint32_t)tentry; /* entry point */
return (rt_uint8_t *)stk; *(--stk) = (rt_uint32_t)texit; /* lr */
*(--stk) = 0xdeadbeef; /* r12 */
*(--stk) = 0xdeadbeef; /* r11 */
*(--stk) = 0xdeadbeef; /* r10 */
*(--stk) = 0xdeadbeef; /* r9 */
*(--stk) = 0xdeadbeef; /* r8 */
*(--stk) = 0xdeadbeef; /* r7 */
*(--stk) = 0xdeadbeef; /* r6 */
*(--stk) = 0xdeadbeef; /* r5 */
*(--stk) = 0xdeadbeef; /* r4 */
*(--stk) = 0xdeadbeef; /* r3 */
*(--stk) = 0xdeadbeef; /* r2 */
*(--stk) = 0xdeadbeef; /* r1 */
*(--stk) = (rt_uint32_t)parameter; /* r0 : argument */
*(--stk) = SVCMODE; /* cpsr */
*(--stk) = SVCMODE; /* spsr */
/* return task's current stack address */
return (rt_uint8_t *)stk;
} }
/*@}*/ /*@}*/

View File

@ -30,31 +30,33 @@
* @return stack address * @return stack address
*/ */
rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter, rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter,
rt_uint8_t *stack_addr, void *texit) rt_uint8_t *stack_addr, void *texit)
{ {
unsigned long *stk; rt_uint32_t *stk;
stk = (unsigned long *)stack_addr; stack_addr += sizeof(rt_uint32_t);
*(stk) = (unsigned long)tentry; /* entry point */ stack_addr = (rt_uint8_t *)RT_ALIGN_DOWN((rt_uint32_t)stack_addr, 8);
*(--stk) = (unsigned long)texit; /* lr */ stk = (rt_uint32_t *)stack_addr;
*(--stk) = 0; /* r12 */ *(--stk) = (rt_uint32_t)tentry; /* entry point */
*(--stk) = 0; /* r11 */ *(--stk) = (rt_uint32_t)texit; /* lr */
*(--stk) = 0; /* r10 */ *(--stk) = 0xdeadbeef; /* r12 */
*(--stk) = 0; /* r9 */ *(--stk) = 0xdeadbeef; /* r11 */
*(--stk) = 0; /* r8 */ *(--stk) = 0xdeadbeef; /* r10 */
*(--stk) = 0; /* r7 */ *(--stk) = 0xdeadbeef; /* r9 */
*(--stk) = 0; /* r6 */ *(--stk) = 0xdeadbeef; /* r8 */
*(--stk) = 0; /* r5 */ *(--stk) = 0xdeadbeef; /* r7 */
*(--stk) = 0; /* r4 */ *(--stk) = 0xdeadbeef; /* r6 */
*(--stk) = 0; /* r3 */ *(--stk) = 0xdeadbeef; /* r5 */
*(--stk) = 0; /* r2 */ *(--stk) = 0xdeadbeef; /* r4 */
*(--stk) = 0; /* r1 */ *(--stk) = 0xdeadbeef; /* r3 */
*(--stk) = (unsigned long)parameter; /* r0 : argument */ *(--stk) = 0xdeadbeef; /* r2 */
*(--stk) = SVCMODE; /* cpsr */ *(--stk) = 0xdeadbeef; /* r1 */
*(--stk) = SVCMODE; /* spsr */ *(--stk) = (rt_uint32_t)parameter; /* r0 : argument */
*(--stk) = SVCMODE; /* cpsr */
*(--stk) = SVCMODE; /* spsr */
/* return task's current stack address */ /* return task's current stack address */
return (rt_uint8_t *)stk; return (rt_uint8_t *)stk;
} }
/*@}*/ /*@}*/

View File

@ -22,38 +22,40 @@
* This function will initialize thread stack * This function will initialize thread stack
* *
* @param tentry the entry of thread * @param tentry the entry of thread
* @param parameter the parameter of entry * @param parameter the parameter of entry
* @param stack_addr the beginning stack address * @param stack_addr the beginning stack address
* @param texit the function will be called when thread exit * @param texit the function will be called when thread exit
* *
* @return stack address * @return stack address
*/ */
rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter, rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter,
rt_uint8_t *stack_addr, void *texit) rt_uint8_t *stack_addr, void *texit)
{ {
rt_uint32_t *stk; rt_uint32_t *stk;
stk = (rt_uint32_t*)stack_addr; stack_addr += sizeof(rt_uint32_t);
*(stk) = (rt_uint32_t)tentry; /* entry point */ stack_addr = (rt_uint8_t *)RT_ALIGN_DOWN((rt_uint32_t)stack_addr, 8);
*(--stk) = (rt_uint32_t)texit; /* lr */ stk = (rt_uint32_t *)stack_addr;
*(--stk) = 0; /* r12 */ *(--stk) = (rt_uint32_t)tentry; /* entry point */
*(--stk) = 0; /* r11 */ *(--stk) = (rt_uint32_t)texit; /* lr */
*(--stk) = 0; /* r10 */ *(--stk) = 0xdeadbeef; /* r12 */
*(--stk) = 0; /* r9 */ *(--stk) = 0xdeadbeef; /* r11 */
*(--stk) = 0; /* r8 */ *(--stk) = 0xdeadbeef; /* r10 */
*(--stk) = 0; /* r7 */ *(--stk) = 0xdeadbeef; /* r9 */
*(--stk) = 0; /* r6 */ *(--stk) = 0xdeadbeef; /* r8 */
*(--stk) = 0; /* r5 */ *(--stk) = 0xdeadbeef; /* r7 */
*(--stk) = 0; /* r4 */ *(--stk) = 0xdeadbeef; /* r6 */
*(--stk) = 0; /* r3 */ *(--stk) = 0xdeadbeef; /* r5 */
*(--stk) = 0; /* r2 */ *(--stk) = 0xdeadbeef; /* r4 */
*(--stk) = 0; /* r1 */ *(--stk) = 0xdeadbeef; /* r3 */
*(--stk) = (rt_uint32_t)parameter; /* r0 : argument */ *(--stk) = 0xdeadbeef; /* r2 */
*(--stk) = Mode_SVC; /* cpsr */ *(--stk) = 0xdeadbeef; /* r1 */
*(--stk) = Mode_SVC; /* spsr */ *(--stk) = (rt_uint32_t)parameter; /* r0 : argument */
*(--stk) = Mode_SVC; /* cpsr */
*(--stk) = Mode_SVC; /* spsr */
/* return task's current stack address */ /* return task's current stack address */
return (rt_uint8_t *)stk; return (rt_uint8_t *)stk;
} }
/*@}*/ /*@}*/

View File

@ -31,21 +31,23 @@ rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter,
{ {
rt_uint32_t *stk; rt_uint32_t *stk;
stack_addr += sizeof(rt_uint32_t);
stack_addr = (rt_uint8_t *)RT_ALIGN_DOWN((rt_uint32_t)stack_addr, 8);
stk = (rt_uint32_t *)stack_addr; stk = (rt_uint32_t *)stack_addr;
*(stk) = (rt_uint32_t)tentry; /* entry point */ *(--stk) = (rt_uint32_t)tentry; /* entry point */
*(--stk) = (rt_uint32_t)texit; /* lr */ *(--stk) = (rt_uint32_t)texit; /* lr */
*(--stk) = 0; /* r12 */ *(--stk) = 0xdeadbeef; /* r12 */
*(--stk) = 0; /* r11 */ *(--stk) = 0xdeadbeef; /* r11 */
*(--stk) = 0; /* r10 */ *(--stk) = 0xdeadbeef; /* r10 */
*(--stk) = 0; /* r9 */ *(--stk) = 0xdeadbeef; /* r9 */
*(--stk) = 0; /* r8 */ *(--stk) = 0xdeadbeef; /* r8 */
*(--stk) = 0; /* r7 */ *(--stk) = 0xdeadbeef; /* r7 */
*(--stk) = 0; /* r6 */ *(--stk) = 0xdeadbeef; /* r6 */
*(--stk) = 0; /* r5 */ *(--stk) = 0xdeadbeef; /* r5 */
*(--stk) = 0; /* r4 */ *(--stk) = 0xdeadbeef; /* r4 */
*(--stk) = 0; /* r3 */ *(--stk) = 0xdeadbeef; /* r3 */
*(--stk) = 0; /* r2 */ *(--stk) = 0xdeadbeef; /* r2 */
*(--stk) = 0; /* r1 */ *(--stk) = 0xdeadbeef; /* r1 */
*(--stk) = (rt_uint32_t)parameter; /* r0 : argument */ *(--stk) = (rt_uint32_t)parameter; /* r0 : argument */
/* cpsr */ /* cpsr */