Update version number to V8.0.0 (without the release candidate number).

[freertos] / FreeRTOS / Source / portable / MPLAB / PIC32MX / port_asm.S

diff --git a/FreeRTOS/Source/portable/MPLAB/PIC32MX/port_asm.S b/FreeRTOS/Source/portable/MPLAB/PIC32MX/port_asm.S
index f95e5bde816392226eba6d8a544b1769ef667937..54e15e5667aa5554bf1025070f5e854a3fbc2a43 100644 (file)
--- a/FreeRTOS/Source/portable/MPLAB/PIC32MX/port_asm.S
+++ b/FreeRTOS/Source/portable/MPLAB/PIC32MX/port_asm.S
@@ -1,5 +1,6 @@
 /*\r
-    FreeRTOS V7.5.2 - Copyright (C) 2013 Real Time Engineers Ltd.\r
+    FreeRTOS V8.0.0 - Copyright (C) 2014 Real Time Engineers Ltd.\r
+    All rights reserved\r
 \r
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
 \r
@@ -115,29 +116,26 @@ vPortStartFirstTask:
 \r
 /*******************************************************************/\r
 \r
-       .set            noreorder\r
+       .set            noreorder\r
        .set            noat\r
-       .ent            vPortYieldISR\r
+       .ent            vPortYieldISR\r
 \r
 vPortYieldISR:\r
 \r
        /* Make room for the context. First save the current status so it can be\r
-       manipulated, and the cause and EPC registers so thier original values are\r
-       captured. */\r
-       mfc0            k0, _CP0_CAUSE\r
-       addiu           sp,     sp, -portCONTEXT_SIZE\r
+       manipulated. */\r
+       addiu           sp, sp, -portCONTEXT_SIZE\r
        mfc0            k1, _CP0_STATUS\r
 \r
-       /* Also save s6 and s5 so we can use them during this interrupt.  Any\r
-       nesting interrupts should maintain the values of these registers\r
-       across the ISR. */\r
+       /* Also save s6 and s5 so they can be used.  Any nesting interrupts should\r
+       maintain the values of these registers across the ISR. */\r
        sw                      s6, 44(sp)\r
        sw                      s5, 40(sp)\r
        sw                      k1, portSTATUS_STACK_LOCATION(sp)\r
 \r
-       /* Interrupts above the kernel priority are going to be re-enabled. */\r
-       srl                     k0, k0, 0xa\r
-       ins             k1, k0, 10, 6\r
+       /* Prepare to re-enabled interrupt above the kernel priority. */\r
+       ins             k1, zero, 10, 6\r
+       ori                     k1, k1, ( configMAX_SYSCALL_INTERRUPT_PRIORITY << 10 )\r
        ins                     k1, zero, 1, 4\r
 \r
        /* s5 is used as the frame pointer. */\r
@@ -158,16 +156,16 @@ vPortYieldISR:
        after interrupts are enabled. */\r
        mfc0            s6, _CP0_EPC\r
 \r
-       /* Re-enable interrupts. */\r
+       /* Re-enable interrupts above configMAX_SYSCALL_INTERRUPT_PRIORITY. */\r
        mtc0            k1, _CP0_STATUS\r
 \r
        /* Save the context into the space just created.  s6 is saved again\r
        here as it now contains the EPC value. */\r
-       sw                      ra,     120(s5)\r
+       sw                      ra, 120(s5)\r
        sw                      s8, 116(s5)\r
        sw                      t9, 112(s5)\r
-       sw                      t8,     108(s5)\r
-       sw                      t7,     104(s5)\r
+       sw                      t8, 108(s5)\r
+       sw                      t7, 104(s5)\r
        sw                      t6, 100(s5)\r
        sw                      t5, 96(s5)\r
        sw                      t4, 92(s5)\r
@@ -184,7 +182,7 @@ vPortYieldISR:
        sw                      s7, 48(s5)\r
        sw                      s6, portEPC_STACK_LOCATION(s5)\r
        /* s5 and s6 has already been saved. */\r
-       sw                      s4,     36(s5)\r
+       sw                      s4, 36(s5)\r
        sw                      s3, 32(s5)\r
        sw                      s2, 28(s5)\r
        sw                      s1, 24(s5)\r
@@ -208,18 +206,21 @@ vPortYieldISR:
        is below configMAX_SYSCALL_INTERRUPT_PRIORITY - so this can only ever\r
        raise the IPL value and never lower it. */\r
        di\r
+       ehb\r
        mfc0            s7, _CP0_STATUS\r
-       ins             s7, $0, 10, 6\r
+       ins             s7, zero, 10, 6\r
        ori                     s6, s7, ( configMAX_SYSCALL_INTERRUPT_PRIORITY << 10 ) | 1\r
 \r
        /* This mtc0 re-enables interrupts, but only above\r
        configMAX_SYSCALL_INTERRUPT_PRIORITY. */\r
        mtc0            s6, _CP0_STATUS\r
+       ehb\r
 \r
        /* Clear the software interrupt in the core. */\r
        mfc0            s6, _CP0_CAUSE\r
        ins                     s6, zero, 8, 1\r
        mtc0            s6, _CP0_CAUSE\r
+       ehb\r
 \r
        /* Clear the interrupt in the interrupt controller. */\r
        la                      s6, IFS0CLR\r
@@ -231,6 +232,7 @@ vPortYieldISR:
 \r
        /* Clear the interrupt mask again.  The saved status value is still in s7. */\r
        mtc0            s7, _CP0_STATUS\r
+       ehb\r
 \r
        /* Restore the stack pointer from the TCB. */\r
        la                      s0, pxCurrentTCB\r
@@ -272,6 +274,7 @@ vPortYieldISR:
 \r
        /* Protect access to the k registers, and others. */\r
        di\r
+       ehb\r
 \r
        /* Set nesting back to zero.  As the lowest priority interrupt this\r
        interrupt cannot have nested. */\r
@@ -289,10 +292,11 @@ vPortYieldISR:
        lw                      k0, portEPC_STACK_LOCATION(sp)\r
 \r
        /* Remove stack frame. */\r
-       addiu           sp,     sp,     portCONTEXT_SIZE\r
+       addiu           sp, sp, portCONTEXT_SIZE\r
 \r
        mtc0            k1, _CP0_STATUS\r
        mtc0            k0, _CP0_EPC\r
+       ehb\r
        eret\r
        nop\r
 \r