diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2003-02-11 23:29:06 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2003-02-11 23:29:06 +0000 |
| commit | 9518a5bc4d41403d2f4d635a6973f3b36b7b4f65 (patch) | |
| tree | c764aa01d1532ad094f62cd58a87b3c5dee67838 /c/src/lib/libcpu/sh/sh7032/score | |
| parent | 2003-02-11 Jay Monkman <jtm@smoothsmoothie.com> (diff) | |
| download | rtems-9518a5bc4d41403d2f4d635a6973f3b36b7b4f65.tar.bz2 | |
2003-02-11 Joel Sherrill <joel@OARcorp.com>
* score/cpu_asm.c: Rework logic that decides when to call
_Thread_Dispatch. Analysis by Sergei Organov <osv@javad.ru>
determined that _ISR_Signals_to_thread_executing was not being
honored and/or cleared properly.
Diffstat (limited to 'c/src/lib/libcpu/sh/sh7032/score')
| -rw-r--r-- | c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c b/c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c index b9caadb242..cc94c11693 100644 --- a/c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c +++ b/c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c @@ -287,6 +287,8 @@ void __ISR_Handler( unsigned32 vector) _CPU_ISR_Disable( level ); + _Thread_Dispatch_disable_level--; + _ISR_Nest_level--; #if( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE) @@ -296,16 +298,18 @@ void __ISR_Handler( unsigned32 vector) stack_ptr = _old_stack_ptr; #endif - _Thread_Dispatch_disable_level--; - _CPU_ISR_Enable( level ); - if ( _Thread_Dispatch_disable_level == 0 ) - { - if(( _Context_Switch_necessary) || (! _ISR_Signals_to_thread_executing)) - { - _ISR_Signals_to_thread_executing = FALSE; - _Thread_Dispatch(); - } + if ( _ISR_Nest_level ) + return; + + if ( _Thread_Dispatch_disable_level ) { + _ISR_Signals_to_thread_executing = FALSE; + return; + } + + if ( _Context_Switch_necessary || _ISR_Signals_to_thread_executing ) { + _ISR_Signals_to_thread_executing = FALSE; + _Thread_Dispatch(); } } |