nuttx/nuttx-mirror
1
2
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2025-01-13 10:58:49 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Costmetic changes from review of merge request

Browse source
This commit is contained in:
Gregory Nutt 2015-12-26 16:39:51 -06:00
parent 21bdeac349
commit 46da8a07ef
2 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
arch/avr/src/avr/excptmacros.h
View file

@ -141,7 +141,7 @@
*
* At completion:
* Register state is saved on the stack; All registers are available for usage except sp and
* r24 which still contains the IRQ number as set by the HANDLER macro.
* r24 which still contains the IRQ number as set by the HANDLER macro.
*
********************************************************************************************/
@ -418,7 +418,7 @@
* On completion:
* All registers restored except for the PC with now resides at the top of the new stack
* so that ret can be used to switch to the new context. (ret, not reti, becaue ret
* will preserve the restored interrupt state).
* will preserve the restored interrupt state).
*
********************************************************************************************/
@ -514,22 +514,23 @@
ld r0, x+
/* The following control flow split is required to eliminate non-atomic
interrupt_enable - return sequence.
NOTE: since actual returning is handled by this macro it has been removed
from up_fullcontextrestore function (up_switchcontext.S)
*/
/* The following control flow split is required to eliminate non-atomic
* interrupt_enable - return sequence.
*
* NOTE: since actual returning is handled by this macro it has been removed
* from up_fullcontextrestore function (up_switchcontext.S)
*/
/* If interrupts shall be enabled go to 'restore remaining and reti' code
* otherwise just do 'restore remaining and ret'
*/
/* if interrupts shall be enabled go to 'restore remaining and reti' code
otherwise just do 'restore remaining and ret' */
ld r24, x+
bst r24, SREG_I
brts go_reti
/* Restore the status register, interrupts are disabled */
out _SFR_IO_ADDR(SREG), r24
/* Restore r24-r25 - The temporary and IRQ number registers */
@ -547,20 +548,21 @@
ret
go_reti:
/* restore the Status Register with interrupts disabled
and exit with reti (that will set the Interrupt Enable) */
/* restore the Status Register with interrupts disabled
* and exit with reti (that will set the Interrupt Enable)
*/
andi r24, ~(1 << SREG_I)
out _SFR_IO_ADDR(SREG), r24
ld r25, x+
ld r24, x+
pop r27
pop r27
pop r26
reti
.endm
/********************************************************************************************

3
arch/avr/src/avr/up_switchcontext.S
View file

@ -130,8 +130,7 @@ up_fullcontextrestore:
TCB_RESTORE
/* Retruning from the function is handled in TCB_RESTORE */
/* Returning from the function is handled in TCB_RESTORE */
.endfunc
.end