From c51df7a94c1f21803db25f46a73a7fb291588eda Mon Sep 17 00:00:00 2001
From: kenneth <zhushangyuan@huawei.com>
Date: Tue, 19 Oct 2021 20:01:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20los=5Fexc.S=E4=B8=AD=5FExcInMsp=E4=B8=BB?=
 =?UTF-8?q?=E6=A0=88=E4=B8=AD=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86=E5=87=BD?=
 =?UTF-8?q?=E6=95=B0=E4=B8=AD=E5=BC=82=E5=B8=B8=E8=BF=94=E5=9B=9E=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复los_exc.S中_ExcInMsp主栈中异常处理函数中异常返回类型错误

close #I4EJI4

Signed-off-by: kenneth <zhushangyuan@huawei.com>
---
 kernel/arch/arm/cortex-m3/keil/los_exc.S               | 2 +-
 kernel/arch/arm/cortex-m33/gcc/NTZ/los_exc.S           | 2 +-
 kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_exc.S | 2 +-
 kernel/arch/arm/cortex-m33/gcc/los_exc.S               | 2 +-
 kernel/arch/arm/cortex-m33/iar/NTZ/los_exc.S           | 2 +-
 kernel/arch/arm/cortex-m33/iar/TZ/non_secure/los_exc.S | 2 +-
 kernel/arch/arm/cortex-m4/gcc/los_exc.S                | 2 +-
 kernel/arch/arm/cortex-m4/iar/los_exc.S                | 2 +-
 kernel/arch/arm/cortex-m7/gcc/los_exc.S                | 2 +-
 kernel/arch/arm/cortex-m7/iar/los_exc.S                | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/kernel/arch/arm/cortex-m3/keil/los_exc.S b/kernel/arch/arm/cortex-m3/keil/los_exc.S
index 96f338db..b2f9d374 100644
--- a/kernel/arch/arm/cortex-m3/keil/los_exc.S
+++ b/kernel/arch/arm/cortex-m3/keil/los_exc.S
@@ -198,7 +198,7 @@ _hwiActiveCheck
     ADD   R2, R2, R12, LSL #5               ; calculate R2 (hwi number) as uwPid
 
 _ExcInMSP
-    CMP   LR, #0XFFFFFFED
+    CMP   LR, #0xFFFFFFE9
     BNE   _NoFloatInMsp
     ADD   R3, R13, #104
     PUSH  {R3}
diff --git a/kernel/arch/arm/cortex-m33/gcc/NTZ/los_exc.S b/kernel/arch/arm/cortex-m33/gcc/NTZ/los_exc.S
index 449b5799..cbc48728 100755
--- a/kernel/arch/arm/cortex-m33/gcc/NTZ/los_exc.S
+++ b/kernel/arch/arm/cortex-m33/gcc/NTZ/los_exc.S
@@ -276,7 +276,7 @@ _hwiActiveCheck:
 _ExcInMSP:
     .fnstart
     .cantunwind
-    CMP   LR, #0XFFFFFFED
+    CMP   LR, #0xFFFFFFE9
     BNE   _NoFloatInMsp
     ADD   R3, R13, #104
     PUSH  {R3}
diff --git a/kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_exc.S b/kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_exc.S
index f8274299..6178f97c 100755
--- a/kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_exc.S
+++ b/kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_exc.S
@@ -260,7 +260,7 @@ _hwiActiveCheck:
 _ExcInMSP:
     .fnstart
     .cantunwind
-    CMP   LR, #0XFFFFFFED
+    CMP   LR, #0xFFFFFFE9
     BNE   _NoFloatInMsp
     ADD   R3, R13, #104
     PUSH  {R3}
diff --git a/kernel/arch/arm/cortex-m33/gcc/los_exc.S b/kernel/arch/arm/cortex-m33/gcc/los_exc.S
index 7675dd16..b3ead49c 100644
--- a/kernel/arch/arm/cortex-m33/gcc/los_exc.S
+++ b/kernel/arch/arm/cortex-m33/gcc/los_exc.S
@@ -276,7 +276,7 @@ _hwiActiveCheck:
 _ExcInMSP:
     .fnstart
     .cantunwind
-    CMP   LR, #0XFFFFFFED
+    CMP   LR, #0xFFFFFFE9
     BNE   _NoFloatInMsp
     ADD   R3, R13, #104
     PUSH  {R3}
diff --git a/kernel/arch/arm/cortex-m33/iar/NTZ/los_exc.S b/kernel/arch/arm/cortex-m33/iar/NTZ/los_exc.S
index 15051af2..4b560685 100644
--- a/kernel/arch/arm/cortex-m33/iar/NTZ/los_exc.S
+++ b/kernel/arch/arm/cortex-m33/iar/NTZ/los_exc.S
@@ -198,7 +198,7 @@ _hwiActiveCheck
     ADD   R2, R2, R12, LSL #5               ; calculate R2 (hwi number) as uwPid
 
 _ExcInMSP
-    CMP   LR, #0XFFFFFFED
+    CMP   LR, #0xFFFFFFE9
     BNE   _NoFloatInMsp
     ADD   R3, R13, #104
     PUSH  {R3}
diff --git a/kernel/arch/arm/cortex-m33/iar/TZ/non_secure/los_exc.S b/kernel/arch/arm/cortex-m33/iar/TZ/non_secure/los_exc.S
index d954304d..604d7310 100644
--- a/kernel/arch/arm/cortex-m33/iar/TZ/non_secure/los_exc.S
+++ b/kernel/arch/arm/cortex-m33/iar/TZ/non_secure/los_exc.S
@@ -187,7 +187,7 @@ _hwiActiveCheck
     ADD   R2, R2, R12, LSL #5               ; calculate R2 (hwi number) as uwPid
 
 _ExcInMSP
-    CMP   LR, #0XFFFFFFED
+    CMP   LR, #0xFFFFFFE9
     BNE   _NoFloatInMsp
     ADD   R3, R13, #104
     PUSH  {R3}
diff --git a/kernel/arch/arm/cortex-m4/gcc/los_exc.S b/kernel/arch/arm/cortex-m4/gcc/los_exc.S
index 6b0e0973..9e66ef71 100644
--- a/kernel/arch/arm/cortex-m4/gcc/los_exc.S
+++ b/kernel/arch/arm/cortex-m4/gcc/los_exc.S
@@ -275,7 +275,7 @@ _hwiActiveCheck:
 _ExcInMSP:
     .fnstart
     .cantunwind
-    CMP   LR, #0XFFFFFFED
+    CMP   LR, #0xFFFFFFE9
     BNE   _NoFloatInMsp
     ADD   R3, R13, #104
     PUSH  {R3}
diff --git a/kernel/arch/arm/cortex-m4/iar/los_exc.S b/kernel/arch/arm/cortex-m4/iar/los_exc.S
index 7c26aba9..cbc6c22f 100644
--- a/kernel/arch/arm/cortex-m4/iar/los_exc.S
+++ b/kernel/arch/arm/cortex-m4/iar/los_exc.S
@@ -198,7 +198,7 @@ _hwiActiveCheck
     ADD   R2, R2, R12, LSL #5               ; calculate R2 (hwi number) as uwPid
 
 _ExcInMSP
-    CMP   LR, #0xFFFFFFED
+    CMP   LR, #0xFFFFFFE9
     BNE   _NoFloatInMsp
     ADD   R3, R13, #104
     PUSH  {R3}
diff --git a/kernel/arch/arm/cortex-m7/gcc/los_exc.S b/kernel/arch/arm/cortex-m7/gcc/los_exc.S
index 4ea0e827..e6f79098 100644
--- a/kernel/arch/arm/cortex-m7/gcc/los_exc.S
+++ b/kernel/arch/arm/cortex-m7/gcc/los_exc.S
@@ -276,7 +276,7 @@ _hwiActiveCheck:
 _ExcInMSP:
     .fnstart
     .cantunwind
-    CMP   LR, #0XFFFFFFED
+    CMP   LR, #0xFFFFFFE9
     BNE   _NoFloatInMsp
     ADD   R3, R13, #104
     PUSH  {R3}
diff --git a/kernel/arch/arm/cortex-m7/iar/los_exc.S b/kernel/arch/arm/cortex-m7/iar/los_exc.S
index f1efbf3c..ee118607 100644
--- a/kernel/arch/arm/cortex-m7/iar/los_exc.S
+++ b/kernel/arch/arm/cortex-m7/iar/los_exc.S
@@ -198,7 +198,7 @@ _hwiActiveCheck
     ADD   R2, R2, R12, LSL #5               ; calculate R2 (hwi number) as uwPid
 
 _ExcInMSP
-    CMP   LR, #0XFFFFFFED
+    CMP   LR, #0xFFFFFFE9
     BNE   _NoFloatInMsp
     ADD   R3, R13, #104
     PUSH  {R3}
-- 
GitLab