Rename ARM_CAx_No_GIC ARM_CA5_No_GIC and add FreeRTOSConfig setting to specify the number of registers in the FPU unit.

2014-07-12 20:39:22 +00:00 · 2014-07-12 20:39:22 +00:00 · 8ad9b75810
commit 8ad9b75810
parent 29336e35b5
4 changed files with 4 additions and 0 deletions
--- a/FreeRTOS/Source/portable/IAR/ARM_CA5_No_GIC/port.c
+++ b/FreeRTOS/Source/portable/IAR/ARM_CA5_No_GIC/port.c
--- a/FreeRTOS/Source/portable/IAR/ARM_CA5_No_GIC/portASM.h
+++ b/FreeRTOS/Source/portable/IAR/ARM_CA5_No_GIC/portASM.h
@ -80,7 +80,9 @@ portSAVE_CONTEXT macro
 	; Save the floating point context, if any
 	FMRXNE  R1,  FPSCR
 	VPUSHNE {D0-D15}
+#if configFPU_D32 == 1
 	VPUSHNE	{D16-D31}
+#endif ; configFPU_D32
 	PUSHNE	{R1}

 	; Save ulPortTaskHasFPUContext itself
@ -114,7 +116,9 @@ portRESTORE_CONTEXT macro

 	; Restore the floating point context, if any
 	POPNE 	{R0}
+#if configFPU_D32 == 1
 	VPOPNE	{D16-D31}
+#endif ; configFPU_D32
 	VPOPNE	{D0-D15}
 	VMSRNE  FPSCR, R0

--- a/FreeRTOS/Source/portable/IAR/ARM_CA5_No_GIC/portASM.s
+++ b/FreeRTOS/Source/portable/IAR/ARM_CA5_No_GIC/portASM.s
--- a/FreeRTOS/Source/portable/IAR/ARM_CA5_No_GIC/portmacro.h
+++ b/FreeRTOS/Source/portable/IAR/ARM_CA5_No_GIC/portmacro.h