Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-08 01:42:58 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix PIC32 jalr instructions: arguments consistentley reversed

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4052 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2011-10-18 01:51:47 +00:00
parent 780cc915c5
commit f6b63d6284
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/mips/src/mips32/up_copystate.c
+1 -1
View File
@@ -70,7 +70,7 @@ void up_copystate(uint32_t *dest, uint32_t *src)
{
int i;
/* In the Cortex-M3 model, the state is copied from the stack to the TCB,
/* In the MIPS model, the state is copied from the stack to the TCB,
* but only a reference is passed to get the state from the TCB. So the
* following check avoids copying the TCB save area onto itself:
*/
arch/mips/src/pic32mx/pic32mx-head.S
+5 -5
View File
@@ -434,7 +434,7 @@ _bev_handler:
move a0, sp /* Pass register save structure as the parameter 1 */
USE_INTSTACK t0, t1, t2 /* Switch to the interrupt stack */
la t0, pic32mx_dobev /* Call up_dobev(regs) */
jalr t0, ra
jalr ra, t0
di /* Disable interrupts */
RESTORE_STACK t0, t1 /* Undo the operations of USE_STACK */
EXCPT_EPILOGUE v0 /* Return to the context returned by up_dobev() */
@@ -456,7 +456,7 @@ _int_handler:
move a0, sp /* Pass register save structure as the parameter 1 */
USE_INTSTACK t0, t1, t2 /* Switch to the interrupt stack */
la t0, pic32mx_decodeirq /* Call pic32mx_decodeirq(regs) */
jalr t0, ra
jalr ra, t0
di /* Disable interrupts */
RESTORE_STACK t0, t1 /* Undo the operations of USE_STACK */
EXCPT_EPILOGUE v0 /* Return to the context returned by pic32mx_decodeirq() */
@@ -479,7 +479,7 @@ _nmi_handler:
move a0, sp /* Pass register save structure as the parameter 1 */
USE_INTSTACK t0, t1, t2 /* Switch to the interrupt stack */
la t0, pic32mx_donmi /* Call up_donmi(regs) */
jalr t0, ra
jalr ra, t0
di /* Disable interrupts */
RESTORE_STACK t0, t1 /* Undo the operations of USE_STACK */
EXCPT_EPILOGUE v0 /* Return to the context returned by pic32mx_donmi() */
@@ -505,13 +505,13 @@ __start_nuttx:
/* Perform low level initialization */
la t0, pic32mx_lowinit
jalr t0, ra
jalr ra, t0
nop
/* Call os_start */
la t0, os_start
jalr t0, ra
jalr ra, t0
nop
/* Just in case main returns, go into an infinite loop */