From def85bceba26725dc3840cdd63d33ec19823dd25 Mon Sep 17 00:00:00 2001 From: rtel Date: Sat, 12 Jul 2014 20:39:22 +0000 Subject: [PATCH] Rename ARM_CAx_No_GIC ARM_CA5_No_GIC and add FreeRTOSConfig setting to specify the number of registers in the FPU unit. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2275 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- .../portable/IAR/{ARM_CAx_No_GIC => ARM_CA5_No_GIC}/port.c | 0 .../portable/IAR/{ARM_CAx_No_GIC => ARM_CA5_No_GIC}/portASM.h | 4 ++++ .../portable/IAR/{ARM_CAx_No_GIC => ARM_CA5_No_GIC}/portASM.s | 0 .../IAR/{ARM_CAx_No_GIC => ARM_CA5_No_GIC}/portmacro.h | 0 4 files changed, 4 insertions(+) rename FreeRTOS/Source/portable/IAR/{ARM_CAx_No_GIC => ARM_CA5_No_GIC}/port.c (100%) rename FreeRTOS/Source/portable/IAR/{ARM_CAx_No_GIC => ARM_CA5_No_GIC}/portASM.h (95%) rename FreeRTOS/Source/portable/IAR/{ARM_CAx_No_GIC => ARM_CA5_No_GIC}/portASM.s (100%) rename FreeRTOS/Source/portable/IAR/{ARM_CAx_No_GIC => ARM_CA5_No_GIC}/portmacro.h (100%) diff --git a/FreeRTOS/Source/portable/IAR/ARM_CAx_No_GIC/port.c b/FreeRTOS/Source/portable/IAR/ARM_CA5_No_GIC/port.c similarity index 100% rename from FreeRTOS/Source/portable/IAR/ARM_CAx_No_GIC/port.c rename to FreeRTOS/Source/portable/IAR/ARM_CA5_No_GIC/port.c diff --git a/FreeRTOS/Source/portable/IAR/ARM_CAx_No_GIC/portASM.h b/FreeRTOS/Source/portable/IAR/ARM_CA5_No_GIC/portASM.h similarity index 95% rename from FreeRTOS/Source/portable/IAR/ARM_CAx_No_GIC/portASM.h rename to FreeRTOS/Source/portable/IAR/ARM_CA5_No_GIC/portASM.h index 0e40e557b..3af3284d3 100644 --- a/FreeRTOS/Source/portable/IAR/ARM_CAx_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 diff --git a/FreeRTOS/Source/portable/IAR/ARM_CAx_No_GIC/portASM.s b/FreeRTOS/Source/portable/IAR/ARM_CA5_No_GIC/portASM.s similarity index 100% rename from FreeRTOS/Source/portable/IAR/ARM_CAx_No_GIC/portASM.s rename to FreeRTOS/Source/portable/IAR/ARM_CA5_No_GIC/portASM.s diff --git a/FreeRTOS/Source/portable/IAR/ARM_CAx_No_GIC/portmacro.h b/FreeRTOS/Source/portable/IAR/ARM_CA5_No_GIC/portmacro.h similarity index 100% rename from FreeRTOS/Source/portable/IAR/ARM_CAx_No_GIC/portmacro.h rename to FreeRTOS/Source/portable/IAR/ARM_CA5_No_GIC/portmacro.h -- 2.39.5