sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests 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 74c314fb2a
commit cc97bab6c3
6 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/mips/src/mips32/up_copystate.c
View File

@ -70,7 +70,7 @@ void up_copystate(uint32_t *dest, uint32_t *src)
{ {
int i; 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 * 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: * following check avoids copying the TCB save area onto itself:
*/ */

10
arch/mips/src/pic32mx/pic32mx-head.S
View File

@ -434,7 +434,7 @@ _bev_handler:
move a0, sp /* Pass register save structure as the parameter 1 */ move a0, sp /* Pass register save structure as the parameter 1 */
USE_INTSTACK t0, t1, t2 /* Switch to the interrupt stack */ USE_INTSTACK t0, t1, t2 /* Switch to the interrupt stack */
la t0, pic32mx_dobev /* Call up_dobev(regs) */ la t0, pic32mx_dobev /* Call up_dobev(regs) */
jalr t0, ra jalr ra, t0
di /* Disable interrupts */ di /* Disable interrupts */
RESTORE_STACK t0, t1 /* Undo the operations of USE_STACK */ RESTORE_STACK t0, t1 /* Undo the operations of USE_STACK */
EXCPT_EPILOGUE v0 /* Return to the context returned by up_dobev() */ 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 */ move a0, sp /* Pass register save structure as the parameter 1 */
USE_INTSTACK t0, t1, t2 /* Switch to the interrupt stack */ USE_INTSTACK t0, t1, t2 /* Switch to the interrupt stack */
la t0, pic32mx_decodeirq /* Call pic32mx_decodeirq(regs) */ la t0, pic32mx_decodeirq /* Call pic32mx_decodeirq(regs) */
jalr t0, ra jalr ra, t0
di /* Disable interrupts */ di /* Disable interrupts */
RESTORE_STACK t0, t1 /* Undo the operations of USE_STACK */ RESTORE_STACK t0, t1 /* Undo the operations of USE_STACK */
EXCPT_EPILOGUE v0 /* Return to the context returned by pic32mx_decodeirq() */ 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 */ move a0, sp /* Pass register save structure as the parameter 1 */
USE_INTSTACK t0, t1, t2 /* Switch to the interrupt stack */ USE_INTSTACK t0, t1, t2 /* Switch to the interrupt stack */
la t0, pic32mx_donmi /* Call up_donmi(regs) */ la t0, pic32mx_donmi /* Call up_donmi(regs) */
jalr t0, ra jalr ra, t0
di /* Disable interrupts */ di /* Disable interrupts */
RESTORE_STACK t0, t1 /* Undo the operations of USE_STACK */ RESTORE_STACK t0, t1 /* Undo the operations of USE_STACK */
EXCPT_EPILOGUE v0 /* Return to the context returned by pic32mx_donmi() */ EXCPT_EPILOGUE v0 /* Return to the context returned by pic32mx_donmi() */
@ -505,13 +505,13 @@ __start_nuttx:
/* Perform low level initialization */ /* Perform low level initialization */
la t0, pic32mx_lowinit la t0, pic32mx_lowinit
jalr t0, ra jalr ra, t0
nop nop
/* Call os_start */ /* Call os_start */
la t0, os_start la t0, os_start
jalr t0, ra jalr ra, t0
nop nop
/* Just in case main returns, go into an infinite loop */ /* Just in case main returns, go into an infinite loop */

2
configs/pcblogic-pic32mx/ostest/ld.script
View File

@ -191,7 +191,7 @@ SECTIONS
*/ */
/* This causes failures if there are no RAM functions /* This causes failures if there are no RAM functions
.ramfunc /* ALIGN(2K) */ : .ramfunc :
{ {
_sramfunc = ABSOLUTE(.); _sramfunc = ABSOLUTE(.);
*(.ramfunc .ramfunc.*) *(.ramfunc .ramfunc.*)

2
configs/pic32-starterkit/ostest/ld.script
View File

@ -191,7 +191,7 @@ SECTIONS
*/ */
/* This causes failures if there are no RAM functions /* This causes failures if there are no RAM functions
.ramfunc /* ALIGN(2K) */ : .ramfunc :
{ {
_sramfunc = ABSOLUTE(.); _sramfunc = ABSOLUTE(.);
*(.ramfunc .ramfunc.*) *(.ramfunc .ramfunc.*)

2
configs/sure-pic32mx/ostest/ld.script
View File

@ -191,7 +191,7 @@ SECTIONS
*/ */
/* This causes failures if there are no RAM functions /* This causes failures if there are no RAM functions
.ramfunc /* ALIGN(2K) */ : .ramfunc :
{ {
_sramfunc = ABSOLUTE(.); _sramfunc = ABSOLUTE(.);
*(.ramfunc .ramfunc.*) *(.ramfunc .ramfunc.*)

1
include/cxx/ctime
View File

@ -59,7 +59,6 @@ namespace std
using ::sigevent; using ::sigevent;
using ::clock_settime; using ::clock_settime;
using ::clock_gettime; using ::clock_gettime;
using ::lock_getres;
using ::mktime; using ::mktime;
using ::gmtime_r; using ::gmtime_r;
using ::timer_create; using ::timer_create;