Move the ehb instruction in the PIC32/MPLAB port layer.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1418 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/Source/portable/MPLAB/PIC32MX/ISR_Support.h b/Source/portable/MPLAB/PIC32MX/ISR_Support.h
index 9a9caa3afe5fef3d5d10a3668732dd1fe9e6e4df..56b44e22fe4d3c970c476351d9c80bd7c3318909 100644 (file)
--- a/Source/portable/MPLAB/PIC32MX/ISR_Support.h
+++ b/Source/portable/MPLAB/PIC32MX/ISR_Support.h
@@ -208,8 +208,8 @@
        addiu           sp,     sp,     portCONTEXT_SIZE\r
 \r
        mtc0            k0, _CP0_STATUS\r
-       ehb\r
        mtc0            k1, _CP0_EPC\r
+       ehb\r
        eret \r
        nop\r
 \r

diff --git a/Source/portable/MPLAB/PIC32MX/port_asm.S b/Source/portable/MPLAB/PIC32MX/port_asm.S
index 7c6d4ae8837fc64a5c80cf62765dfa6d16a1c0d4..ad1a7b23a6d526a9a9e1502e7e0a781d4f2cbd1e 100644 (file)
--- a/Source/portable/MPLAB/PIC32MX/port_asm.S
+++ b/Source/portable/MPLAB/PIC32MX/port_asm.S
@@ -284,9 +284,9 @@ vPortYieldISR:
        /* Remove stack frame. */\r
        addiu           sp,     sp,     portCONTEXT_SIZE\r
 \r
-       mtc0            k1, _CP0_STATUS\r
-       ehb     \r
+       mtc0            k1, _CP0_STATUS \r
        mtc0            k0, _CP0_EPC\r
+       ehb\r
        eret \r
        nop\r
 \r