Skip to content

R
rt-thread

红岛 / rt-thread
与 Fork 源项目一致

Fork自 RT-Thread / rt-thread

通知 1
Star 1
Fork 0
R
rt-thread

体验新版 GitCode，发现更多精彩内容 >>

未验证 提交 a2f20dde 编写于 作者: B Bernard Xiong 提交者： GitHub
浏览文件
操作

Merge pull request #1201 from aozima/cortex-m 

[libcpu]: fixed #1196 FPU FPCA issue.
上级 c9fe93dc dd1041bb
显示空白变更内容
内联 并排
Showing with 24 addition and 24 deletion
libcpu/arm/cortex-m4/context_gcc.S
浏览文件 @ a2f20dde
...@@ -145,16 +145,16 @@ switch_to_thread: ...@@ -145,16 +145,16 @@ switch_to_thread:
MSR psp, r1 /* update stack pointer */ MSR psp, r1 /* update stack pointer */
pendsv_exit:
/* restore interrupt */
MSR PRIMASK, r2
#if defined (__VFP_FP__) && !defined(__SOFTFP__) #if defined (__VFP_FP__) && !defined(__SOFTFP__)
ORR lr, lr, #0x10 /* lr |= (1 << 4), clean FPCA. */ ORR lr, lr, #0x10 /* lr |= (1 << 4), clean FPCA. */
CMP r3, #0 /* if(flag_r3 != 0) */ CMP r3, #0 /* if(flag_r3 != 0) */
BICNE lr, lr, #0x10 /* lr &= ~(1 << 4), set FPCA. */ BICNE lr, lr, #0x10 /* lr &= ~(1 << 4), set FPCA. */
#endif #endif
pendsv_exit:
/* restore interrupt */
MSR PRIMASK, r2
ORR lr, lr, #0x04 ORR lr, lr, #0x04
BX lr BX lr
......
libcpu/arm/cortex-m4/context_iar.S
浏览文件 @ a2f20dde
...@@ -149,10 +149,6 @@ skip_pop_fpu ...@@ -149,10 +149,6 @@ skip_pop_fpu
MSR psp, r1 ; update stack pointer MSR psp, r1 ; update stack pointer
pendsv_exit
; restore interrupt
MSR PRIMASK, r2
#if defined ( __ARMVFP__ ) #if defined ( __ARMVFP__ )
ORR lr, lr, #0x10 ; lr |= (1 << 4), clean FPCA. ORR lr, lr, #0x10 ; lr |= (1 << 4), clean FPCA.
CBZ r3, return_without_fpu ; if(flag_r3 != 0) CBZ r3, return_without_fpu ; if(flag_r3 != 0)
...@@ -160,6 +156,10 @@ pendsv_exit ...@@ -160,6 +156,10 @@ pendsv_exit
return_without_fpu return_without_fpu
#endif #endif
pendsv_exit
; restore interrupt
MSR PRIMASK, r2
ORR lr, lr, #0x04 ORR lr, lr, #0x04
BX lr BX lr
......
libcpu/arm/cortex-m4/context_rvds.S
浏览文件 @ a2f20dde
...@@ -147,16 +147,16 @@ switch_to_thread ...@@ -147,16 +147,16 @@ switch_to_thread
MSR psp, r1 ; update stack pointer MSR psp, r1 ; update stack pointer
pendsv_exit
; restore interrupt
MSR PRIMASK, r2
IF {FPU} != "SoftVFP" IF {FPU} != "SoftVFP"
ORR lr, lr, #0x10 ; lr |= (1 << 4), clean FPCA. ORR lr, lr, #0x10 ; lr |= (1 << 4), clean FPCA.
CMP r3, #0 ; if(flag_r3 != 0) CMP r3, #0 ; if(flag_r3 != 0)
BICNE lr, lr, #0x10 ; lr &= ~(1 << 4), set FPCA. BICNE lr, lr, #0x10 ; lr &= ~(1 << 4), set FPCA.
ENDIF ENDIF
pendsv_exit
; restore interrupt
MSR PRIMASK, r2
ORR lr, lr, #0x04 ORR lr, lr, #0x04
BX lr BX lr
ENDP ENDP
......
libcpu/arm/cortex-m7/context_gcc.S
浏览文件 @ a2f20dde
...@@ -145,16 +145,16 @@ switch_to_thread: ...@@ -145,16 +145,16 @@ switch_to_thread:
MSR psp, r1 /* update stack pointer */ MSR psp, r1 /* update stack pointer */
pendsv_exit:
/* restore interrupt */
MSR PRIMASK, r2
#if defined (__VFP_FP__) && !defined(__SOFTFP__) #if defined (__VFP_FP__) && !defined(__SOFTFP__)
ORR lr, lr, #0x10 /* lr |= (1 << 4), clean FPCA. */ ORR lr, lr, #0x10 /* lr |= (1 << 4), clean FPCA. */
CMP r3, #0 /* if(flag_r3 != 0) */ CMP r3, #0 /* if(flag_r3 != 0) */
BICNE lr, lr, #0x10 /* lr &= ~(1 << 4), set FPCA. */ BICNE lr, lr, #0x10 /* lr &= ~(1 << 4), set FPCA. */
#endif #endif
pendsv_exit:
/* restore interrupt */
MSR PRIMASK, r2
ORR lr, lr, #0x04 ORR lr, lr, #0x04
BX lr BX lr
......
libcpu/arm/cortex-m7/context_iar.S
浏览文件 @ a2f20dde
...@@ -149,10 +149,6 @@ skip_pop_fpu ...@@ -149,10 +149,6 @@ skip_pop_fpu
MSR psp, r1 ; update stack pointer MSR psp, r1 ; update stack pointer
pendsv_exit
; restore interrupt
MSR PRIMASK, r2
#if defined ( __ARMVFP__ ) #if defined ( __ARMVFP__ )
ORR lr, lr, #0x10 ; lr |= (1 << 4), clean FPCA. ORR lr, lr, #0x10 ; lr |= (1 << 4), clean FPCA.
CBZ r3, return_without_fpu ; if(flag_r3 != 0) CBZ r3, return_without_fpu ; if(flag_r3 != 0)
...@@ -160,6 +156,10 @@ pendsv_exit ...@@ -160,6 +156,10 @@ pendsv_exit
return_without_fpu return_without_fpu
#endif #endif
pendsv_exit
; restore interrupt
MSR PRIMASK, r2
ORR lr, lr, #0x04 ORR lr, lr, #0x04
BX lr BX lr
......
libcpu/arm/cortex-m7/context_rvds.S
浏览文件 @ a2f20dde
...@@ -147,16 +147,16 @@ switch_to_thread ...@@ -147,16 +147,16 @@ switch_to_thread
MSR psp, r1 ; update stack pointer MSR psp, r1 ; update stack pointer
pendsv_exit
; restore interrupt
MSR PRIMASK, r2
IF {FPU} != "SoftVFP" IF {FPU} != "SoftVFP"
ORR lr, lr, #0x10 ; lr |= (1 << 4), clean FPCA. ORR lr, lr, #0x10 ; lr |= (1 << 4), clean FPCA.
CMP r3, #0 ; if(flag_r3 != 0) CMP r3, #0 ; if(flag_r3 != 0)
BICNE lr, lr, #0x10 ; lr &= ~(1 << 4), set FPCA. BICNE lr, lr, #0x10 ; lr &= ~(1 << 4), set FPCA.
ENDIF ENDIF
pendsv_exit
; restore interrupt
MSR PRIMASK, r2
ORR lr, lr, #0x04 ORR lr, lr, #0x04
BX lr BX lr
ENDP ENDP
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或