Update version number to 9.0.0rc2.

[freertos] / FreeRTOS / Source / portable / Tasking / ARM_CM4F / port_asm.asm

diff --git a/FreeRTOS/Source/portable/Tasking/ARM_CM4F/port_asm.asm b/FreeRTOS/Source/portable/Tasking/ARM_CM4F/port_asm.asm
index 413de2e1c598d2c5ac77c10bc082b621f177b133..8b8cd94fbf46ab31147a0528b13baf8fe77c3b13 100644 (file)
--- a/FreeRTOS/Source/portable/Tasking/ARM_CM4F/port_asm.asm
+++ b/FreeRTOS/Source/portable/Tasking/ARM_CM4F/port_asm.asm
@@ -1,5 +1,6 @@
 ;/*\r
-;    FreeRTOS V7.5.2 - Copyright (C) 2013 Real Time Engineers Ltd.\r
+;    FreeRTOS V9.0.0rc2 - Copyright (C) 2016 Real Time Engineers Ltd.\r
+;    All rights reserved\r
 ;\r
 ;\r
 ;    ***************************************************************************\r
@@ -51,22 +52,28 @@
 ;    licensing and training services.\r
 ;*/\r
 \r
+\r
        .extern pxCurrentTCB\r
        .extern vTaskSwitchContext\r
        .extern ulMaxSyscallInterruptPriorityConst\r
 \r
-       .global PendSV_Handler\r
+       .global _vector_14\r
+       .global _lc_ref__vector_pp_14\r
        .global SVC_Handler\r
        .global vPortStartFirstTask\r
        .global vPortEnableVFP\r
-       \r
+       .global ulPortSetInterruptMask\r
+       .global vPortClearInterruptMask\r
+\r
 ;-----------------------------------------------------------\r
 \r
        .section .text\r
        .thumb\r
        .align 4\r
-PendSV_Handler: .type func\r
+_vector_14: .type func\r
+\r
        mrs r0, psp\r
+       isb\r
 \r
        ;Get the location of the current TCB.\r
        ldr.w   r3, =pxCurrentTCB\r
@@ -83,13 +90,14 @@ PendSV_Handler: .type func
        ;Save the new top of stack into the first member of the TCB.\r
        str r0, [r2]\r
 \r
-       stmdb sp!, {r3, r14}\r
+       stmdb sp!, {r3}\r
        ldr.w r0, =ulMaxSyscallInterruptPriorityConst\r
+       ldr r0, [r0]\r
        msr basepri, r0\r
        bl vTaskSwitchContext\r
        mov r0, #0\r
        msr basepri, r0\r
-       ldmia sp!, {r3, r14}\r
+       ldmia sp!, {r3}\r
 \r
        ;The first item in pxCurrentTCB is the task top of stack.\r
        ldr r1, [r3]\r
@@ -104,9 +112,66 @@ PendSV_Handler: .type func
        vldmiaeq r0!, {s16-s31}\r
 \r
        msr psp, r0\r
+       isb\r
        bx r14\r
 \r
-       .size   PendSV_Handler, $-PendSV_Handler\r
+       .size   _vector_14, $-_vector_14\r
+       .endsec\r
+\r
+;-----------------------------------------------------------\r
+\r
+; This function is an XMC4000 silicon errata workaround.  It will get used when\r
+; the SILICON_BUG_PMC_CM_001 linker macro is defined.\r
+       .section .text\r
+       .thumb\r
+       .align 4\r
+_lc_ref__vector_pp_14: .type func\r
+\r
+       mrs r0, psp\r
+       isb\r
+\r
+       ;Get the location of the current TCB.\r
+       ldr.w   r3, =pxCurrentTCB\r
+       ldr     r2, [r3]\r
+\r
+       ;Is the task using the FPU context?  If so, push high vfp registers.\r
+       tst r14, #0x10\r
+       it eq\r
+       vstmdbeq r0!, {s16-s31}\r
+\r
+       ;Save the core registers.\r
+       stmdb r0!, {r4-r11, r14}\r
+\r
+       ;Save the new top of stack into the first member of the TCB.\r
+       str r0, [r2]\r
+\r
+       stmdb sp!, {r3}\r
+       ldr.w r0, =ulMaxSyscallInterruptPriorityConst\r
+       ldr r0, [r0]\r
+       msr basepri, r0\r
+       bl vTaskSwitchContext\r
+       mov r0, #0\r
+       msr basepri, r0\r
+       ldmia sp!, {r3}\r
+\r
+       ;The first item in pxCurrentTCB is the task top of stack.\r
+       ldr r1, [r3]\r
+       ldr r0, [r1]\r
+\r
+       ;Pop the core registers.\r
+       ldmia r0!, {r4-r11, r14}\r
+\r
+       ;Is the task using the FPU context?  If so, pop the high vfp registers too.\r
+       tst r14, #0x10\r
+       it eq\r
+       vldmiaeq r0!, {s16-s31}\r
+\r
+       msr psp, r0\r
+       isb\r
+       push { lr }\r
+       pop { pc } ; XMC4000 specific errata workaround.  Do not used "bx lr" here.\r
+\r
+       .size   _lc_ref__vector_pp_14, $-_lc_ref__vector_pp_14\r
        .endsec\r
 \r
 ;-----------------------------------------------------------\r
@@ -122,6 +187,7 @@ SVC_Handler: .type func
        ;Pop the core registers.\r
        ldmia r0!, {r4-r11, r14}\r
        msr psp, r0\r
+       isb\r
        mov r0, #0\r
        msr     basepri, r0\r
        bx r14\r
@@ -142,6 +208,9 @@ vPortStartFirstTask .type func
        msr msp, r0\r
        ;Call SVC to start the first task.\r
        cpsie i\r
+       cpsie f\r
+       dsb\r
+       isb\r
        svc 0\r
        .size   vPortStartFirstTask, $-vPortStartFirstTask\r
        .endsec\r
@@ -163,6 +232,32 @@ vPortEnableVFP .type func
        .size   vPortEnableVFP, $-vPortEnableVFP\r
        .endsec\r
 \r
+;-----------------------------------------------------------\r
+\r
+       .section .text\r
+       .thumb\r
+       .align 4\r
+ulPortSetInterruptMask:\r
+       mrs r0, basepri\r
+       ldr.w r1, =ulMaxSyscallInterruptPriorityConst\r
+       ldr r1, [r1]\r
+       msr basepri, r1\r
+       bx r14\r
+       .size   ulPortSetInterruptMask, $-ulPortSetInterruptMask\r
+       .endsec\r
+\r
+;-----------------------------------------------------------\r
+\r
+       .section .text\r
+       .thumb\r
+       .align 4\r
+vPortClearInterruptMask:\r
+       msr basepri, r0\r
+       bx r14\r
+       .size   vPortClearInterruptMask, $-vPortClearInterruptMask\r
+       .endsec\r
+\r
+;-----------------------------------------------------------\r
 \r
        .end\r
-       \r
+\r