Changeset 306 for asp3_wo_tecs/trunk/arch/arm_gcc/common/gic_support.S

Timestamp:

Jun 27, 2017, 10:53:32 AM (7 years ago)

Author:

ertl-honda

Message:

3.1.0を反映

File:

• asp3_wo_tecs/trunk/arch/arm_gcc/common/gic_support.S (modified) (8 diffs)

asp3_wo_tecs/trunk/arch/arm_gcc/common/gic_support.S

@@ -1 +1 @@
 /*
- *  TOPPERS/ASP Kernel
- *      Toyohashi Open Platform for Embedded Real-Time Systems/
- *      Advanced Standard Profile Kernel
+ *  TOPPERS Software
+ *      Toyohashi Open Platform for Embedded Real-Time Systems
  * 
  *  Copyright (C) 2000-2003 by Embedded and Real-Time Systems Laboratory
@@ -53 +52 @@
  *  ã®è²¬ä»»ã‚’è² ã‚ãªã„ï¼Ž
  * 
- *  $Id: gic_support.S 522 2016-01-14 06:56:53Z ertl-hiro $
+ *  $Id: gic_support.S 718 2016-04-01 15:05:01Z ertl-hiro $
  */
 
@@ -79 +78 @@
 å ±ï¼ˆå‰²è¾¼ã¿ç™ºç”Ÿå‰ã®å‰²è¾¼ã¿
  *  優å
-ˆåº¦ãƒžã‚¹ã‚¯ï¼‰ã‚’，スタックに保存する．
+ˆåº¦ãƒžã‚¹ã‚¯ï¼‰ã‚’，スタックのå
+ˆé ­ã«ä¿å­˜ã™ã‚‹ï¼Ž
  */
         ATEXT
@@ -104 +104 @@
         str             r0, [r1]                        /* 新しい割込み優å
 ˆåº¦ãƒžã‚¹ã‚¯ã‚’セットする */
-//      DATA_SYNC_BARRIER                       /* 割込み優å
+        asm_data_sync_barrier r0        /* 割込み優å
 ˆåº¦ãƒžã‚¹ã‚¯ãŒã‚»ãƒƒãƒˆã•ã‚Œã‚‹ã®ã‚’å¾
 つ */
-#if __TARGET_ARCH_ARM == 6
-        mov             r0, #0
-        mcr             p15, 0, r0, c7, c10, 4
-#elif __TARGET_ARCH_ARM == 7
-        dsb
-#endif /* __TARGET_ARCH_ARM == 7 */
-        push    {r2}                            /* irc_end_intで用いるæƒ
+        str             r2, [sp]                        /* irc_end_intで用いるæƒ
 å ±ã‚’ä¿å­˜ */
 
@@ -141 +135 @@
 ƒã«æˆ»ã™ï¼Ž
          */
-        pop             {r2}                            /* irc_begin_intで保存したæƒ
+        ldr             r2, [sp]                        /* irc_begin_intで保存したæƒ
 å ±ã‚’å¾©å¸° */
         ldr             r1, =GICC_PMR           /* 割込み優å
@@ -178 +172 @@
 å ±ï¼ˆCPU例外発生前の割込み優å
 ˆåº¦ãƒžã‚¹ã‚¯ï¼‰ã‚’，スタッ
- *      クに保存する．
+ *      クのå
+ˆé ­ã«ä¿å­˜ã™ã‚‹ï¼Ž
  */
         ATEXT
@@ -191 +186 @@
 ˆåº¦ã‚’取得 */
         ldr             r2, [r1]
-        push    {r2}                            /* irc_end_excで用いるæƒ
+        str             r2, [sp]                        /* irc_end_excで用いるæƒ
 å ±ã‚’ä¿å­˜ */
         bx              lr
@@ -207 +202 @@
 ƒã«æˆ»ã™ï¼Ž
          */
-        pop             {r2}                            /* irc_begin_excで保存したæƒ
+        ldr             r2, [sp]                        /* irc_begin_excで保存したæƒ
 å ±ã‚’å¾©å¸° */
         ldr             r1, =GICC_PMR           /* 割込み優å