michaelh/zephyr
1
0
Fork 0
Code Releases Activity

arm: fix tabs-vs-space issues in isr_wrapper.s

Browse source 
Change-Id: I4a87fe44e2a9444a460e7b0629d41a845ad2e7ed
Signed-off-by: Benjamin Walsh <benjamin.walsh@windriver.com>
This commit is contained in:
Benjamin Walsh 2015-05-14 13:00:38 -04:00 • committed by Anas Nashif
commit f166d84220
1 changed files with 30 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

61
arch/arm/core/isr_wrapper.s
View file

@ -68,45 +68,44 @@ GTEXT(_IntExit)
*/ */
SECTION_FUNC(TEXT, _isr_wrapper) SECTION_FUNC(TEXT, _isr_wrapper)
_GDB_STUB_EXC_ENTRY _GDB_STUB_EXC_ENTRY
push {lr} /* lr is now the first item on the stack */ push {lr} /* lr is now the first item on the stack */
#ifdef CONFIG_ADVANCED_POWER_MANAGEMENT #ifdef CONFIG_ADVANCED_POWER_MANAGEMENT
/* /*
* All interrupts are disabled when handling idle wakeup. * All interrupts are disabled when handling idle wakeup. For tickless
* For tickless idle, this ensures that the calculation and programming of * idle, this ensures that the calculation and programming of the device
* the device for the next timer deadline is not interrupted. * for the next timer deadline is not interrupted. For non-tickless idle,
* For non-tickless idle, this ensures that the clearing of the kernel idle * this ensures that the clearing of the kernel idle state is not
* state is not interrupted. * interrupted. In each case, _sys_power_save_idle_exit is called with
* In each case, _sys_power_save_idle_exit is called with interrupts * interrupts disabled.
* disabled. */
*/ cpsid i /* PRIMASK = 1 */
cpsid i /* PRIMASK = 1 */
/* is this a wakeup from idle ? */ /* is this a wakeup from idle ? */
ldr r2, =_nanokernel ldr r2, =_nanokernel
ldr r0, [r2, #__tNANO_idle_OFFSET] /* requested idle duration, in ticks */ ldr r0, [r2, #__tNANO_idle_OFFSET] /* requested idle duration, in ticks */
cmp r0, #0 cmp r0, #0
ittt ne ittt ne
movne r1, #0 movne r1, #0
strne r1, [r2, #__tNANO_idle_OFFSET] /* clear kernel idle state */ strne r1, [r2, #__tNANO_idle_OFFSET] /* clear kernel idle state */
blxne _sys_power_save_idle_exit blxne _sys_power_save_idle_exit
cpsie i /* re-enable interrupts (PRIMASK = 0) */ cpsie i /* re-enable interrupts (PRIMASK = 0) */
#endif /* CONFIG_ADVANCED_POWER_MANAGEMENT */ #endif /* CONFIG_ADVANCED_POWER_MANAGEMENT */
mrs r0, IPSR /* get exception number */ mrs r0, IPSR /* get exception number */
sub r0, r0, #16 /* get IRQ number */ sub r0, r0, #16 /* get IRQ number */
lsl r0, r0, #3 /* table is 8-byte wide */ lsl r0, r0, #3 /* table is 8-byte wide */
ldr r1, =_sw_isr_table ldr r1, =_sw_isr_table
add r1, r1, r0 /* table entry: ISRs must have their MSB set to stay add r1, r1, r0 /* table entry: ISRs must have their MSB set to stay
* in thumb mode */ * in thumb mode */
ldmia r1,{r0,r3} /* arg in r0, ISR in r3 */ ldmia r1,{r0,r3} /* arg in r0, ISR in r3 */
blx r3 /* call ISR */ blx r3 /* call ISR */
pop {lr} pop {lr}
/* exception return is done in _IntExit(), including _GDB_STUB_EXC_EXIT */ /* exception return is done in _IntExit(), including _GDB_STUB_EXC_EXIT */
b _IntExit b _IntExit