commit 1f452ffdc324901911d50968cfb7ae99b27f4b0d
author Richard Barry <ribarry@amazon.com> Fri May 13 10:42:16 2011 +0000
committer Richard Barry <ribarry@amazon.com> Fri May 13 10:42:16 2011 +0000
tree 19eff40ed37f1d2a1b3e39b48c4c7aa57e4aaccd
parent f95c8efb63f84802ea28cc7d4ef7219eb2464958

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

Source/portable/MPLAB/PIC32MX/ISR_Support.h

diff --git a/Source/portable/MPLAB/PIC32MX/ISR_Support.h b/Source/portable/MPLAB/PIC32MX/ISR_Support.h
index 9a9caa3..56b44e2 100644
--- 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

 

 	mtc0		k0, _CP0_STATUS

-	ehb

 	mtc0 		k1, _CP0_EPC

+	ehb

 	eret 

 	nop

 

Source/portable/MPLAB/PIC32MX/port_asm.S

diff --git a/Source/portable/MPLAB/PIC32MX/port_asm.S b/Source/portable/MPLAB/PIC32MX/port_asm.S
index 7c6d4ae..ad1a7b2 100644
--- a/Source/portable/MPLAB/PIC32MX/port_asm.S
+++ b/Source/portable/MPLAB/PIC32MX/port_asm.S
@@ -284,9 +284,9 @@
 	/* Remove stack frame. */

 	addiu		sp,	sp,	portCONTEXT_SIZE

 

-	mtc0		k1, _CP0_STATUS

-	ehb	

+	mtc0		k1, _CP0_STATUS	

 	mtc0 		k0, _CP0_EPC

+	ehb

 	eret 

 	nop