From e939ffe35502b2c0ccfa709673b21a42d2253109 Mon Sep 17 00:00:00 2001
From: zhouji <956133287@qq.com>
Date: Tue, 6 Apr 2021 19:15:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9C=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=97=B6=E8=87=AA=E5=8A=A8=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?FPU=E7=9A=84=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=BD=93FPU=E6=9C=AB=E5=BC=80=E5=90=AF=E6=97=B6=E5=B0=86?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=BC=80=E5=90=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 libcpu/arm/cortex-a/trap.c | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/libcpu/arm/cortex-a/trap.c b/libcpu/arm/cortex-a/trap.c
index a213e776c7..3faa136677 100644
--- a/libcpu/arm/cortex-a/trap.c
+++ b/libcpu/arm/cortex-a/trap.c
@@ -47,30 +47,24 @@ void rt_hw_trap_undef(struct rt_hw_exp_stack *regs)
 {
 #ifdef RT_USING_FPU
     {
-        uint32_t ins;
+        uint32_t val;
         uint32_t addr;
 
         if (regs->cpsr & (1 << 5))
         {
             /* thumb mode */
             addr = regs->pc - 2;
-            ins = (uint32_t)*(uint16_t*)addr;
-            if ((ins & (3 << 11)) != 0)
-            {
-                /* 32 bit ins */
-                ins <<= 16;
-                ins += *(uint16_t*)(addr + 2);
-            }
         }
         else
         {
             addr = regs->pc - 4;
-            ins = *(uint32_t*)addr;
         }
-        if ((ins & 0xe00) == 0xa00)
+        asm volatile ("vmrs %0, fpexc" : "=r"(val)::"memory");
+
+        if (!(val & 0x40000000))
         {
             /* float ins */
-            uint32_t val = (1U << 30);
+            val = (1U << 30);
 
             asm volatile ("vmsr fpexc, %0"::"r"(val):"memory");
             regs->pc = addr;