sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Same fixes as for interrupt return

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@567 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2008-01-25 23:14:49 +00:00
parent 8fff87f7c5
commit c5d3ec31ab
1 changed files with 112 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
arch/z16/src/z16f/z16f_restoreusercontext.S
View File

@ -70,7 +70,9 @@
*************************************************************************/
_up_restoreusercontext:
/* Disable interrupts throughout the following */
/* Disable interrupts while we are accessing the TCB's register
* save structure
*/
di
@ -78,28 +80,33 @@ _up_restoreusercontext:
ld sp, 2*REG_SP(r1) /* sp=Value of SP on return */
ld r2, 2*REG_PC(r1) /* r2=return address */
push r1 /* Push the return address onto the stack */
push r2 /* Push the return address onto the stack */
ld r7, 2*REG_R7(r1) /* r7=saved value of r7 */
push r7 /* Save this so that we can use r7 */
ld r7, sp /* r7=saved SP value */
/* Retore r8-r18 */
/* Retore r8-r14 */
ld sp, r1 /* sp=Value of SP at call to _up_doirq */
ld sp, r1 /* sp=Points to register save structure */
popmhi <r8-r14> /* Restore r8-r14 */
add sp, #4 /* Skip over r15=sp */
/* Test if interrupts should be enabled upon return */
ld.w r2, 2*REG_FLAGS(r1) /* r2=padded flags value */
tm r2, #Z16F_CNTRL_FLAGS_IRQE /* Test IRQE bit */
tm r2, #Z16F_CNTRL_FLAGS_IRQE /* Test IRQE bit (Z-bit == 0 if disabled) */
popmlo <r0-r6> /* Restore r0-r6 (retains Z-bit) */
ld sp, r7 /* Recover the correct SP value (retains Z-bit) */
pop r7 /* Get the saved value of r7 (retains Z-bit)*/
jp z, _up_returndisabled /* Jump if interrupts should remain disabled */
/* Return with interrupts enabled */
/* Return with interrupts enabled. Note that at this point in the logic,
* we are finished accessing the TCB. Therefore, any interrupt level context
* switches that may modify the TCB should be OK
*/
popmlo <r0-r7> /* Restore r0-r7 */
ei /* Enable interrupts and return */
ret
/* Return with interrupts disabled */
ei /* Enable interrupts */
_up_returndisabled:
popmlo <r0-r7> /* Restore r0-r7 */
ret
end