RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2002-08-26 Eric Norum <eric.norum@usask.ca>

Browse Source 
* cpu_asm.S: More PR267 tinkering which eliminates some conditional
	compilation.
This commit is contained in:
Joel Sherrill
2002-08-26 13:03:01 +00:00
parent 2085b08e74
commit a7bafd58d0
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cpukit/score/cpu/m68k/ChangeLog
View File

@@ -1,3 +1,8 @@
2002-08-26 Eric Norum <eric.norum@usask.ca>
* cpu_asm.S: More PR267 tinkering which eliminates some conditional
compilation.
2002-08-14 Brett Swimley <brett.swimley@aedinc.net> 2002-08-14 Brett Swimley <brett.swimley@aedinc.net>
* cpu_asm.S: Per PR267, the _ISR_Handler() function never was modifying * cpu_asm.S: Per PR267, the _ISR_Handler() function never was modifying

7
cpukit/score/cpu/m68k/cpu_asm.S
View File

@@ -139,8 +139,6 @@ SYM (_ISR_Handler):
#if ( CPU_HAS_SOFTWARE_INTERRUPT_STACK == 1 ) #if ( CPU_HAS_SOFTWARE_INTERRUPT_STACK == 1 )
tstl SYM (_ISR_Nest_level) | Interrupting an interrupt handler?
bne 2f | Yes, just skip over stack switch code
movel _CPU_Interrupt_stack_high,a0 | a0 now point just above interrupt stack movel _CPU_Interrupt_stack_high,a0 | a0 now point just above interrupt stack
cmpl _CPU_Interrupt_stack_low,a7 | stack below interrupt stack? cmpl _CPU_Interrupt_stack_low,a7 | stack below interrupt stack?
bcs.b 1f | yes, switch to interrupt stack bcs.b 1f | yes, switch to interrupt stack
@@ -167,18 +165,15 @@ SYM (_ISR_Handler):
movel d0,a7@- | push vector number movel d0,a7@- | push vector number
jbsr a0@ | invoke the user ISR jbsr a0@ | invoke the user ISR
addql #4,a7 | remove vector number addql #4,a7 | remove vector number
subql #1,SYM(_ISR_Nest_level) | Reduce interrupt-nesting count
#if ( CPU_HAS_SOFTWARE_INTERRUPT_STACK == 1 ) #if ( CPU_HAS_SOFTWARE_INTERRUPT_STACK == 1 )
subql #1,SYM(_ISR_Nest_level) | Reduce interrupt-nesting count
bne 1f | Skip if return to interrupt
movel _CPU_Interrupt_stack_high,a0 movel _CPU_Interrupt_stack_high,a0
subql #4,a0 subql #4,a0
cmpl a0,a7 | At top of interrupt stack? cmpl a0,a7 | At top of interrupt stack?
bne.b 1f | No, do not restore task stack pointer bne.b 1f | No, do not restore task stack pointer
movel (a7),a7 | Restore task stack pointer movel (a7),a7 | Restore task stack pointer
1: 1:
#else
subql #1,SYM (_ISR_Nest_level) | one less nest level
#endif /* CPU_HAS_SOFTWARE_INTERRUPT_STACK == 1 */ #endif /* CPU_HAS_SOFTWARE_INTERRUPT_STACK == 1 */
subql #1,SYM (_Thread_Dispatch_disable_level) subql #1,SYM (_Thread_Dispatch_disable_level)
| unnest multitasking | unnest multitasking