stack addr align to 8byte.

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2509 bbd45198-f89e-11dd-88c7-29a3b14d5316

3 files changed, 196 insertions, 159 deletions

diff --git a/libcpu/arm/cortex-m0/cpuport.c b/libcpu/arm/cortex-m0/cpuport.c
index 2000b1175d..fcd7d8635f 100644
--- a/libcpu/arm/cortex-m0/cpuport.c
+++ b/libcpu/arm/cortex-m0/cpuport.c
@@ -1,111 +1,118 @@
-/*

- * File      : cpu.c

- * This file is part of RT-Thread RTOS

- * COPYRIGHT (C) 2009, RT-Thread Development Team

- *

- * The license and distribution terms for this file may be

- * found in the file LICENSE in this distribution or at

- * http://www.rt-thread.org/license/LICENSE

- *

- * Change Logs:

- * Date           Author       Notes

- * 2010-01-25     Bernard      first version

- * 2012-05-31     aozima       Merge all of the C source code into cpuport.c

- * 2012-08-17     aozima       fixed bug: store r8 - r11.

- */

-

-#include <rtthread.h>

-

-struct exception_stack_frame

-{

-    rt_uint32_t r0;

-    rt_uint32_t r1;

-    rt_uint32_t r2;

-    rt_uint32_t r3;

-    rt_uint32_t r12;

-    rt_uint32_t lr;

-    rt_uint32_t pc;

-    rt_uint32_t psr;

-};

-

-struct stack_frame

-{

-    /* r4 ~ r7 low register */

-    rt_uint32_t r4;

-    rt_uint32_t r5;

-    rt_uint32_t r6;

-    rt_uint32_t r7;

-

-    /* r8 ~ r11 high register */

-    rt_uint32_t r8;

-    rt_uint32_t r9;

-    rt_uint32_t r10;

-    rt_uint32_t r11;

-	

-    struct exception_stack_frame exception_stack_frame;

-};

-

-/* flag in interrupt handling */

-rt_uint32_t rt_interrupt_from_thread, rt_interrupt_to_thread;

-rt_uint32_t rt_thread_switch_interrupt_flag;

-

-/**

- * This function will initialize thread stack

- *

- * @param tentry the entry of thread

- * @param parameter the parameter of entry

- * @param stack_addr the beginning stack address

- * @param texit the function will be called when thread exit

- *

- * @return stack address

- */

-rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter,

-                             rt_uint8_t *stack_addr, void *texit)

-{

-    struct stack_frame * stack_frame;

-    rt_uint8_t * stk;

-    unsigned long i;

-

-    stk = stack_addr + sizeof(rt_uint32_t);

-

-    stk -= sizeof(struct stack_frame);

-    stack_frame = (struct stack_frame *)stk;

-	

-    /* init all register */

-    for(i=0; i<sizeof(struct stack_frame)/sizeof(rt_uint32_t); i++)

-    {

-        ((rt_uint32_t*)stack_frame)[i] = 0xdeadbeef;

-    }

-

-    stack_frame->exception_stack_frame.r0  = (unsigned long)parameter; /* r0 : argument */

-    stack_frame->exception_stack_frame.r1  = 0;                        /* r1 */

-    stack_frame->exception_stack_frame.r2  = 0;                        /* r2 */

-    stack_frame->exception_stack_frame.r3  = 0;                        /* r3 */

-    stack_frame->exception_stack_frame.r12 = 0;                        /* r12 */

-    stack_frame->exception_stack_frame.lr  = (unsigned long)texit;     /* lr */

-    stack_frame->exception_stack_frame.pc  = (unsigned long)tentry;    /* entry point, pc */

-    stack_frame->exception_stack_frame.psr = 0x01000000L;              /* PSR */

-

-    /* return task's current stack address */

-    return stk;

-}

-

-extern long list_thread(void);

-extern rt_thread_t rt_current_thread;

-void rt_hw_hard_fault_exception(struct exception_stack_frame* contex)

-{

-    rt_kprintf("psr: 0x%08x\n", contex->psr);

-    rt_kprintf(" pc: 0x%08x\n", contex->pc);

-    rt_kprintf(" lr: 0x%08x\n", contex->lr);

-    rt_kprintf("r12: 0x%08x\n", contex->r12);

-    rt_kprintf("r03: 0x%08x\n", contex->r3);

-    rt_kprintf("r02: 0x%08x\n", contex->r2);

-    rt_kprintf("r01: 0x%08x\n", contex->r1);

-    rt_kprintf("r00: 0x%08x\n", contex->r0);

-

-    rt_kprintf("hard fault on thread: %s\n", rt_current_thread->name);

-#ifdef RT_USING_FINSH

-    list_thread();

-#endif

-    while (1);

-}

+/*
+ * File      : cpuport.c
+ * This file is part of RT-Thread RTOS
+ * COPYRIGHT (C) 2006 - 2012, RT-Thread Development Team
+ *
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.rt-thread.org/license/LICENSE
+ *
+ * Change Logs:
+ * Date           Author       Notes
+ * 2010-01-25     Bernard      first version
+ * 2012-05-31     aozima       Merge all of the C source code into cpuport.c
+ * 2012-08-17     aozima       fixed bug: store r8 - r11.
+ * 2012-12-23     aozima       stack addr align to 8byte.
+ */
+
+#include <rtthread.h>
+
+struct exception_stack_frame
+{
+    rt_uint32_t r0;
+    rt_uint32_t r1;
+    rt_uint32_t r2;
+    rt_uint32_t r3;
+    rt_uint32_t r12;
+    rt_uint32_t lr;
+    rt_uint32_t pc;
+    rt_uint32_t psr;
+};
+
+struct stack_frame
+{
+    /* r4 ~ r7 low register */
+    rt_uint32_t r4;
+    rt_uint32_t r5;
+    rt_uint32_t r6;
+    rt_uint32_t r7;
+
+    /* r8 ~ r11 high register */
+    rt_uint32_t r8;
+    rt_uint32_t r9;
+    rt_uint32_t r10;
+    rt_uint32_t r11;
+
+    struct exception_stack_frame exception_stack_frame;
+};
+
+/* flag in interrupt handling */
+rt_uint32_t rt_interrupt_from_thread, rt_interrupt_to_thread;
+rt_uint32_t rt_thread_switch_interrupt_flag;
+
+/**
+ * This function will initialize thread stack
+ *
+ * @param tentry the entry of thread
+ * @param parameter the parameter of entry
+ * @param stack_addr the beginning stack address
+ * @param texit the function will be called when thread exit
+ *
+ * @return stack address
+ */
+rt_uint8_t *rt_hw_stack_init(void *tentry,
+                             void *parameter,
+                             rt_uint8_t *stack_addr,
+                             void *texit)
+{
+    struct stack_frame * stack_frame;
+    rt_uint8_t * stk;
+    unsigned long i;
+
+    stk = stack_addr + sizeof(rt_uint32_t);
+    stk = (rt_uint8_t*)RT_ALIGN_DOWN((rt_uint32_t)stk, 8);
+    stk -= sizeof(struct stack_frame);
+
+    stack_frame = (struct stack_frame *)stk;
+
+    /* init all register */
+    for(i=0; i<sizeof(struct stack_frame)/sizeof(rt_uint32_t); i++)
+    {
+        ((rt_uint32_t*)stack_frame)[i] = 0xdeadbeef;
+    }
+
+    stack_frame->exception_stack_frame.r0  = (unsigned long)parameter; /* r0 : argument */
+    stack_frame->exception_stack_frame.r1  = 0;                        /* r1 */
+    stack_frame->exception_stack_frame.r2  = 0;                        /* r2 */
+    stack_frame->exception_stack_frame.r3  = 0;                        /* r3 */
+    stack_frame->exception_stack_frame.r12 = 0;                        /* r12 */
+    stack_frame->exception_stack_frame.lr  = (unsigned long)texit;     /* lr */
+    stack_frame->exception_stack_frame.pc  = (unsigned long)tentry;    /* entry point, pc */
+    stack_frame->exception_stack_frame.psr = 0x01000000L;              /* PSR */
+
+    /* return task's current stack address */
+    return stk;
+}
+
+extern long list_thread(void);
+extern rt_thread_t rt_current_thread;
+/**
+ * fault exception handling
+ */
+void rt_hw_hard_fault_exception(struct exception_stack_frame* contex)
+{
+    rt_kprintf("psr: 0x%08x\n", contex->psr);
+    rt_kprintf(" pc: 0x%08x\n", contex->pc);
+    rt_kprintf(" lr: 0x%08x\n", contex->lr);
+    rt_kprintf("r12: 0x%08x\n", contex->r12);
+    rt_kprintf("r03: 0x%08x\n", contex->r3);
+    rt_kprintf("r02: 0x%08x\n", contex->r2);
+    rt_kprintf("r01: 0x%08x\n", contex->r1);
+    rt_kprintf("r00: 0x%08x\n", contex->r0);
+
+    rt_kprintf("hard fault on thread: %s\n", rt_current_thread->name);
+#ifdef RT_USING_FINSH
+    list_thread();
+#endif
+    while (1);
+}
diff --git a/libcpu/arm/cortex-m3/cpuport.c b/libcpu/arm/cortex-m3/cpuport.c
index af41a79f6a..967a6610c5 100644
--- a/libcpu/arm/cortex-m3/cpuport.c
+++ b/libcpu/arm/cortex-m3/cpuport.c
@@ -1,7 +1,7 @@
 /*
  * File      : cpuport.c
  * This file is part of RT-Thread RTOS
- * COPYRIGHT (C) 2011, RT-Thread Development Team
+ * COPYRIGHT (C) 2006 - 2012, RT-Thread Development Team
  *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
@@ -12,21 +12,36 @@
  * 2009-01-05 	Bernard 	first version
  * 2011-02-14	onelife		Modify for EFM32
  * 2011-06-17	onelife		Merge all of the C source code into cpuport.c
+ * 2012-12-23   aozima      stack addr align to 8byte.
  */
 
 #include <rtthread.h>
 
-/* stack context */
-struct stack_context
+struct exception_stack_frame
 {
-	rt_uint32_t r0;
-	rt_uint32_t r1;
-	rt_uint32_t r2;
-	rt_uint32_t r3;
-	rt_uint32_t r12;
-	rt_uint32_t lr;
-	rt_uint32_t pc;
-	rt_uint32_t psr;
+    rt_uint32_t r0;
+    rt_uint32_t r1;
+    rt_uint32_t r2;
+    rt_uint32_t r3;
+    rt_uint32_t r12;
+    rt_uint32_t lr;
+    rt_uint32_t pc;
+    rt_uint32_t psr;
+};
+
+struct stack_frame
+{
+    /* r4 ~ r11 register */
+    rt_uint32_t r4;
+    rt_uint32_t r5;
+    rt_uint32_t r6;
+    rt_uint32_t r7;
+    rt_uint32_t r8;
+    rt_uint32_t r9;
+    rt_uint32_t r10;
+    rt_uint32_t r11;
+
+    struct exception_stack_frame exception_stack_frame;
 };
 
 /* flag in interrupt handling */
@@ -34,34 +49,47 @@ rt_uint32_t rt_interrupt_from_thread, rt_interrupt_to_thread;
 rt_uint32_t rt_thread_switch_interrupt_flag;
 
 /**
- * initializes stack of thread
+ * This function will initialize thread stack
+ *
+ * @param tentry the entry of thread
+ * @param parameter the parameter of entry
+ * @param stack_addr the beginning stack address
+ * @param texit the function will be called when thread exit
+ *
+ * @return stack address
  */
-rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter,
-	rt_uint8_t *stack_addr, void *texit)
+rt_uint8_t *rt_hw_stack_init(void *tentry,
+                             void *parameter,
+                             rt_uint8_t *stack_addr,
+                             void *texit)
 {
-	unsigned long *stk;
+    struct stack_frame *stack_frame;
+    rt_uint8_t         *stk;
+    unsigned long       i;
+
+    stk         = stack_addr + sizeof(rt_uint32_t);
+    stk = (rt_uint8_t*)RT_ALIGN_DOWN((rt_uint32_t)stk, 8);
+    stk        -= sizeof(struct stack_frame);
+
+    stack_frame = (struct stack_frame *)stk;
 
-	stk 	 = (unsigned long *)stack_addr;
-	*(stk)   = 0x01000000L;					/* PSR */
-	*(--stk) = (unsigned long)tentry;		/* entry point, pc */
-	*(--stk) = (unsigned long)texit;		/* lr */
-	*(--stk) = 0;							/* r12 */
-	*(--stk) = 0;							/* r3 */
-	*(--stk) = 0;							/* r2 */
-	*(--stk) = 0;							/* r1 */
-	*(--stk) = (unsigned long)parameter;	/* r0 : argument */
+    /* init all register */
+    for (i = 0; i < sizeof(struct stack_frame) / sizeof(rt_uint32_t); i ++)
+    {
+        ((rt_uint32_t *)stack_frame)[i] = 0xdeadbeef;
+    }
 
-	*(--stk) = 0;							/* r11 */
-	*(--stk) = 0;							/* r10 */
-	*(--stk) = 0;							/* r9 */
-	*(--stk) = 0;							/* r8 */
-	*(--stk) = 0;							/* r7 */
-	*(--stk) = 0;							/* r6 */
-	*(--stk) = 0;							/* r5 */
-	*(--stk) = 0;							/* r4 */
+    stack_frame->exception_stack_frame.r0  = (unsigned long)parameter; /* r0 : argument */
+    stack_frame->exception_stack_frame.r1  = 0;                        /* r1 */
+    stack_frame->exception_stack_frame.r2  = 0;                        /* r2 */
+    stack_frame->exception_stack_frame.r3  = 0;                        /* r3 */
+    stack_frame->exception_stack_frame.r12 = 0;                        /* r12 */
+    stack_frame->exception_stack_frame.lr  = (unsigned long)texit;     /* lr */
+    stack_frame->exception_stack_frame.pc  = (unsigned long)tentry;    /* entry point, pc */
+    stack_frame->exception_stack_frame.psr = 0x01000000L;              /* PSR */
 
-	/* return task's current stack address */
-	return (rt_uint8_t *)stk;
+    /* return task's current stack address */
+    return stk;
 }
 
 extern long list_thread(void);
@@ -69,22 +97,22 @@ extern rt_thread_t rt_current_thread;
 /**
  * fault exception handling
  */
-void rt_hw_hard_fault_exception(struct stack_context* contex)
+void rt_hw_hard_fault_exception(struct exception_stack_frame* contex)
 {
-	rt_kprintf("psr: 0x%08x\n", contex->psr);
-	rt_kprintf(" pc: 0x%08x\n", contex->pc);
-	rt_kprintf(" lr: 0x%08x\n", contex->lr);
-	rt_kprintf("r12: 0x%08x\n", contex->r12);
-	rt_kprintf("r03: 0x%08x\n", contex->r3);
-	rt_kprintf("r02: 0x%08x\n", contex->r2);
-	rt_kprintf("r01: 0x%08x\n", contex->r1);
-	rt_kprintf("r00: 0x%08x\n", contex->r0);
+    rt_kprintf("psr: 0x%08x\n", contex->psr);
+    rt_kprintf(" pc: 0x%08x\n", contex->pc);
+    rt_kprintf(" lr: 0x%08x\n", contex->lr);
+    rt_kprintf("r12: 0x%08x\n", contex->r12);
+    rt_kprintf("r03: 0x%08x\n", contex->r3);
+    rt_kprintf("r02: 0x%08x\n", contex->r2);
+    rt_kprintf("r01: 0x%08x\n", contex->r1);
+    rt_kprintf("r00: 0x%08x\n", contex->r0);
 
-	rt_kprintf("hard fault on thread: %s\n", rt_current_thread->name);
+    rt_kprintf("hard fault on thread: %s\n", rt_current_thread->name);
 #ifdef RT_USING_FINSH
-	list_thread();
+    list_thread();
 #endif
-	while (1);
+    while (1);
 }
 
 /**
@@ -92,7 +120,7 @@ void rt_hw_hard_fault_exception(struct stack_context* contex)
  */
 void rt_hw_cpu_shutdown()
 {
-	rt_kprintf("shutdown...\n");
+    rt_kprintf("shutdown...\n");
 
-	RT_ASSERT(0);
+    RT_ASSERT(0);
 }
diff --git a/libcpu/arm/cortex-m4/cpuport.c b/libcpu/arm/cortex-m4/cpuport.c
index d320dccbb0..c2921b3af9 100644
--- a/libcpu/arm/cortex-m4/cpuport.c
+++ b/libcpu/arm/cortex-m4/cpuport.c
@@ -14,6 +14,7 @@
  * 2011-12-31     aozima       fixed stack align issues.
  * 2012-01-01     aozima       support context switch load/store FPU register.
  * 2012-12-11     lgnq         fixed the coding style.
+ * 2012-12-23     aozima       stack addr align to 8byte.
  */
 
 #include <rtthread.h>
@@ -106,6 +107,7 @@ rt_uint8_t *rt_hw_stack_init(void       *tentry,
     unsigned long       i;
 
     stk         = stack_addr + sizeof(rt_uint32_t);
+    stk = (rt_uint8_t*)RT_ALIGN_DOWN((rt_uint32_t)stk, 8);
     stk        -= sizeof(struct stack_frame);
 
     stack_frame = (struct stack_frame *)stk;