initialize register r31(LP) with texit in V850/cpuport.c

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

1 files changed, 44 insertions, 38 deletions

diff --git a/libcpu/v850/cpuport.c b/libcpu/v850/cpuport.c
index d5fee8ffa9..a1a165a1ad 100644
--- a/libcpu/v850/cpuport.c
+++ b/libcpu/v850/cpuport.c
@@ -1,7 +1,7 @@
 /*

  * File      : cpuport.c

  * This file is part of RT-Thread RTOS

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

+ * COPYRIGHT (C) 2009 - 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

@@ -10,6 +10,7 @@
  * Change Logs:

  * Date           Author       Notes

  * 2011-02-23     Bernard      the first version

+ * 2012-09-23     lgnq         initialize register r31(LP) with texit

  */

 

 #include <rtthread.h>

@@ -27,9 +28,9 @@ rt_uint32_t rt_thread_switch_interrupt_flag;
 void rt_hw_interrupt_init(void)

 {

     /* init interrupt nest, and context in thread sp */

-    rt_interrupt_nest = 0;

-    rt_interrupt_from_thread = 0;

-    rt_interrupt_to_thread = 0;

+    rt_interrupt_nest               = 0;

+    rt_interrupt_from_thread        = 0;

+    rt_interrupt_to_thread          = 0;

     rt_thread_switch_interrupt_flag = 0;

 }

 

@@ -43,44 +44,49 @@ void rt_hw_interrupt_init(void)
  *

  * @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)

 {

-    rt_uint32_t *stk;     

-   

-    stk    = (rt_uint32_t *)stack_addr;          /* Load stack pointer                                      */   

-    *(--stk) = (rt_uint32_t) 0x23232323;         /* r23 */   

-    *(--stk) = (rt_uint32_t) 0x24242424;         /* r24 */   

-    *(--stk) = (rt_uint32_t) 0x25252525;         /* r25 */   

-    *(--stk) = (rt_uint32_t) 0x26262626;         /* r26 */   

-    *(--stk) = (rt_uint32_t) 0x27272727;         /* r27 */   

-    *(--stk) = (rt_uint32_t) 0x28282828;         /* r28 */   

-    *(--stk) = (rt_uint32_t) 0x29292929;         /* r29 */   

-    *(--stk) = (rt_uint32_t) 0x30303030;         /* r30 */   

-    *(--stk) = (rt_uint32_t) 0x31313131;         /* r31 */   

-    *(--stk) = (rt_uint32_t) 0x00000000;         /* Task PSW = Interrupts enabled                                 */   

-    *(--stk) = (rt_uint32_t) tentry;             /* Task's PC */   

-    *(--stk) = (rt_uint32_t) 0x16161616;         /* r16 */   

-    *(--stk) = (rt_uint32_t) 0x15151515;         /* r15 */   

-    *(--stk) = (rt_uint32_t) 0x14141414;         /* r14 */   

-    *(--stk) = (rt_uint32_t) 0x13131313;         /* r13 */   

-    *(--stk) = (rt_uint32_t) 0x12121212;         /* r12 */   

-    *(--stk) = (rt_uint32_t) 0x11111111;         /* r11 */   

-    *(--stk) = (rt_uint32_t) 0x10101010;         /* r10 */   

-    *(--stk) = (rt_uint32_t) 0x09090909;         /* r9 */   

-    *(--stk) = (rt_uint32_t) 0x08080808;         /* r8 */   

-    *(--stk) = (rt_uint32_t) 0x07070707;         /* r7 */   

-    *(--stk) = (rt_uint32_t) 0x06060606;         /* r6 */   

-    *(--stk) = (rt_uint32_t) 0x05050505;         /* r5 */   

-    *(--stk) = (rt_uint32_t) 0x02020202;         /* r2 */   

-    *(--stk) = (rt_uint32_t) parameter;          /* r1 */   

-    return ((rt_uint8_t *)stk); 

+    rt_uint32_t *stk;

+

+    stk      = (rt_uint32_t *)stack_addr;    /* Load stack pointer */

+

+    *(--stk) = (rt_uint32_t)0x23232323;      /* r23 */

+    *(--stk) = (rt_uint32_t)0x24242424;      /* r24 */

+    *(--stk) = (rt_uint32_t)0x25252525;      /* r25 */

+    *(--stk) = (rt_uint32_t)0x26262626;      /* r26 */

+    *(--stk) = (rt_uint32_t)0x27272727;      /* r27 */

+    *(--stk) = (rt_uint32_t)0x28282828;      /* r28 */

+    *(--stk) = (rt_uint32_t)0x29292929;      /* r29 */

+    *(--stk) = (rt_uint32_t)0x30303030;      /* r30 */

+    *(--stk) = (rt_uint32_t)texit;           /* r31 */

+    *(--stk) = (rt_uint32_t)0x00000000;      /* Task PSW = Interrupts enabled */

+    *(--stk) = (rt_uint32_t)tentry;          /* Task's PC */

+    *(--stk) = (rt_uint32_t)0x16161616;      /* r16 */

+    *(--stk) = (rt_uint32_t)0x15151515;      /* r15 */

+    *(--stk) = (rt_uint32_t)0x14141414;      /* r14 */

+    *(--stk) = (rt_uint32_t)0x13131313;      /* r13 */

+    *(--stk) = (rt_uint32_t)0x12121212;      /* r12 */

+    *(--stk) = (rt_uint32_t)0x11111111;      /* r11 */

+    *(--stk) = (rt_uint32_t)0x10101010;      /* r10 */

+    *(--stk) = (rt_uint32_t)0x09090909;      /* r9 */

+    *(--stk) = (rt_uint32_t)0x08080808;      /* r8 */

+    *(--stk) = (rt_uint32_t)0x07070707;      /* r7 */

+    *(--stk) = (rt_uint32_t)0x06060606;      /* r6 */

+    *(--stk) = (rt_uint32_t)0x05050505;      /* r5 */

+    *(--stk) = (rt_uint32_t)0x02020202;      /* r2 */

+    *(--stk) = (rt_uint32_t)parameter;       /* r1 */

+

+    return ((rt_uint8_t *)stk);

 }

 

 void rt_hw_context_switch(rt_uint32_t from, rt_uint32_t to)

 {

     rt_interrupt_from_thread = from;

     rt_interrupt_to_thread = to;

-    asm("trap 0x10");    

+    asm("trap 0x10");

 }

 

 void rt_hw_context_switch_interrupt(rt_uint32_t from, rt_uint32_t to)

@@ -88,7 +94,7 @@ void rt_hw_context_switch_interrupt(rt_uint32_t from, rt_uint32_t to)
     if (rt_thread_switch_interrupt_flag != 1)

     {

         rt_thread_switch_interrupt_flag = 1;

-        rt_interrupt_from_thread = from;        

+        rt_interrupt_from_thread = from;

     }

-    rt_interrupt_to_thread = to;  

-}
\ No newline at end of file
+    rt_interrupt_to_thread = to;

+}